From 80a60247f527825aa5e02e19bcaec4bd864fce2a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 4 Feb 2008 19:37:23 +0000 Subject: [PATCH] Slight changes to the activity view. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1120 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/projects_helper.rb | 4 ++++ app/views/projects/activity.rhtml | 23 ++++++++++++++--------- public/stylesheets/application.css | 6 ++++++ 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 883be0ead..c07bbd2c2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -26,6 +26,10 @@ module ProjectsHelper }, options end + def format_activity_description(text) + h(truncate(text, 250)) + end + def project_settings_tabs tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural}, {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural}, diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index 41a8ae100..bde806554 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -1,17 +1,22 @@

<%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %>

+
<% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %> -

<%= day_name(day.cwday) %> <%= day.day %>

- -<% end %> + <%= e.event_author if e.respond_to?(:event_author) %> +<% end -%> + +<% end -%> +
-<% if @events_by_day.empty? %>

<%= l(:label_no_data) %>

<% end %> +<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
<% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1abd1f6fd..b3b8b341d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -147,6 +147,12 @@ div#issue-changesets .changeset { padding: 4px;} div#issue-changesets .changeset { border-bottom: 1px solid #ddd; } div#issue-changesets p { margin-top: 0; margin-bottom: 1em;} +div#activity dl { margin-left: 2em; } +div#activity dd { margin-bottom: 1em; } +div#activity dt { margin-bottom: 1px; } +div#activity dt .time { color: #777; font-size: 80%; } +div#activity dd .description { font-style: italic; } + .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;} #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; } -- 2.39.5