diff options
Diffstat (limited to 'templates/web/default/admin')
| -rw-r--r-- | templates/web/default/admin/council_contacts.html | 37 | ||||
| -rw-r--r-- | templates/web/default/admin/council_edit.html | 30 | ||||
| -rw-r--r-- | templates/web/default/admin/footer.html | 3 | ||||
| -rw-r--r-- | templates/web/default/admin/header.html | 14 | ||||
| -rw-r--r-- | templates/web/default/admin/index.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/list_updates.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/problem_row.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/report_edit.html | 1 | ||||
| -rw-r--r-- | templates/web/default/admin/search_abuse.html | 21 | ||||
| -rw-r--r-- | templates/web/default/admin/search_users.html | 4 | ||||
| -rw-r--r-- | templates/web/default/admin/stats.html | 6 | ||||
| -rw-r--r-- | templates/web/default/admin/update_edit.html | 2 |
12 files changed, 72 insertions, 52 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html index ac6698510..56850a82b 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,8 +38,10 @@ <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> <th>[% loc('When edited') %]</th> <th>[% loc('Confirm') %]</th> </tr> @@ -47,8 +51,10 @@ <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> <td>[% contact.whenedited.ymd _ ' ' _ contact.whenedited.hms %]</td> <td><input type="checkbox" name="confirmed" value="[% contact.category %]"></td> </tr> @@ -79,10 +85,10 @@ <p> <input type="checkbox" name="confirmed" value="1" id="confirmed"> - <label for="confirmed">[% loc('Confirmed') %]</label> + <label for="confirmed" class="inline">[% loc('Confirmed') %]</label> - <input type="checkbox" name="deleted" value="1"id="deleted"> - <label for="deleted">[% loc('Deleted') %]</label> + <input type="checkbox" name="deleted" value="1" id="deleted"> + <label for="deleted" class="inline">[% loc('Deleted') %]</label> </p> <p> @@ -90,6 +96,11 @@ </p> <p> + <input type="checkbox" name="non_public" value="1" id="non_public"> + <label for="non_public" class="inline">[% loc('Private') %]</label> + </p> + + <p> <input type="hidden" name="area_id" value="[% area_id %]" > <input type="hidden" name="posted" value="new" > <input type="hidden" name="token" value="[% token %]" > @@ -104,24 +115,23 @@ <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>: + <label for="endpoint">Endpoint</label> <input type="text" name="endpoint" id="endpoint" value="[% conf.endpoint %]" size="50"> </p> <p> - <label for="jurisdiction">Jurisdiction</label>: + <label for="jurisdiction">Jurisdiction</label> <input type="text" name="jurisdiction" id="jurisdiction" value="[% conf.jurisdiction %]" size="50"> </p> <p> - <label for="api_key">Api Key</label>: + <label for="api_key">Api Key</label> <input type="text" name="api_key" id="api_key" value="[% conf.api_key %]" size="25"> </p> <p> - <label for="send_method">Send Method</label>: + <label for="send_method">Send Method</label> <select name="send_method"> <option value=""> -- Select a method -- </option> [% FOR method IN send_methods %] @@ -131,18 +141,23 @@ </p> <p> - <label for="send_comments">Use Open311 comment sending extension</label>: <input type="checkbox" name="send_comments"[% ' checked' IF conf.send_comments %]> + <label for="send_comments" class="inline">Use Open311 comment sending extension</label> </p> <p> - <label for"comment_user_id">User to attribute fetched comments to</label>: + <label for"comment_user_id">User to attribute fetched comments to</label> <input type="text" name="comment_user_id" value="[% conf.comment_user_id %]"> </p> <p> - <label for="suppress_alerts">Do not send email alerts on fetched comments to problem creator</label>: <input type="checkbox" name="suppress_alerts"[% ' checked' IF conf.suppress_alerts %]> + <label for="suppress_alerts" class="inline">Do not send email alerts on fetched comments to problem creator</label> + </p> + + <p> + <input type="checkbox" name="devolved"[% ' checked' IF conf.can_be_devolved %]> + <label for="devolved" class="inline">Endpoint lookup can be devolved to contacts</label> </p> <p> diff --git a/templates/web/default/admin/council_edit.html b/templates/web/default/admin/council_edit.html index 0968d3570..408466b51 100644 --- a/templates/web/default/admin/council_edit.html +++ b/templates/web/default/admin/council_edit.html @@ -26,10 +26,38 @@ <strong>[% loc('Email:') %] </strong> <input type="text" name="email" value="[% contact.email | html %]" size="30"> <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> <label for="confirmed">[% loc('Confirmed' ) %]</label> - <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]> <label for="deleted">[% loc('Deleted') %]</label><br> + <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]> <label for="deleted">[% loc('Deleted') %]</label> + <input type="checkbox" name="non_public" value="1" id="non_public"[% ' checked' IF contact.non_public %]> <label for="non_public">[% loc('Private') %]</label><br> <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/footer.html b/templates/web/default/admin/footer.html index 308b1d01b..4c891c4ff 100644 --- a/templates/web/default/admin/footer.html +++ b/templates/web/default/admin/footer.html @@ -1,2 +1 @@ -</body> -</html> +[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index e0317cca0..93254f5e3 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -1,18 +1,16 @@ -<html> -<head> -<title>[% title %] - [% loc('FixMyStreet administration') %]</title> +[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage' %] <style type="text/css"> dt { clear: left; float: left; font-weight: bold; } dd { margin-left: 8em; } -.hidden { color: #666666; } +.adminhidden { color: #666666; } .error { color: red; } +select { width: auto; } </style> -</head> -<body> - <strong>[% loc('FixMyStreet admin:') %]</strong> + <p><strong>[% loc('FixMyStreet admin:') %]</strong> [%- FOREACH link IN allowed_links %] <a href="[% c.uri_for( link ) %]">[% allowed_pages.$link.0 %]</a> - [%- END %] + [% IF NOT loop.last %]|[% END %] + [% END %]</p> <h1>[% title %]</h1> 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/list_updates.html b/templates/web/default/admin/list_updates.html index 0a05ba4ac..d21919b16 100644 --- a/templates/web/default/admin/list_updates.html +++ b/templates/web/default/admin/list_updates.html @@ -15,7 +15,7 @@ <th>*</th> </tr> [% FOREACH update IN updates -%] - <tr[% ' class="hidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> + <tr[% ' class="adminhidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> <td>[%- IF update.state == 'confirmed' && update.problem.state != 'hidden' -%] [%- cobrand_data = update.cobrand_data %] [%- cobrand_data = c.data_for_generic_update IF !update.cobrand %] diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html index 22825429a..5aa8bbfee 100644 --- a/templates/web/default/admin/problem_row.html +++ b/templates/web/default/admin/problem_row.html @@ -1,5 +1,5 @@ [%- FOR problem IN problems %] - <tr[% ' class="hidden"' IF problem.state == 'hidden' %]> + <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]> <td>[%- IF problem.is_visible -%] [%- cobrand_data = problem.cobrand_data %] [%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %] diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index 9ef7e8248..ea98a9be9 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -40,6 +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> [% IF problem.photo %] [% photo = problem.get_photo_params %] diff --git a/templates/web/default/admin/search_abuse.html b/templates/web/default/admin/search_abuse.html deleted file mode 100644 index 0984e85cf..000000000 --- a/templates/web/default/admin/search_abuse.html +++ /dev/null @@ -1,21 +0,0 @@ -[% INCLUDE 'admin/header.html' title=loc('Search Abuse Table') %] - -<form method="get" action="[% c.uri_for('search_abuse') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> - <label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search"> -</form> - - -[% IF emails.size > 0 %] -<table cellspacing="0" cellpadding="2" border="1"> - <tr> - <th>[% loc('Email') %]</th> - </tr> -[%- FOREACH foo IN emails %] - <tr> - <td>[%- foo.email | html -%]</td> - </tr> -[%- END -%] -</table> -[% END %] - -[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html index 18c964dfe..0b4ba88e7 100644 --- a/templates/web/default/admin/search_users.html +++ b/templates/web/default/admin/search_users.html @@ -20,8 +20,8 @@ <td>[% PROCESS value_or_nbsp value=user.name %]</td> <td><a href="[% c.uri_for( 'search_reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> - <td>[% user.flagged ? loc('Yes') : ' ' %]</td> - <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td> + <td>[% user.flagged == 2 ? loc('(Email in abuse table)') : user.flagged ? loc('Yes') : ' ' %]</td> + <td>[% IF user.id %]<a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a>[% END %]</td> </tr> [%- END -%] </table> diff --git a/templates/web/default/admin/stats.html b/templates/web/default/admin/stats.html index 3b9f4a264..234600837 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> @@ -73,11 +73,11 @@ </p> <p> - <input type="checkbox" name="unconfirmed" id="unconfirmed"[% unconfirmed ? ' checked' : '' %] /><label for="unconfirmed">[% loc('Include unconfirmed reports') %]</label> + <input type="checkbox" name="unconfirmed" id="unconfirmed"[% unconfirmed ? ' checked' : '' %] /><label class="inline" for="unconfirmed">[% loc('Include unconfirmed reports') %]</label> </p> <p> - <input type="checkbox" name="bymonth" id="bymonth"[% bymonth ? ' checked' : '' %] /><label for="bymonth">[% loc('By Date') %]</label> + <input type="checkbox" name="bymonth" id="bymonth"[% bymonth ? ' checked' : '' %] /><label class="inline" for="bymonth">[% loc('By Date') %]</label> </p> <p> diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html index e1783fd7c..1d5ee80b4 100644 --- a/templates/web/default/admin/update_edit.html +++ b/templates/web/default/admin/update_edit.html @@ -45,7 +45,7 @@ [% photo = update.get_photo_params %] <li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]"> <input type="checkbox" id="remove_photo" name="remove_photo" value="1"> -<label for="remove_photo">[% loc("Remove photo (can't be undone!)") %]</label></li> +<label for="remove_photo" class="inline">[% loc("Remove photo (can't be undone!)") %]</label></li> [% END %] </ul> <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></form> |