changeset 1356:a6a25685e5a6 cannam

Merge from live branch

--- a/app/controllers/welcome_controller.rb	Fri Jun 21 11:19:01 2013 +0100
+++ b/app/controllers/welcome_controller.rb	Thu Jul 18 12:19:27 2013 +0100
@@ -24,7 +24,7 @@
   def index
     @site_project = Project.find_by_identifier "soundsoftware-site"
     @site_news = []
-    @site_news = News.latest_for @site_project if @site_project
+    @site_news = News.latest_for(@site_project, 3) if @site_project
     
     # tests if user is logged in to generate the tips of the day list
     if User.current.logged?

--- a/app/views/activities/_busy.html.erb	Fri Jun 21 11:19:01 2013 +0100
+++ b/app/views/activities/_busy.html.erb	Thu Jul 18 12:19:27 2013 +0100
@@ -13,7 +13,7 @@
    <ul>
 
    <% 
-      for project in busy_projects(events, 5)
+      for project in busy_projects(events, 7)
    %>
 
    <li class="busy">

--- a/app/views/projects/explore.html.erb	Fri Jun 21 11:19:01 2013 +0100
+++ b/app/views/projects/explore.html.erb	Thu Jul 18 12:19:27 2013 +0100
@@ -11,7 +11,7 @@
 <h2><%= l(:label_explore_projects) %></h2>
 
 <div class="threecolumnleft">
-<% cache(:action => 'explore', :action_suffix => 'tags', :expires_in => 1.hour) do %>
+<% cache(:action => 'explore', :action_suffix => 'tags') do %>
   <div class="tags box">
   <h3><%=l(:label_project_tags_all)%></h3>
     <%= render :partial => 'projects/tagcloud' %>
@@ -28,7 +28,7 @@
 </div>
 
 <div class="threecolumnleft">
-  <% cache(:action => 'explore', :action_suffix => 'busy_institutions', :expires_in => 1.hour) do %>
+  <% cache(:action => 'explore', :action_suffix => 'busy_institutions') do %>
   <div class="institutions box">
   <h3><%=l(:label_institutions_busy)%></h3>
     <%= render :partial => 'activities/busy_institution' %>
@@ -38,7 +38,7 @@
 </div>
 
 <div class="threecolumnmid">
-  <% cache(:action => 'explore', :action_suffix => 'busy_projects', :expires_in => 1.hour) do %>
+  <% cache(:action => 'explore', :action_suffix => 'busy_projects') do %>
   <div class="projects box">
   <h3><%=l(:label_projects_busy)%></h3>
     <%= render :partial => 'activities/busy' %>

--- a/app/views/users/_form.html.erb	Fri Jun 21 11:19:01 2013 +0100
+++ b/app/views/users/_form.html.erb	Thu Jul 18 12:19:27 2013 +0100
@@ -1,5 +1,6 @@
-<%= javascript_include_tag "ssamr_institutions" %>
-
+<% content_for :header_tags do %>
+  <%= javascript_include_tag "ssamr_institutions" %>
+<% end %>
 
 <%= error_messages_for 'user' %>
 
@@ -27,9 +28,9 @@
 
 <div class="box tabular">
 	<h3><%=l(:label_ssamr_details)%></h3>
-          <%= labelled_fields_for :ssamr_user_details do |ssamr_user_detail| %>
+          <%= labelled_fields_for :ssamr_user_detail, @user.ssamr_user_detail do |ssamr_user_detail| %>
             <p>
-              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>                            
+              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>
             </p>
 
             <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>

--- a/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Fri Jun 21 11:19:01 2013 +0100
+++ b/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Thu Jul 18 12:19:27 2013 +0100
@@ -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; }

--- a/public/themes/soundsoftware/stylesheets/application.css	Fri Jun 21 11:19:01 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/application.css	Thu Jul 18 12:19:27 2013 +0100
@@ -207,7 +207,7 @@
     float: right;
     width: 27%;
     margin-right: 3%;
-    margin-top: 2.5em;
+    margin-top: 1em;
     margin-left: 2em;
     margin-bottom: 2em;
 }