diff options
Diffstat (limited to 'perllib/Page.pm')
| -rw-r--r-- | perllib/Page.pm | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm index c336d29ec..5d2a3b8b2 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.88 2008-04-10 19:07:38 matthew Exp $ +# $Id: Page.pm,v 1.89 2008-04-14 16:05:57 matthew Exp $ # package Page; @@ -73,7 +73,8 @@ sub microsite { my $q = shift; my $host = $ENV{HTTP_HOST} || ''; $q->{site} = 'fixmystreet'; - $q->{site} = 'scambs' if $host =~ /scambs/ || $q->param('scamb'); + $q->{site} = 'scambs' if $host =~ /scambs/; + $q->{site} = 'emptyhomes' if $host =~ /emptyhomes/; } =item header Q [PARAM VALUE ...] @@ -103,6 +104,11 @@ sub header ($%) { $html = join('', <FP>); close FP; $html =~ s#<!-- TITLE -->#$title#; + } elsif ($q->{site} eq 'emptyhomes') { + open FP, '../templates/website/emptyhomes-header'; + $html = join('', <FP>); + close FP; + $html =~ s#<!-- TITLE -->#$title#; } else { $html = <<EOF; <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -150,6 +156,11 @@ sub footer { my $html = join('', <FP>); close FP; return $html; + } elsif ($q->{site} eq 'emptyhomes') { + open FP, '../templates/website/emptyhomes-footer'; + my $html = join('', <FP>); + close FP; + return $html; } my $pc = $q->param('pc') || ''; @@ -204,7 +215,7 @@ sub display_map { $params{pins} ||= ''; $params{pre} ||= ''; $params{post} ||= ''; - my $px = defined($params{px}) ? $params{px}-254 : 0; + my $px = defined($params{px}) ? 254-$params{px} : 0; my $py = defined($params{py}) ? 254-$params{py} : 0; my $x = int($params{x})<=0 ? 0 : $params{x}; my $y = int($params{y})<=0 ? 0 : $params{y}; @@ -280,7 +291,7 @@ sub display_pin { my %cols = (red=>'R', green=>'G', blue=>'B', purple=>'P'); my $out = '<img class="pin" src="/i/pin' . $cols{$col} . $num . '.gif" alt="Problem" style="top:' . ($py-59) - . 'px; right:' . ($px-31) . 'px; position: absolute;">'; + . 'px; left:' . ($px) . 'px; position: absolute;">'; return $out unless $_ && $_->{id} && $col ne 'blue'; my $url = NewURL($q, id=>$_->{id}, x=>undef, y=>undef); $out = '<a title="' . $_->{title} . '" href="' . $url . '">' . $out . '</a>'; @@ -320,15 +331,16 @@ EOF # P is easting or northing # BL is bottom left tile reference of displayed map sub os_to_px { - my ($p, $bl) = @_; - return tile_to_px(os_to_tile($p), $bl); + my ($p, $bl, $invert) = @_; + return tile_to_px(os_to_tile($p), $bl, $invert); } -# Convert tile co-ordinates to pixel co-ordinates from top right of map +# Convert tile co-ordinates to pixel co-ordinates from top left of map # BL is bottom left tile reference of displayed map sub tile_to_px { - my ($p, $bl) = @_; - $p = 508 - 254 * ($p - $bl); + my ($p, $bl, $invert) = @_; + $p = 254 * ($p - $bl); + $p = 508 - $p if $invert; $p = int($p + .5 * ($p <=> 0)); return $p; } |