##// END OF EJS Templates
Display a projects tree instead of a flat list in notification preferences (#11539)....
Jean-Philippe Lang -
r10006:c0c491dd6180
parent child
Show More
@@ -13,7 +13,9
13
13
14 <h2><%=l(:label_project_plural)%></h2>
14 <h2><%=l(:label_project_plural)%></h2>
15
15
16 <div id="projects-index">
16 <%= render_project_hierarchy(@projects)%>
17 <%= render_project_hierarchy(@projects)%>
18 </div>
17
19
18 <% if User.current.logged? %>
20 <% if User.current.logged? %>
19 <p style="text-align:right;">
21 <p style="text-align:right;">
@@ -9,17 +9,15
9 </p>
9 </p>
10 <%= content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %>
10 <%= content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %>
11 <p>
11 <p>
12 <% @user.projects.each do |project| %>
12 <%= render_project_nested_lists(@user.projects) do |project|
13 <label>
13 content_tag('label',
14 <%= check_box_tag(
14 check_box_tag(
15 'notified_project_ids[]',
15 'notified_project_ids[]',
16 project.id,
16 project.id,
17 @user.notified_projects_ids.include?(project.id)
17 @user.notified_projects_ids.include?(project.id)
18 ) %>
18 ) + ' ' + h(project.name)
19 <%= h(project.name) %>
19 )
20 </label>
20 end %>
21 <br />
22 <% end %>
23 </p>
21 </p>
24 <p><em class="info"><%= l(:text_user_mail_option) %></em></p>
22 <p><em class="info"><%= l(:text_user_mail_option) %></em></p>
25 <% end %>
23 <% end %>
@@ -412,12 +412,15 form .attributes select { width: 60%; }
412 input#issue_subject { width: 99%; }
412 input#issue_subject { width: 99%; }
413 select#issue_done_ratio { width: 95px; }
413 select#issue_done_ratio { width: 95px; }
414
414
415 ul.projects { margin: 0; padding-left: 1em; }
415 ul.projects {margin:0; padding-left:1em;}
416 ul.projects.root { margin: 0; padding: 0; }
416 ul.projects.root {margin:0; padding:0;}
417 ul.projects ul.projects { border-left: 3px solid #e0e0e0; }
417 ul.projects li {list-style-type:none;}
418 ul.projects li.root { list-style-type:none; margin-bottom: 1em; }
418
419 ul.projects li.child { list-style-type:none; margin-top: 1em;}
419 #projects-index ul.projects ul.projects { border-left: 3px solid #e0e0e0; }
420 ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
420 #projects-index ul.projects li.root {margin-bottom: 1em;}
421 #projects-index ul.projects li.child {margin-top: 1em;}
422 #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; }
423 #notified-projects ul.projects ul {padding-left:1.6em;}
421 .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
424 .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
422
425
423 #tracker_project_ids ul { margin: 0; padding-left: 1em; }
426 #tracker_project_ids ul { margin: 0; padding-left: 1em; }
General Comments 0
You need to be logged in to leave comments. Login now