diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-10 17:30:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-10 17:30:35 +0000 |
| commit | c0c491dd61807df44ce7e20d1cfc04c7830ab48e (patch) | |
| tree | 53a4ae61a384d30b0da1d75a86d0c72c56a5175d /app/views | |
| parent | 0a6c1d9c136b271913bfba12e08d2169e6afa99f (diff) | |
| download | redmine-c0c491dd61807df44ce7e20d1cfc04c7830ab48e.tar.gz redmine-c0c491dd61807df44ce7e20d1cfc04c7830ab48e.zip | |
Display a projects tree instead of a flat list in notification preferences (#11539).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10189 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/_mail_notifications.html.erb | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 3d527917a..621ffd5f1 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -13,7 +13,9 @@ <h2><%=l(:label_project_plural)%></h2> +<div id="projects-index"> <%= render_project_hierarchy(@projects)%> +</div> <% if User.current.logged? %> <p style="text-align:right;"> diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb index 9a6022b17..546051232 100644 --- a/app/views/users/_mail_notifications.html.erb +++ b/app/views/users/_mail_notifications.html.erb @@ -9,17 +9,15 @@ </p> <%= content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %> <p> - <% @user.projects.each do |project| %> - <label> - <%= check_box_tag( - 'notified_project_ids[]', + <%= render_project_nested_lists(@user.projects) do |project| + content_tag('label', + check_box_tag( + 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) - ) %> - <%= h(project.name) %> - </label> - <br /> - <% end %> + ) + ' ' + h(project.name) + ) + end %> </p> <p><em class="info"><%= l(:text_user_mail_option) %></em></p> <% end %> |