##// END OF EJS Templates
jro_apps » redmine
RSS
calendar and activity views edited (previous/next links)...
Jean-Philippe Lang -
r70:2c335dbf32f7
parent child
Show More
Show file before | Show file after | Hide comments
@@ -403,7 +403,8 class ProjectsController < ApplicationController
403 }
403 }
404 @show_documents = 1
404 @show_documents = 1
405 end
405 end
406
406
407 render :layout => false if request.xhr?
407 end
408 end
408
409
409 def calendar
410 def calendar
Show file before | Show file after | Hide comments
@@ -61,6 +61,10 module ApplicationHelper
61 def day_name(day)
61 def day_name(day)
62 l(:general_day_names).split(',')[day-1]
62 l(:general_day_names).split(',')[day-1]
63 end
63 end
64
65 def month_name(month)
66 l(:actionview_datehelper_select_month_names).split(',')[month-1]
67 end
64
68
65 def pagination_links_full(paginator, options={}, html_options={})
69 def pagination_links_full(paginator, options={}, html_options={})
66 html = ''
70 html = ''
Show file before | Show file after | Hide comments
@@ -1,4 +1,4
1 <h2><%=l(:label_activity)%></h2>
1 <h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
2
2
3 <div>
3 <div>
4 <div class="rightbox">
4 <div class="rightbox">
@@ -13,7 +13,7
13 <%= end_form_tag %>
13 <%= end_form_tag %>
14 </div>
14 </div>
15 <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
15 <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
16 <h3><%= day_name(day.cwday) %> <%= format_date(day) %></h3>
16 <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
17 <ul>
17 <ul>
18 <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %>
18 <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %>
19 <li><p>
19 <li><p>
@@ -37,5 +37,18
37 </ul>
37 </ul>
38 <% end %>
38 <% end %>
39 <% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
39 <% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
40
41 <div style="float:left;">
42 <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
43 {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
44 {:href => url_for(:action => 'activity', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
45 %>
46 </div>
47 <div style="float:right;">
48 <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
49 {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
50 {:href => url_for(:action => 'activity', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
51 %>&nbsp;
52 </div>
40 <br />
53 <br />
41 </div> No newline at end of file
54 </div>
Show file before | Show file after | Hide comments
@@ -55,13 +55,13 end %>
55 <table width="100%">
55 <table width="100%">
56 <tr>
56 <tr>
57 <td align="left">
57 <td align="left">
58 <%= link_to_remote ('&#171; ' + l(:label_previous)),
58 <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
59 {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
59 {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
60 {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
60 {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
61 %>
61 %>
62 </td>
62 </td>
63 <td align="right">
63 <td align="right">
64 <%= link_to_remote (l(:label_next) + ' &#187;'),
64 <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
65 {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
65 {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
66 {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
66 {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
67 %>
67 %>
General Comments 0
You need to be logged in to leave comments. Login now