diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Map/UKCouncilWMTS.pm | 2 | ||||
| -rw-r--r-- | t/cobrand/bristol.t | 10 | ||||
| -rw-r--r-- | templates/web/base/alert/_list.html | 14 | ||||
| -rw-r--r-- | web/cobrands/bexley/js.js | 1 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 16 |
6 files changed, 34 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 456be61d1..18197b9ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ - Don't include lat/lon of private reports in ‘Report another problem here’ link. - Allow contact send method to be unset always. + - Fix z-index stacking bug that was causing unclickable RSS icons on /alert page. #2624 - Front end improvements: - Set report title autocomplete to off to prevent email autocompleting - Development improvements: diff --git a/perllib/FixMyStreet/Map/UKCouncilWMTS.pm b/perllib/FixMyStreet/Map/UKCouncilWMTS.pm index da0720f06..aba6d3840 100644 --- a/perllib/FixMyStreet/Map/UKCouncilWMTS.pm +++ b/perllib/FixMyStreet/Map/UKCouncilWMTS.pm @@ -36,6 +36,8 @@ sub tile_parameters { # Reproject a WGS84 lat/lon into BNG easting/northing sub reproject_from_latlon($$$) { my ($self, $lat, $lon) = @_; + # do not try to reproject if we have no co-ordindates as convert breaks + return (0.0, 0.0) if $lat == 0 && $lon == 0; my ($x, $y) = Utils::convert_latlon_to_en($lat, $lon); return ($x, $y); } diff --git a/t/cobrand/bristol.t b/t/cobrand/bristol.t index b2b8cff13..d4770b6ee 100644 --- a/t/cobrand/bristol.t +++ b/t/cobrand/bristol.t @@ -21,6 +21,16 @@ my $email_contact = $mech->create_contact_ok( send_method => 'Email' ); +subtest 'Reports page works with no reports', sub { + FixMyStreet::override_config { + ALLOWED_COBRANDS => [ 'bristol' ], + MAPIT_URL => 'http://mapit.uk/', + MAP_TYPE => 'Bristol', + }, sub { + $mech->get_ok("/reports"); + }; +}; + subtest 'Only Open311 categories are shown on Bristol cobrand', sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'bristol' ], diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html index d997a5abb..b9d955466 100644 --- a/templates/web/base/alert/_list.html +++ b/templates/web/base/alert/_list.html @@ -23,7 +23,9 @@ [% END %] <p id="rss_local"> - <a href="[% rss_feed_uri %]"><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <a href="[% rss_feed_uri %]" class="alerts-rss-link"> + <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed of nearby problems') %]" alt="[% loc('RSS feed') %]"> + </a> <label class="label-containing-checkbox" for="[% rss_feed_id %]"> <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> [% tprintf( loc('Problems within %.1fkm of %s'), population_radius, name_of_location ) %] @@ -38,8 +40,9 @@ [% FOREACH option IN options %] <p> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" -title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <a href="[% option.uri %]" class="alerts-rss-link"> + <img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="[% loc('RSS feed') %]"> + </a> <label class="label-containing-checkbox" for="[% option.id %]"> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> [% option.text %] @@ -55,8 +58,9 @@ title="[% option.rss_text %]" alt="RSS feed" border="0"></a> [% FOREACH option IN reported_to_options %] <p> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" - title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <a href="[% option.uri %]" class="alerts-rss-link"> + <img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="[% loc('RSS feed') %]"> + </a> <label class="label-containing-checkbox" for="[% option.id %]"> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> [% option.text %] diff --git a/web/cobrands/bexley/js.js b/web/cobrands/bexley/js.js index e0d87d66d..cc973fda6 100644 --- a/web/cobrands/bexley/js.js +++ b/web/cobrands/bexley/js.js @@ -123,6 +123,7 @@ fixmystreet.assets.add(road_defaults, { }, road: true, all_categories: true, + nearest_radius: 0.1, actions: { found: function(layer, feature) { var category = $('select#form_category').val(), diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 32a85fa04..2d67b3986 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -2377,11 +2377,17 @@ a#geolocate_link.loading, .btn--geolocate.loading { .a { background: #f6f6f6; } - img[width="16"] { - margin-top: 4px; - margin-#{$left}: 0.5em; - float: $right; - } +} + +.alerts-rss-link { + position: relative; + z-index: 1; // stack in front of the position:relative .label-containing-checkbox + + img { + margin-top: 4px; + margin-#{$left}: 0.5em; + float: $right; + } } .alerts__nearby-activity { |