Fix Before the Freeze winter promotion (main site only)

6 files changed, 58 insertions, 15 deletions

diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index d441fc9fa..38e83c1c2 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -10,14 +10,24 @@
 <li><a href="/faq">[% loc("Help") %]</a></li>
 </ul>
 
-[% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %]
+[% IF ! c.cobrand.moniker %]
+  <!-- winter 2011 promotion for unbranded site only -->
+  <div id="promo">
+    <a href="http://www.mysociety.org/2011/11/02/fix-before-the-freeze/" 
+      title="Fix Before the Freeze - report those dangerous potholes and  broken streetlights before winter hits"><img 
+      src="/i/promo-fb4tf.gif" 
+      alt="Fix Before the Freeze - report those dangerous potholes and  broken streetlights before winter hits" ></a>
+  </div>
+  [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="159" height="39" src="/i/mysociety-on-white.gif" alt="View mySociety.org"><span id="logoie"></span></a>') %]
+  
+[% ELSE %]
+
+  [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %]
 
+[% END %]
+
+</div>
 <div id="footer">  
-    <!-- winter 2011 promotion -->
-    <p><a href="http://www.mysociety.org/2011/11/02/fix-before-the-freeze/" 
-      title="Fix Before the Freeze - report those dangerous potholes and  broken streetlights before winter hits"><img 
-      src="http://www.mysociety.org/wp/wp-content/uploads/2011/11/fixbeforethefreezebadge165.gif" 
-      style="width:165;height:165;margin:0;border:none;" alt="Fix Before the Freeze - report those dangerous potholes and  broken streetlights before winter hits" ></a></p>
 
     <p>[% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %]
     | <a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', '&nbsp;') %]</a></p>
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index 1aa8ce159..f54793fe4 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -29,6 +29,7 @@
             [%- loc('Fix<span id="my">My</span>Street') %]
         [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
 
+      <div [% IF ! c.cobrand.moniker %]class="promo-background"[% END %] >
         <ul id="meta">
             [% IF c.user_exists %]
                 <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %]
@@ -37,7 +38,10 @@
                 <li>&nbsp;</li>
             [% END %]
         </ul>
-
         <div id="wrapper"><div id="mysociety">
+          
+          [% IF ! c.cobrand.moniker %]
+          
+          [% END %]
 
     [% INCLUDE 'debug_header.html' %]
diff --git a/web/css/_main.scss b/web/css/_main.scss
index 383e099a1..8d3b00418 100644
--- a/web/css/_main.scss
+++ b/web/css/_main.scss
@@ -55,14 +55,6 @@ select, input, textarea {
         background-color: $header_back;
     }
     
-    p.promo {
-        border-top:    1px solid #bbb;
-        border-bottom: 1px solid #bbb;
-        background-color: #eee;
-        text-align: center;
-        padding: 0 0.5em;
-    }
-
 }
 
 // Site layout
@@ -164,6 +156,31 @@ select, input, textarea {
     background-position: 100% 0;
 }
 
+#promo {
+    position: absolute;
+    top: 3.3em;
+    left: 10px;
+    a {
+        display: block;
+        padding:0;
+        border:2px solid white;
+        img {
+            margin:0px;            
+        }
+    }
+    a:hover {
+        border:2px dotted #70CFE3; 
+    }
+}
+
+.promo-background {
+    margin-top:-4px; 
+    background-image:url(/i/promo-icicles.gif);
+    background-repeat:repeat-x;
+    background-position:top left;
+    padding-top:3em;
+}
+
 #logo {
     border: none;
     position: absolute;
@@ -211,6 +228,18 @@ select, input, textarea {
     #logo {
         display: none;
     }
+    #promo {
+        position: static;
+        width: 116px;
+        top: none;
+        text-align: center;
+        margin: 0.25em auto;
+        display:block;        
+    }
+    .promo-background img#logo {
+        border:2px solid #fff;
+        background-color: #fff;
+    }
     #header {
         font-size: 150%;
     }
diff --git a/web/i/mysociety-on-white.gif b/web/i/mysociety-on-white.gif
new file mode 100644
index 000000000..0f8a10296
--- /dev/null
+++ b/web/i/mysociety-on-white.gif
diff --git a/web/i/promo-fb4tf.gif b/web/i/promo-fb4tf.gif
new file mode 100644
index 000000000..d2d5ca1e0
--- /dev/null
+++ b/web/i/promo-fb4tf.gif
diff --git a/web/i/promo-icicles.gif b/web/i/promo-icicles.gif
new file mode 100644
index 000000000..bac92fb17
--- /dev/null
+++ b/web/i/promo-icicles.gif