Smaller map, smaller watermark. Tweaks.

7 files changed, 30 insertions, 7 deletions

diff --git a/templates/website/emptyhomes-header b/templates/website/emptyhomes-header
index f50b75c8f..9c839fe77 100644
--- a/templates/website/emptyhomes-header
+++ b/templates/website/emptyhomes-header
@@ -11,7 +11,7 @@
 @import "/css/emptyhomes.css";
 </style>
 <!--[if LT IE 7]>
-<style type="text/css">@import url("/css/ie6.css");</style>
+<style type="text/css">@import url("/css/ie6-378.css");</style>
 <![endif]-->
 <!-- RSS -->
 </head>
diff --git a/templates/website/scambs-header b/templates/website/scambs-header
index 4b4c0a6c2..bc17d2535 100644
--- a/templates/website/scambs-header
+++ b/templates/website/scambs-header
@@ -11,7 +11,7 @@
 @import "/css/scambs.css";
 </style>
 <!--[if LT IE 7]>
-<style type="text/css">@import url("/css/ie6.css");</style>
+<style type="text/css">@import url("/css/ie6-378.css");</style>
 <![endif]-->
 <link rel="stylesheet" type="text/css" href="http://www.scambs.gov.uk/system/css/print.css" media="print">
 <script type="text/javascript" src="http://www.scambs.gov.uk/system/js/external.js"></script>
diff --git a/web/css/core.css b/web/css/core.css
index ad600023a..20969ef1d 100644
--- a/web/css/core.css
+++ b/web/css/core.css
@@ -23,7 +23,7 @@ label {
     width: 5em;
 }
 
-#fieldset {
+fieldset, #fieldset {
     border: none;
     padding: 0.5em;
 }
@@ -73,7 +73,7 @@ ul#error {
 
 /* Front page */
 
-#expl {
+p#expl {
     text-align: center;
     font-size: 150%;
     margin: 0 2em;
@@ -268,6 +268,9 @@ p#copyright {
     margin: 0;
 }
 
+#closest_problems {
+    margin-bottom: 0;
+}
 #alert_links {
     float: right;
 }
diff --git a/web/css/emptyhomes.css b/web/css/emptyhomes.css
index b95f400e3..813904b07 100644
--- a/web/css/emptyhomes.css
+++ b/web/css/emptyhomes.css
@@ -1,3 +1,7 @@
+p#expl {
+    font-size: 130%;
+}
+
 #alert_links {
     float: none;
 }
@@ -77,3 +81,14 @@ blockquote {
 #update_form, #problem_form {
     clear: both; 
 }
+
+#watermark {
+    background: url("/i/mojwatermark-378.png");
+    height: 84px;
+    width: 171px;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+}
+
+
diff --git a/web/css/ie6-378.css b/web/css/ie6-378.css
new file mode 100644
index 000000000..e22f519ff
--- /dev/null
+++ b/web/css/ie6-378.css
@@ -0,0 +1,4 @@
+#watermark {
+    background: none;
+    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/i/mojwatermark-378.png',sizingMethod='scale');
+}
diff --git a/web/i/mojwatermark-378.png b/web/i/mojwatermark-378.png
new file mode 100644
index 000000000..81faeef84
--- /dev/null
+++ b/web/i/mojwatermark-378.png
diff --git a/web/index.cgi b/web/index.cgi
index a0974ffbd..2c540d94b 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -6,7 +6,7 @@
 # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: index.cgi,v 1.194 2008-05-14 14:24:12 matthew Exp $
+# $Id: index.cgi,v 1.195 2008-05-14 15:02:28 matthew Exp $
 
 use strict;
 use Standard;
@@ -663,13 +663,14 @@ to describe the location of the problem instead.</small>"), $skipurl));
     } else {
         $out .= $q->p(_('No problems have been reported yet.'));
     }
-    $out .= $q->h2(sprintf(_('Closest problems within %skm'), $dist));
+    $out .= $q->h2({-id => 'closest_problems'}, sprintf(_('Closest problems within %skm'), $dist));
     my $email_me = _('Email me problems');
     my $rss_title = _('RSS feed of recent local problems');
     my $rss_alt = _('RSS feed');
+    my $u_pc = uri_escape($input{pc});
     $out .= <<EOF;
     <div id="alert_links">
-    <a id="email_alert" href="/alert?pc=$input_h{pc};type=local;feed=local:$x:$y;alert=Subscribe">$email_me</a>
+    <a id="email_alert" href="/alert?pc=$u_pc;type=local;feed=local:$x:$y;alert=Subscribe">$email_me</a>
      &nbsp; <span id="rss_link"><a href="/rss/$x,$y"><img src="/i/feed.png" width="16" height="16" title="$rss_title" alt="$rss_alt" border="0" style="vertical-align: middle"></a></span>
     </div>
 EOF