@@ -403,7 +403,8 class ProjectsController < ApplicationController | |||
|
403 | 403 | } |
|
404 | 404 | @show_documents = 1 |
|
405 | 405 | end |
|
406 | ||
|
406 | ||
|
407 | render :layout => false if request.xhr? | |
|
407 | 408 | end |
|
408 | 409 | |
|
409 | 410 | def calendar |
@@ -61,6 +61,10 module ApplicationHelper | |||
|
61 | 61 | def day_name(day) |
|
62 | 62 | l(:general_day_names).split(',')[day-1] |
|
63 | 63 | end |
|
64 | ||
|
65 | def month_name(month) | |
|
66 | l(:actionview_datehelper_select_month_names).split(',')[month-1] | |
|
67 | end | |
|
64 | 68 | |
|
65 | 69 | def pagination_links_full(paginator, options={}, html_options={}) |
|
66 | 70 | html = '' |
@@ -1,4 +1,4 | |||
|
1 | <h2><%=l(:label_activity)%></h2> | |
|
1 | <h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2> | |
|
2 | 2 | |
|
3 | 3 | <div> |
|
4 | 4 | <div class="rightbox"> |
@@ -13,7 +13,7 | |||
|
13 | 13 | <%= end_form_tag %> |
|
14 | 14 | </div> |
|
15 | 15 | <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %> |
|
16 |
<h3><%= day_name(day.cwday) %> <%= |
|
|
16 | <h3><%= day_name(day.cwday) %> <%= day.day %></h3> | |
|
17 | 17 | <ul> |
|
18 | 18 | <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %> |
|
19 | 19 | <li><p> |
@@ -37,5 +37,18 | |||
|
37 | 37 | </ul> |
|
38 | 38 | <% end %> |
|
39 | 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 ('« ' + (@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)}") + ' »'), | |
|
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 | %> | |
|
52 | </div> | |
|
40 | 53 | <br /> |
|
41 | 54 | </div> No newline at end of file |
@@ -55,13 +55,13 end %> | |||
|
55 | 55 | <table width="100%"> |
|
56 | 56 | <tr> |
|
57 | 57 | <td align="left"> |
|
58 | <%= link_to_remote ('« ' + l(:label_previous)), | |
|
58 | <%= link_to_remote ('« ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), | |
|
59 | 59 | {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }}, |
|
60 | 60 | {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))} |
|
61 | 61 | %> |
|
62 | 62 | </td> |
|
63 | 63 | <td align="right"> |
|
64 | <%= link_to_remote (l(:label_next) + ' »'), | |
|
64 | <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' »'), | |
|
65 | 65 | {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }}, |
|
66 | 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