jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
kaizheng 2013-08-01 20:27:14 +08:00
parent e635237acd 18b1d22502
commit 28296f3f9b
10 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -17,7 +17,7 @@
class UsersController < ApplicationController class UsersController < ApplicationController
layout 'base_users' layout 'base_users'
before_filter :require_admin, :except => [:show, :index,:tag_save] before_filter :require_admin, :except => [:show, :index,:tag_save, :user_projects, :user_newfeedback, :user_comments]
before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments] before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments]
accept_api_auth :index, :show, :create, :update, :destroy accept_api_auth :index, :show, :create, :update, :destroy

1
app/views/issues/_list.html.erb
View File

@ -78,6 +78,7 @@
<li id="issue-<%= issue.id %>" class="hascontextmenu <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>"> <li id="issue-<%= issue.id %>" class="hascontextmenu <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<% column_content = ( query.inline_columns.map {|column| "<li class=\"#{column.css_classes}\">#{column_content(column, issue)}</li>"}) %> <% column_content = ( query.inline_columns.map {|column| "<li class=\"#{column.css_classes}\">#{column_content(column, issue)}</li>"}) %>
<%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
<ul class="issue_list"> <ul class="issue_list">
<%= raw column_content[0] %> <%= raw column_content[0] %>
<%= raw column_content[4] %> <%= raw column_content[4] %>

5
app/views/layouts/_base_footer.html.erb Normal file
View File

@ -0,0 +1,5 @@
<div id="footer" style="margin-left:-5px;padding-top: 10px;clear: both;">
<div class="bgl"><div class="bgr">
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2013 Jean-Philippe Lang
</div></div>
</div>

4
app/views/layouts/base_projects.html.erb
View File

@ -119,9 +119,11 @@
<%= call_hook :view_layouts_base_content %> <%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<%= render_flash_messages %> <%= render_flash_messages %>
</div> </div>
<%=render :partial => 'layouts/base_footer'%>
</div> </div>
<div id="ajax-indicator" style="display:none;"> <div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span> <span><%= l(:label_loading) %></span>
</div> </div>

20
app/views/layouts/base_users.html.erb
View File

@ -18,16 +18,8 @@
<body class="<%= h body_css_classes %>"> <body class="<%= h body_css_classes %>">
<div id="wrapper"> <div id="wrapper">
<div id="wrapper2"> <div id="wrapper2">
<div id="wrapper3"> <div id="wrapper3">
<div id="top-menu" style="background-color: #FFFFFF"> <%=render :partial => 'layouts/base_header'%>
<div id="account">
<div id="top-menu" style="background-color: #FFFFFF">
<%= render_menu :account_menu -%>
</div>
<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
<%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
</div>
<div id="main" class=""> <div id="main" class="">
<!--user page--> <!--user page-->
<div id="sidebar"> <div id="sidebar">
@ -139,9 +131,12 @@
<%= call_hook :view_layouts_base_content %> <%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<%= render_flash_messages %> <%= render_flash_messages %>
</div>
</div>
<%=render :partial => 'layouts/base_footer'%>
</div> </div>
<div id="ajax-indicator" style="display:none;"> <div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span> <span><%= l(:label_loading) %></span>
</div> </div>
@ -150,6 +145,7 @@
</div> </div>
</div> </div>
<%= call_hook :view_layouts_base_body_bottom %> <%= call_hook :view_layouts_base_body_bottom %>
</body> </body>
</html> </html>

4
app/views/users/index.html.erb
View File

@ -137,9 +137,7 @@
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %> <% end %>
<% end %> <% end %>
</p> <%= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %>
<p>
<%= user.changesets.count == 0 ? '' : "#{l(:label_total_commit, :total_commit => user.changesets.count)}" %> | managed 7 projects | Most experience in c++
</p> </p>
</div> </div>
<% end -%> <% end -%>

2
app/views/users/show.html.erb
View File

@ -11,7 +11,7 @@
<td colspan="2" valign="top"><strong> <%= content_tag('span', h(e.project), :class => 'project') %></strong> <span class="font_lighter">有了最新动态</span> <%= link_to format_activity_title(e.event_title), e.event_url %></td> <td colspan="2" valign="top"><strong> <%= content_tag('span', h(e.project), :class => 'project') %></strong> <span class="font_lighter">有了最新动态</span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" ><p class="font_description"><%= format_activity_description(e.event_description) %></p></td> <td colspan="2" width="580" ><p class="font_description"><%= textilizable e.event_description %></p></td>
</tr> </tr>
<tr> <tr>
<td align="left"><a class="font_lighter"></a></td> <td align="left"><a class="font_lighter"></a></td>

BIN
public/images/issues-closed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
public/images/issues.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

31
public/themes/redpenny-master/stylesheets/application.css
View File

@ -1103,7 +1103,9 @@ a.project {
float: left; float: left;
margin-top: 0px; margin-top: 0px;
width: 908px; width: 908px;
height: 148px; min-height: 120px;
height: auto;
margin-bottom: 5px;
} }
a.root { a.root {
@ -1118,7 +1120,7 @@ a.root {
margin-right: auto; margin-right: auto;
margin-bottom: 10px; margin-bottom: 10px;
width: 908px; width: 908px;
height: 250px; height: auto;
padding-top: 10px; padding-top: 10px;
padding-left: 10px; padding-left: 10px;
padding-bottom: 10px; padding-bottom: 10px;
@ -1191,9 +1193,11 @@ a.img-tag3{
} }
.add-info { .add-info {
margin-top: 160px; float: left;
margin-top: 0px;
height: 20px; height: 20px;
width: 908px; width: 908px;
margin-bottom: 5px;
} }
.main-language { .main-language {
float: left; float: left;
@ -1247,8 +1251,8 @@ a.tag {
div.well { div.well {
color: black; color: black;
min-height: 20px; min-height: 20px;
height: 110px; height: auto;
padding: 19px; padding: 19px 19px 6px 19px;
margin-bottom: 20px; margin-bottom: 20px;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #eee; border: 1px solid #eee;
@ -1400,6 +1404,7 @@ div.issue-note .description {
*/ */
div.autoscroll ul.issue_list { div.autoscroll ul.issue_list {
margin-left: 30px;
} }
div.autoscroll ul { div.autoscroll ul {
@ -1415,9 +1420,10 @@ div.autoscroll li.hascontextmenu{
position: relative; position: relative;
display: block; display: block;
margin-bottom: -1px; margin-bottom: -1px;
margin-left: 10px;
padding: 8px 10px 10px 10px;/*by young*/ padding: 8px 10px 10px 10px;/*by young*/
border: 1px solid rgb(229,229,229); border: 1px solid rgb(229,229,229);
width: 650px;/*by young*/ width: 600px;/*by young*/
} }
div.autoscroll li.id { div.autoscroll li.id {
@ -1434,12 +1440,12 @@ div.autoscroll li.id a {
div.autoscroll li.subject { div.autoscroll li.subject {
margin:0px 60px 0px 0px; margin:0px 60px 0px 0px;
font-size: 15px; font-size: small;
line-height: 1.3; line-height: 1.3;
word-wrap: break-word; word-wrap: break-word;
} }
div.autoscroll li.subject a{ div.autoscroll li.subject a{
color: rgb(0, 0, 0); color: rgb(51, 51, 51);
} }
div.autoscroll ul.list-group-item-meta{ div.autoscroll ul.list-group-item-meta{
font-size: 11px; font-size: 11px;
@ -1454,10 +1460,17 @@ div.autoscroll ul.list-group-item-meta li {
} }
div.autoscroll li.tracker, div.autoscroll li.status, div.autoscroll li.priority{ div.autoscroll li.tracker, div.autoscroll li.status, div.autoscroll li.priority{
color: rgb(17, 102, 153); color: rgb(51, 51, 51);
font: 10px/1.4 Helvetica,arial,freesans,clean,sans-serif;
} }
li.issue img.img-tag-issues {
float: left;
height: 24px;
width: 24px;
}
/* /*
*/ */