0001-Fix-HTML-structure-of-query_form-on-calendar-gantt-v.patch

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

Download (2.81 KB)

View differences:

app/views/calendars/show.html.erb
3 3
<%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
4 4
             :method => :get, :id => 'query_form') do %>
5 5
<%= hidden_field_tag 'set_filter', '1' %>
6

  
7
<div id="query_form_with_buttons" class="hide-when-print">
8
<div id="query_form_content">
6 9
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
7 10
  <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
8 11
  <div style="<%= @query.new_record? ? "" : "display: none;" %>">
......
13 16
<p style="float:right;">
14 17
  <%= link_to_previous_month(@year, @month, :accesskey => accesskey(:previous)) %> | <%= link_to_next_month(@year, @month, :accesskey => accesskey(:next)) %>
15 18
</p>
19
</div>
16 20

  
17 21
<p class="buttons">
18 22
<%= label_tag('month', l(:label_month)) %>
......
23 27
<%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
24 28
<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
25 29
</p>
30
</div>
26 31
<% end %>
27 32

  
28 33
<%= error_messages_for 'query' %>
app/views/gantts/show.html.erb
14 14
             :method => :get, :id => 'query_form') do %>
15 15
<%= hidden_field_tag 'set_filter', '1' %>
16 16
<%= hidden_field_tag 'gantt', '1' %>
17

  
18
<div id="query_form_with_buttons" class="hide-when-print">
19
<div id="query_form_content">
17 20
<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
18 21
  <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
19 22
  <div style="<%= @query.new_record? ? "" : "display: none;" %>">
......
53 56
    </table>
54 57
  </div>
55 58
</fieldset>
59
</div>
56 60

  
57 61
<p class="contextual">
58 62
  <%= gantt_zoom_link(@gantt, :in) %>
......
76 80
                       :class => 'icon icon-save' %>
77 81
<% end %>
78 82
</p>
83
</div>
79 84
<% end %>
80 85

  
81 86
<%= error_messages_for 'query' %>
82
-