<%= l(:label_main_menu) %>
<%= l(:label_spent_time) %>
-<%= l_hours(@total_hours) %>
+<%= l_hours(@total_hours) %>
<%= link_to(l(:label_details), {:controller => '/timelog', :action => 'index', :project_id => @project}) %> | <%= link_to(l(:label_report), project_time_entries_report_path(@project)) %> diff --git a/lib/redmine.rb b/lib/redmine.rb index 5c75681f87..29e0c8c4b2 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -232,10 +232,10 @@ Redmine::AccessControl.map do |map| end Redmine::MenuManager.map :top_menu do |menu| - menu.push :my_page, { :controller => '/my', :action => 'page' }, :html => {:'data-icon' => '5'}, :if => Proc.new { User.current.logged? } + menu.push :my_page, { :controller => '/my', :action => 'page' }, :html => {:'data-icon' => "".html_safe}, :if => Proc.new { User.current.logged? } # projects menu will be added by Redmine::MenuManager::TopMenuHelper#render_projects_top_menu_node menu.push :administration, { :controller => '/admin', :action => 'projects' }, :if => Proc.new { User.current.admin? }, :last => true - menu.push :help, OpenProject::Info.help_url, :last => true, :caption => I18n.t('label_help'), :html => { :accesskey => OpenProject::AccessKeys.key_for(:help), :'data-icon' => 'L'} + menu.push :help, OpenProject::Info.help_url, :last => true, :caption => I18n.t('label_help'), :html => { :accesskey => OpenProject::AccessKeys.key_for(:help), :'data-icon' => "".html_safe} end Redmine::MenuManager.map :account_menu do |menu| @@ -248,8 +248,8 @@ Redmine::MenuManager.map :application_menu do |menu| end Redmine::MenuManager.map :my_menu do |menu| - menu.push :account, {:controller => '/my', :action => 'account'}, :caption => :label_my_account, :html => {:'data-icon2' => 'B'} - menu.push :password, {:controller => '/my', :action => 'password'}, :caption => :button_change_password, :if => Proc.new { User.current.change_password_allowed? }, :html => {:'data-icon2' => 'i'} + menu.push :account, {:controller => '/my', :action => 'account'}, :caption => :label_my_account, :html => {:'data-icon2' => "".html_safe} + menu.push :password, {:controller => '/my', :action => 'password'}, :caption => :button_change_password, :if => Proc.new { User.current.change_password_allowed? }, :html => {:'data-icon2' => "".html_safe} menu.push :delete_account, :deletion_info_path, :caption => I18n.t('account.delete'), :param => :user_id, @@ -257,48 +257,48 @@ Redmine::MenuManager.map :my_menu do |menu| end Redmine::MenuManager.map :admin_menu do |menu| - menu.push :projects, {:controller => '/admin', :action => 'projects'}, :caption => :label_project_plural, :html => {:'data-icon2' => '7'} - menu.push :users, {:controller => '/users'}, :caption => :label_user_plural, :html => {:'data-icon2' => 'B'} - menu.push :groups, {:controller => '/groups'}, :caption => :label_group_plural, :html => {:'data-icon2' => '&'} - menu.push :roles, {:controller => '/roles'}, :caption => :label_role_and_permissions, :html => {:'data-icon2' => 'A'} - menu.push :types, {:controller => '/types'}, :caption => :label_type_plural, :html => {:'data-icon2' => 'z'} + menu.push :projects, {:controller => '/admin', :action => 'projects'}, :caption => :label_project_plural, :html => {:'data-icon2' => "".html_safe} + menu.push :users, {:controller => '/users'}, :caption => :label_user_plural, :html => {:'data-icon2' => "".html_safe} + menu.push :groups, {:controller => '/groups'}, :caption => :label_group_plural, :html => {:'data-icon2' => "".html_safe} + menu.push :roles, {:controller => '/roles'}, :caption => :label_role_and_permissions, :html => {:'data-icon2' => "".html_safe} + menu.push :types, {:controller => '/types'}, :caption => :label_type_plural, :html => {:'data-icon2' => "".html_safe} menu.push :statuses, {:controller => '/statuses'}, :caption => :label_work_package_status_plural, - :html => {:class => 'statuses', :'data-icon2' => 'A'} - menu.push :workflows, {:controller => '/workflows', :action => 'edit'}, :caption => Proc.new { Workflow.model_name.human }, :html => {:'data-icon2' => 'A'} + :html => {:class => 'statuses', :'data-icon2' => "".html_safe} + menu.push :workflows, {:controller => '/workflows', :action => 'edit'}, :caption => Proc.new { Workflow.model_name.human }, :html => {:'data-icon2' => "".html_safe} menu.push :custom_fields, {:controller => '/custom_fields'}, :caption => :label_custom_field_plural, - :html => {:class => 'custom_fields', :'data-icon2' => 'A'} - menu.push :enumerations, {:controller => '/enumerations'}, :html => {:'data-icon2' => 'A'} - menu.push :settings, {:controller => '/settings'}, :html => {:'data-icon2' => 'T'} + :html => {:class => 'custom_fields', :'data-icon2' => "".html_safe} + menu.push :enumerations, {:controller => '/enumerations'}, :html => {:'data-icon2' => "".html_safe} + menu.push :settings, {:controller => '/settings'}, :html => {:'data-icon2' => "".html_safe} menu.push :ldap_authentication, {:controller => '/ldap_auth_sources', :action => 'index'}, - :html => {:class => 'server_authentication', :'data-icon2' => 'A'} - menu.push :plugins, {:controller => '/admin', :action => 'plugins'}, :last => true, :html => {:'data-icon2' => 'A'} - menu.push :info, {:controller => '/admin', :action => 'info'}, :caption => :label_information_plural, :last => true, :html => {:'data-icon2' => '%'} + :html => {:class => 'server_authentication', :'data-icon2' => "".html_safe} + menu.push :plugins, {:controller => '/admin', :action => 'plugins'}, :last => true, :html => {:'data-icon2' => "".html_safe} + menu.push :info, {:controller => '/admin', :action => 'info'}, :caption => :label_information_plural, :last => true, :html => {:'data-icon2' => "".html_safe} menu.push :colors, {:controller => '/planning_element_type_colors', :action => 'index'}, - {:caption => :'timelines.admin_menu.colors', :html => {:'data-icon2' => 'A'}} + {:caption => :'timelines.admin_menu.colors', :html => {:'data-icon2' => "".html_safe}} menu.push :project_types, {:controller => '/project_types', :action => 'index'}, - {:caption => :'timelines.admin_menu.project_types', :html => {:'data-icon2' => 'z'}} + {:caption => :'timelines.admin_menu.project_types', :html => {:'data-icon2' => "".html_safe}} end Redmine::MenuManager.map :project_menu do |menu| menu.push :overview, { :controller => '/projects', :action => 'show' }, - :html => {:'data-icon2' => '7'} + :html => {:'data-icon2' => "".html_safe} menu.push :activity, { :controller => '/activities', :action => 'index' }, :param => :project_id, :if => Proc.new { |p| p.module_enabled?("activity") }, - :html => {:'data-icon2' => 'k'} + :html => {:'data-icon2' => "".html_safe} menu.push :roadmap, { :controller => '/versions', :action => 'index' }, :param => :project_id, :if => Proc.new { |p| p.shared_versions.any? }, - :html => {:'data-icon2' => '0'} + :html => {:'data-icon2' => "".html_safe} menu.push :work_packages, { :controller => '/work_packages', :action => 'index' }, :param => :project_id, :caption => :label_work_package_plural, - :html => {:'data-icon2' => 'c'} + :html => {:'data-icon2' => "".html_safe} menu.push :new_work_package, { :controller => '/work_packages', :action => 'new'}, :param => :project_id, @@ -314,17 +314,17 @@ Redmine::MenuManager.map :project_menu do |menu| menu.push :timelines, {:controller => '/timelines', :action => 'index'}, :param => :project_id, :caption => :'timelines.project_menu.timelines', - :html => {:'data-icon2' => 'f'} + :html => {:'data-icon2' => "".html_safe} menu.push :calendar, { :controller => '/work_packages/calendars', :action => 'index' }, :param => :project_id, :caption => :label_calendar, - :html => {:'data-icon2' => 'K'} + :html => {:'data-icon2' => "".html_safe} menu.push :news, { :controller => '/news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural, - :html => {:'data-icon2' => '2'} + :html => {:'data-icon2' => "".html_safe} menu.push :new_news, { :controller => '/news', :action => 'new' }, :param => :project_id, @@ -336,29 +336,29 @@ Redmine::MenuManager.map :project_menu do |menu| :param => :project_id, :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural, - :html => {:'data-icon2' => 'x'} + :html => {:'data-icon2' => "".html_safe} menu.push :repository, { :controller => '/repositories', :action => 'show' }, :param => :project_id, :if => Proc.new { |p| p.repository && !p.repository.new_record? }, - :html => {:'data-icon2' => 'o'} + :html => {:'data-icon2' => "".html_safe} menu.push :reportings, {:controller => '/reportings', :action => 'index'}, :param => :project_id, :caption => :'timelines.project_menu.reportings', - :html => {:'data-icon2' => 'w'} + :html => {:'data-icon2' => "".html_safe} menu.push :project_associations, {:controller => '/project_associations', :action => 'index'}, :param => :project_id, :caption => :'timelines.project_menu.project_associations', :if => Proc.new { |p| p.project_type.try :allows_association }, - :html => {:'data-icon2' => '4'} + :html => {:'data-icon2' => "".html_safe} menu.push :settings, { :controller => '/projects', :action => 'settings' }, :caption => :label_project_settings, :last => true, - :html => {:'data-icon2' => 'T'} + :html => {:'data-icon2' => "".html_safe} end Redmine::Activity.map do |activity| diff --git a/lib/redmine/menu_manager/menu_helper.rb b/lib/redmine/menu_manager/menu_helper.rb index 4d858c58db..28d65b848c 100644 --- a/lib/redmine/menu_manager/menu_helper.rb +++ b/lib/redmine/menu_manager/menu_helper.rb @@ -56,7 +56,7 @@ module Redmine::MenuManager::MenuHelper :param => :project_id, :caption => main_item.name, :after => :repository, - :html => {:'data-icon2' => 'Y'} + :html => {:'data-icon2' => "".html_safe} menu.push :"#{main_item.item_class}_new_page", { :action=>"new_child", :controller=>"/wiki", :id => CGI.escape(main_item.title) }, diff --git a/lib/redmine/menu_manager/top_menu_helper.rb b/lib/redmine/menu_manager/top_menu_helper.rb index e57dcf9e52..253014b703 100644 --- a/lib/redmine/menu_manager/top_menu_helper.rb +++ b/lib/redmine/menu_manager/top_menu_helper.rb @@ -55,7 +55,7 @@ module Redmine::MenuManager::TopMenuHelper :action => 'index' }, :title => l(:label_project_plural), :access_key => OpenProject::AccessKeys.key_for(:project_search), - :'data-icon' => 'g' + :'data-icon' => "".html_safe if User.current.impaired? content_tag :li do @@ -67,7 +67,7 @@ module Redmine::MenuManager::TopMenuHelper ret = content_tag :li do link_to l(:label_project_view_all), {:controller => '/projects', :action => 'index'}, - :'data-icon4' => '7' + :'data-icon4' => "".html_safe end ret += content_tag :li, :id => "project-search-container" do @@ -100,7 +100,7 @@ module Redmine::MenuManager::TopMenuHelper end def render_module_top_menu_node(items = more_top_menu_items) - render_drop_down_menu_node link_to(l(:label_modules), "#", :title => l(:label_modules), :'data-icon' => 'M'), + render_drop_down_menu_node link_to(l(:label_modules), "#", :title => l(:label_modules), :'data-icon' => "".html_safe), items, :id => "more-menu" end