jro_apps/redmine Commit - r1062:0faa4568a0ab

app/controllers/application.rb +3 0

               before_filter :user_setup, :check_if_login_required, :set_localization
               filter_parameter_logging :password
+              include Redmine::MenuManager::MenuController
+              helper Redmine::MenuManager::MenuHelper
               REDMINE_SUPPORTED_SCM.each do |scm|
                 require_dependency "repository/#{scm.underscore}"
               end

app/controllers/issue_categories_controller.rb +1 0

             class IssueCategoriesController < ApplicationController
               layout 'base'
+              menu_item :settings
               before_filter :find_project, :authorize
               verify :method => :post, :only => :destroy

app/controllers/messages_controller.rb +1 0

             class MessagesController < ApplicationController
               layout 'base'
+              menu_item :boards
               before_filter :find_board, :only => :new
               before_filter :find_message, :except => :new
               before_filter :authorize

app/controllers/projects_controller.rb +7 0

             class ProjectsController < ApplicationController
               layout 'base'
+              menu_item :overview
+              menu_item :activity, :only => :activity
+              menu_item :roadmap, :only => :roadmap
+              menu_item :files, :only => [:list_files, :add_file]
+              menu_item :settings, :only => :settings
+              menu_item :issues, :only => [:add_issue, :bulk_edit_issues, :changelog, :move_issues]
               before_filter :find_project, :except => [ :index, :list, :add ]
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]

app/controllers/queries_controller.rb +1 0

             class QueriesController < ApplicationController
               layout 'base'
+              menu_item :issues
               before_filter :find_project, :authorize
               def index

app/controllers/reports_controller.rb +1 0

             class ReportsController < ApplicationController
               layout 'base'
+              menu_item :issues
               before_filter :find_project, :authorize
               def issue_report

app/controllers/repositories_controller.rb +1 0

             class RepositoriesController < ApplicationController
               layout 'base'
+              menu_item :repository
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize

app/controllers/timelog_controller.rb +2 -1

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class TimelogController < ApplicationController
               layout 'base'
+              menu_item :issues
               before_filter :find_project, :authorize
               helper :sort

app/controllers/versions_controller.rb +1 0

             class VersionsController < ApplicationController
               layout 'base'
+              menu_item :roadmap
               before_filter :find_project, :authorize
               cache_sweeper :version_sweeper, :only => [ :edit, :destroy ]

app/controllers/wikis_controller.rb +1 0

             class WikisController < ApplicationController
               layout 'base'
+              menu_item :settings
               before_filter :find_project, :authorize
               # Create or update a project's wiki

app/views/layouts/base.rhtml +1 -7

                 <h1><%= h(@project ? @project.name : Setting.app_title) %></h1>
                 <div id="main-menu">
-                    <ul>
+                    <%= render_main_menu(@project) %>
-                        <% Redmine::MenuManager.allowed_items(:project_menu, User.current, @project).each do |item| %>
-                        <% unless item.condition && !item.condition.call(@project) %>
-                            <li><%= link_to l(item.name), {item.param => @project}.merge(item.url) %></li>
-                        <% end %>
-                        <% end if @project && !@project.new_record? %>
-                    </ul>
                 </div>
             </div>

lib/redmine.rb +14 -11

@@ -91,15 +91,18 end
91		91
92	# Project menu configuration	92	# Project menu configuration
93	Redmine::MenuManager.map :project_menu do \|menu\|	93	Redmine::MenuManager.map :project_menu do \|menu\|
94	menu.push :~~label_~~overview, :controller => 'projects', :action => 'show'	94	menu.push :overview, { :controller => 'projects', :action => 'show' }, :caption => :label_overview
95	menu.push :~~label_~~activity, :controller => 'projects', :action => 'activity'	95	menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
96	menu.push :~~label_~~roadmap, :controller => 'projects', :action => 'roadmap'	96	menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, :caption => :label_roadmap
97	menu.push :~~label_issue_plural~~, { :controller => 'issues', :action => 'index' }, :param => :project_id	97	menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
98	menu.push :~~label_~~news~~_plural~~, { :controller => 'news', :action => 'index' }, :param => :project_id	98	menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
99	menu.push :~~label_~~document~~_plural~~, { :controller => 'documents', :action => 'index' }, :param => :project_id	99	menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
100	menu.push :~~label_~~wiki, { :controller => 'wiki', :action => 'index', :page => nil }, ~~:if~~ => ~~Proc~~.~~new~~ { \|p\| p.~~wiki~~ && !p.~~wiki~~.~~new_record?~~ }	100	menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },
101	menu.push :label_board_plural, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { \|p\| p.boards.any? }	101	:if => Proc.new { \|p\| p.wiki && !p.wiki.new_record? }, :caption => :label_wiki
102	menu.push :label_attachment_plural, :controller => 'projects', :action => 'list_files'	102	menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
103	menu.push :label_repository, { :controller => 'repositories', :action => 'show' }, :if => Proc.new { \|p\| p.repository && !p.repository.new_record? }	103	:if => Proc.new { \|p\| p.boards.any? }, :caption => :label_board_plural
104	menu.push :labe~~l_setting~~s, :controller => 'projects', :action => '~~settings'~~	104	menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
		105	menu.push :repository, { :controller => 'repositories', :action => 'show' },
		106	:if => Proc.new { \|p\| p.repository && !p.repository.new_record? }, :caption => :label_repository
		107	menu.push :settings, { :controller => 'projects', :action => 'settings' }, :caption => :label_settings
105	end	108	end

lib/redmine/menu_manager.rb +59 -1

@@ -17,6 +17,63
17		17
18	module Redmine	18	module Redmine
19	module MenuManager	19	module MenuManager
		20	module MenuController
		21	def self.included(base)
		22	base.extend(ClassMethods)
		23	end
		24
		25	module ClassMethods
		26	@@menu_items = Hash.new {\|hash, key\| hash[key] = {:default => key, :actions => {}}}
		27	mattr_accessor :menu_items
		28
		29	# Set the menu item name for a controller or specific actions
		30	# Examples:
		31	# * menu_item :tickets # => sets the menu name to :tickets for the whole controller
		32	# * menu_item :tickets, :only => :list # => sets the menu name to :tickets for the 'list' action only
		33	# * menu_item :tickets, :only => [:list, :show] # => sets the menu name to :tickets for 2 actions only
		34	#
		35	# The default menu item name for a controller is controller_name by default
		36	# Eg. the default menu item name for ProjectsController is :projects
		37	def menu_item(id, options = {})
		38	if actions = options[:only]
		39	actions = [] << actions unless actions.is_a?(Array)
		40	actions.each {\|a\| menu_items[controller_name.to_sym][:actions][a.to_sym] = id}
		41	else
		42	menu_items[controller_name.to_sym][:default] = id
		43	end
		44	end
		45	end
		46
		47	def menu_items
		48	self.class.menu_items
		49	end
		50
		51	# Returns the menu item name according to the current action
		52	def current_menu_item
		53	menu_items[controller_name.to_sym][:actions][action_name.to_sym] \|\|
		54	menu_items[controller_name.to_sym][:default]
		55	end
		56	end
		57
		58	module MenuHelper
		59	# Returns the current menu item name
		60	def current_menu_item
		61	@controller.current_menu_item
		62	end
		63
		64	# Renders the application main menu as a ul element
		65	def render_main_menu(project)
		66	links = []
		67	Redmine::MenuManager.allowed_items(:project_menu, User.current, project).each do \|item\|
		68	unless item.condition && !item.condition.call(project)
		69	links << content_tag('li',
		70	link_to(l(item.caption), {item.param => project}.merge(item.url),
		71	:class => (current_menu_item == item.name ? 'selected' : nil)))
		72	end
		73	end if project && !project.new_record?
		74	links.empty? ? nil : content_tag('ul', links.join("\n"))
		75	end
		76	end
20		77
21	class << self	78	class << self
22	def map(menu_name)	79	def map(menu_name)
@@ -48,13 +105,14 module Redmine
48	end	105	end
49		106
50	class MenuItem	107	class MenuItem
51	attr_reader :name, :url, :param, :condition	108	attr_reader :name, :url, :param, :condition, :caption
52		109
53	def initialize(name, url, options)	110	def initialize(name, url, options)
54	@name = name	111	@name = name
55	@url = url	112	@url = url
56	@condition = options[:if]	113	@condition = options[:if]
57	@param = options[:param] \|\| :id	114	@param = options[:param] \|\| :id
		115	@caption = options[:caption] \|\| name.to_s.humanize
58	end	116	end
59	end	117	end
60	end	118	end

public/stylesheets/application.css +1 -1

               padding: 4px 4px 4px 4px;
               background: #2C4056;
             }
-            #main-menu li a:hover {background:#759FCF;}
+            #main-menu li a:hover, #main-menu li a.selected {background:#759FCF;}
             #main {background: url(../images/mainbg.png) repeat-x; background-color:#EEEEEE;}

	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