baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add show filters toggle to user and scheme pages

pull/2748/head
Manny Dinssa 8 months ago
parent
83e3ddccdd
commit
97e895027a
4 changed files with 15 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/views/organisations/schemes.html.erb
  2. 4
      app/views/organisations/users.html.erb
  3. 4
      app/views/schemes/index.html.erb
  4. 4
      app/views/users/index.html.erb

2
app/views/organisations/schemes.html.erb
Unescape View File

@ -23,7 +23,9 @@
<div class="app-filter-layout" data-controller="filter-layout"> <div class="app-filter-layout" data-controller="filter-layout">
<% if SchemePolicy.new(current_user, nil).create? %> <% if SchemePolicy.new(current_user, nil).create? %>
<div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
<%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %> <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
</div>
<% end %> <% end %>
<%= govuk_details( <%= govuk_details(

4
app/views/organisations/users.html.erb
Unescape View File

@ -12,10 +12,12 @@
<h2 class="govuk-visually-hidden">Users</h2> <h2 class="govuk-visually-hidden">Users</h2>
<% end %> <% end %>
<div class="app-filter-layout" data-controller="filter-layout">
<div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
<% if current_user.data_coordinator? || current_user.support? %> <% if current_user.data_coordinator? || current_user.support? %>
<%= govuk_button_link_to "Invite user", new_user_path(organisation_id: @organisation.id), html: { method: :get } %> <%= govuk_button_link_to "Invite user", new_user_path(organisation_id: @organisation.id), html: { method: :get } %>
<% end %> <% end %>
<div class="app-filter-layout" data-controller="filter-layout"> </div>
<%= render partial: "users/user_filters" %> <%= render partial: "users/user_filters" %>
<div class="app-filter-layout__content"> <div class="app-filter-layout__content">

4
app/views/schemes/index.html.erb
Unescape View File

@ -5,12 +5,12 @@
<%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Supported housing schemes", sub: nil } : { main: "Supported housing schemes", sub: current_user.organisation.name } %> <%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Supported housing schemes", sub: nil } : { main: "Supported housing schemes", sub: current_user.organisation.name } %>
<div class="app-filter-layout" data-controller="filter-layout">
<% if SchemePolicy.new(current_user, nil).create? %> <% if SchemePolicy.new(current_user, nil).create? %>
<div class="govuk-button-group govuk-!-margin-bottom-6"> <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
<%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %> <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
</div> </div>
<% end %> <% end %>
<div class="app-filter-layout" data-controller="filter-layout">
<%= render partial: "schemes/scheme_filters" %> <%= render partial: "schemes/scheme_filters" %>
<div class="app-filter-layout__content"> <div class="app-filter-layout__content">
<%= render SearchComponent.new(current_user:, search_label: "Search by postcode, scheme name, scheme code or location name", value: @searched) %> <%= render SearchComponent.new(current_user:, search_label: "Search by postcode, scheme name, scheme code or location name", value: @searched) %>

4
app/views/users/index.html.erb
Unescape View File

@ -5,12 +5,12 @@
<%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Users", sub: nil } : { main: "Users", sub: current_user.organisation.name } %> <%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Users", sub: nil } : { main: "Users", sub: current_user.organisation.name } %>
<div class="app-filter-layout" data-controller="filter-layout">
<% if current_user.data_coordinator? || current_user.support? %> <% if current_user.data_coordinator? || current_user.support? %>
<div class="govuk-button-group govuk-!-margin-bottom-6"> <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
<%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %> <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
</div> </div>
<% end %> <% end %>
<div class="app-filter-layout" data-controller="filter-layout">
<%= render partial: "users/user_filters" %> <%= render partial: "users/user_filters" %>
<div class="app-filter-layout__content"> <div class="app-filter-layout__content">
<%= render SearchComponent.new(current_user:, search_label: "Search by name or email address", value: @searched) %> <%= render SearchComponent.new(current_user:, search_label: "Search by name or email address", value: @searched) %>

Write Preview
Loading…
Cancel
Save