Merge pull request #1954 from alphagov/choose-accounts

Choose accounts

app/templates/views/all-services.html

@@ -1,16 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/browse-list.html" import browse_list %}
-
-{% block per_page_title %}
-  All services
-{% endblock %}
-
-{% block maincolumn_content %}
-
-  <h1 class="heading-large">
-    All services
-  </h1>
-
-  {{ browse_list(services) }}
-
-{% endblock %}

app/templates/views/choose-account.html

@@ -0,0 +1,42 @@
+{% extends "withoutnav_template.html" %}
+
+{% block per_page_title %}
+  Choose service
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  <h1 class="heading-large">
+    Choose service
+  </h1>
+  <nav class="browse-list">
+    <ul>
+      {% for org in organisations %}
+        <li class="browse-list-item">
+          <a href="{{ url_for('.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
+          {% if org.services %}
+            <ul class="browse-sub-list">
+              {% for item in org.services %}
+                <li class="browse-list-sub-item">
+                  <a href="{{ url_for('.service_dashboard', service_id=item.id) }}" class="browse-list-link">{{ item.name }}</a>
+                </li>
+              {% endfor %}
+            </ul>
+          {% endif %}
+        </li>
+        <div class ="keyline-block"></div>
+      {% endfor %}
+      {% if services_without_organisations %}
+        {% for item in services_without_organisations %}
+          <li class="browse-list-item">
+            <a href="{{ url_for('.service_dashboard', service_id=item.id) }}" class="browse-list-link">{{ item.name }}</a>
+          </li>
+        {% endfor %}
+        <div class ="keyline-block"></div>
+      {% endif %}
+    </ul>
+  {% if can_add_service %}
+    <a href="{{ url_for('.add_service') }}" class="browse-list-link">Add a new service…</a>
+  {% endif %}
+
+{% endblock %}

app/templates/views/choose-service.html

@@ -1,25 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/browse-list.html" import browse_list %}
-
-{% block per_page_title %}
-  Choose service
-{% endblock %}
-
-{% block maincolumn_content %}
-
-  <h1 class="heading-large">
-    Choose service
-  </h1>
-
-  {{ browse_list(services) }}
-  {% if can_add_service %}
-    {{ browse_list([
-      {
-        'title': 'Add a new service…',
-        'link': url_for('.add_service')
-      },
-    ]) }}
-  {% endif %}
-
-
-{% endblock %}

app/templates/views/service-settings.html

@@ -1,6 +1,5 @@
 {% extends "withnav_template.html" %}
 {% from "components/banner.html" import banner_wrapper %}
-{% from "components/browse-list.html" import browse_list %}
 {% from "components/table.html" import mapping_table, row, text_field, optional_text_field, edit_field, field, boolean_field with context %}
 
 {% block service_page_title %}