Mercurial > hg > soundsoftware-site

changeset 372:bb5e1ca422f8 cannam-pre-20110113-merge

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 Fri, 01 Apr 2011 12:22:58 +0100
parents 8da54f33a17b (current diff) 4188c6eaadf7 (diff)
children dcfde3922ec2 773777b12fa1
files
diffstat 1 files changed, 4 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/welcome/index.rhtml	Fri Apr 01 12:14:07 2011 +0100
+++ b/app/views/welcome/index.rhtml	Fri Apr 01 12:22:58 2011 +0100
@@ -9,6 +9,10 @@
 <div class="splitcontentleft">
   <%= textilizable Setting.welcome_text %>
   
+  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
+</div>
+
+<div class="splitcontentright">
   <% if @news.any? %>
   <div class="news box">
 	<h3><%=l(:label_news_latest)%></h3>
@@ -16,17 +20,6 @@
 		<%= link_to l(:label_news_view_all), :controller => 'news' %>
   </div>
   <% end %>
-  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
-</div>
-
-<div class="splitcontentright">
-  <% if not @tipsoftheday.empty? %>
-    <div class="newsoftheday box">
-          <h3><%=l(:label_tipoftheday)%></h3>
-          <%= textilizable @tipsoftheday %>
-    </div>
-  <% end %>
-
     <% if @projects.any? %>
 	<div class="projects box">
 	<h3><%=l(:label_project_latest)%></h3>