Browse Source

Re-add filters

pull/2879/head
Kat 4 months ago
parent
commit
9c4c98593e
  1. 11
      app/frontend/styles/_custom-rails-admin.scss
  2. 4
      app/views/layouts/rails_admin/application.html.erb
  3. 2
      app/views/rails_admin/main/index.html.erb

11
app/frontend/styles/_custom-rails-admin.scss

@ -21,3 +21,14 @@
float: right; float: right;
} }
} }
.rails-admin-filters-box {
.filter {
// stylelint-disable-next-line declaration-no-important
display: flex !important;
}
button {
min-width: 20%;
}
}

4
app/views/layouts/rails_admin/application.html.erb

@ -38,6 +38,10 @@
<script> <script>
document.body.className += " js-enabled" + ("noModule" in HTMLScriptElement.prototype ? " govuk-frontend-supported" : ""); document.body.className += " js-enabled" + ("noModule" in HTMLScriptElement.prototype ? " govuk-frontend-supported" : "");
</script> </script>
<div data-i18n-options="<%= I18n.t("admin.js").to_json %>" id="admin-js"></div>
<div class="badge bg-warning" id="loading" style="display:none; position:fixed; right:20px; bottom:20px; z-index:100000">
<%= t("admin.loading") %>
</div>
<%= govuk_skip_link %> <%= govuk_skip_link %>

2
app/views/rails_admin/main/index.html.erb

@ -51,7 +51,7 @@
<div id="list"> <div id="list">
<%= form_tag(index_path(params.except(*%w[page f query])), method: :get) do %> <%= form_tag(index_path(params.except(*%w[page f query])), method: :get) do %>
<div class="card mb-3 p-3 bg-light"> <div class="card mb-3 p-3 bg-light">
<div class="row" data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></div> <div class="row rails-admin-filters-box" data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></div>
<hr class="filters_box" style="display:<%= ordered_filters.empty? ? "none" : "block" %>"> <hr class="filters_box" style="display:<%= ordered_filters.empty? ? "none" : "block" %>">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">

Loading…
Cancel
Save