Make navigating organisations a bit easier

app/templates/org_nav.html

@@ -1,6 +1,6 @@
 <nav class="navigation">
   <ul>
-  	<li><a href="{{ url_for('.organisation_dashboard', org_id=current_org.id) }}" {{ org_navigation.is_selected('dashboard') }}>Dashboard</a></li>
+  	<li><a href="{{ url_for('.organisation_dashboard', org_id=current_org.id) }}" {{ org_navigation.is_selected('dashboard') }}>Services</a></li>
     <li><a href="{{ url_for('.manage_org_users', org_id=current_org.id) }}" {{ org_navigation.is_selected('team-members') }}>Team members</a></li>
     <li><a href="{{ url_for('.organisation_settings', org_id=current_org.id) }}" {{ org_navigation.is_selected('settings') }}>Settings</a></li>
   </ul>

app/templates/org_template.html

@@ -8,6 +8,10 @@
   <div id="content">
     <div class="navigation-service">
       <div class="navigation-service-name">
+        {% if current_user.platform_admin %}
+          <a href="{{ url_for('.organisations') }}">Organisations</a>
+          &gt;
+        {% endif %}
         {{ current_org.name }}
       </div>
       <a href="{{ url_for('main.choose_account') }}" class="navigation-service-switch">Switch service</a>

app/templates/views/organisations/add-organisation.html

@@ -13,7 +13,7 @@
 
 {% block platform_admin_content %}
 
-  <h1 class="heading-large">Create an organisation</h1>
+  <h1 class="heading-large">New organisation</h1>
   {% call form_wrapper() %}
     {{textbox(form.name)}}
     {{ page_footer(

app/templates/views/organisations/index.html

@@ -1,4 +1,5 @@
 {% extends "views/platform-admin/_base_template.html" %}
+{% from "components/live-search.html" import live_search %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block per_page_title %}
@@ -14,6 +15,7 @@
   <h1 class="heading-large">
     Organisations
   </h1>
+  {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
   <nav class="browse-list">
     <ul>
       {% for org in organisations %}
@@ -26,8 +28,8 @@
       {% endfor %}
     </ul>
   </nav>
-  <div>
-    <a href="{{ url_for('main.add_organisation') }}" class="browse-list-link">Create an organisation</a>
+  <div class="js-stick-at-bottom-when-scrolling">
+    <a href="{{ url_for('main.add_organisation') }}" class="button-secondary">New organisation</a>
   </div>
 
 {% endblock %}

app/templates/views/organisations/organisation/index.html

@@ -1,17 +1,13 @@
 {% extends "org_template.html" %}
 
-{% block per_page_title %}
-  {{ current_org.name }}
-{% endblock %}
-
 {% block org_page_title %}
-  {{ current_org.name }}
+  Services
 {% endblock %}
 
 {% block maincolumn_content %}
 
   <h1 class="heading-large">
-    {{ current_org.name }}
+    Services
   </h1>
   <ul>
   {% for service in organisation_services %}

app/templates/views/organisations/organisation/settings/index.html

@@ -2,11 +2,11 @@
 {% from "components/table.html" import mapping_table, optional_text_field, row, text_field, edit_field with context %}
 
 {% block org_page_title %}
-  Organisation settings
+  Settings
 {% endblock %}
 
 {% block maincolumn_content %}
-  <h1 class="heading-large">Organisation settings</h1>
+  <h1 class="heading-large">Settings</h1>
   <div class="bottom-gutter-3-2 dashboard-table body-copy-table">
     {% call mapping_table(
       caption='General',