diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 1bddaeb2a..1bb831843 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -110,13 +110,13 @@ module UsersHelper
else
case state
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', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
content_tag('div', content, :class => "pagination")
when 1
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_tag('div', content, :class => "pagination")
end
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 5ac13e207..ca6c4e4bd 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -201,9 +201,11 @@
-
+ <% if @user.user_extensions.identity == 2 %>
+ <%= render_menu :user_enterprise_menu %>
+ <% else %>
<%= render_menu :user_menu %>
-
+ <% end %>
<%= yield %>
<%= call_hook :view_layouts_base_content %>
diff --git a/app/views/praise_tread/_praise_tread.html.erb b/app/views/praise_tread/_praise_tread.html.erb
index 4e28d7033..5fee2a593 100644
--- a/app/views/praise_tread/_praise_tread.html.erb
+++ b/app/views/praise_tread/_praise_tread.html.erb
@@ -8,14 +8,14 @@
<% if @flag == 1 %>
- <%= image_tag "/images/praise_tread/praise_false.png" , weight:"35px", height:"35px",:title => l(:label_issue_praise_over) %> |
+ <%= image_tag "/images/praise_tread/praise_false.png" , weight:"22px", height:"22px",:title => l(:label_issue_praise_over) %> |
<%= get_praise_num(obj)%> |
- <%= image_tag "/images/praise_tread/tread_false.png",weight:"35px", height:"35px",:title => l(:label_issue_appraise_over) %> |
+ <%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_appraise_over) %> |
@@ -23,14 +23,14 @@
- <%= image_tag "/images/praise_tread/praise_false.png",weight:"35px", height:"35px", :title => l(:label_issue_appraise_over) %> |
+ <%= image_tag "/images/praise_tread/praise_false.png",weight:"22px", height:"22px", :title => l(:label_issue_appraise_over) %> |
<%= get_praise_num(obj)%> |
- <%= image_tag "/images/praise_tread/tread_false.png",weight:"35px", height:"35px",:title => l(:label_issue_tread_over) %> |
+ <%= image_tag "/images/praise_tread/tread_false.png",weight:"22px", height:"22px",:title => l(:label_issue_tread_over) %> |
<% end %>
@@ -39,14 +39,14 @@
- <%= link_to image_tag("/images/praise_tread/praise_true.png",weight:"35px", height:"35px",:title => l(:label_issue_praise)),
+ | <%= 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%> |
<%= get_praise_num(obj)%> |
- <%= link_to image_tag("/images/praise_tread/tread_true.png",weight:"35px", height:"35px",:title => l(:label_issue_tread)),:controller=>"praise_tread",
+ | <%= 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 %> |
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 38515ed06..375bc6f20 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1519,7 +1519,7 @@ zh:
label_student: 学生
label_other: 其他
label_enterprise: 企业
- label_developer: 开发者
+ label_developer: 用户
label_gender: 性别
label_gender_male: 男
label_gender_female: 女
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 509fa8e73..ee9a9386c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -334,6 +334,15 @@ Redmine::MenuManager.map :user_menu do |menu|
menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'}
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
Redmine::MenuManager.map :user_menu_self do |menu|