Look update.

author: matthew <matthew> 2008-10-13 14:06:44 +0000
committer: matthew <matthew> 2008-10-13 14:06:44 +0000
commit: b49a79e33123a432214919411bc0c1805794dcda (patch)
tree: 1b15bc82fb5df3851c3f03b4156bf444b3e20763
parent: 941dcbd39fefe75a8ac8b7c1524640f6446d4c87 (diff)
6 files changed, 142 insertions, 77 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm
index 6d7572470..9c2173c14 100644
--- a/perllib/Page.pm
+++ b/perllib/Page.pm
@@ -6,7 +6,7 @@
 # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: Page.pm,v 1.119 2008-10-13 11:22:36 matthew Exp $
+# $Id: Page.pm,v 1.120 2008-10-13 14:06:44 matthew Exp $
 #
 
 package Page;
@@ -262,7 +262,7 @@ sub display_map {
     $params{pre} ||= '';
     $params{post} ||= '';
     my $mid_point = 254;
-    if ($q->{site} eq 'emptyhomes' || $q->{site} eq 'scambs') { # Map is c. 380px wide
+    if ($q->{site} eq 'scambs') { # Map is c. 380px wide
         $mid_point = 189;
     }
     my $px = defined($params{px}) ? $mid_point - $params{px} : 0;
@@ -482,7 +482,7 @@ sub os_to_px_with_adjust {
     my $y_tile = $in_y || int($y);
     my $px = Page::os_to_px($easting, $x_tile);
     my $py = Page::os_to_px($northing, $y_tile, 1);
-    if ($q->{site} eq 'emptyhomes' || $q->{site} eq 'scambs') { # Map is 380px
+    if ($q->{site} eq 'scambs') { # Map is 380px
         if ($py > 380) {
             $y_tile--;
             $py = Page::os_to_px($northing, $y_tile, 1);
diff --git a/templates/website/emptyhomes-header b/templates/website/emptyhomes-header
index 7682d0280..ad85aad16 100644
--- a/templates/website/emptyhomes-header
+++ b/templates/website/emptyhomes-header
@@ -1,27 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en-gb">
 <head>
-<title><!-- TITLE -->Empty Homes Agency</title>
+<title><!-- TITLE -->Report Empty Homes - Empty Homes Agency</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="/yui/utilities.js"></script>
 <script type="text/javascript" src="/js.js"></script>
-<link href="/css/cache-eha2.css" rel="stylesheet" type="text/css">
-<style type="text/css" media="screen, projection">
+<style type="text/css">
 @import "/css/core.css";
 @import "/css/emptyhomes.css";
 </style>
 <!--[if LT IE 7]>
-<style type="text/css">@import url("/css/ie6-378.css");</style>
+<style type="text/css">@import url("/css/ie6.css");</style>
 <![endif]-->
 <!-- RSS -->
 </head>
 <body>
 
 <div id="header">
-<div id="logo"><img src="http://www.emptyhomes.com/siteimages/logo%20col%20300dpi%20copy.jpg" alt="Empty Homes Agency" width="350" height="91"></div>
+<a href="/"><img border="0" src="/i/eha.jpg" alt="Empty Homes Agency" width="350" height="91"></a>
 </div>
 
-<div id="smallnav">
+<div id="navigation">
       <ul>
       <li><a href="/">Report a property</a>
       <li><a href="/reports">Reports</a></li>
@@ -31,5 +30,5 @@
       </ul>
 </div>
 
-<div id="main">
-<div id="middle">
+<div id="wrapper">
+<div id="content">
diff --git a/web/about.cgi b/web/about.cgi
index 3d0dcc6fa..c0e92e54b 100755
--- a/web/about.cgi
+++ b/web/about.cgi
@@ -6,7 +6,7 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: about.cgi,v 1.6 2008-10-09 18:21:18 matthew Exp $
+# $Id: about.cgi,v 1.7 2008-10-13 14:06:44 matthew Exp $
 
 use strict;
 use Standard -db;
@@ -16,6 +16,7 @@ sub main {
     my $q = shift;
     print Page::header($q, title=>'About us');
     print <<ABOUTUS if $q->{site} eq 'emptyhomes';
+<h1>The Empty Homes Agency</h1>
 <p>The Empty Homes agency is an independent campaigning charity. We are not
 part of government, and have no formal links with local councils although we
 work in cooperation with both. We exist to highlight the waste of empty
diff --git a/web/css/emptyhomes.css b/web/css/emptyhomes.css
index d4fa75e06..92af5dd6b 100644
--- a/web/css/emptyhomes.css
+++ b/web/css/emptyhomes.css
@@ -1,12 +1,5 @@
-p#expl {
-    font-size: 130%;
-}
-
-#alert_links {
-    float: none;
-}
-
 /* Smaller map */
+/*
 #map_box {
     width: 380px;
 }
@@ -23,93 +16,158 @@ p#expl {
     right: 0;
 }
 
-#toptitle {
-    margin-top: 0.5em;
-}
-
-#left {
+p#fixed, p#unknown {
+    margin-right: 400px;
     width: auto;
 }
-#middle {
-    width: 600px;
+*/
+
+/* Generics */
+
+body {
+    font-family: Geneva, Helvetica, Arial, sans-serif;
+    margin: 0;
+    padding: 0;
+    /* color: #a9aeb0; */
 }
-#middle p {
-    width: auto;
+
+h1 {
+    margin: 0;
+    font-size: 175%;
+    padding: 3px;
+    color: #FFFFFF;
+    background-color: #9999CC;
+    background-color: #30517A;
+
 }
-#middle h1 {
-    width: auto;
+h2 {
+    font-size: 140%;
+    background-color: #B1BECF;
+    color: #30517A;
+    padding: 3px;
 }
-p#fixed, p#unknown {
-    margin-right: 400px;
-    width: auto;
+
+h3 {
+    color: #30517A;
 }
 
-#left #topbox a, #left #bottombox a {
+a:link {
     color: #30517A;
-    font-weight: normal;
-    background-color: inherit;
+}
+a:visited {
+    color: #354664;
+}
+a:hover, a:active {
+    background-color: #B1BECF;
 }
 
-#header, #smallnav, #main {
-    margin: 0 auto;
+blockquote {
+    border-left: solid 4px #013B63;
 }
 
-#search p {
-    text-align: right;
-    font-family: Verdana, Arial, Helvetica, sans-serif;
+.a {
     color: #000000;
+    background-color: #DCDCED; /* #427499; */
+    background-color: #B1BECF;
+}
+
+/* Site layout */
+
+#header {
+    font-size: 200%;
+    font-weight: bold;
     margin: 0;
+    padding: 5px 0.5em;
+    float: left;
 }
-#search p#searchbox {
-    margin: 0.5em 0 0.25em;
+
+#content {
+    width: 100%; /* Must specify a width or IE goes crazy wrong! */
+    position: relative;
+    margin: 0 auto;
+    max-width: 60em;
 }
 
-/* So IE and Firefox match */
-#left ol {
+/* Can't put the margin in #content because of above IE craziness */
+#wrapper {
+    clear: both;
+    margin: 0 2em 2em;
+    padding-top: 0.5em;
+}
+
+#navigation {
+    float: right;
     padding: 0;
+    margin: 0;
+    list-style-type: none;
+    font-size: 83%;
+}
+#navigation li {
+    display: inline;
+    padding: 0;
+    margin: 0;
 }
 
-blockquote {
-    border-left: solid 4px #013B63;
+#navigation a {
+    display: -moz-inline-box;
+    display: inline-block;
+    padding: 0.5em 1em;
+}
+#navigation a:link, #navigation a:visited {
+    color: #30517A;
 }
+#navigation a:hover, #navigation a:active {
+    background-color: #DCDCED;
+    background-color: #9999CC;
+    background-color: #B1BECF;
 
-.a {
-    color: #000000;
-    background-color: #DCDCED; /* #427499; */
+    color: #ffffff;
+    color: #30517A;
 }
 
-#postcodeForm, #front_stats div {
+#nav_new a {
+    background-image: url("/i/new.png");
+    background-repeat: no-repeat;
+    background-position: 100% 0;
+}
+
+#logo {
+    border: none;
+    position: absolute;
+    top: 4em;
+    right: 10px;
+}
+
+#footer {
+    clear: both;
+    font-size: 83%;
+    border-top: solid 2em #ffffff;
     background-color: #80AE7D;
-    color: #000000;
+    color: #FFFFFF;
+    margin: 2em 0 1em 0;
+    padding: 20px;
+}
+#address1 a {
+    color: #FFFFFF;
 }
+
 #postcodeForm {
-    _width: 500px;
+    background-color: #80AE7D;
+    color: #000000;
 }
 
 #front_stats div {
-    padding: 0.5em 0;
-    width: 6em;
+    background-color: #80AE7D;
+    color: #000000;
+    /*padding: 0.5em 0;
+    width: 6em; */
 }
 
-#update_form, #problem_form {
+#problem_form {
     clear: both; 
 }
 
-/* Slightly narrower so it fits */
-#col_problems, #col_fixed {
-    width: 45%;
-}
-
-/* Sub nav for the internal bits */
-#left ol ul {
-    font-size: 90%;
-}
-#left ol ul a {
-    padding: 4px 0 4px 20px;
-    background-color: #ffffff;
-}
-#left ol ul a:hover {
-    background-color: #B1BECF;
-    background-color: #DCDCED;
+#alert_links_area {
+    margin-top: 2px;
 }
 
diff --git a/web/i/eha.jpg b/web/i/eha.jpg
new file mode 100644
index 000000000..56e767b86
--- /dev/null
+++ b/web/i/eha.jpg
diff --git a/web/index.cgi b/web/index.cgi
index a7960d355..8965c2cf1 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.218 2008-10-13 11:53:26 matthew Exp $
+# $Id: index.cgi,v 1.219 2008-10-13 14:06:44 matthew Exp $
 
 use strict;
 use Standard;
@@ -556,12 +556,19 @@ problems for $list and emailing it to us at <a href='mailto:$e'>$e</a>.";
         my $e = mySociety::Config::get('CONTACT_EMAIL');
         my $list = join(' or ', map { $areas_info->{$_}->{name} } @$all_councils);
         my $n = @$all_councils;
-        $out .= '<p>We do not yet have details for the council';
-        $out .= ($n>1) ? 's that cover' : ' that covers';
-        $out .= " this location. If you submit a problem here it will be
+        if ($q->{site} ne 'emptyhomes') {
+            $out .= '<p>We do not yet have details for the council';
+            $out .= ($n>1) ? 's that cover' : ' that covers';
+            $out .= " this location. If you submit a problem here it will be
 left on the site, but <strong>not</strong> reported to the council.
 You can help us by finding a contact email address for local
 problems for $list and emailing it to us at <a href='mailto:$e'>$e</a>.";
+        } else {
+	    $out .= "<p>We do not yet have details for the council that covers
+this location. If you submit a report here it will be left on the site, but
+not reported to the council &ndash; please still leave your report, so that
+we can show to the council the activity in their area.";
+        }
         $out .= '<input type="hidden" name="council" value="-1">';
     }
author	matthew <matthew>	2008-10-13 14:06:44 +0000
committer	matthew <matthew>	2008-10-13 14:06:44 +0000
commit	b49a79e33123a432214919411bc0c1805794dcda (patch)
tree	1b15bc82fb5df3851c3f03b4156bf444b3e20763
parent	941dcbd39fefe75a8ac8b7c1524640f6446d4c87 (diff)