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

diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 3d527917aefacd6eaa24c24437ea3cc4a04aad8b..621ffd5f1eaf4f4be43b8424102bedfabe2d18ef 100644 (file)
--- 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 9a6022b1779d2b45612b0fe60ab732598055b15f..546051232b363eb7e20e117027eeca2357e85f70 100644 (file)
--- 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 %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8ada32524f8500f85ab1178e2558890b491aac33..df3cd544454960e0b37c55b384ef7287febf13b5 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -412,12 +412,15 @@ form .attributes select { width: 60%; }
 input#issue_subject { width: 99%; }
 select#issue_done_ratio { width: 95px; }
 
-ul.projects { margin: 0; padding-left: 1em; }
-ul.projects.root { margin: 0;  padding: 0; }
-ul.projects ul.projects { border-left: 3px solid #e0e0e0; }
-ul.projects li.root { list-style-type:none; margin-bottom: 1em; }
-ul.projects li.child { list-style-type:none; margin-top: 1em;}
-ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
+ul.projects {margin:0; padding-left:1em;}
+ul.projects.root {margin:0; padding:0;}
+ul.projects li {list-style-type:none;}
+
+#projects-index ul.projects ul.projects { border-left: 3px solid #e0e0e0; }
+#projects-index ul.projects li.root {margin-bottom: 1em;}
+#projects-index ul.projects li.child {margin-top: 1em;}
+#projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
+#notified-projects ul.projects ul {padding-left:1.6em;}
 .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
 
 #tracker_project_ids ul { margin: 0;  padding-left: 1em; }