0002-Fix-source-indentation-and-newline-usage.patch

Mischa The Evil, 2017-06-09 00:13

Download (8.28 KB)

View differences:

app/views/calendars/show.html.erb
6 6

  
7 7
<div id="query_form_with_buttons" class="hide-when-print">
8 8
<div id="query_form_content">
9
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
10
  <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
11
  <div style="<%= @query.new_record? ? "" : "display: none;" %>">
12
    <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
13
  </div>
14
</fieldset>
15

  
16
<p style="float:right;">
17
  <%= link_to_previous_month(@year, @month, :accesskey => accesskey(:previous)) %> | <%= link_to_next_month(@year, @month, :accesskey => accesskey(:next)) %>
18
</p>
9
  <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
10
    <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
11
    <div style="<%= @query.new_record? ? "" : "display: none;" %>">
12
      <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
13
    </div>
14
  </fieldset>
15

  
16
  <p style="float:right;">
17
    <%= link_to_previous_month(@year, @month, :accesskey => accesskey(:previous)) %> | <%= link_to_next_month(@year, @month, :accesskey => accesskey(:next)) %>
18
  </p>
19 19
</div>
20 20

  
21 21
<p class="buttons">
22
<%= label_tag('month', l(:label_month)) %>
23
<%= select_month(@month, :prefix => "month", :discard_type => true) %>
24
<%= label_tag('year', l(:label_year)) %>
25
<%= select_year(@year, :prefix => "year", :discard_type => true) %>
22
  <%= label_tag('month', l(:label_month)) %>
23
  <%= select_month(@month, :prefix => "month", :discard_type => true) %>
24
  <%= label_tag('year', l(:label_year)) %>
25
  <%= select_year(@year, :prefix => "year", :discard_type => true) %>
26 26

  
27
<%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
28
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
27
  <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
28
  <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
29 29
</p>
30 30
</div>
31 31
<% end %>
app/views/gantts/show.html.erb
17 17

  
18 18
<div id="query_form_with_buttons" class="hide-when-print">
19 19
<div id="query_form_content">
20
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
21
  <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
22
  <div style="<%= @query.new_record? ? "" : "display: none;" %>">
23
    <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
24
  </div>
25
</fieldset>
26
<fieldset id="options" class="collapsible collapsed">
27
  <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
28
  <div style="display: none;">
29
    <table>
30
      <tr>
31
        <td>
32
          <fieldset>
33
            <legend><%= l(:label_related_issues) %></legend>
34
            <label for="draw_relations">
35
              <%= check_box 'query', 'draw_relations', :id => 'draw_relations' %>
36
              <% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
37
              <% rels.each do |rel| %>
38
                <% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
39
                <%= content_tag(:span, '&nbsp;&nbsp;&nbsp;'.html_safe,
40
                                :style => "background-color: #{color}") %>
41
                <%= l(IssueRelation::TYPES[rel][:name]) %>
42
              <% end %>
43
            </label>
44
          </fieldset>
45
        </td>
46
        <td>
47
          <fieldset>
48
            <legend><%= l(:label_gantt_progress_line) %></legend>
49
            <label for="draw_progress_line">
50
              <%= check_box 'query', 'draw_progress_line', :id => 'draw_progress_line' %>
51
              <%= l(:label_display) %>
52
            </label>
53
          </fieldset>
54
        </td>
55
      </tr>
56
    </table>
57
  </div>
58
</fieldset>
20
  <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
21
    <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
22
    <div style="<%= @query.new_record? ? "" : "display: none;" %>">
23
      <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
24
    </div>
25
  </fieldset>
26

  
27
  <fieldset id="options" class="collapsible collapsed">
28
    <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
29
    <div style="display: none;">
30
      <table>
31
        <tr>
32
          <td>
33
            <fieldset>
34
              <legend><%= l(:label_related_issues) %></legend>
35
              <label for="draw_relations">
36
                <%= check_box 'query', 'draw_relations', :id => 'draw_relations' %>
37
                <% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
38
                <% rels.each do |rel| %>
39
                  <% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
40
                  <%= content_tag(:span, '&nbsp;&nbsp;&nbsp;'.html_safe,
41
                                  :style => "background-color: #{color}") %>
42
                  <%= l(IssueRelation::TYPES[rel][:name]) %>
43
                <% end %>
44
              </label>
45
            </fieldset>
46
          </td>
47
          <td>
48
            <fieldset>
49
              <legend><%= l(:label_gantt_progress_line) %></legend>
50
              <label for="draw_progress_line">
51
                <%= check_box 'query', 'draw_progress_line', :id => 'draw_progress_line' %>
52
                <%= l(:label_display) %>
53
              </label>
54
            </fieldset>
55
          </td>
56
        </tr>
57
      </table>
58
    </div>
59
  </fieldset>
59 60
</div>
60 61

  
61 62
<p class="contextual">
......
64 65
</p>
65 66

  
66 67
<p class="buttons">
67
<%= text_field_tag 'months', @gantt.months, :size => 2 %>
68
<%= l(:label_months_from) %>
69
<%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
70
<%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
71
<%= hidden_field_tag 'zoom', @gantt.zoom %>
68
  <%= text_field_tag 'months', @gantt.months, :size => 2 %>
69
  <%= l(:label_months_from) %>
70
  <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
71
  <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
72
  <%= hidden_field_tag 'zoom', @gantt.zoom %>
72 73

  
73
<%= link_to_function l(:button_apply), '$("#query_form").submit()',
74
                     :class => 'icon icon-checked' %>
75
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
76
            :class => 'icon icon-reload' %>
77
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
78
  <%= link_to_function l(:button_save),
79
                       "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
80
                       :class => 'icon icon-save' %>
81
<% end %>
74
  <%= link_to_function l(:button_apply), '$("#query_form").submit()',
75
                       :class => 'icon icon-checked' %>
76
  <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
77
              :class => 'icon icon-reload' %>
78
  <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
79
    <%= link_to_function l(:button_save),
80
                         "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
81
                         :class => 'icon icon-save' %>
82
  <% end %>
82 83
</p>
83 84
</div>
84 85
<% end %>
85
-