From c439780f32605f81d0b654dbd0be82d10303421e Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 30 Nov 2021 18:22:05 +0000
Subject: [PATCH] Nested layout is nicer

---
 app/views/layouts/application.html.erb   |  2 +-
 app/views/layouts/organisations.html.erb | 25 ++++++++++++++++++++++++
 app/views/organisations/show.html.erb    | 16 ---------------
 app/views/organisations/users.html.erb   | 16 ---------------
 4 files changed, 26 insertions(+), 33 deletions(-)
 create mode 100644 app/views/layouts/organisations.html.erb

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4ad2ae7a4..ccadc799f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -66,7 +66,7 @@
             end
           %>
         <% end %>
-        <%= yield %>
+        <%= content_for?(:content) ? yield(:content) : yield %>
       </main>
     </div>
 
diff --git a/app/views/layouts/organisations.html.erb b/app/views/layouts/organisations.html.erb
new file mode 100644
index 000000000..5819fb9d4
--- /dev/null
+++ b/app/views/layouts/organisations.html.erb
@@ -0,0 +1,25 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link(
+    text: 'Back',
+    href: :back,
+  ) %>
+<% end %>
+
+<% content_for :content do %>
+  <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) },
+  ]) %>
+
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
+      <%= content_for?(:organisations_content) ? yield(:organisations_content) : yield %>
+    </div>
+  </div>
+<% end %>
+
+<%= render template: "layouts/application" %>
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
index 45eabf6e5..106d6316d 100644
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@@ -1,19 +1,3 @@
-<% 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_summary_list do |summary_list| %>
   <% @organisation.display_attributes.each do |attr, val| %>
     <%= summary_list.row do |row|
diff --git a/app/views/organisations/users.html.erb b/app/views/organisations/users.html.erb
index 094036aa4..0e18005e6 100644
--- a/app/views/organisations/users.html.erb
+++ b/app/views/organisations/users.html.erb
@@ -1,19 +1,3 @@
-<% 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|