6 files changed, 31 insertions, 14 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm
index 0fb3c5278..28646fbf3 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.154 2009-08-10 10:59:31 matthew Exp $
+# $Id: Page.pm,v 1.155 2009-08-10 12:24:05 matthew Exp $
 #
 
 package Page;
@@ -157,7 +157,7 @@ sub header ($%) {
         my %vars;
         if ($q->{site} eq 'emptyhomes') {
             my $lang_url = mySociety::Config::get('BASE_URL');
-	    $lang_url .= $ENV{REQUEST_URI} if $ENV{REQUEST_URI};
+            $lang_url .= $ENV{REQUEST_URI} if $ENV{REQUEST_URI};
             if ($lang eq 'en-gb') {
                 $lang_url =~ s{http://}{$&cy.};
             } else {
@@ -223,6 +223,10 @@ sub footer {
         open FP, $file . '/../templates/website/' . $q->{site} . '-footer';
         my $html = join('', <FP>);
         close FP;
+        my $lang = $mySociety::Locale::lang;
+        if ($q->{site} eq 'emptyhomes' && $lang eq 'cy') {
+            $html =~ s/25 Walter Road<br>Swansea/25 Heol Walter<br>Abertawe/;
+        }
         return $html;
     }
 
diff --git a/templates/website/emptyhomes-footer b/templates/website/emptyhomes-footer
index c0790c3d6..2f704b8f1 100644
--- a/templates/website/emptyhomes-footer
+++ b/templates/website/emptyhomes-footer
@@ -4,10 +4,9 @@
 <div id="footer">
 <div style="float: right">
 Shelter Cymru<br>
-25 Walter Road<br>
-Swansea
+25 Walter Road<br>Swansea
 <br>SA1 5NN<br>
-<a href="http://www.sheltercymru.org.uk/shelter/home/contactus.asp?Email=14"></a>
+<a href="mailto:emptyhomes&#64;sheltercymru.org.uk">emptyhomes&#64;sheltercymru.org.uk</a>
 </div>
 
 Empty Homes Agency <br>
diff --git a/templates/website/faq-eha.cy.html b/templates/website/faq-eha.cy.html
index 211906a1e..2da452e28 100644
--- a/templates/website/faq-eha.cy.html
+++ b/templates/website/faq-eha.cy.html
@@ -6,8 +6,10 @@
 <dt>Sut ydw i’n defnyddio’r safle?</dt>
 <dd>Rhowch god post neu gyfeiriad yn y blwch ar y dudalen hafan ac fe gyflwynir map o’r ardal honno i chi. Cliciwch ar y man lle mae’r eiddo gwag, llenwch y manylion, llwythwch ffotograff i fyny os oes un gennych a phwyswch anfon. A dyna’r cyfan. Gallwch hefyd weld adroddiadau am eiddo gwag eraill a gweld beth wnaed amdanyn nhw.</dd>
 <dt>A yw’r gwasanaeth ar gael am ddim?</dt>
-<dd>Ydy. Talwyd am gostau datblygu a chynnal y safle hwn gan yr Asiantaeth Tai Gwag a thrwy haelioni ei gyllidwyr.
-Elusen yw’r Asiantaeth Tai Gwag, felly os ydych yn credu yn ein nodau a hoffech gyfrannu, <a href="http://www.emptyhomes.com/donate.html">mae croeso i chi wneud hynny </a>.</dd>
+<dd>Ydy. Talwyd am gostau datblygu a chynnal y safle hwn gan yr Asiantaeth Tai Gwag a Shelter Cymru drwy haelioni eu cyllidwyr. Mae'r Asiantaeth Tai Gwag a Shelter Cymru yn elusennau cofrestredig, felly os ydych yn credu yn ein nodau a hoffech gyfrannu, mae croeso i chi wneud hynny. 
+<a href="http://www.emptyhomes.com/donate.html">Asiantaeth Tai Gwag</a>
+/ <a href="http://www.sheltercymru.org.uk/shelter/cymraeg/howtohelp/ood.asp">Shelter Cymru</a>.</dd>
+
 <dt>Ydych chi’n cael gwared ar gynnwys gwirion neu anghyfreithlon?</dt>
 <dd>Rydym yn cadw’r hawl i ddileu unrhyw adroddiadau neu ddiweddariadau yr ydym yn eu hystyried yn amhriodol.</dd>
 <dt>Sut mae cynghorau’n dod ag eiddo gwag yn ôl mewn defnydd?</dt>
diff --git a/templates/website/faq-eha.html b/templates/website/faq-eha.html
index 1a55478ec..545097bd4 100755
--- a/templates/website/faq-eha.html
+++ b/templates/website/faq-eha.html
@@ -13,10 +13,12 @@ in the details, upload a photo if you have one and press submit. That&rsquo;s
 it. You can also view other empty properties that have been reported and see
 what has been done about them.</dd>
         <dt>Is it free?</dt>
-        <dd>Yes. The costs of developing and running this site have been
-paid for by The Empty Homes Agency and through the generosity of its funders.
-The Empty Homes Agency is a charity, so if you believe in our aims and would
-like to make a contribution, <a href="http://www.emptyhomes.com/donate.html">please do</a>.</dd>
+        <dd>Yes. The costs of developing and running this site are shared
+between the Empty Homes Agency and Shelter Cymru through the generosity of
+their funders. Both the Empty Homes Agency and Shelter Cymru are registered charities,
+so if you believe in their aims and would like to make a contribution, please do:
+<a href="http://www.emptyhomes.com/donate.html">Empty Homes Agency</a>
+or <a href="http://www.sheltercymru.org.uk/shelter/howtohelp/ood.asp">Shelter Cymru</a>.</dd>
         <dt>Do you remove silly or illegal content?</dt>
         <dd>We reserve the right to remove any reports or updates
 which we consider to be inappropriate.</dd>
diff --git a/web/css/core.css b/web/css/core.css
index 34d4d2405..ce034ad61 100644
--- a/web/css/core.css
+++ b/web/css/core.css
@@ -257,6 +257,11 @@ p#copyright {
     padding: 4px; */
 }
 
+#sub_map_links {
+    float: right;
+    margin-top: 0;
+}
+
 /* Problem pages */
 
 #fixed, #unknown {
diff --git a/web/index.cgi b/web/index.cgi
index 3ad592cfa..ec02d9a40 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.260 2009-07-17 15:03:02 matthew Exp $
+# $Id: index.cgi,v 1.261 2009-08-10 12:24:06 matthew Exp $
 
 use strict;
 use Standard;
@@ -23,6 +23,7 @@ use mySociety::AuthToken;
 use mySociety::Config;
 use mySociety::DBHandle qw(select_all);
 use mySociety::EmailUtil;
+use mySociety::GeoUtil;
 use mySociety::Locale;
 use mySociety::MaPit;
 use mySociety::PostcodeUtil;
@@ -793,7 +794,7 @@ sub display_location {
         $hide_link = NewURL($q, -retain=>1, no_pins=>1);
         $hide_text = _('Hide pins');
     }
-    my $map_links = "<p style='float:right; margin-top:0;'><a id='hide_pins_link' href='$hide_link'>$hide_text</a> | <a id='all_pins_link' href='$all_link'>$all_text</a></p> <input type='hidden' id='all_pins' name='all_pins' value='$input_h{all_pins}'>";
+    my $map_links = "<p id='sub_map_links'><a id='hide_pins_link' href='$hide_link'>$hide_text</a> | <a id='all_pins_link' href='$all_link'>$all_text</a></p> <input type='hidden' id='all_pins' name='all_pins' value='$input_h{all_pins}'>";
 
     my $out = Page::display_map($q, x => $x, y => $y, type => 1, pins => $pins, post => $map_links );
     $out .= $q->h1(_('Problems in this area'));
@@ -894,9 +895,13 @@ sub display_problem {
 
     my $out = '';
 
+    my ($lat, $lon) = mySociety::GeoUtil::national_grid_to_wgs84($problem->{easting}, $problem->{northing}, 'G');
+    my $map_links = "<p id='sub_map_links'><a href='http://maps.google.co.uk/maps?output=embed&amp;z=16&amp;q="
+        . uri_escape($problem->{title}) . "\@$lat,$lon'>View on Google Maps</a></p>";
+
     my $pins = Page::display_pin($q, $px, $py, 'blue');
     $out .= Page::display_map($q, x => $x_tile, y => $y_tile, type => 0,
-        pins => $pins, px => $px, py => $py );
+        pins => $pins, px => $px, py => $py, post => $map_links );
     if ($q->{site} ne 'emptyhomes' && $problem->{state} eq 'confirmed' && $problem->{duration} > 8*7*24*60*60) {
         $out .= $q->p({id => 'unknown'}, _('This problem is old and of unknown status.'))
     }