Browse Source

Match the prototype design

pull/122/head
baarkerlounger 4 years ago
parent
commit
0007f59ac8
  1. 6
      app/controllers/organisations_controller.rb
  2. 8
      app/views/organisations/_details.html.erb
  3. 9
      app/views/organisations/show.html.erb
  4. 16
      app/views/organisations/users.html.erb
  5. 2
      config/routes.rb

6
app/controllers/organisations_controller.rb

@ -2,12 +2,8 @@ class OrganisationsController < ApplicationController
before_action :authenticate_user!
before_action :find_organisation
def details
render "_details"
end
def users
render "_users"
render "users"
end
private

8
app/views/organisations/_details.html.erb

@ -1,8 +0,0 @@
<%= govuk_summary_list do |summary_list| %>
<% @organisation.display_attributes.each do |attr, val| %>
<%= summary_list.row do |row|
row.key { attr.to_s.humanize }
row.value { simple_format(val, {}, wrapper_tag: "div") }
end %>
<% end %>
<% end %>

9
app/views/organisations/show.html.erb

@ -14,4 +14,11 @@
{ name: t('Users'), url: users_organisation_path(@organisation) },
]) %>
<%= render "details" %>
<%= govuk_summary_list do |summary_list| %>
<% @organisation.display_attributes.each do |attr, val| %>
<%= summary_list.row do |row|
row.key { attr.to_s.humanize }
row.value { simple_format(val, {}, wrapper_tag: "div") }
end %>
<% end %>
<% end %>

16
app/views/organisations/_users.html.erb → app/views/organisations/users.html.erb

@ -1,3 +1,19 @@
<% content_for :before_content do %>
<%= govuk_back_link(
text: 'Back',
href: :back,
) %>
<% end %>
<h1 class="govuk-heading-l">
Your Organisation
</h1>
<%= render TabNavigationComponent.new(items: [
{ name: t('Details'), url: details_organisation_path(@organisation) },
{ name: t('Users'), url: users_organisation_path(@organisation) },
]) %>
<%= govuk_table do |table| %>
<%= table.head do |head| %>
<%= head.row do |row|

2
config/routes.rb

@ -20,7 +20,7 @@ Rails.application.routes.draw do
resources :organisations do
member do
get "details", to: "organisations#details"
get "details", to: "organisations#show"
get "users", to: "organisations#users"
end
end

Loading…
Cancel
Save