Mercurial > hg > soundsoftware-site

changeset 361:30f68ecfdde4 bug_127

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Formatting for Latest News box -- make it much more like the Recent Activity layout. Also adjust the date formatting in Latest Projects likewise.
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 01 Apr 2011 11:41:25 +0100
parents 96cfb24411c6
children d1eb5d381a77 f3d8335d4e71 f47173c3bb7c
files app/views/activities/_recent.rhtml app/views/news/_news.rhtml app/views/welcome/index.rhtml config/locales/en.yml public/stylesheets/application.css
diffstat 5 files changed, 28 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/activities/_recent.rhtml	Fri Apr 01 10:31:22 2011 +0100
+++ b/app/views/activities/_recent.rhtml	Fri Apr 01 11:41:25 2011 +0100
@@ -2,6 +2,12 @@
 <% max = 5 %>
 <% if (events.nil?) 
      activity = Redmine::Activity::Fetcher.new(User.current, :project => @project)
+     if @project
+        # Don't show news (duplicated with News box) or wiki edits (too
+	# tedious) in project front page
+        activity.scope = [ "changesets", "files", "issues", "documents" ]
+     end
+
      events = activity.events(Date.today - 28, Date.today + 1).first(max)
    end
 %>
--- a/app/views/news/_news.rhtml	Fri Apr 01 10:31:22 2011 +0100
+++ b/app/views/news/_news.rhtml	Fri Apr 01 11:41:25 2011 +0100
@@ -1,6 +1,12 @@
-<p><%= link_to_project(news.project) + ': ' unless @project %>
-<%= link_to h(news.title), news_path(news) %>
-<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
-<br />
+<div id="news">
+<dt>
+<span class="time"><%= format_time(news.created_on) %></span>
+<% if !@project %>
+<span class="project"><%= link_to_project(news.project) %></span>
+<% end %>
+<span class="headline"><%= link_to h(news.title), news_path(news) %></span>
+<span class="comments"><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></span>
+</dt><dd>
 <% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>
-<span class="author"><%= authoring news.created_on, news.author %></span></p>
+</dd>
+</div>
--- a/app/views/welcome/index.rhtml	Fri Apr 01 10:31:22 2011 +0100
+++ b/app/views/welcome/index.rhtml	Fri Apr 01 11:41:25 2011 +0100
@@ -34,7 +34,8 @@
 		<% for project in @projects %>
 		  <% @project = project %>
 			<li class="latest">
-			<%= link_to_project project %> (<%= format_time(project.created_on) %>)
+			<span class="title"><%= link_to_project project %></span>
+			<span class="time"><%= format_time(project.created_on)%></span>
 			<%= render_project_short_description project %>
 			</li>
 		<% end %>
--- a/config/locales/en.yml	Fri Apr 01 10:31:22 2011 +0100
+++ b/config/locales/en.yml	Fri Apr 01 11:41:25 2011 +0100
@@ -753,6 +753,7 @@
   label_added_time_by: "Added by {{author}} {{age}} ago"
   label_updated_time_by: "Updated by {{author}} {{age}} ago"
   label_updated_time: "Updated {{value}} ago"
+  label_time_ago: "{{age}} ago"
   label_jump_to_a_project: Jump to a project...
   label_file_plural: Downloads
   label_changeset_plural: Changesets
--- a/public/stylesheets/application.css	Fri Apr 01 10:31:22 2011 +0100
+++ b/public/stylesheets/application.css	Fri Apr 01 11:41:25 2011 +0100
@@ -294,16 +294,18 @@
 div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
 div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 
-div#activity dl, #search-results { margin-left: 2em; }
+div#activity dl, div#news dl, #search-results { margin-left: 2em; }
 div#activity .box dl { margin-left: 0; }
-div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
-div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
-div#activity dt.me .time { border-bottom: 1px solid #999; }
-div#activity dt .time { color: #777; font-size: 80%; }
+div#activity dd, div#news dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
+div#activity dt, div#news dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
+div#activity dt.me .time, div#news dt.me .time { border-bottom: 1px solid #999; }
+div#activity dt .time, div#news dt .time, .projects .latest .time { color: #777; font-size: 80%; }
 div#activity dd .description, #search-results dd .description { font-style: italic; }
-div#activity span.project:after, #search-results span.project:after { content: " -"; }
+div#activity span.project:after, div#news span.project:after, #search-results span.project:after { content: " -"; }
 div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
 
+.projects .latest .title { margin-right: 0.5em; }
+
 #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
 
 div#search-results-counts { display: block; padding-left: 0; margin-left: 0; }