11287..cbf5a (2010-03-04 11:35)
(2010-03-04 11:39) 00847..bac15
Author: Claes NästénDate: Thu Mar 04 11:38:36 +0100 2010
Subject: Introduce ActivitiesController displaying activies on project level.
-
Rename app/views/activity/_activity_list.rhtml to app/views/activities/_activity_list_user.rhtml
-
Rename app/views/activity/_activity_list.rhtml to app/views/activities/_activity_list_project.rhtml
-
Rename test/unit/task_observer_test.rb to test/functional/activities_controller_test.rb
| app/helpers/application_helper.rb | |
| 66 | @@ -66,9 +66,14 @@ |
| 66 | end |
| 67 | |
| 68 | # Format user for small display on single row |
| 69 | def format_user_small(user) |
| 70 | content_tag(:span, image_tag(user.image_url(30), :style => 'float: left;') << link_to(h(user.display_name), user_summary_path(user)), |
| 71 | :class => 'user_name') |
| 72 | def format_user_small(user, include_name=true) |
| 73 | link_body = content_tag(:span, image_tag(user.image_url(30), |
| 74 | :style => 'float: left;')) |
| 75 | if include_name |
| 76 | link_body << h(user.display_name) |
| 77 | end |
| 78 | |
| 79 | link_to(link_body, user_summary_path(user), :class => 'user_name') |
| 80 | end |
| 81 | |
| 82 | # Generate box with borders for title and body html. |
| ... | |
| app/views/summary/user.rhtml | |
| 3 | @@ -3,7 +3,8 @@ |
| 3 | <%= wiki_html(nil, @user.about_me) %> |
| 4 | |
| 5 | <h4>Activity last 14 days</h4> |
| 6 | <%= render(:partial => 'activity/activity_list', :locals => { :activity_dates => @activity_dates }) %> |
| 7 | <%= render(:partial => 'activities/activity_list_user', |
| 8 | :locals => { :activity_dates => @activity_dates }) %> |
| 9 | |
| 10 | <h4>Status</h4> |
| 11 | <%= render(:partial => 'user_tabs', :locals => { } ) %> |
| ... | |
| config/routes.rb | |
| 26 | @@ -26,6 +26,7 @@ |
| 26 | :search => :any, |
| 27 | :subscribe => :get }) |
| 28 | projects.resource(:news) |
| 29 | projects.resource(:activity) |
| 30 | projects.resources(:phases) |
| 31 | projects.resources(:releases) |
| 32 | projects.resource(:repository, |
| ... | |
| app/views/layouts/application.rhtml | |
| 54 | @@ -54,6 +54,7 @@ |
| 54 | <ul> |
| 55 | <% if @project %> |
| 56 | <% [['About', project_path(@project), ['ProjectsController']], |
| 57 | ['Activity', project_activity_path(@project), ['ActivitiesController']], |
| 58 | ['News', project_news_path(@project), ['NewsController']], |
| 59 | ['Files', project_releases_path(@project), ['ReleasesController']], |
| 60 | ['Mailing Lists', project_mailing_lists_path(@project), ['MailingListsController']], |
| ... | |