Mercurial > hg > soundsoftware-site
changeset 369:a70a6b9df76b live
Merge from branch "feature_124"
| author | Chris Cannam |
|---|---|
| date | Fri, 01 Apr 2011 12:13:55 +0100 |
| parents | f3d8335d4e71 (current diff) ce85aa993384 (diff) |
| children | 055518fc4e4c |
| files | |
| diffstat | 4 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- /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>
--- 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; }