30471.patch

Mizuki ISHIKAWA, 2021-01-15 03:44

Download (3.39 KB)

View differences:

app/views/queries/_form.html.erb
1 1
<%= error_messages_for 'query' %>
2 2

  
3 3
<div class="box">
4
<div class="tabular">
5 4
<%= hidden_field_tag 'gantt', '1' if params[:gantt] %>
6 5
<%= hidden_field_tag 'calendar', '1' if params[:calendar] %>
7 6

  
7
<div class='tabular'>
8 8
<p><label for="query_name"><%=l(:field_name)%></label>
9 9
<%= text_field 'query', 'name', :size => 80 %></p>
10 10

  
......
27 27
  <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
28 28
  <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p>
29 29
<% end %>
30
</div>
31

  
32
<fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
33
<%= render :partial => 'queries/filters', :locals => {:query => query}%>
34
</fieldset>
30 35

  
31 36
<% unless params[:calendar] %>
32 37
  <fieldset id="options"><legend><%= l(:label_options) %></legend>
38
    <div class='tabular'>
33 39
    <% if @query.available_display_types.size > 1 %>
34 40
      <p><label for='display_type'><%= l(:label_display_type) %></label>
35 41
        <%= available_display_types_tags(@query) %>
......
38 44

  
39 45
    <p id ="default_columns"><label for="query_default_columns"><%=l(:label_default_columns)%></label>
40 46
    <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
41
          :data => {:disables => "#columns, .block_columns input"} %></p>
47
          :data => {:disables => "#columns select, #columns input, .block_columns input"} %></p>
48

  
49
    <p id="columns" ><label for='columns'><%= l(:field_column_names) %></label><%= render_query_columns_selection(query) %></p>
42 50

  
43 51
    <% unless params[:gantt] %>
44 52
      <p id="group_by"><label for="query_group_by"><%= l(:field_group_by) %></label>
......
63 71
      <label class="inline"><%= check_box_tag "query[draw_selected_columns]", "1", @query.draw_selected_columns, :data => { :enables => 'span.query-columns select, span.query-columns input'} %> <%= l(:description_selected_columns) %></label>
64 72
      </p>
65 73
    <% end %>
74
    </div>
66 75
  </fieldset>
67 76
<% end %>
68
</div>
69

  
70
<fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
71
<%= render :partial => 'queries/filters', :locals => {:query => query}%>
72
</fieldset>
73 77

  
74 78
<% if params[:calendar].nil? && params[:gantt].nil? %>
75 79
  <fieldset id="sort"><legend><%= l(:label_sort) %></legend>
......
90 94
  </fieldset>
91 95
<% end %>
92 96

  
93
<% unless params[:calendar] %>
94
  <%= content_tag 'fieldset', :id => 'columns' do %>
95
  <legend><%= l(:field_column_names) %></legend>
96
  <%= render_query_columns_selection(query) %>
97
  <% end %>
98
<% end %>
99

  
100 97
</div>
101 98

  
102 99
<%= javascript_tag do %>
public/stylesheets/application.css
408 408
  min-width:150px;
409 409
}
410 410

  
411
.tabular #columns label[for='columns'] {
412
  margin-top: 100px;
413
}
414
.tabular #columns .query-columns label {
415
  float: initial;
416
  margin-left: 0px;
417
  text-align: left;
418
  width: initial;
419
}
420

  
411 421
.query-totals {text-align:right; margin-top:-2.3em;}
412 422
.query-totals>span:not(:first-child) {margin-left:0.6em;}
413 423
.query-totals .value {font-weight:bold;}