# HG changeset patch
# User Chris Cannam
# Date 1301656916 -3600
# Node ID c2230be27b7e7578d7226a69d976797e29bf961e
# Parent  055518fc4e4cdbd8dc51b0b70bf8e716b82a1c04# Parent  4188c6eaadf7ca41fef8505687db5212b1c01c78
Merge from branch "feature_128"

diff -r 055518fc4e4c -r c2230be27b7e app/views/welcome/index.rhtml
--- a/app/views/welcome/index.rhtml	Fri Apr 01 12:14:07 2011 +0100
+++ b/app/views/welcome/index.rhtml	Fri Apr 01 12:21:56 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>