changeset 1010:76a677c96bce browsing

Layout bits
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Mon, 12 Nov 2012 14:22:39 +0000
parents 066b55d7c053
children f44860e089c5
files app/views/projects/explore.html.erb config/locales/en.yml public/stylesheets/application.css vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css
diffstat 4 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/projects/explore.html.erb	Mon Nov 12 13:34:32 2012 +0000
+++ b/app/views/projects/explore.html.erb	Mon Nov 12 14:22:39 2012 +0000
@@ -1,27 +1,23 @@
 
-<h2><%= l(:label_browse) %></h2>
+<h2><%= l(:label_explore_projects) %></h2>
 
+  <div class="tags box">
+  <h3><%=l(:label_project_tags_all)%></h3>
+    <%= render :partial => 'projects/tagcloud' %>
+  </div>
 <div class="splitcontentleft">
+  <div class="institutions box">
+  <h3><%=l(:label_institutions_busy)%></h3>
+    <%= render :partial => 'activities/busy_institution' %>
+  </div>
   <div class="projects box">
   <h3><%=l(:label_project_latest)%></h3>
     <%= render :partial => 'projects/latest' %>
-    <%= link_to l(:label_projects_more), :controller => 'projects' %>
   </div>
 </div>
-<div class="splitcontentleft">
-  <div class="projects box">
-  <h3><%=l(:label_project_tags_all)%></h3>
-    <%= render :partial => 'projects/tagcloud' %>
-    <%= link_to l(:label_projects_more), :controller => 'projects' %>
-  </div>
+<div class="splitcontentright">
   <div class="projects box">
   <h3><%=l(:label_projects_busy)%></h3>
     <%= render :partial => 'activities/busy' %>
-    <%= link_to l(:label_projects_more), :controller => 'projects' %>
-  </div>
-  <div class="projects box">
-  <h3><%=l(:label_institutions_busy)%></h3>
-    <%= render :partial => 'activities/busy_institution' %>
-    <%= link_to l(:label_projects_more), :controller => 'projects' %>
   </div>
 </div>
--- a/config/locales/en.yml	Mon Nov 12 13:34:32 2012 +0000
+++ b/config/locales/en.yml	Mon Nov 12 14:22:39 2012 +0000
@@ -494,9 +494,9 @@
   label_project_all: All Projects
   label_project_latest: Latest projects
   label_projects_more: More projects
-  label_project_tags_all: Tags for projects
+  label_project_tags_all: Popular tags
   label_projects_busy: Busy projects
-  label_institutions_busy: Busy institutions
+  label_institutions_busy: Active institutions
   label_managers: Managed by
   label_issue: Issue
   label_issue_new: New issue
@@ -693,7 +693,7 @@
   label_repository: Repository
   label_is_external_repository: Track an external repository
   label_repository_plural: Repositories
-  label_browse: Browse
+  label_explore_projects: Explore projects
   label_modification: "%{count} change"
   label_modification_plural: "%{count} changes"
   label_branch: Branch
--- a/public/stylesheets/application.css	Mon Nov 12 13:34:32 2012 +0000
+++ b/public/stylesheets/application.css	Mon Nov 12 14:22:39 2012 +0000
@@ -240,6 +240,8 @@
 div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
 div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
 div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
+div.tags h3 { background: url(../images/ticket_note.png) no-repeat 0% 50%; padding-left: 20px; }
+div.institutions h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
 
 #watchers ul {margin: 0;  padding: 0;}
 #watchers li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
--- a/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Mon Nov 12 13:34:32 2012 +0000
+++ b/vendor/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Mon Nov 12 14:22:39 2012 +0000
@@ -22,6 +22,7 @@
 ul.tags li { margin: .25em 0px; }
 
 div.tags { text-align: center; }
+div.tags h3 { text-align: left; }
 div.tags .tag-label { margin: .25em; }
 div.tags .tag-nube-1 { font-size: .8em; }
 div.tags .tag-nube-2 { font-size: .9em; }