diff options
| -rwxr-xr-x | templates/web/fixmystreet/around/display_location.html | 10 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 6 | ||||
| -rwxr-xr-x | templates/web/fixmystreet/reports/council.html | 4 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 9 |
4 files changed, 8 insertions, 21 deletions
diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index 051ea85a3..c98982a60 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -82,18 +82,10 @@ <div class="shadow-wrap"> <ul id="key-tools" class="singleton"> - <li><a class="feed" id="updates_link" href="[% email_url | html %]">Get updates</a></li> + <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">Get updates</a></li> </ul> </div> -<!-- <div id="email_alert_box"> - <ul> - <li><a href="[% rss_url | html %]" id="rss_alert">[% rss_alt %]</a></li> - <li><a rel="nofollow" href="[% email_url | html %]">[%- loc('Email me new local problems') -%]</a></li> - </ul> - </div> --> - - <section class="full-width"> <menu id="problems-nav" class="tab-nav"> <ul> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 78dee48a5..eaaf37f9c 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -28,9 +28,9 @@ <div class="shadow-wrap"> <ul id="key-tools"> - <li><a rel="nofollow" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse' ) %]</a></li> - <li><a rel="nofollow" id="email_alert" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> - <li><a class="chevron" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> + <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse' ) %]</a></li> + <li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> </ul> </div> diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 8beddfed2..275fe35d4 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -50,9 +50,9 @@ [% ELSE %] <div class="shadow-wrap"> <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> - <li><a rel="nofollow" id="email_alert" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> + <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> [% IF children.size %] - <li><a href="#council_wards" id="council_wards_link" class="chevron">[% loc('Wards of this council') %]</a> + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a> [% END %] </ul> </div> diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 68e870201..073e942da 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -153,11 +153,6 @@ $(function(){ $('#another_qn').hide('fast'); }); - var timer; - function email_alert_close() { - $('#email_alert_box').hide('fast'); - } - // FIXME - needs to use translated string jQuery.validator.addMethod('validCategory', function(value, element) { return this.optional(element) || value != '-- Pick a category --'; }, validation_strings.category ); @@ -405,8 +400,8 @@ $.fn.drawer = function(id, ajax) { }); }; - $('#council_wards_link').drawer('council_wards', false); - $('#updates_link').drawer('updates_ajax', true); + $('#key-tool-wards').drawer('council_wards', false); + $('#key-tool-around-updates').drawer('updates_ajax', true); // Go directly to RSS feed if RSS button clicked on alert page // (due to not wanting around form to submit, though good thing anyway) |