# HG changeset patch
# User Chris Cannam
# Date 1301656435 -3600
# Node ID a70a6b9df76b3f297098e27e27a910be9a216723
# Parent  f3d8335d4e716d719425dcfe61586b3d945b1b28# Parent  ce85aa9933846533f623bd94bf04c68ef59d626d
Merge from branch "feature_124"

diff -r f3d8335d4e71 -r a70a6b9df76b app/controllers/my_controller.rb
--- a/app/controllers/my_controller.rb	Fri Apr 01 12:13:41 2011 +0100
+++ b/app/controllers/my_controller.rb	Fri Apr 01 12:13:55 2011 +0100
@@ -26,12 +26,13 @@
              'issueswatched' => :label_watched_issues,
              'activitymyprojects' => :label_activity_my_recent,
              'news' => :label_news_latest,
+             'tipoftheday' => :label_tipoftheday,
              'calendar' => :label_calendar,
              'documents' => :label_document_plural,
              'timelog' => :label_spent_time
            }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
 
-  DEFAULT_LAYOUT = {  'left' => ['activitymyprojects'], 
+  DEFAULT_LAYOUT = {  'left' => ['tipoftheday', 'activitymyprojects'], 
                       'right' => ['issueswatched','calendar'] 
                    }.freeze
 
diff -r f3d8335d4e71 -r a70a6b9df76b app/controllers/welcome_controller.rb
--- a/app/controllers/welcome_controller.rb	Fri Apr 01 12:13:41 2011 +0100
+++ b/app/controllers/welcome_controller.rb	Fri Apr 01 12:13:55 2011 +0100
@@ -25,7 +25,7 @@
     @news = News.latest User.current
     @projects = Project.latest User.current
     
-    # tests if user is logged in to gfenerate the tips of the day list
+    # tests if user is logged in to generate the tips of the day list
     if User.current.logged?
       @tipsoftheday = Setting.tipoftheday_text
     else
diff -r f3d8335d4e71 -r a70a6b9df76b app/views/my/blocks/_tipoftheday.rhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_tipoftheday.rhtml	Fri Apr 01 12:13:55 2011 +0100
@@ -0,0 +1,4 @@
+    <h3><%=l(:label_tipoftheday)%></h3>
+    <div class="tipoftheday box">
+          <div class="tip"><%= textilizable Setting.tipoftheday_text %></div>
+    </div>
diff -r f3d8335d4e71 -r a70a6b9df76b public/stylesheets/application.css
--- a/public/stylesheets/application.css	Fri Apr 01 12:13:41 2011 +0100
+++ b/public/stylesheets/application.css	Fri Apr 01 12:13:55 2011 +0100
@@ -305,6 +305,7 @@
 div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
 
 .projects .latest .title { margin-right: 0.5em; }
+.tipoftheday .tip { margin-left: 2em; margin-top: 0.5em; }
 
 #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }