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:
huangjingquan 2013-10-08 22:21:24 +08:00
parent e19fe844a2 aefd9b545b
commit b14f0e2901
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/users_helper.rb
View File

@ -110,13 +110,13 @@ module UsersHelper
else else
case state case state
when 0 when 0
s = content_tag('span', '我参入的课程', :class => "current-page") s = content_tag('span', '我加入的课程', :class => "current-page")
content << content_tag('li', s) content << content_tag('li', s)
content << content_tag('li', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1})) content << content_tag('li', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
content_tag('div', content, :class => "pagination") content_tag('div', content, :class => "pagination")
when 1 when 1
s = content_tag('span', '我的作业', :class => "current-page") s = content_tag('span', '我的作业', :class => "current-page")
content << content_tag('li', link_to('我参入的课程', {:controller => 'users', :action => 'user_courses', :type => 0})) content << content_tag('li', link_to('我加入的课程', {:controller => 'users', :action => 'user_courses', :type => 0}))
content << content_tag('li', s, :class => "current-page") content << content_tag('li', s, :class => "current-page")
content_tag('div', content, :class => "pagination") content_tag('div', content, :class => "pagination")
end end

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

@ -201,9 +201,11 @@
<div id="content" style="padding-top: 0px;"> <div id="content" style="padding-top: 0px;">
<div class="tabs_new"> <div class="tabs_new">
<% if @user.user_extensions.identity == 2 %>
<%= render_menu :user_enterprise_menu %>
<% else %>
<%= render_menu :user_menu %> <%= render_menu :user_menu %>
<% end %>
</div> </div>
<%= yield %> <%= yield %>
<%= call_hook :view_layouts_base_content %> <%= call_hook :view_layouts_base_content %>

12
app/views/praise_tread/_praise_tread.html.erb
View File

@ -8,14 +8,14 @@
<% if @flag == 1 %> <!-- 顶过 --><!-- modified by bai --> <% if @flag == 1 %> <!-- 顶过 --><!-- modified by bai -->
<table style="line-height: 1px"> <table style="line-height: 1px">
<tr> <tr>
<td ><%= image_tag "/images/praise_tread/praise_false.png" , weight:"35px", height:"35px",:title => l(:label_issue_praise_over) %></td> <td ><%= image_tag "/images/praise_tread/praise_false.png" , weight:"22px", height:"22px",:title => l(:label_issue_praise_over) %></td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td> <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
</tr> </tr>
<tr> <tr>
<td><%= image_tag "/images/praise_tread/tread_false.png",weight:"35px", height:"35px",:title => l(:label_issue_appraise_over) %></td> <td><%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_appraise_over) %></td>
</tr> </tr>
</table> </table>
@ -23,14 +23,14 @@
<table style="line-height: 1px"> <table style="line-height: 1px">
<tr> <tr>
<td > <%= image_tag "/images/praise_tread/praise_false.png",weight:"35px", height:"35px", :title => l(:label_issue_appraise_over) %></td> <td > <%= image_tag "/images/praise_tread/praise_false.png",weight:"22px", height:"22px", :title => l(:label_issue_appraise_over) %></td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td> <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
</tr> </tr>
<tr> <tr>
<td><%= image_tag "/images/praise_tread/tread_false.png",weight:"35px", height:"35px",:title => l(:label_issue_tread_over) %> </td> <td><%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_tread_over) %> </td>
</tr> </tr>
</table> </table>
<% end %> <% end %>
@ -39,14 +39,14 @@
<table style="line-height: 1px"> <table style="line-height: 1px">
<tr> <tr>
<td > <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"35px", height:"35px",:title => l(:label_issue_praise)), <td > <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
:controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class%> </td> :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class%> </td>
</tr> </tr>
<tr> <tr>
<td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td> <td align="center"><strong class="font_small_watch"><%= get_praise_num(obj)%></strong></td>
</tr> </tr>
<tr> <tr>
<td> <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"35px", height:"35px",:title => l(:label_issue_tread)),:controller=>"praise_tread", <td> <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"22px", height:"22px",:title => l(:label_issue_tread)),:controller=>"praise_tread",
:action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class %></td> :action=>"tread_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class %></td>
</tr> </tr>
</table> </table>

2
config/locales/zh.yml
View File

@ -1519,7 +1519,7 @@ zh:
label_student: 学生 label_student: 学生
label_other: 其他 label_other: 其他
label_enterprise: 企业 label_enterprise: 企业
label_developer: 开发者 label_developer: 用户
label_gender: 性别 label_gender: 性别
label_gender_male: 男 label_gender_male: 男
label_gender_female: 女 label_gender_female: 女

9
lib/redmine.rb
View File

@ -335,6 +335,15 @@ Redmine::MenuManager.map :user_menu do |menu|
menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'}
menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback'} menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback'}
end
Redmine::MenuManager.map :user_enterprise_menu do |menu|
menu.push :activity, {:controller => 'users', :action => 'show' }
menu.push :user_project, {:controller => 'users', :action => 'user_projects'}
menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'}
menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback'}
end end
Redmine::MenuManager.map :user_menu_self do |menu| Redmine::MenuManager.map :user_menu_self do |menu|
menu.push :activity, {:controller => 'users', :action => 'show' } menu.push :activity, {:controller => 'users', :action => 'show' }