# HG changeset patch # User Chris Cannam # Date 1358863967 0 # Node ID 1027f0f3a81ada7858ef9639dfcd31816fea599f # Parent 820314b808cf110f7aafa1b6fb1c54a9505c7396 Make "busy projects" and "recent projects" look uniform diff -r 820314b808cf -r 1027f0f3a81a app/views/activities/_busy.html.erb --- a/app/views/activities/_busy.html.erb Mon Jan 21 16:23:43 2013 +0000 +++ b/app/views/activities/_busy.html.erb Tue Jan 22 14:12:47 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 %> diff -r 820314b808cf -r 1027f0f3a81a public/stylesheets/application.css --- a/public/stylesheets/application.css Mon Jan 21 16:23:43 2013 +0000 +++ b/public/stylesheets/application.css Tue Jan 22 14:12:47 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; }