Merge remote-tracking branch 'origin/bromley' into bromley

5 files changed, 73 insertions, 13 deletions

diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html
index 5add3c006..d1fa64273 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -60,6 +60,19 @@
 		</form>
 	</div>
 
+    <ul id="main-menu">
+        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
+            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
+        %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
+            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+        %]<li><[% IF c.req.uri.path == '/reports/Bromley' %]span[% ELSE %]a href="/reports/Bromley"[% END
+            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
+        %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
+            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
+        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
+            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
+    </ul>
+
 </div>
 		
     <div class="wrapper">
diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html
index 8d4459c01..010dfe55c 100644
--- a/templates/web/fixmystreet/alert/index.html
+++ b/templates/web/fixmystreet/alert/index.html
@@ -2,6 +2,18 @@
 
 <h1>[% loc('Local RSS feeds and email alerts') %]</h1>
 
+[% IF photos.size %]
+<div class="sticky-sidebar">
+  <aside>
+    <h2>[% loc('Some photos of recent reports') %]</h2>
+    [% FOREACH p IN photos %]
+        <a href="/report/[% p.id %]"><img border="0" height="100"
+            src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
+    [% END %]
+  </aside>
+</div>
+[% END %]
+
 <p>
 [% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including
 alerts for all problems within a particular ward or council, or all problems
@@ -27,16 +39,4 @@ within a certain distance of a particular location.') %]
   </fieldset>
 </form>
 
-[% IF photos.size %]
-<div class="sticky-sidebar">
-  <aside>
-    <h2>[% loc('Some photos of recent reports') %]</h2>
-    [% FOREACH p IN photos %]
-        <a href="/report/[% p.id %]"><img border="0" height="100"
-            src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a>
-    [% END %]
-  </aside>
-</div>
-[% END %]
-
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/alert/list.html b/templates/web/fixmystreet/alert/list.html
index 8305fff6f..84899d457 100644
--- a/templates/web/fixmystreet/alert/list.html
+++ b/templates/web/fixmystreet/alert/list.html
@@ -20,7 +20,6 @@
 
 <form id="alerts" name="alerts" method="post" action="/alert/subscribe">
 
-[%# XXX These photos should perhaps be in a vertical column on the right hand side, as currently. %]
   [% IF photos.size %]
     <div class="sticky-sidebar">
       <aside>
diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss
index 054315fbd..bb47ae60d 100644
--- a/web/cobrands/bromley/bromley.scss
+++ b/web/cobrands/bromley/bromley.scss
@@ -79,3 +79,26 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
 #bromley-footer .footer-nav li { list-style-type: none; }
 #bromley-footer p { margin: 0; }
 
+#main-menu {
+    text-align: center;
+    margin: 2em 0;
+    padding: 0;
+    li {
+        margin: 0;
+        padding: 0;
+        display: inline;
+        a, span {
+            padding: 1em;
+            color: #000;
+            background: #eef;
+            @include background(linear-gradient(#eef, #eee));
+        }
+        span {
+            text-decoration: underline;
+        }
+    }
+    a:hover {
+        background: #ccf;
+    }
+}
+
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 6572a6f10..bd9ae28fe 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -45,6 +45,7 @@ body.frontpage {
 
 // White background, so no shadow needed.
 .content {
+    margin-top: 1em;
     @include box-shadow(none);
 }
 .ie6, .ie7, .ie8  {
@@ -74,3 +75,27 @@ body.mappage .content {
     top: 0;
 }
 
+// Fix location of aside sidebar
+body.twothirdswidthpage {
+    .content {
+        aside {
+            @include box-shadow(none);
+        }
+        .sticky-sidebar {
+            aside {
+                position: absolute;
+                top: 0;
+            }
+        }
+    }
+}
+@media only screen and (min-width: 48em) and (max-width: 61em) {
+    body.twothirdswidthpage {
+        .content {
+            .sticky-sidebar {
+                top: auto;
+            }
+        }
+    }
+}
+