jro_apps/redmine Commit - r1133:377a45ae1adc

Slight changes to calendar and activity h2 titles....

Jean-Philippe Lang -

r1133:377a45ae1adc

parent child

Context file:

r1133:377a45ae1adc

Collapse all files

app/views/projects/activity.rhtml +1 -1

-            <h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
+            <h2><%= "#{month_name(@month)} #{@year}" %></h2>
             <div id="activity">
             <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
             <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
               <dd><% unless e.event_description.blank? -%>
               <span class="description"><%= format_activity_description(e.event_description) %></span><br />
               <% end %>
               <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
             <% end -%>
             </dl>
             <% end -%>
             </div>
             <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
             <div style="float:left;">
             <% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>
             <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
                                 {:update => "content", :url => prev_params}, {:href => url_for(prev_params)} %>
             </div>
             <div style="float:right;">
             <% next_params = params.clone.update :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) %>
             <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
                                 {:update => "content", :url => next_params}, {:href => url_for(next_params)} %>
             &nbsp;
             </div>
             <br />
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key})) %>
             <% end %>
             <% content_for :sidebar do %>
             <% form_tag do %>
             <h3><%= l(:label_activity) %></h3>
             <p><% @event_types.each do |t| %>
             <label><%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
             <% end %></p>
             <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
             <% end %>
             <% end %>
             <% html_title(l(:label_activity)) -%>

app/views/projects/calendar.rhtml +1 -1

             <% cache(:year => @year, :month => @month, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
-            <h2><%= l(:label_calendar) %>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
+            <h2><%= "#{month_name(@month)} #{@year}" %></h2>
             <table width="100%">
             <tr><td align="left">
                 <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
                                     {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
                                     {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
                                     %>
             </td><td align="right">
                 <%= 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), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
                                     {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
                                     %>
             </td></tr>
             </table>
             <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
             <%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
             <%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
             <%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
             <% end %>
             <% content_for :sidebar do %>
                 <h3><%= l(:label_calendar) %></h3>
                 <% form_tag() do %>
                 <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
                 <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
                 <% @trackers.each do |tracker| %>
                   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
                 <% end %>
                 <% if @project.active_children.any? %>
                 <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
                 <% end %>
                 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
                 <% end %>
             <% 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