diff options
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/admin/search_users.html | 2 | ||||
| -rw-r--r-- | templates/web/default/auth/general.html | 2 | ||||
| -rw-r--r-- | templates/web/default/common_header_tags.html | 2 | ||||
| -rw-r--r-- | templates/web/default/questionnaire/creator_fixed.html | 4 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 4 | ||||
| -rw-r--r-- | templates/web/default/report/new/fill_in_details_form.html | 2 | ||||
| -rw-r--r-- | templates/web/default/static/fun.html | 35 |
7 files changed, 8 insertions, 43 deletions
diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html index b4fa2c2da..98723e6ef 100644 --- a/templates/web/default/admin/search_users.html +++ b/templates/web/default/admin/search_users.html @@ -18,7 +18,7 @@ [%- FOREACH user IN users %] <tr> <td>[% PROCESS value_or_nbsp value=user.name %]</td> - <td>[% PROCESS value_or_nbsp value=user.email %]</td> + <td><a href="[% c.uri_for( 'search_reports', 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> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index c2249fa46..f5e2e423f 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -34,7 +34,7 @@ <div id="form_sign_in_yes"> <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value=""> </p> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index e74ae7b70..c87f93994 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -3,7 +3,7 @@ <script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> -<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script> +<script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script> <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> diff --git a/templates/web/default/questionnaire/creator_fixed.html b/templates/web/default/questionnaire/creator_fixed.html index 0d3181ec1..5b6d1254a 100644 --- a/templates/web/default/questionnaire/creator_fixed.html +++ b/templates/web/default/questionnaire/creator_fixed.html @@ -11,9 +11,9 @@ <p align="center"> <input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> -<label for="reported_yes">[% loc('Yes') %]</label> +<label class="inline" for="reported_yes">[% loc('Yes') %]</label> <input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> -<label for="reported_no">[% loc('No') %]</label> +<label class="inline" for="reported_no">[% loc('No') %]</label> </p> <p><input type="submit" name="submit" value="[% loc('Submit') %]"></p> diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 999d332d2..fac3ef0b2 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -1,7 +1,7 @@ [% PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html; + problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] @@ -144,7 +144,7 @@ [% END %] <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </p> 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 2a74a44db..9c9451914 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -137,7 +137,7 @@ [% END %] <div class="form-field"> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </div> diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html deleted file mode 100644 index 00976f3ec..000000000 --- a/templates/web/default/static/fun.html +++ /dev/null @@ -1,35 +0,0 @@ -[% INCLUDE header.html - title = 'Weird and Wonderful reports' -%] - -<h1>Weird and Wonderful reports</h1> - -<p>Here are some of the best or strangest reports we’ve seen on FixMyStreet. -They’ve all been fixed, and in one case could have saved lives! -Do let us know if you find any more.</p> - -<ul style='list-style-type: none; margin:0; padding:0'> - -<li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> - <h2>Dumped Piano (right)</h2> - <p>The reporter of this problem summed it up with their report, - which consisted solely of the one character “!”. — - <a href='http://www.fixmystreet.com/report/9468'>Problem report</a> - -<li><h2>Mad Seagull</h2> - <p>“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — - <a href='http://www.fixmystreet.com/report/2722'>Problem report</a> - -<li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> - <h2>Boxes full of cheese dumped (right)</h2> - <p>“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — - <a href='http://www.fixmystreet.com/report/6553'>Problem report</a> - -<li><h2>Dangerous Nivea Billboard</h2> - <p>“The Nivea 'Oxygen is a wonderful thing' billboard here has a device on it releasing bubbles and foam. This is blowing into the road which is both distracting and dangerous to drivers. A large ball of foam hit my windscreen unexpectedly and nearly caused me to have an accident” — - <a href='http://www.fixmystreet.com/report/7552'>Problem report</a> - -</ul> - -[% INCLUDE footer.html %] - |