5 files changed, 39 insertions, 4 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html
index 60e270c7c..eb9606a31 100644
--- a/templates/web/default/admin/council_contacts.html
+++ b/templates/web/default/admin/council_contacts.html
@@ -1,5 +1,7 @@
 [% INCLUDE 'admin/header.html' title=tprintf(loc('Council contacts for %s'), council_name) -%]
 
+[% conf = open311.next %]
+
 [% IF updated %]
 <p>
 <em>[% updated %]</em>
@@ -36,6 +38,7 @@
             <th>[% loc('Email') %]</th>
             <th>[% loc('Confirmed') %]</th>
             <th>[% loc('Deleted') %]</th>
+            <th>[% loc('Devolved') %]</th>
             <th>[% loc('Last editor') %]</th>
             <th>[% loc('Note') %]</th>
             <th>[% loc('Public') %]</th>
@@ -48,6 +51,7 @@
                 <td>[% contact.email | html %]</td>
                 <td>[% IF contact.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
                 <td>[% IF contact.deleted %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
+                <td>[% IF conf.can_be_devolved && contact.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
                 <td>[% contact.editor %]</td>
                 <td>[% contact.note | html %]</td>
                 <td>[% contact.non_public ? loc('Non Public') : loc('Public') %]</td>
@@ -111,7 +115,6 @@
 
     <h2>[% loc('Configure Open311 integration') %]</h2>
     <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
-    [% conf = open311.next %]
     <p>
         <label for="endpoint">Endpoint</label>: 
         <input type="text" name="endpoint" id="endpoint" value="[% conf.endpoint %]" size="50">
@@ -153,6 +156,11 @@
     </p>
 
     <p>
+        <label for="devolved">Endpoint lookup can be devolved to contacts</label>:
+        <input type="checkbox" name="devolved"[% ' checked' IF conf.can_be_devolved %]>
+    </p>
+
+    <p>
     <input type="hidden" name="open311_id" value="[% conf.id %]">
     <input type="hidden" name="area_id" value="[% area_id %]">
     <input type="hidden" name="posted" value="open311">
diff --git a/templates/web/default/admin/council_edit.html b/templates/web/default/admin/council_edit.html
index 9ec0578ff..408466b51 100644
--- a/templates/web/default/admin/council_edit.html
+++ b/templates/web/default/admin/council_edit.html
@@ -31,6 +31,33 @@
 
     <strong>[% loc('Note:') %] </strong><textarea name="note" rows="3" cols="40">[% contact.note | html %]</textarea> <br>
 
+    <h2>[% loc('Configure Endpoint') %]</h2>
+    <form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+    <p>
+        <label for="endpoint">Endpoint</label>: 
+        <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint %]" size="50">
+    </p>
+
+    <p>
+        <label for="jurisdiction">Jurisdiction</label>: 
+        <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction %]" size="50">
+    </p>
+
+    <p>
+        <label for="api_key">Api Key</label>: 
+        <input type="text" name="api_key" id="api_key" value="[% contact.api_key %]" size="25">
+    </p>
+
+    <p>
+        <label for="send_method">Send Method</label>:
+        <select name="send_method">
+            <option value=""> -- Select a method -- </option>
+            [% FOR method IN send_methods %]
+            <option value="[% method %]"[% ' selected' IF contact.send_method == method %]>[% method %]</option>
+            [% END %]
+        </select>
+    </p>
+
     <input type="hidden" name="area_id" value="[% area_id %]">
     <input type="hidden" name="posted" value="new">
     <input type="submit" name="Save changes" value="[% loc('Save changes') %]">
diff --git a/templates/web/default/admin/index.html b/templates/web/default/admin/index.html
index b1eddaa3a..2c5ee55db 100644
--- a/templates/web/default/admin/index.html
+++ b/templates/web/default/admin/index.html
@@ -21,7 +21,7 @@
 
 [% IF c.cobrand.admin_show_creation_graph -%]
     <p>
-        <a href="[% c.config.BASE_URL %]/bci-live-creation.png">[% loc('Graph of problem creation by status over time') %]</a>
+        <a href="[% c.config.BASE_URL %]/fms-live-creation.png">[% loc('Graph of problem creation by status over time') %]</a>
     </p>
 [% END -%]
 
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index d283037c2..ea98a9be9 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -40,7 +40,7 @@
 <li>[% loc('Extra data:') %] [% problem.extra ? 'Yes' : 'No' %]</li>
 <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li>
 <li><label for="flagged">[% loc('Flagged:') %]</label> <input type="checkbox" name="flagged"[% ' checked' IF problem.flagged %]></li>
-<li><label for="non_public">[% loc('Private:') %]</label> <input type="checkbox" name="non_public"[% ' checked' IF problem.non_public %]></li>
+<li><label for="non_public">[% loc('Private') %]:</label> <input type="checkbox" name="non_public"[% ' checked' IF problem.non_public %]></li>
 
 [% IF problem.photo %]
 [% photo = problem.get_photo_params %]
diff --git a/templates/web/default/admin/stats.html b/templates/web/default/admin/stats.html
index 3b9f4a264..273a71aec 100644
--- a/templates/web/default/admin/stats.html
+++ b/templates/web/default/admin/stats.html
@@ -2,7 +2,7 @@
 
 [% IF show_count %]
 <p>
-<strong>[% tprintf( loc( '%sreports between %s and %s' ), ( unconfirmed ? loc( 'All' ) _ ' ' : loc( 'Confirmed' ) _ ' ' ), start_date.ymd, end_date.ymd ) | html %]</strong>
+<strong>[% tprintf( unconfirmed ? loc( 'All reports between %s and %s' ) : loc( 'Confirmed reports between %s and %s' ), start_date.ymd, end_date.ymd ) | html %]</strong>
 </p>
 [% IF bymonth %]
 <table>