Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Fixed fieldset toggling

Browse Source
This commit is contained in:
cryptogopher 2019-11-11 15:21:05 +01:00
parent 2e477921e9
commit fd11198446
2 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/views/ingredients/_filters.html.erb
View File

@ -1,35 +1,37 @@
<fieldset id="filters" class="collapsible"> <fieldset id="filters" class="collapsible">
<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend> <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
<%= error_messages_for @formula_q %> <div>
<%= error_messages_for @formula_q %>
<%= form_tag url, id: 'filters_form', method: :get, remote: true do %> <%= form_tag url, id: 'filters_form', method: :get, remote: true do %>
<table class="filter"> <table class="filter">
<tr> <tr>
<td> <td>
<%= text_field_tag 'filters[name]', session[:filters][:name], placeholder: 'name', <%= text_field_tag 'filters[name]', session[:filters][:name], placeholder: 'name',
:onblur => '$("#filters_form").submit(); return false;' %> :onblur => '$("#filters_form").submit(); return false;' %>
</td> </td>
<td> <td>
<%= select_tag 'filters[visibility]', <%= select_tag 'filters[visibility]',
visibility_options(session[:filters][:visibility]), visibility_options(session[:filters][:visibility]),
:onchange => '$("#filters_form").submit(); return false;' %> :onchange => '$("#filters_form").submit(); return false;' %>
</td> </td>
<td style="width:100%;"> <td style="width:100%;">
<%= text_field_tag 'filters[nutrients]', session[:filters][:nutrients], <%= text_field_tag 'filters[nutrients]', session[:filters][:nutrients],
placeholder: 'conditional expression including nutrients', size: 40, placeholder: 'conditional expression including nutrients', size: 40,
:style => 'box-sizing:border-box; width:100%;', :style => 'box-sizing:border-box; width:100%;',
:onblur => '$("#filters_form").submit(); return false;' %> :onblur => '$("#filters_form").submit(); return false;' %>
</td> </td>
<td> <td>
<%= link_to l(:button_apply), '#', :class => "icon icon-checked", <%= link_to l(:button_apply), '#', :class => "icon icon-checked",
:onclick => '$("#filters_form").submit(); return false;' %> :onclick => '$("#filters_form").submit(); return false;' %>
</td> </td>
<td> <td>
<%= link_to l(:button_clear), '#', :class => "icon icon-reload", <%= link_to l(:button_clear), '#', :class => "icon icon-reload",
:onclick => '$("#filters_form input, #filters_form select").val(""); :onclick => '$("#filters_form input, #filters_form select").val("");
$("#filters_form").submit(); return false;' %> $("#filters_form").submit(); return false;' %>
</td> </td>
</tr> </tr>
</table> </table>
<% end %> <% end %>
</div>
</fieldset> </fieldset>

30
app/views/ingredients/_options.html.erb
View File

@ -1,19 +1,21 @@
<fieldset id="options" class="collapsible"> <fieldset id="options" class="collapsible">
<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend> <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
<%= form_tag toggle_nutrient_column_project_ingredients_path(@project), <div>
id: 'add_nutrient_column', method: :post, remote: true do %> <%= form_tag toggle_nutrient_column_project_ingredients_path(@project),
<table> id: 'add_nutrient_column', method: :post, remote: true do %>
<tr> <table>
<td style="width:100%"></td> <tr>
<td> <td style="width:100%"></td>
<%= select_tag 'id', nutrient_column_options %> <td>
</td> <%= select_tag 'id', nutrient_column_options %>
<td> </td>
<%= submit_tag l(:button_add) %> <td>
</td> <%= submit_tag l(:button_add) %>
</tr> </td>
</table> </tr>
<% end %> </table>
<% end %>
</div>
</fieldset> </fieldset>
<table class="list" style="border:none; width:100%"> <table class="list" style="border:none; width:100%">