Fix banner corner colour (CM2), add pin explanation (CM9).

6 files changed, 134 insertions, 6 deletions

diff --git a/templates/web/bromley/around/display_location.html b/templates/web/bromley/around/display_location.html
new file mode 100755
index 000000000..9d0a5e6c7
--- /dev/null
+++ b/templates/web/bromley/around/display_location.html
@@ -0,0 +1,117 @@
+[%
+
+    rss_alt   = loc('RSS feed');
+    rss_title = loc('RSS feed of recent local problems');
+
+    rss_url
+        = pc
+        ? c.uri_for( "/rss/pc", pc )
+        : c.uri_for( "/rss/l/$short_latitude,$short_longitude" );
+            
+    email_url = c.uri_for(
+        '/alert/list',
+        {
+            lat  => short_latitude,
+            lon  => short_longitude,
+            feed => "local:$short_latitude:$short_longitude",
+        }
+    );
+
+    url_skip = c.uri_for(
+        '/report/new',
+        {
+            pc         => pc
+            latitude   => short_latitude,
+            longitude  => short_longitude,
+            skipped    => 1,
+        }
+    );
+
+    PROCESS "maps/${map.type}.html";
+
+    INCLUDE 'header.html',
+        title  => loc('Viewing a location')
+        rss    => [ loc('Recent local problems, FixMyStreet'), rss_url ],
+        bodyclass => 'mappage',
+        robots => 'noindex,nofollow';
+%]
+
+<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate">
+    [% IF c.req.params.map_override %]
+        <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]">
+    [% END %]
+    <input type="hidden" name="pc" value="[% pc | html %]">
+
+    <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]">
+    <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]">
+
+    [% map_html %]
+
+        <p id='sub_map_links'>
+            [% IF c.req.params.no_pins %]
+                <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a>
+            [% ELSE %]
+                <a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 1 } ) %]'>[% loc('Hide pins') %]</a>
+            [% END %]
+            [% IF c.cobrand.country == 'GB' || c.cobrand.country == 'NO' %]
+                [% IF c.req.params.all_pins %]
+                    <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => undef } ) %]'>[% loc('Hide old') %]</a>
+                [% ELSE %]
+                    <a id='all_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => undef, all_pins => 1 } ) %]'>[% loc('Show old') %]</a>
+                [% END %]
+            [% END %]
+        </p>
+
+    </div>
+
+
+
+
+    <div id="side">
+
+        <h1 class="big-green-banner">[% loc( 'Click map to report a problem' ) %]
+            <span style="">Yellow pins show existing reports</span></h1>
+
+        <p id="skip-this-step">
+            [%
+                tprintf(
+                    loc("Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"),
+                    url_skip
+                )
+            %]
+        </p>
+
+        <div class="shadow-wrap">
+            <ul id="key-tools" class="singleton">
+                <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">Get updates</a></li>
+            </ul>
+        </div>
+
+        <section class="full-width">
+            <menu id="problems-nav" class="tab-nav">
+                <ul>
+                    <li><a href="#current">[% loc('Problems on the map') %]</a></li>
+                    <li><a href="#current_near">[% loc( 'Problems nearby' ) %]</a></li>
+                </ul>
+            </menu>
+            
+            <ul id="current" class="issue-list-a tab">
+                [% INCLUDE "around/on_map_list_items.html" %]
+            </ul>
+
+            <ul id="current_near" class="issue-list-a tab">
+                [% INCLUDE "around/around_map_list_items.html" %]
+            </ul>
+        </section>
+    </div>
+
+    <div style="display:none" id="side-form">
+    [% INCLUDE "report/new/fill_in_details_form.html"
+        js = 1,
+        report.used_map = 1
+        report.name = c.user.name
+    %]
+    </div>
+</form>
+
+[% INCLUDE 'footer.html' %]
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss
index b76a37609..0fc15782a 100644
--- a/web/cobrands/bromley/_colours.scss
+++ b/web/cobrands/bromley/_colours.scss
@@ -5,4 +5,5 @@ $primary_b: #000000;
 $primary_text: #ffffff;
 
 $contrast1: rgb(76,120,168);
+$contrast1_dark: darken(rgb(76,120,168), 10%);
 $contrast2: #AA8D11;
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index c453da80c..b82e46246 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -724,7 +724,7 @@ a:hover.button-left {
     width: 0;
     height: 0;
     border-left: 0.5em solid transparent;
-    border-bottom: 0.5em solid #4B8304;
+    border-bottom: 0.5em solid $contrast1_dark;
   }
 }
 
@@ -760,7 +760,7 @@ a:hover.button-left {
       color:#fff;
       background: $contrast1;
       &:before {
-        border-bottom: 0.5em solid #4B8304;
+        border-bottom: 0.5em solid $contrast1_dark;
       }
     }
   }
diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet/_colours.scss
index 2463cdeeb..1a62d0282 100644
--- a/web/cobrands/fixmystreet/_colours.scss
+++ b/web/cobrands/fixmystreet/_colours.scss
@@ -5,4 +5,5 @@ $primary_b: #F3B11E;
 $primary_text: #222;
 
 $contrast1: #00BD08;
+$contrast1_dark: #4B8304;
 $contrast2: #AA8D11;
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 57b26f42d..3c6d573e1 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -653,9 +653,14 @@ body.twothirdswidthpage {
     top:-0.5em;
     position: absolute;
     border-top: 0.5em solid transparent;
-    border-left: 0.5em solid #4B8304;
+    border-left: 0.5em solid $contrast1_dark;
     border-bottom:none;
   }
+  span {
+    display: block;
+    font-size: 80%;
+    padding-top: 0.5em;
+  }
 }
 .ie6 .big-green-banner {
   background: $contrast1 url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat;
@@ -677,7 +682,7 @@ body.twothirdswidthpage {
       background-position:-324px -326px;
       background-repeat:no-repeat;
       &:before {
-        border-bottom: 0.75em solid #4B8304;
+        border-bottom: 0.75em solid $contrast1_dark;
       }
     }
   }
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index be5be08cb..bc0ff1856 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -139,14 +139,18 @@ $(function(){
             }
             if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
                 // Remove full-screen-ness
-                if (cobrand != 'bromley') {
+                var banner_text;
+                if (cobrand == 'bromley') {
+                    banner_text = 'Click map to report a problem<span>Yellow pins show existing reports</span>';
+                } else {
                     $('#site-header').show();
+                    banner_text = 'Click map to report a problem';
                 }
                 $('#fms_pan_zoom').css({ top: '4.75em !important' });
                 $('.big-green-banner')
                     .removeClass('mobile-map-banner')
                     .prependTo('#side')
-                    .text('Click map to report a problem');
+                    .html(banner_text);
             }
             $('span.report-a-problem-btn').css({ cursor:'' }).off('.reportBtn');
         }