Make email branding settings a table

So that it matches the other settings on this page

app/main/views/service_settings.py

@@ -34,7 +34,14 @@ from app import user_api_client, current_service, organisations_client
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_settings(service_id):
-    return render_template('views/service-settings.html')
+    if current_service['organisation']:
+        organisation = organisations_client.get_organisation(current_service['organisation'])['organisation']
+    else:
+        organisation = None
+    return render_template(
+        'views/service-settings.html',
+        organisation=organisation
+    )
 
 
 @main.route("/services/<service_id>/service-settings/name", methods=['GET', 'POST'])

app/notify_client/organisations_client.py

@@ -15,5 +15,8 @@ class OrganisationsClient(BaseAPIClient):
         self.client_id = app.config['ADMIN_CLIENT_USER_NAME']
         self.secret = app.config['ADMIN_CLIENT_SECRET']
 
+    def get_organisation(self, id):
+        return self.get(url='/organisation/{}'.format(id))
+
     def get_organisations(self):
         return self.get(url='/organisation')['organisations']

app/templates/views/service-settings.html

@@ -60,12 +60,26 @@
 
       <h2 class="heading-medium">Platform admin settings</h2>
 
-      {{ browse_list([
-        {
-          'title': 'Email branding',
-          'link': url_for('.service_set_branding_and_org', service_id=current_service.id)
-        }
-      ]) }}
+      {% call mapping_table(
+        caption='Settings',
+        field_headings=['Label', 'Value', 'Action'],
+        field_headings_visible=False,
+        caption_visible=False
+      ) %}
+        {% call row() %}
+          {{ text_field('Email branding' )}}
+          {% call field() %}
+            {% if current_service.branding == 'govuk' %}
+              GOV.UK
+            {% elif current_service.branding == 'both' %}
+              GOV.UK and {{ organisation.name if organisation else None }}
+            {% elif current_service.branding == 'org' %}
+              Only {{ organisation.name if organisation else None }}
+            {% endif %}
+          {% endcall %}
+          {{ edit_field('Change', url_for('.service_set_branding_and_org', service_id=current_service.id)) }}
+        {% endcall %}
+      {% endcall %}
 
       <ul>
         <li class="bottom-gutter">