jro_apps/redmine Commit - r3928:3eea03d70efd

Refactor: extract link to previous and next month into helpers....

Eric Davis -

r3928:3eea03d70efd

parent child

Context file:

r3928:3eea03d70efd

Collapse all files

app/helpers/calendars_helper.rb created 644 +14 0

@@ -0,0 +1,14
	1	module CalendarsHelper
	2	def link_to_previous_month(year, month)
	3	link_to_remote ('« ' + (month==1 ? "#{month_name(12)} #{year-1}" : "#{month_name(month-1)}")),
	4	{:update => "content", :url => { :year => (month==1 ? year-1 : year), :month =>(month==1 ? 12 : month-1) }},
	5	{:href => url_for(:action => 'show', :year => (month==1 ? year-1 : year), :month =>(month==1 ? 12 : month-1))}
	6	end
	7
	8	def link_to_next_month(year, month)
	9	link_to_remote ((month==12 ? "#{month_name(1)} #{year+1}" : "#{month_name(month+1)}") + ' »'),
	10	{:update => "content", :url => { :year => (month==12 ? year+1 : year), :month =>(month==12 ? 1 : month+1) }},
	11	{:href => url_for(:action => 'show', :year => (month==12 ? year+1 : year), :month =>(month==12 ? 1 : month+1))}
	12
	13	end
	14	end

app/views/calendars/show.html.erb +1 -8

             <h2><%= l(:label_calendar) %></h2>
             <% form_tag(calendar_path, :method => :put, :id => 'query_form') do %>
               <%= hidden_field_tag('project_id', @project.to_param) if @project%>
             <fieldset id="filters" class="collapsible">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div>
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <p style="float:right;">
-            <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
+              <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
-                                    {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
-                                    {:href => url_for(:action => 'show', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
-                                    %> |
-            <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
-                                    {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
-                                    {:href => url_for(:action => 'show', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
-                                    %>
             </p>
             <p class="buttons">
             <%= label_tag('month', l(:label_month)) %>
             <%= select_month(@month, :prefix => "month", :discard_type => true) %>
             <%= label_tag('year', l(:label_year)) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %>
             <%= link_to_remote l(:button_apply),
                                { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
                                  :update => "content",
                                  :with => "Form.serialize('query_form')"
                                }, :class => 'icon icon-checked' %>
             <%= link_to_remote l(:button_clear),
                                { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
                                  :update => "content",
                                }, :class => 'icon icon-reload' if @query.new_record? %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
             <p class="legend cal">
             	<span class="starting"><%= l(:text_tip_task_begin_day) %></span>
             	<span class="ending"><%= l(:text_tip_task_end_day) %></span>
             	<span class="starting ending"><%= l(:text_tip_task_begin_end_day) %></span>
             </p>
             <% end %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_calendar)) -%>

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