Mercurial > hg > soundsoftware-site
diff app/views/common/_calendar.html.erb @ 1115:433d4f72a19b redmine-2.2
Update to Redmine SVN revision 11137 on 2.2-stable branch
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Jan 2013 12:01:42 +0000 |
| parents | cbb26bc654de |
| children |
line wrap: on
line diff
--- a/app/views/common/_calendar.html.erb Wed Jun 27 14:54:18 2012 +0100 +++ b/app/views/common/_calendar.html.erb Mon Jan 07 12:01:42 2013 +0000 @@ -6,7 +6,7 @@ <tr> <% day = calendar.startdt while day <= calendar.enddt %> -<%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %> +<%= ("<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>".html_safe) if day.cwday == calendar.first_wday %> <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>"> <p class="day-num"><%= day.day %></p> <% calendar.events_on(day).each do |i| %> @@ -24,7 +24,7 @@ <% end %> <% end %> </td> -<%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %> +<%= '</tr><tr>'.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %> <% day = day + 1 end %> </tr>