Project

General

Profile

Feature #13242 » list_with_li.v2.patch

Now with correct end-of-line - Filou Centrinov, 2013-04-20 18:11

View differences:

app/views/activities/index.html.erb (working copy)
43 43
<% content_for :sidebar do %>
44 44
<%= form_tag({}, :method => :get) do %>
45 45
<h3><%= l(:label_activity) %></h3>
46
<p><% @activity.event_types.each do |t| %>
47
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
46
<ul><% @activity.event_types.each do |t| %>
47
<li><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
48 48
<label for="show_<%=t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%></label>
49
<br />
50
<% end %></p>
49
</li>
50
<% end %></ul>
51 51
<% if @project && @project.descendants.active.any? %>
52 52
    <%= hidden_field_tag 'with_subprojects', 0 %>
53 53
    <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
app/views/documents/index.html.erb (working copy)
25 25

  
26 26
<% content_for :sidebar do %>
27 27
  <h3><%= l(:label_sort_by, '') %></h3>
28
  <%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %><br />
29
  <%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %><br />
30
  <%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %><br />
31
  <%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %>
28
  <ul>
29
    <li><%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %></li>
30
    <li><%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %></li>
31
    <li><%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %></li>
32
    <li><%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %></li>
33
  </ul>
32 34
<% end %>
33 35

  
34 36
<% html_title(l(:label_document_plural)) -%>
app/views/versions/index.html.erb (working copy)
34 34
<% content_for :sidebar do %>
35 35
<%= form_tag({}, :method => :get) do %>
36 36
<h3><%= l(:label_roadmap) %></h3>
37
<ul>
37 38
<% @trackers.each do |tracker| %>
38
  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
39
  <%=h tracker.name %></label><br />
39
  <li>
40
    <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
41
    <%=h tracker.name %></label>
42
  </li>
40 43
<% end %>
44
</ul>
41 45
<br />
42 46
<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
43 47
<% if @project.descendants.active.any? %>
......
48 52
<% end %>
49 53

  
50 54
<h3><%= l(:label_version_plural) %></h3>
55
<ul>
51 56
<% @versions.each do |version| %>
52
<%= link_to format_version_name(version), "##{version_anchor(version)}" %><br />
57
  <li><%= link_to format_version_name(version), "##{version_anchor(version)}" %><br /></li>
53 58
<% end %>
59
</ul>
54 60
<% if @completed_versions.present? %>
55 61
<p>
56 62
  <%= link_to_function l(:label_completed_versions), 
57 63
                       '$("#toggle-completed-versions").toggleClass("collapsed"); $("#completed-versions").toggle()',
58 64
                       :id => 'toggle-completed-versions', :class => 'collapsible collapsed' %><br />
59
  <span id="completed-versions" style="display:none;">
60
    <%= @completed_versions.map {|version| link_to format_version_name(version), version_path(version)}.join("<br />\n").html_safe %>
61
  </span>
65
  <ul id="completed-versions" style="display:none;">
66
    <% @completed_versions.each do |version| %>
67
      <li><%= link_to format_version_name(version), "version_path(version)}" %></li>
68
    <% end %>  
69
  </ul>
62 70
</p>
63 71
<% end %>
64 72
<% end %>
app/views/wiki/_sidebar.html.erb (working copy)
3 3
<% end -%>
4 4

  
5 5
<h3><%= l(:label_wiki) %></h3>
6

  
7
<%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br />
8
<%= link_to l(:label_index_by_title), {:action => 'index'} %><br />
9
<%= link_to l(:label_index_by_date), {:controller => 'wiki', :project_id => @project, :action => 'date_index'} %><br />
6
<ul>
7
  <li><%= link_to l(:field_start_page), {:action => 'show', :id => nil} %></li>
8
  <li><%= link_to l(:label_index_by_title), {:action => 'index'} %></li>
9
  <li><%= link_to l(:label_index_by_date), {:controller => 'wiki', :project_id => @project, :action => 'date_index'} %></li>
10
</ul>
(2-2/2)