Mercurial > hg > soundsoftware-site
comparison app/views/activities/index.html.erb @ 1116:bb32da3bea34 redmine-2.2-integration
Merge from live
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Jan 2013 14:41:20 +0000 |
| parents | 433d4f72a19b 066b55d7c053 |
| children | 4f746d8966dd 51364c0cd58f |
comparison
equal
deleted
inserted
replaced
| 1115:433d4f72a19b | 1116:bb32da3bea34 |
|---|---|
| 1 <h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2> | 1 <h2><%= |
| 2 if @author.nil? | |
| 3 if @institution_name.blank? | |
| 4 l(:label_activity) | |
| 5 else | |
| 6 l(:label_institution_activity, h(@institution_name)) | |
| 7 end | |
| 8 else | |
| 9 l(:label_user_activity, link_to_user(@author)).html_safe | |
| 10 end | |
| 11 %></h2> | |
| 2 <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p> | 12 <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p> |
| 3 | 13 |
| 4 <div id="activity"> | 14 <div id="activity"> |
| 5 <% @events_by_day.keys.sort.reverse.each do |day| %> | 15 <% @events_by_day.keys.sort.reverse.each do |day| %> |
| 6 <h3><%= format_activity_day(day) %></h3> | 16 <h3><%= format_activity_day(day) %></h3> |