Tidy up Bromley templates a bit.

6 files changed, 26 insertions, 224 deletions

diff --git a/templates/web/bromley/around/display_location.html b/templates/web/bromley/around/display_location.html
deleted file mode 100755
index b961ef4c6..000000000
--- a/templates/web/bromley/around/display_location.html
+++ /dev/null
@@ -1,117 +0,0 @@
-[%
-
-    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>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/templates/web/bromley/header.html b/templates/web/bromley/header.html
index a089853b1..b8e56172c 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -88,6 +88,8 @@
 
             <h1 class="main desk-only">Reporting a problem in Bromley&rsquo;s streets or parks</h1>
 
+            [% pre_container_extra %]
+
             <div class="container">
                 <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
 
diff --git a/templates/web/bromley/index.html b/templates/web/bromley/index.html
deleted file mode 100644
index bd68bad72..000000000
--- a/templates/web/bromley/index.html
+++ /dev/null
@@ -1,99 +0,0 @@
-[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %]
-[% map_js = BLOCK %]
-<script>
-yepnope.addPrefix( 'preload', function ( resource ) {
-    resource.noexec = true;
-    return resource;
-});
-Modernizr.load({
-    load: [
-        "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
-        "preload![% version('/js/map-OpenLayers.js') %]",
-        "preload![% version('/js/map-bing-ol.js') %]",
-        "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
-    ]
-});
-</script>
-[% END %]
-
-[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
-
-<h1 class="main mob-only">Reporting a problem in Bromley&rsquo;s streets or parks</h1>
-
-[% IF error %]
-    <p class="form-error">[% error %]</p>
-[% END %]
-
-<div id="front-main">
-    <div id="front-main-container">
-        [% question = c.cobrand.enter_postcode_text() %]
-        <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
-            <label for="pc">[% question %]:</label>
-            <div>
-                <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]">
-                <input type="submit" value="[% loc('Go') %]" id="submit">
-            </div>
-        </form>
-
-    </div>
-</div>
-
-<p>This is primarily for reporting physical problems that can be fixed
-like graffiti, cleansing issues or road defects. To report other
-kinds of problems like missed bins use our
-<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
-</p>
-
-<div class="tablewrapper">
-    <div id="front-howto">
-        <h2>[% loc('How to report a problem') %]</h2>
-        
-        <ol class="big-numbers">
-            <li>[% question %]</li>
-            <li>[% loc('Locate the problem on a map of the area') %]</li>
-            <li>[% loc('Enter details of the problem') %]</li>
-            <li>Confirm the report and Bromley Council will investigate</li>
-        </ol>
-        
-        <section class="full-width">
-        [% INCLUDE "front/stats.html" %]
-        [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %]
-        </section>
-    </div>
-
-
-    [% 
-        recent_photos = c.cobrand.recent_photos('front', 5);
-    %]
-
-    [% IF recent_photos.size %]
-    <div id="front-recently">
-        <h2>[% loc('Recently reported problems') %]</h2>
-
-        <section class="full-width">
-            <ul class="issue-list-a">
-            [% FOREACH p IN recent_photos %]
-                <li>
-                    <a href="/report/[% p.id %]">
-                        <div class="text">
-                            <h4>[% p.title | html %]</h4>
-                            <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small>
-                        </div>
-                        <div class="img">
-                            <img alt="[% p.title | html %]" title="[% p.title | html %]" height="60" width="90" src="/photo/[% p.id %].fp.jpeg">
-                        </div>
-                    </a>
-                </li>    
-            [% END %]
-            </ul>
-        </section>
-
-    </div>
-    [% END %]
-</div>
-
-
-<!-- [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %] -->
-
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html
index c98982a60..a7240688f 100755
--- a/templates/web/fixmystreet/around/display_location.html
+++ b/templates/web/fixmystreet/around/display_location.html
@@ -69,7 +69,12 @@
 
     <div id="side">
 
-        <h1 class="big-green-banner">[% loc( 'Click map to report a problem' ) %]</h1>
+        <h1 class="big-green-banner">[%
+            loc( 'Click map to report a problem' );
+            IF c.cobrand.moniker == 'bromley';
+                '<span>Yellow pins show existing reports</span>';
+            END
+        %]</h1>
 
         <p id="skip-this-step">
             [%
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index 42c60d051..476c426b0 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -19,9 +19,12 @@ Modernizr.load({
 [% pre_container_extra = BLOCK %]
 <div id="front-main">
     <div id="front-main-container">
-        <h1>[% loc('Report, view, or discuss local problems') %]</h1>
-
-        <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
+        [% IF c.cobrand.moniker == 'bromley' %]
+            <h1 class="main mob-only">Reporting a problem in Bromley&rsquo;s streets or parks</h1>
+        [% ELSE %]
+            <h1>[% loc('Report, view, or discuss local problems') %]</h1>
+            <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
+        [% END %]
 
         [%
             question
@@ -42,8 +45,12 @@ Modernizr.load({
 
 [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
 
-[% IF error %]
-    <p class="error">[% error %]</p>
+[% IF c.cobrand.moniker == 'bromley' %]
+<p>This is primarily for reporting physical problems that can be fixed
+like graffiti, cleansing issues or road defects. To report other
+kinds of problems like missed bins use our
+<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
+</p>
 [% END %]
 
 <div class="tablewrapper">
@@ -54,7 +61,11 @@ Modernizr.load({
             <li>[% question %]</li>
             <li>[% loc('Locate the problem on a map of the area') %]</li>
             <li>[% loc('Enter details of the problem') %]</li>
-            <li>[% loc('We send it to the council on your behalf') %]</li>
+            [% IF c.cobrand.is_council %]
+                <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li>
+            [% ELSE %]
+                <li>[% loc('We send it to the council on your behalf') %]</li>
+            [% END %]
         </ol>
         
         <section class="full-width">
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 5fa5fd116..eef0ee679 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -46,7 +46,7 @@ body.twothirdswidthpage .content {
 #front-main {
     background: $primary;
     @include border-radius(1em 1em 0 0);
-    margin-bottom: 1em;
+    margin: 2em 1em 0;
     padding-top: 0;
     // layout sets this because base has it slightly lighter
     h2 {