Mercurial > hg > soundsoftware-site

changeset 1185:f37237021a46 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 22 Jan 2013 14:14:56 +0000
parents 4d1a31b30987 (current diff) 1027f0f3a81a (diff)
children e19f375f9afa 7f57e82048a4
files
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/activities/_busy.html.erb	Mon Jan 21 15:48:48 2013 +0000
+++ b/app/views/activities/_busy.html.erb	Tue Jan 22 14:14:56 2013 +0000
@@ -31,11 +31,11 @@
      <%
 	u = project.users_by_role
 	if ! u.empty? %>
-     (<%=
+     <%=
 	   mgmt_roles = u.keys.select{ |r| r.allowed_to?(:edit_project) }
 	   managers = mgmt_roles.map{ |r| u[r] }.flatten.sort.uniq
 	   managers.map{ |m| m.name }.join(', ')
-	 %>)<%
+	 %><%
 	end
 	%>
 	</span>
--- a/public/stylesheets/application.css	Mon Jan 21 15:48:48 2013 +0000
+++ b/public/stylesheets/application.css	Tue Jan 22 14:14:56 2013 +0000
@@ -332,7 +332,7 @@
 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 dt .time, div#news dt .time, .projects .latest .time, .projects .busy .managers { color: #777; font-size: 80%; }
 div#activity dd .description, #search-results dd .description { font-style: italic; }
 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; }
@@ -363,7 +363,7 @@
   margin-left: 0;
 }
 
-.projects .latest .title { margin-right: 0.5em; }
+.projects .latest .title, .projects .busy .title { margin-right: 0.5em; }
 .tipoftheday .tip { margin-left: 2em; margin-top: 0.5em; }
 
 #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
@@ -419,7 +419,7 @@
 ul.projects li.child { list-style-type:none; }
 ul.projects div.root a.project { font-weight: bold; }
 
-li.latest { margin-bottom: 0.5em; }
+li.latest, li.busy { margin-bottom: 0.5em; }
 
 #tracker_project_ids ul { margin: 0;  padding-left: 1em; }
 #tracker_project_ids li { list-style-type:none; }