From 4eea97c83bb64203dd67c2b042f966a04edfc383 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Thu, 8 Feb 2018 12:17:23 +0000
Subject: [PATCH 1/7] Add organisation to platform admin navigation

---
 app/templates/views/platform-admin/_base_template.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html
index da8d6dd9f..786a79dfb 100644
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -11,10 +11,11 @@
         Platform admin
       </p>
       <nav class="navigation">
-        {% for link_text, url in [
+          {% for link_text, url in [
           ('Summary', url_for('main.platform_admin')),
           ('Live services', url_for('main.live_services')),
           ('Trial mode services', url_for('main.trial_services')),
+          ('Organisations', url_for('main.organisations')),
           ('Providers', url_for('main.view_providers')),
           ('Email branding', url_for('main.email_branding')),
           ('Letter jobs', url_for('main.letter_jobs')),

From b11bfd49e328bb22d1dcde03563f4a36f62483cc Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Thu, 8 Feb 2018 12:18:37 +0000
Subject: [PATCH 2/7] Add Organisations API Client

---
 app/__init__.py                               |  3 ++
 app/notify_client/organisations_api_client.py | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 app/notify_client/organisations_api_client.py

diff --git a/app/__init__.py b/app/__init__.py
index 0d01c194e..75af97bd2 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -51,6 +51,7 @@ from app.notify_client.events_api_client import EventsApiClient
 from app.notify_client.provider_client import ProviderClient
 from app.notify_client.email_branding_client import EmailBrandingClient
 from app.notify_client.models import AnonymousUser
+from app.notify_client.organisations_api_client import OrganisationsClient
 from app.notify_client.letter_jobs_client import LetterJobsClient
 from app.notify_client.inbound_number_client import InboundNumberClient
 from app.notify_client.billing_api_client import BillingAPIClient
@@ -72,6 +73,7 @@ template_statistics_client = TemplateStatisticsApiClient()
 events_api_client = EventsApiClient()
 provider_client = ProviderClient()
 email_branding_client = EmailBrandingClient()
+organisations_client = OrganisationsClient()
 asset_fingerprinter = AssetFingerprinter()
 statsd_client = StatsdClient()
 deskpro_client = DeskproClient()
@@ -108,6 +110,7 @@ def create_app(application):
     events_api_client.init_app(application)
     provider_client.init_app(application)
     email_branding_client.init_app(application)
+    organisations_client.init_app(application)
     letter_jobs_client.init_app(application)
     inbound_number_client.init_app(application)
     billing_api_client.init_app(application)
diff --git a/app/notify_client/organisations_api_client.py b/app/notify_client/organisations_api_client.py
new file mode 100644
index 000000000..ade5ad378
--- /dev/null
+++ b/app/notify_client/organisations_api_client.py
@@ -0,0 +1,30 @@
+from app.notify_client import NotifyAdminAPIClient
+
+
+class OrganisationsClient(NotifyAdminAPIClient):
+
+    def __init__(self):
+        super().__init__("a" * 73, "b")
+
+    def init_app(self, app):
+        self.base_url = app.config['API_HOST_NAME']
+        self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
+        self.api_key = app.config['ADMIN_CLIENT_SECRET']
+
+    def get_organisations(self):
+        return self.get(url='/organisations')
+
+    def get_organisation(self, org_id):
+        return self.get(url='/organisations/{}'.format(org_id))
+
+    def create_organisation(self, name):
+        data = {
+            "name": name
+        }
+        return self.post(url="/organisations", data=data)
+
+    def update_organisation(self, org_id, name):
+        data = {
+            "name": name
+        }
+        return self.post(url="/organisations/{}".format(org_id), data=data)

From f0e8661e343d6e9499e39bc336c111db3036bac9 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Thu, 8 Feb 2018 12:19:21 +0000
Subject: [PATCH 3/7] Add organisations pages to show orgs and create/edit them

---
 app/main/__init__.py                          |   1 +
 app/main/forms.py                             |   5 +
 app/main/views/organisations.py               |  63 +++++++++++
 .../organisations/manage-organisation.html    |  27 +++++
 .../views/organisations/organisations.html    |  28 +++++
 tests/app/main/views/test_organisations.py    | 104 ++++++++++++++++++
 6 files changed, 228 insertions(+)
 create mode 100644 app/main/views/organisations.py
 create mode 100644 app/templates/views/organisations/manage-organisation.html
 create mode 100644 app/templates/views/organisations/organisations.html
 create mode 100644 tests/app/main/views/test_organisations.py

diff --git a/app/main/__init__.py b/app/main/__init__.py
index ceea4e4b0..4ec54c1e2 100644
--- a/app/main/__init__.py
+++ b/app/main/__init__.py
@@ -30,6 +30,7 @@ from app.main.views import (  # noqa
     letter_jobs,
     email_branding,
     conversation,
+    organisations,
     notifications,
     inbound_number
 )
diff --git a/app/main/forms.py b/app/main/forms.py
index 2004d1661..537b11ba7 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -665,6 +665,11 @@ class ServiceCreateEmailBranding(StripWhitespaceForm):
     file = FileField_wtf('Upload a PNG logo', validators=[FileAllowed(['png'], 'PNG Images only!')])
 
 
+class CreateOrUpdateOrganisation(StripWhitespaceForm):
+
+    name = StringField('Name', validators=[DataRequired()])
+
+
 class LetterBranding(StripWhitespaceForm):
 
     def __init__(self, choices=[], *args, **kwargs):
diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py
new file mode 100644
index 000000000..013dbcd4a
--- /dev/null
+++ b/app/main/views/organisations.py
@@ -0,0 +1,63 @@
+from flask import redirect, render_template, url_for
+from flask_login import login_required
+
+from app import organisations_client
+from app.main import main
+from app.main.forms import CreateOrUpdateOrganisation
+from app.utils import user_has_permissions
+
+
+@main.route("/organisations", methods=['GET'])
+@login_required
+@user_has_permissions(admin_override=True)
+def organisations():
+    orgs = organisations_client.get_organisations()
+
+    return render_template(
+        'views/organisations/organisations.html',
+        organisations=orgs
+    )
+
+
+@main.route("/organisation/<org_id>/edit", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions(admin_override=True)
+def update_organisation(org_id):
+    org = organisations_client.get_organisation(org_id)
+
+    form = CreateOrUpdateOrganisation()
+
+    if form.validate_on_submit():
+        organisations_client.update_organisation(
+            org_id=org_id,
+            name=form.name.data
+        )
+
+        return redirect(url_for('.organisations'))
+
+    form.name.data = org['name']
+
+    return render_template(
+        'views/organisations/manage-organisation.html',
+        form=form,
+        organisation=org
+    )
+
+
+@main.route("/organisations/create", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions(admin_override=True)
+def create_organisation():
+    form = CreateOrUpdateOrganisation()
+
+    if form.validate_on_submit():
+        organisations_client.create_organisation(
+            name=form.name.data,
+        )
+
+        return redirect(url_for('.organisations'))
+
+    return render_template(
+        'views/organisations/manage-organisation.html',
+        form=form
+    )
diff --git a/app/templates/views/organisations/manage-organisation.html b/app/templates/views/organisations/manage-organisation.html
new file mode 100644
index 000000000..a2b52a0d8
--- /dev/null
+++ b/app/templates/views/organisations/manage-organisation.html
@@ -0,0 +1,27 @@
+{% extends "views/platform-admin/_base_template.html" %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/textbox.html" import textbox, colour_textbox %}
+
+{% block service_page_title %}
+  {{ '{} an organisations'.format('Update' if organisation else 'Create')}}
+{% endblock %}
+
+{% block platform_admin_content %}
+
+  <h1 class="heading-large">{{ '{} an organisation'.format('Update' if organisation else 'Create')}}</h1>
+  <div class="grid-row">
+    <div class="column-three-quarters">
+
+      <form method="post">
+        <div class="form-group">
+          <div style='margin-top:15px;'>{{textbox(form.name)}}</div>
+          {{ page_footer(
+            'Save',
+            back_link=url_for('.organisations'),
+            back_link_text='Back to organisations',
+          ) }}
+        </div>
+      </form>
+    </div>
+  </div>
+{% endblock %}
diff --git a/app/templates/views/organisations/organisations.html b/app/templates/views/organisations/organisations.html
new file mode 100644
index 000000000..4d4028d63
--- /dev/null
+++ b/app/templates/views/organisations/organisations.html
@@ -0,0 +1,28 @@
+{% extends "views/platform-admin/_base_template.html" %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block service_page_title %}
+  Show organisations
+{% endblock %}
+
+{% block platform_admin_content %}
+
+  <h1 class="heading-large">
+    <div>Organisations</div>
+  </h1>
+  <div class="grid-row">
+    <div class="column-three-quarters">
+      {% for org in organisations %}
+        <div>
+          <a href="{{ url_for('main.update_organisation', org_id=org['id']) }}" class="browse-list-link">{{ org['name'] }}</a>
+          {% if not org['active'] %}
+            <span class="table-field-status-default heading-medium">- archived</span>
+          {% endif %}
+        </div>
+      {% endfor %}
+        <br/>
+        <div><a href="{{ url_for('main.create_organisation') }}" class="browse-list-link">Create an organisation</a></div>
+    </div>
+  </div>
+
+{% endblock %}
diff --git a/tests/app/main/views/test_organisations.py b/tests/app/main/views/test_organisations.py
new file mode 100644
index 000000000..746a5a035
--- /dev/null
+++ b/tests/app/main/views/test_organisations.py
@@ -0,0 +1,104 @@
+from bs4 import BeautifulSoup
+from flask import url_for
+
+from tests.conftest import (
+    normalize_spaces
+)
+
+
+def test_organisation_page_shows_all_organisations(
+    logged_in_platform_admin_client,
+    mocker
+):
+    orgs = [
+        {'id': '1', 'name': 'Test 1', 'active': True},
+        {'id': '2', 'name': 'Test 2', 'active': True},
+        {'id': '3', 'name': 'Test 3', 'active': False},
+    ]
+
+    mocker.patch(
+        'app.organisations_client.get_organisations', return_value=orgs
+    )
+    response = logged_in_platform_admin_client.get(
+        url_for('.organisations')
+    )
+
+    assert response.status_code == 200
+    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+
+    assert normalize_spaces(
+        page.select_one('h1').text
+    ) == "Organisations"
+
+    for index, org in enumerate(orgs):
+        assert (page.select('a.browse-list-link')[index]).text == org['name']
+        if not org['active']:
+            assert (page.select_one('.table-field-status-default,heading-medium')).text == '- archived'
+    assert normalize_spaces((page.select('a.browse-list-link')[-1]).text) == 'Create an organisation'
+
+
+def test_edit_organisation_shows_the_correct_organisation(
+    logged_in_platform_admin_client,
+    fake_uuid,
+    mocker
+):
+    org = {'id': fake_uuid, 'name': 'Test 1', 'active': True}
+    mocker.patch(
+        'app.organisations_client.get_organisation', return_value=org
+    )
+
+    response = logged_in_platform_admin_client.get(
+        url_for('.update_organisation', org_id=fake_uuid)
+    )
+
+    assert response.status_code == 200
+    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+
+    assert page.select_one('#name').attrs.get('value') == org['name']
+
+
+def test_create_new_organisation(
+    logged_in_platform_admin_client,
+    mocker,
+    fake_uuid
+):
+    mock_create_organisation = mocker.patch(
+        'app.organisations_client.create_organisation'
+    )
+
+    org = {'name': 'new name'}
+
+    logged_in_platform_admin_client.post(
+        url_for('.create_organisation'),
+        content_type='multipart/form-data',
+        data=org
+    )
+
+    mock_create_organisation.assert_called_once_with(name=org['name'])
+
+
+def test_update_organisation(
+    logged_in_platform_admin_client,
+    mocker,
+    fake_uuid,
+):
+    org = {'name': 'new name'}
+
+    mocker.patch(
+        'app.organisations_client.get_organisation', return_value=org
+    )
+    mock_update_organisation = mocker.patch(
+        'app.organisations_client.update_organisation'
+    )
+
+    logged_in_platform_admin_client.post(
+        url_for('.update_organisation', org_id=fake_uuid),
+        content_type='multipart/form-data',
+        data=org
+    )
+
+    assert mock_update_organisation.called
+    mock_update_organisation.assert_called_once_with(
+        org_id=fake_uuid,
+        name=org['name']
+    )

From d4c6491c939db855a6d4ec6d6d8f63cd0a20ea1d Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Thu, 8 Feb 2018 15:41:31 +0000
Subject: [PATCH 4/7] Add title

---
 app/templates/views/organisations/manage-organisation.html | 4 ++++
 app/templates/views/organisations/organisations.html       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/templates/views/organisations/manage-organisation.html b/app/templates/views/organisations/manage-organisation.html
index a2b52a0d8..eeb8a1100 100644
--- a/app/templates/views/organisations/manage-organisation.html
+++ b/app/templates/views/organisations/manage-organisation.html
@@ -2,6 +2,10 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/textbox.html" import textbox, colour_textbox %}
 
+{% block per_page_title %}
+  {{ '{} an organisations'.format('Update' if organisation else 'Create')}}
+{% endblock %}
+
 {% block service_page_title %}
   {{ '{} an organisations'.format('Update' if organisation else 'Create')}}
 {% endblock %}
diff --git a/app/templates/views/organisations/organisations.html b/app/templates/views/organisations/organisations.html
index 4d4028d63..9e29b2d58 100644
--- a/app/templates/views/organisations/organisations.html
+++ b/app/templates/views/organisations/organisations.html
@@ -1,6 +1,10 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 
+{% block per_page_title %}
+  Show organisations
+{% endblock %}
+
 {% block service_page_title %}
   Show organisations
 {% endblock %}

From a200f1a17ef7266eb2a707d56e694c7495b44769 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Thu, 8 Feb 2018 16:18:18 +0000
Subject: [PATCH 5/7] Go to organisation stub page which will eventually show
 list of services

---
 app/main/views/organisations.py               | 12 ++++++++++
 .../views/organisations/organisations.html    |  2 +-
 .../organisations/view-organisation.html      | 23 ++++++++++++++++++
 tests/app/main/views/test_organisations.py    | 24 +++++++++++++++++--
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 app/templates/views/organisations/view-organisation.html

diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py
index 013dbcd4a..118d2940d 100644
--- a/app/main/views/organisations.py
+++ b/app/main/views/organisations.py
@@ -19,6 +19,18 @@ def organisations():
     )
 
 
+@main.route("/organisation/<org_id>", methods=['GET'])
+@login_required
+@user_has_permissions(admin_override=True)
+def view_organisation(org_id):
+    org = organisations_client.get_organisation(org_id)
+
+    return render_template(
+        'views/organisations/view-organisation.html',
+        organisation=org
+    )
+
+
 @main.route("/organisation/<org_id>/edit", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions(admin_override=True)
diff --git a/app/templates/views/organisations/organisations.html b/app/templates/views/organisations/organisations.html
index 9e29b2d58..96c164912 100644
--- a/app/templates/views/organisations/organisations.html
+++ b/app/templates/views/organisations/organisations.html
@@ -18,7 +18,7 @@
     <div class="column-three-quarters">
       {% for org in organisations %}
         <div>
-          <a href="{{ url_for('main.update_organisation', org_id=org['id']) }}" class="browse-list-link">{{ org['name'] }}</a>
+          <a href="{{ url_for('main.view_organisation', org_id=org['id']) }}" class="browse-list-link">{{ org['name'] }}</a>
           {% if not org['active'] %}
             <span class="table-field-status-default heading-medium">- archived</span>
           {% endif %}
diff --git a/app/templates/views/organisations/view-organisation.html b/app/templates/views/organisations/view-organisation.html
new file mode 100644
index 000000000..bcb7ce474
--- /dev/null
+++ b/app/templates/views/organisations/view-organisation.html
@@ -0,0 +1,23 @@
+{% extends "views/platform-admin/_base_template.html" %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block per_page_title %}
+  {{ organisation['name'] }}
+{% endblock %}
+
+{% block service_page_title %}
+  {{ organisation['name'] }}
+{% endblock %}
+
+{% block platform_admin_content %}
+
+  <h1 class="heading-large">
+    <div>{{ organisation['name'] }}</div>
+  </h1>
+  <div class="grid-row">
+    <div class="column-three-quarters">
+      [List of services]
+    </div>
+  </div>
+
+{% endblock %}
diff --git a/tests/app/main/views/test_organisations.py b/tests/app/main/views/test_organisations.py
index 746a5a035..5978cef92 100644
--- a/tests/app/main/views/test_organisations.py
+++ b/tests/app/main/views/test_organisations.py
@@ -31,12 +31,32 @@ def test_organisation_page_shows_all_organisations(
     ) == "Organisations"
 
     for index, org in enumerate(orgs):
-        assert (page.select('a.browse-list-link')[index]).text == org['name']
+        assert page.select('a.browse-list-link')[index].text == org['name']
         if not org['active']:
-            assert (page.select_one('.table-field-status-default,heading-medium')).text == '- archived'
+            assert page.select_one('.table-field-status-default,heading-medium').text == '- archived'
     assert normalize_spaces((page.select('a.browse-list-link')[-1]).text) == 'Create an organisation'
 
 
+def test_view_organisation_shows_the_correct_organisation(
+    logged_in_platform_admin_client,
+    fake_uuid,
+    mocker
+):
+    org = {'id': fake_uuid, 'name': 'Test 1', 'active': True}
+    mocker.patch(
+        'app.organisations_client.get_organisation', return_value=org
+    )
+
+    response = logged_in_platform_admin_client.get(
+        url_for('.view_organisation', org_id=fake_uuid)
+    )
+
+    assert response.status_code == 200
+    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+
+    assert page.select_one('.heading-large div').text == org['name']
+
+
 def test_edit_organisation_shows_the_correct_organisation(
     logged_in_platform_admin_client,
     fake_uuid,

From 11a7fc49b7baae03f2abefc00c457270b4274439 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Thu, 8 Feb 2018 17:30:32 +0000
Subject: [PATCH 6/7] Renamed create to add for organisations

---
 app/main/views/organisations.py                      | 4 ++--
 app/templates/views/organisations/organisations.html | 2 +-
 tests/app/main/views/test_organisations.py           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py
index 118d2940d..80b16f8e4 100644
--- a/app/main/views/organisations.py
+++ b/app/main/views/organisations.py
@@ -56,10 +56,10 @@ def update_organisation(org_id):
     )
 
 
-@main.route("/organisations/create", methods=['GET', 'POST'])
+@main.route("/organisations/add", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions(admin_override=True)
-def create_organisation():
+def add_organisation():
     form = CreateOrUpdateOrganisation()
 
     if form.validate_on_submit():
diff --git a/app/templates/views/organisations/organisations.html b/app/templates/views/organisations/organisations.html
index 96c164912..dd2906a2d 100644
--- a/app/templates/views/organisations/organisations.html
+++ b/app/templates/views/organisations/organisations.html
@@ -25,7 +25,7 @@
         </div>
       {% endfor %}
         <br/>
-        <div><a href="{{ url_for('main.create_organisation') }}" class="browse-list-link">Create an organisation</a></div>
+        <div><a href="{{ url_for('main.add_organisation') }}" class="browse-list-link">Create an organisation</a></div>
     </div>
   </div>
 
diff --git a/tests/app/main/views/test_organisations.py b/tests/app/main/views/test_organisations.py
index 5978cef92..1249f7910 100644
--- a/tests/app/main/views/test_organisations.py
+++ b/tests/app/main/views/test_organisations.py
@@ -89,7 +89,7 @@ def test_create_new_organisation(
     org = {'name': 'new name'}
 
     logged_in_platform_admin_client.post(
-        url_for('.create_organisation'),
+        url_for('.add_organisation'),
         content_type='multipart/form-data',
         data=org
     )

From 35571e741ca3c79569f96642dc155b20a7aa1c64 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Fri, 9 Feb 2018 10:28:41 +0000
Subject: [PATCH 7/7] Refactor manage-organisation.html, organisations.html

---
 .../organisations/manage-organisation.html    | 27 +++++++------------
 .../views/organisations/organisations.html    | 21 ++++++++-------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/app/templates/views/organisations/manage-organisation.html b/app/templates/views/organisations/manage-organisation.html
index eeb8a1100..b9d18cea7 100644
--- a/app/templates/views/organisations/manage-organisation.html
+++ b/app/templates/views/organisations/manage-organisation.html
@@ -3,29 +3,22 @@
 {% from "components/textbox.html" import textbox, colour_textbox %}
 
 {% block per_page_title %}
-  {{ '{} an organisations'.format('Update' if organisation else 'Create')}}
+  {{ '{} an organisation'.format('Update' if organisation else 'Create')}}
 {% endblock %}
 
 {% block service_page_title %}
-  {{ '{} an organisations'.format('Update' if organisation else 'Create')}}
+  {{ '{} an organisation'.format('Update' if organisation else 'Create')}}
 {% endblock %}
 
 {% block platform_admin_content %}
 
   <h1 class="heading-large">{{ '{} an organisation'.format('Update' if organisation else 'Create')}}</h1>
-  <div class="grid-row">
-    <div class="column-three-quarters">
-
-      <form method="post">
-        <div class="form-group">
-          <div style='margin-top:15px;'>{{textbox(form.name)}}</div>
-          {{ page_footer(
-            'Save',
-            back_link=url_for('.organisations'),
-            back_link_text='Back to organisations',
-          ) }}
-        </div>
-      </form>
-    </div>
-  </div>
+  <form method="post">
+      {{textbox(form.name)}}
+      {{ page_footer(
+        'Save',
+        back_link=url_for('.organisations'),
+        back_link_text='Back to organisations',
+      ) }}
+  </form>
 {% endblock %}
diff --git a/app/templates/views/organisations/organisations.html b/app/templates/views/organisations/organisations.html
index dd2906a2d..136e61d4a 100644
--- a/app/templates/views/organisations/organisations.html
+++ b/app/templates/views/organisations/organisations.html
@@ -2,31 +2,32 @@
 {% from "components/page-footer.html" import page_footer %}
 
 {% block per_page_title %}
-  Show organisations
+  Organisations
 {% endblock %}
 
 {% block service_page_title %}
-  Show organisations
+  Organisations
 {% endblock %}
 
 {% block platform_admin_content %}
 
   <h1 class="heading-large">
-    <div>Organisations</div>
+    Organisations
   </h1>
-  <div class="grid-row">
-    <div class="column-three-quarters">
+  <nav class="browse-list">
+      <ul>
       {% for org in organisations %}
-        <div>
+        <li class="browse-list-item">
           <a href="{{ url_for('main.view_organisation', org_id=org['id']) }}" class="browse-list-link">{{ org['name'] }}</a>
           {% if not org['active'] %}
             <span class="table-field-status-default heading-medium">- archived</span>
           {% endif %}
-        </div>
+        </li>
       {% endfor %}
-        <br/>
-        <div><a href="{{ url_for('main.add_organisation') }}" class="browse-list-link">Create an organisation</a></div>
-    </div>
+      </ul>
+  </nav>
+  <div>
+    <a href="{{ url_for('main.add_organisation') }}" class="browse-list-link">Create an organisation</a>
   </div>
 
 {% endblock %}