jro_apps/redmine Commit - r1067:16e9ffce0d0e

Added a 'New issue' link in the main menu (accesskey 7)....

Jean-Philippe Lang -

r1067:16e9ffce0d0e

parent child

Context file:

r1067:16e9ffce0d0e

Collapse all files

lib/redmine/access_keys.rb created 644 +31 0

@@ -0,0 +1,31
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module AccessKeys
	20	ACCESSKEYS = {:edit => 'e',
	21	:preview => 'r',
	22	:quick_search => 'f',
	23	:search => '4',
	24	:new_issue => '7'
	25	}.freeze unless const_defined?(:ACCESSKEYS)
	26
	27	def self.key_for(action)
	28	ACCESSKEYS[action]
	29	end
	30	end
	31	end

app/controllers/issues_controller.rb +2 0

             class IssuesController < ApplicationController
               layout 'base'
+              menu_item :new_issue, :only => :new
               before_filter :find_issue, :except => [:index, :changes, :preview, :new, :update_form]
               before_filter :find_project, :only => [:new, :update_form]
               before_filter :authorize, :except => [:index, :changes, :preview, :update_form]

app/helpers/application_helper.rb +1 -7

                 end
               end
-              ACCESSKEYS = {:edit => 'e',
-                            :preview => 'r',
-                            :quick_search => 'f',
-                            :search => '4',
-                            }.freeze unless const_defined?(:ACCESSKEYS)
               def accesskey(s)
-                ACCESSKEYS[s]
+                Redmine::AccessKeys.key_for s
               end
               # Formats text according to system settings.

app/helpers/projects_helper.rb 0 -8

@@ -188,12 +188,4 module ProjectsHelper
188	gc.draw(imgl)	188	gc.draw(imgl)
189	imgl	189	imgl
190	end if Object.const_defined?(:Magick)	190	end if Object.const_defined?(:Magick)
191
192	def new_issue_selector
193	trackers = @project.trackers
194	# can't use form tag inside helper
195	content_tag('form',
196	select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
197	:action => url_for(:controller => 'issues', :action => 'new', :project_id => @project), :method => 'get')
198	end
199	end	191	end

app/views/issues/_sidebar.rhtml 0 -5

@@ -1,8 +1,3
1	<% if authorize_for('issues', 'new') && @project.trackers.any? %>
2	<h3><%= l(:label_issue_new) %></h3>
3	<%= l(:label_tracker) %>: <%= new_issue_selector %>
4	<% end %>
5
6	<h3><%= l(:label_issue_plural) %></h3>	1	<h3><%= l(:label_issue_plural) %></h3>
7	<%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />	2	<%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
8	<%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />	3	<%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />

app/views/projects/show.rhtml 0 -5

             </div>
             <% content_for :sidebar do %>
-                <% if authorize_for('issues', 'new') && @project.trackers.any? %>
-                <h3><%= l(:label_issue_new) %></h3>
-                <%= l(:label_tracker) %>: <%= new_issue_selector %>
-                <% end %>
                 <% planning_links = []
                   planning_links << link_to_if_authorized(l(:label_calendar), :action => 'calendar', :id => @project)
                   planning_links << link_to_if_authorized(l(:label_gantt), :action => 'gantt', :id => @project)

lib/redmine.rb +2 0

               menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
               menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, :caption => :label_roadmap
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
+              menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
+                          :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },

lib/redmine/menu_manager.rb +8 -2

                       unless item.condition && !item.condition.call(project)
                         links << content_tag('li',
                                    link_to(l(item.caption), {item.param => project}.merge(item.url),
-                                           :class => (current_menu_item == item.name ? 'selected' : nil)))
+                                           (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
                       end
                     end if project && !project.new_record?
                     links.empty? ? nil : content_tag('ul', links.join("\n"))
                 end
                 class Mapper
+                  # Adds an item at the end of the menu. Available options:
+                  # * param: the parameter name that is used for the project id (default is :id)
+                  # * condition: a proc that is called before rendering the item, the item is displayed only if it returns true
+                  # * caption: the localized string key that is used as the item label
+                  # * html_options: a hash of html options that are passed to link_to
                   def push(name, url, options={})
                     @items ||= []
                     @items << MenuItem.new(name, url, options)
                 end
                 class MenuItem
-                  attr_reader :name, :url, :param, :condition, :caption
+                  attr_reader :name, :url, :param, :condition, :caption, :html_options
                   def initialize(name, url, options)
                     @name = name
                     @condition = options[:if]
                     @param = options[:param] || :id
                     @caption = options[:caption] || name.to_s.humanize
+                    @html_options = options[:html] || {}
                   end
                 end
               end

public/stylesheets/application.css +1 -1

             #header a {color:#f8f8f8;}
             #quick-search {float:right;}
-            #main-menu {position: absolute;  bottom: 0px;  left:6px;}
+            #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;

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