jro_apps/redmine Commit - r2057:546b98a1186d

Adds a css class on menu items in order to apply item specific styles (eg. icons)....

Jean-Philippe Lang -

r2057:546b98a1186d

parent child

Context file:

r2057:546b98a1186d

Collapse all files

lib/redmine.rb +9 -9

              end
              Redmine::MenuManager.map :top_menu do |menu|
-               menu.push :home, :home_path, :html => { :class => 'home' }
-               menu.push :my_page, { :controller => 'my', :action => 'page' }, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? }
-               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural, :html => { :class => 'projects' }
-               menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? }, :last => true
-               menu.push :help, Redmine::Info.help_url, :html => { :class => 'help' }, :last => true
+               menu.push :home, :home_path
+               menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
+               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
+               menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
+               menu.push :help, Redmine::Info.help_url, :last => true
              end
              Redmine::MenuManager.map :account_menu do |menu|
-               menu.push :login, :signin_path, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? }
-               menu.push :register, { :controller => 'account', :action => 'register' }, :html => { :class => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
-               menu.push :my_account, { :controller => 'my', :action => 'account' }, :html => { :class => 'myaccount' }, :if => Proc.new { User.current.logged? }
-               menu.push :logout, :signout_path, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? }
+               menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
+               menu.push :register, { :controller => 'account', :action => 'register' }, :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 :logout, :signout_path, :if => Proc.new { User.current.logged? }
              end
              Redmine::MenuManager.map :application_menu do |menu|

lib/redmine/menu_manager.rb +14 -2

                      links = []
                      menu_items_for(menu, project) do |item, caption, url, selected|
                        links << content_tag('li',
-                         link_to(h(caption), url, (selected ? item.html_options.merge(:class => 'selected') : item.html_options)))
+                         link_to(h(caption), url, item.html_options(:selected => selected)))
                      end
                      links.empty? ? nil : content_tag('ul', links.join("\n"))
                    end
                  class MenuItem
                    include GLoc
-                   attr_reader :name, :url, :param, :condition, :html_options
+                   attr_reader :name, :url, :param, :condition
                    def initialize(name, url, options)
                      raise "Invalid option :if for menu item '#{name}'" if options[:if] && !options[:if].respond_to?(:call)
                      @param = options[:param] || :id
                      @caption = options[:caption]
                      @html_options = options[:html] || {}
+                     # Adds a unique class to each menu item based on its name
+                     @html_options[:class] = [@html_options[:class], @name.to_s.dasherize].compact.join(' ')
                    end
                    def caption(project=nil)
                        @caption_key ||= (@caption || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))
                      end
                    end
+                   def html_options(options={})
+                     if options[:selected]
+                       o = @html_options.dup
+                       o[:class] += ' selected'
+                       o
+                     else
+                       @html_options
+                     end
+                   end
                  end
                end
              end

public/themes/classic/stylesheets/application.css +3 -3

              h2, .wiki h1 { letter-spacing:-1px; }
              h4 { border-bottom: dotted 1px #c0c0c0; }
-             #top-menu a.home, #top-menu a.mypage, #top-menu a.projects, #top-menu a.admin, #top-menu a.help {
+             #top-menu a.home, #top-menu a.my-page, #top-menu a.projects, #top-menu a.administration, #top-menu a.help {
                  background-position: 0% 40%;
                  background-repeat: no-repeat;
                  padding-left: 20px;
              }
              #top-menu a.home { background-image: url(../../../images/home.png); }
-             #top-menu a.mypage { background-image: url(../../../images/user_page.png); }
+             #top-menu a.my-page { background-image: url(../../../images/user_page.png); }
              #top-menu a.projects { background-image: url(../../../images/projects.png); }
-             #top-menu a.admin { background-image: url(../../../images/admin.png); }
+             #top-menu a.administration { background-image: url(../../../images/admin.png); }
              #top-menu a.help { background-image: url(../../../images/help.png); }

test/functional/projects_controller_test.rb +6 -3

                    get :show, :id => 1
                    assert_tag :div, :attributes => { :id => 'main-menu' },
-                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Foo' } }
+                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Foo',
+                                                                                            :attributes => { :class => 'foo' } } }
                    assert_tag :div, :attributes => { :id => 'main-menu' },
-                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Bar' },
+                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Bar',
+                                                                                            :attributes => { :class => 'bar' } },
                                                                    :before => { :tag => 'li', :child => { :tag => 'a', :content => 'ECOOKBOOK' } } }
                    assert_tag :div, :attributes => { :id => 'main-menu' },
-                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'ECOOKBOOK' },
+                                    :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'ECOOKBOOK',
+                                                                                            :attributes => { :class => 'hello' } },
                                                                    :before => { :tag => 'li', :child => { :tag => 'a', :content => 'Activity' } } }
                    # Remove the menu items

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages