jro_apps/redmine Commit - r1106:80a60247f527

Slight changes to the activity view....

Jean-Philippe Lang -

r1106:80a60247f527

parent child

Context file:

r1106:80a60247f527

Collapse all files

app/helpers/projects_helper.rb +4 0

                                       }, 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},

app/views/projects/activity.rhtml +13 -8

@@ -1,17 +1,22
1	<h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>	1	<h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
2		2
		3	<div id="activity">
3	<% @events_by_day.keys.sort {\|x,y\| y <=> x }.each do \|day\| %>	4	<% @events_by_day.keys.sort {\|x,y\| y <=> x }.each do \|day\| %>
4	<h3><%= day_name(day.cwday) %> <%= day.day %></h3>	5	<h3><%= day_name(day.cwday) %> <%= day.day %></h3>
5	<ul>	6	<dl>
6	<% @events_by_day[day].sort {\|x,y\| y.event_datetime <=> x.event_datetime }.each do \|e\| %>	7	<% @events_by_day[day].sort {\|x,y\| y.event_datetime <=> x.event_datetime }.each do \|e\| -%>
7	<li><p><%= format_time(e.event_datetime, false) %> <%= link_to truncate(e.event_title, 100), e.event_url %><br />	8	<dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
8	<% unless e.event_description.blank? %><em><%= truncate(e.event_description, 500) %></em><br /><% end %>	9	<%= link_to truncate(e.event_title, 100), e.event_url %></dt>
9	<span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></p></li>	10	<dd><% unless e.event_description.blank? -%>
10	<% end %>	11	<span class="description"><%= format_activity_description(e.event_description) %></span><br />
11	</ul>
12	<% end %>	12	<% end %>
		13	<span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
		14	<% end -%>
		15	</dl>
		16	<% end -%>
		17	</div>
13		18
14	<% if @events_by_day.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>	19	<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
15		20
16	<div style="float:left;">	21	<div style="float:left;">
17	<% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>	22	<% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>

public/stylesheets/application.css +6 0

             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%; }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages