Mercurial > hg > soundsoftware-site
diff app/views/activities/index.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 | bb32da3bea34 622f24f53b42 261b3d9a4903 |
line wrap: on
line diff
--- a/app/views/activities/index.html.erb Wed Jun 27 14:54:18 2012 +0100 +++ b/app/views/activities/index.html.erb Mon Jan 07 12:01:42 2013 +0000 @@ -1,4 +1,4 @@ -<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></h2> +<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2> <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p> <div id="activity"> @@ -40,7 +40,7 @@ <% end %> <% content_for :sidebar do %> -<% form_tag({}, :method => :get) do %> +<%= form_tag({}, :method => :get) do %> <h3><%= l(:label_activity) %></h3> <p><% @activity.event_types.each do |t| %> <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>