diff options
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/admin/index.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/stats.html | 36 | ||||
| -rwxr-xr-x | templates/web/default/around/display_location.html | 2 | ||||
| -rw-r--r-- | templates/web/default/auth/change_password.html | 6 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 2 | ||||
| -rwxr-xr-x | templates/web/default/faq/faq-en-gb.html | 6 | ||||
| -rw-r--r-- | templates/web/default/header.html | 10 | ||||
| -rw-r--r-- | templates/web/default/maps/openlayers.html | 20 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 22 | ||||
| -rw-r--r-- | templates/web/default/report/new/fill_in_details_form.html | 11 |
10 files changed, 73 insertions, 44 deletions
diff --git a/templates/web/default/admin/index.html b/templates/web/default/admin/index.html index d1ed09114..b1eddaa3a 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="">[% loc('Graph of problem creation by status over time') %]</a> + <a href="[% c.config.BASE_URL %]/bci-live-creation.png">[% loc('Graph of problem creation by status over time') %]</a> </p> [% END -%] diff --git a/templates/web/default/admin/stats.html b/templates/web/default/admin/stats.html index ccd41601a..3b9f4a264 100644 --- a/templates/web/default/admin/stats.html +++ b/templates/web/default/admin/stats.html @@ -4,6 +4,28 @@ <p> <strong>[% tprintf( loc( '%sreports between %s and %s' ), ( unconfirmed ? loc( 'All' ) _ ' ' : loc( 'Confirmed' ) _ ' ' ), start_date.ymd, end_date.ymd ) | html %]</strong> </p> +[% IF bymonth %] +<table> + <thead> + <td style="width: 8em"><strong>[% loc('Year') %]</strong></td> + <td style="width: 8em"><strong>[% loc('Month') %]</strong></td> + <td><strong>[% loc('Count') %]</strong></td> + </thead> + [% total = 0 %] + [% WHILE ( state = states.next ) %] + [% total = total + state.get_column( 'count' ) %] + <tr> + <td>[% state.get_column( 'c_year') | html %]</td> + <td>[% state.get_column( 'c_month') | html %]</td> + <td>[% state.get_column( 'count' ) %]</td> + </tr> + [% END %] + <tr> + <td colspan="2"><strong>[% loc( 'Total' ) %]</strong></td> + <td><strong>[% total %]</strong></td> + </tr> +</table> +[% ELSE %] <table> <thead> <td style="width: 8em"><strong>[% loc('Current state') %]</strong></td> @@ -22,6 +44,7 @@ <td><strong>[% total %]</strong></td> </tr> </table> +[% END %] [% IF unconfirmed %] <p> @@ -54,6 +77,19 @@ </p> <p> + <input type="checkbox" name="bymonth" id="bymonth"[% bymonth ? ' checked' : '' %] /><label for="bymonth">[% loc('By Date') %]</label> + </p> + + <p> + [% loc('Council:') %] <select id='council' name='council'> + <option value=''>[% loc('No council') %]</option> + [% FOR council IN council_ids %] + <option value="[% council %]"[% ' selected' IF council == selected_council %]>[% council_details.$council.name %]</option> + [% END %] + </select> + </p> + + <p> <input type="submit" name="getcounts" size="30" id="getcounts" value="Get Count" /> </p> </form> diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 4026286ce..8c9047bb2 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -66,7 +66,7 @@ </div> <div id="side"> -<p id="text_map"> +<p id="text_map" class="banner"> [% loc( 'To <strong>report a problem</strong>, simply click on the map at the correct location.' ) %] [% tprintf( diff --git a/templates/web/default/auth/change_password.html b/templates/web/default/auth/change_password.html index be7c14e43..c10560c3e 100644 --- a/templates/web/default/auth/change_password.html +++ b/templates/web/default/auth/change_password.html @@ -7,10 +7,8 @@ [% END %] -<form action="[% c.uri_for('change_password') %]" method="post" name="change_password"> +<form action="[% c.uri_for('change_password') %]" method="post" name="change_password" class="fieldset"> - <div id="fieldset"> - [% IF password_error; errors = { @@ -35,8 +33,6 @@ <input type="submit" value="[% loc('Change Password') %]"> </div> - </div> - </form> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index 607eebd2d..5407e56e1 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -54,7 +54,7 @@ <p>[% loc('<strong>No</strong>, I do not, let me sign in by email:') %]</p> - <div id="fieldset"> + <div class="fieldset"> <div class="form-field"> <label for="name">[% loc('Your name:') %]</label> <input type="text" name="name" value=""> diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index bd9ee889f..599d3a37e 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -108,12 +108,6 @@ by a user of the site.</dd> Ordnance Survey and so this is what we use to display distances. There you have it: not everything British is in miles!</dd> - <dt>Why doesn’t dragging the map work on reporting-a-problem pages in Safari or Konqueror?</dt> - <dd>There’s a bug in these two browsers to do with setting images on form -submit buttons, which the map uses when reporting a problem. It’s fixed in the -latest nightly build of Safari, so will presumably be fixed in the next -release. Until then, I’ve sadly had to disable dragging to avoid people -dragging an empty square.</dd> <dt>Why can’t I zoom out more on the reporting map?</dt> <dd>We want to keep FixMyStreet locally focused, so restrict the ability to move radically between areas. The map on Your Reports will let you see all diff --git a/templates/web/default/header.html b/templates/web/default/header.html index b240bfb06..54aa3f342 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -1,11 +1,11 @@ <!doctype html> -<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> +<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> - <meta name="viewport" content="initial-scale=1.0; target-densitydpi=device-dpi"> + <meta name="viewport" content="initial-scale=1.0"> <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index 3cf615306..aab5180b6 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -47,9 +47,9 @@ var fixmystreet = { <div id="pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div> [% INCLUDE compass %] </noscript></div> - <p id="copyright"> - [% map.copyright %] - </p> + [% IF map.copyright %] + <p id="copyright">[% map.copyright %]</p> + [% END %] [% BLOCK compass %] @@ -65,13 +65,13 @@ var fixmystreet = { SET zoom_out = '#' IF map.zoom <= 0; %] <div style="position: absolute; left: 4px; top: 4px; z-index: 1007;" class="olControlPanZoom olControlNoSelect" unselectable="on"> - <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/north-mini.png" border="0"></a></div> - <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/west-mini.png" border="0"></a></div> - <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/east-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/south-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/zoom-plus-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/zoom-world-mini.png" border="0"></a></div> - <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/zoom-minus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 4px; width: 18px; height: 18px;"><a rel="nofollow" href="[% north %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/north-mini.png" border="0"></a></div> + <div style="position: absolute; left: 4px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% west %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/west-mini.png" border="0"></a></div> + <div style="position: absolute; left: 22px; top: 22px; width: 18px; height: 18px;"><a rel="nofollow" href="[% east %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/east-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 40px; width: 18px; height: 18px;"><a rel="nofollow" href="[% south %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/south-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 63px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_in %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/zoom-plus-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 81px; width: 18px; height: 18px;"><a rel="nofollow" href="[% world %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/zoom-world-mini.png" border="0"></a></div> + <div style="position: absolute; left: 13px; top: 99px; width: 18px; height: 18px;"><a rel="nofollow" href="[% zoom_out %]"><img style="position: relative; width: 18px; height: 18px;" src="/jslib/OpenLayers-2.10/img/zoom-minus-mini.png" border="0"></a></div> </div> [% END %] diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 962075433..1e320e1b4 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -10,18 +10,11 @@ [% map_html %] -[% IF c.cobrand.country == 'GB' %] -<p id='sub_map_links'> - <a href="http://maps.google.co.uk/maps?output=embed&z=16&q= - [%- problem.title _ ' - ' _ c.cobrand.base_url_for_emails _ '/report/' _ problem.id | uri -%] -@[% short_latitude %],[% short_longitude %]">View on Google Maps</a></p> -[% END %] - </div> <div id="side"> -[% IF banner %] -<p id="[% banner.id %]"> +[% IF banner.id %] +<p class="banner" id="[% banner.id %]"> [% banner.text %] </p> [% END %] @@ -72,7 +65,7 @@ [% INCLUDE 'errors.html' %] - <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" id="fieldset"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> + <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="fieldset validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> <input type="hidden" name="submit_update" value="1"> <input type="hidden" name="id" value="[% problem.id | html %]"> @@ -156,6 +149,8 @@ <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </p> + <div class="fieldset"> + <p> <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> <label class="n" for="remember_me"> @@ -167,12 +162,14 @@ <input type="submit" name="submit_sign_in" id="submit_sign_in" value="[% loc('Post') %]"> </p> + </div> + </div> <div id="form_sign_in_no"> <p>[% loc('<strong>No</strong>, let me confirm my update by email:') %]</p> - <div id="fieldset"> + <div class="fieldset"> [% INCLUDE name %] @@ -180,7 +177,6 @@ <label for="password_register">[% loc('Enter a new password:') %]</label> <input type="password" name="password_register" id="password_register" value="" size="25"> </div> - </div> <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> @@ -188,6 +184,8 @@ <input type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]"> </p> + </div> + </div> </div> diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index c20a2bf16..c428df514 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -34,7 +34,7 @@ [% INCLUDE 'report/new/form_heading.html' %] -<div id="fieldset"> +<div class="fieldset"> @@ -137,6 +137,8 @@ <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </div> + <div class="fieldset"> + <p> <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> <label class="n" for="remember_me"> @@ -148,12 +150,14 @@ <input type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> </p> + </div> + </div> <div id="form_sign_in_no"> <p>[% loc('<strong>No</strong>, let me confirm my report by email:') %]</p> - <div id="fieldset"> + <div class="fieldset"> [% INCLUDE name_phone %] @@ -161,7 +165,6 @@ <label for="password_register">[% loc('Enter a new password:') %]</label> <input type="password" name="password_register" id="password_register" value="" size="25"> </div> - </div> <p style="clear:both"><small>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</small></p> @@ -169,6 +172,8 @@ <input type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> </p> + </div> + </div> </div> |