diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index ecd348d55..d3f81582a 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -5,10 +5,48 @@
<%= render_menu :account_menu -%>
- <%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %> - <%= 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? -%> + <% if User.current.logged? -%> +
+ +
+ <% end -%> + <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
+ diff --git a/config/locales/en.yml b/config/locales/en.yml index 81954b8a5..3a1113bc7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -541,6 +541,7 @@ en: label_home: Home label_my_page: My page label_my_account: My account + label_my_message: My messages label_my_projects: My projects label_my_page_block: My page block label_administration: Administration diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 82406f3d4..f61570cba 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -567,6 +567,7 @@ zh: #end label_my_page: 我的工作台 label_my_account: 我的帐号 + label_my_message: 留言 label_my_projects: 我的项目 label_my_page_block: 我的工作台模块 label_administration: 管理 diff --git a/lib/redmine.rb b/lib/redmine.rb index a013ebaca..8a3edbfc9 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -261,6 +261,7 @@ Redmine::MenuManager.map :account_menu do |menu| menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? } menu.push :register, :register_path, :if => Proc.new { !User.current.logged? && Setting.self_registration? } # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } + menu.push :my_message, { :controller => 'users', :action => 'user_newfeedback', id: User.current.id }, :if => Proc.new { User.current.logged? } menu.push :logout, :signout_path, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } end ########fq diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index b6ec9c3c4..a02715a4e 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -2184,4 +2184,44 @@ ul.messages-for-user-reply li { float: left; margin: 0; padding: 0; +} + +#loggedas ul{ + width:115px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} +#loggedas li { + border-bottom: 1px solid #129DAD; + color: white; + list-style: none ; + width: 90%; + padding: 6px 0px; + margin-left: 5%; +} +#loggedas li span{ + cursor: pointer; +} +#loggedas ul:first-child { + border-top: 1px solid #12A7B8; +} +#loggedas li.last_child { + +} +#loggedas .sub_menu { + box-shadow: 2px 2px 6px #b0b0b0 ; + display: none; + background: #13AEBF 0 0 no-repeat; + left: 78.5%; + padding-bottom: 5px; + position: absolute; + top: 40px; + font-size: 1.1em; + margin: 0px; + padding: 0px 0px; + text-align: center; + z-index: 1; +} +#loggedas .sub_menu a{ + margin: 0px; } \ No newline at end of file