# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1373560352 -3600
# Node ID 4ff3f8b81ab3c62de2ad92526312e59af6a5aa4f
# Parent  90d09ace39bf28c1679b8739f5d6d19eb67a3023# Parent  0f5c32bfd33e91367aac53787a7ad7db7994e03b
Merge from live.

diff -r 90d09ace39bf -r 4ff3f8b81ab3 app/controllers/welcome_controller.rb
--- a/app/controllers/welcome_controller.rb	Thu Jun 20 14:54:37 2013 +0100
+++ b/app/controllers/welcome_controller.rb	Thu Jul 11 17:32:32 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?
diff -r 90d09ace39bf -r 4ff3f8b81ab3 app/views/activities/_busy.html.erb
--- a/app/views/activities/_busy.html.erb	Thu Jun 20 14:54:37 2013 +0100
+++ b/app/views/activities/_busy.html.erb	Thu Jul 11 17:32:32 2013 +0100
@@ -13,7 +13,7 @@
    <ul>
 
    <% 
-      for project in busy_projects(events, 5)
+      for project in busy_projects(events, 7)
    %>
 
    <li class="busy">
diff -r 90d09ace39bf -r 4ff3f8b81ab3 app/views/projects/explore.html.erb
--- a/app/views/projects/explore.html.erb	Thu Jun 20 14:54:37 2013 +0100
+++ b/app/views/projects/explore.html.erb	Thu Jul 11 17:32:32 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' %>
diff -r 90d09ace39bf -r 4ff3f8b81ab3 app/views/welcome/index.html.erb
--- a/app/views/welcome/index.html.erb	Thu Jun 20 14:54:37 2013 +0100
+++ b/app/views/welcome/index.html.erb	Thu Jul 11 17:32:32 2013 +0100
@@ -5,10 +5,18 @@
   </div>
 <% end %>
 
+<div id="welcomepagenews">
+  <% if @site_news.any? %>
+    <div class="news box">
+       <h3><%=l(:label_news_site_latest)%></h3>
+	<%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %>
+	<%= link_to l(:label_news_more), { :controller => 'news', :project_id => @site_project.identifier, :action => 'index' } %>
+    </div>
+  <% end %>
+</div>
+
 <div id="welcomepage">
-
 <%= textilizable Setting.welcome_text %>
-
 </div>
   
 <% content_for :header_tags do %>
diff -r 90d09ace39bf -r 4ff3f8b81ab3 plugins/redmine_tags/assets/stylesheets/redmine_tags.css
--- a/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Thu Jun 20 14:54:37 2013 +0100
+++ b/plugins/redmine_tags/assets/stylesheets/redmine_tags.css	Thu Jul 11 17:32:32 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; }
diff -r 90d09ace39bf -r 4ff3f8b81ab3 public/stylesheets/application.css
--- a/public/stylesheets/application.css	Thu Jun 20 14:54:37 2013 +0100
+++ b/public/stylesheets/application.css	Thu Jul 11 17:32:32 2013 +0100
@@ -5,7 +5,12 @@
 #content h1, h2, h3, h4 {color: #555;}
 h2, .wiki h1 {font-size: 20px;}
 h3, .wiki h2 {font-size: 16px;}
-h4, .wiki h3 {font-size: 13px;}
+h4, .wiki h4, .wiki h5, .wiki h6 {font-size: 14px;}
+.wiki h3 {font-size: 15px;}
+.wiki h5 {font-weight: normal; font-style: italic; }
+.wiki h6 {font-weight: normal; font-style: normal; }
+
+
 h4 {border-bottom: 1px dotted #bbb;}
 
 /***** Layout *****/
diff -r 90d09ace39bf -r 4ff3f8b81ab3 public/themes/soundsoftware/stylesheets/application.css
--- a/public/themes/soundsoftware/stylesheets/application.css	Thu Jun 20 14:54:37 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/application.css	Thu Jul 11 17:32:32 2013 +0100
@@ -178,7 +178,7 @@
 
 #welcomepage {
     width: 80%;
-    margin-left: 10%;
+    margin-left: 71px;
     margin-top: 10px;
 }
 #welcomepage blockquote {
@@ -187,15 +187,30 @@
     padding-left: 0;
     margin-left: 0;
 }
+#welcomepage h2 {
+    font-size: 2em;
+    margin-bottom: 0.8em;
+}
 #welcomepage p, #welcomepage li {
-    font-size: 1.2em;
+    font-size: 1.25em;
     color: #3e442c;
 }
 #welcomepage p {
     margin-left: 2em;
-    margin-top: 0.7em;
+    margin-top: 1em;
     margin-bottom: 0.7em;
 }
+#welcomepage a {
+    white-space: nowrap;
+}
+#welcomepagenews {
+    float: right;
+    width: 27%;
+    margin-right: 3%;
+    margin-top: 1em;
+    margin-left: 2em;
+    margin-bottom: 2em;
+}
 
 div.flash.newsalert {
   float: right;