diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/css/core.css | 7 | ||||
| -rwxr-xr-x | web/index.cgi | 18 | ||||
| -rwxr-xr-x | web/questionnaire.cgi | 4 |
3 files changed, 15 insertions, 14 deletions
diff --git a/web/css/core.css b/web/css/core.css index c2e32909a..a1fa31b64 100644 --- a/web/css/core.css +++ b/web/css/core.css @@ -39,7 +39,7 @@ dt { .v { display: none; } -#error { +p#error { text-align: center; color: #cc0000; font-size: larger; @@ -56,6 +56,7 @@ ul#error { padding-right: 4px; border: solid 1px #cc0000; text-align: left; + font-size: larger; } /* Site-wide layout */ @@ -213,11 +214,11 @@ p#copyright { #compass { background-color: #ffffff; border: solid 1px #000000; - border-width: 0 1px 1px 1px; + border-width: 0 1px 1px 0; color: #000000; position: absolute; top: 0px; - right: 439px; + left: 0px; } #compass img { diff --git a/web/index.cgi b/web/index.cgi index 7b9557fe5..c84acc934 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.189 2008-04-10 19:07:39 matthew Exp $ +# $Id: index.cgi,v 1.190 2008-04-14 16:06:03 matthew Exp $ use strict; use Standard; @@ -51,8 +51,8 @@ sub main { $params{title} = 'Submitting your update'; ($out) = submit_update($q); } elsif ($q->param('submit_map')) { - $params{title} = 'Reporting a problem'; ($out, %params) = display_form($q); + $params{title} = 'Reporting a problem'; } elsif ($q->param('id')) { ($out, %params) = display_problem($q); $params{title} .= ' - Viewing a problem'; @@ -393,7 +393,7 @@ sub display_form { $input{x} ||= int($pin_x) - 1; $input{y} ||= int($pin_y) - 1; $px = Page::tile_to_px($pin_x, $input{x}); - $py = Page::tile_to_px($pin_y, $input{y}); + $py = Page::tile_to_px($pin_y, $input{y}, 1); $easting = Page::tile_to_os($pin_x); $northing = Page::tile_to_os($pin_y); } elsif ($input{flickr} && $input{pc} && !$input{easting} && !$input{northing}) { @@ -402,13 +402,13 @@ sub display_form { $input{x} = int(Page::os_to_tile($easting)); $input{y} = int(Page::os_to_tile($northing)); $px = Page::os_to_px($easting, $input{x}); - $py = Page::os_to_px($northing, $input{y}); + $py = Page::os_to_px($northing, $input{y}, 1); } else { # Normal form submission $input{x} = int(Page::os_to_tile($input{easting})); $input{y} = int(Page::os_to_tile($input{northing})); $px = Page::os_to_px($input{easting}, $input{x}); - $py = Page::os_to_px($input{northing}, $input{y}); + $py = Page::os_to_px($input{northing}, $input{y}, 1); $easting = $input_h{easting}; $northing = $input_h{northing}; } @@ -715,7 +715,7 @@ sub display_problem { my $x_tile = $input{x} || int($x); my $y_tile = $input{y} || int($y); my $px = Page::os_to_px($problem->{easting}, $x_tile); - my $py = Page::os_to_px($problem->{northing}, $y_tile); + my $py = Page::os_to_px($problem->{northing}, $y_tile, 1); my $out = ''; @@ -826,7 +826,7 @@ sub map_pins { foreach (@$current_map) { push(@ids, $_->{id}); my $px = Page::os_to_px($_->{easting}, $x); - my $py = Page::os_to_px($_->{northing}, $y); + my $py = Page::os_to_px($_->{northing}, $y, 1); $pins .= Page::display_pin($q, $px, $py, 'red', $count_prob++); } @@ -847,7 +847,7 @@ sub map_pins { order by distance, created desc limit $limit", $mid_e, $mid_n); foreach (@$current) { my $px = Page::os_to_px($_->{easting}, $x); - my $py = Page::os_to_px($_->{northing}, $y); + my $py = Page::os_to_px($_->{northing}, $y, 1); $pins .= Page::display_pin($q, $px, $py, 'red', $count_prob++); } } @@ -858,7 +858,7 @@ sub map_pins { order by created desc limit 9", $mid_e, $mid_n); foreach (@$fixed) { my $px = Page::os_to_px($_->{easting}, $x); - my $py = Page::os_to_px($_->{northing}, $y); + my $py = Page::os_to_px($_->{northing}, $y, 1); $pins .= Page::display_pin($q, $px, $py, 'green', $count_fixed++); } return ($pins, $current_map, $current, $fixed, $dist); diff --git a/web/questionnaire.cgi b/web/questionnaire.cgi index 34bfa9a44..b5118bf59 100755 --- a/web/questionnaire.cgi +++ b/web/questionnaire.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: questionnaire.cgi,v 1.26 2008-04-10 19:19:10 matthew Exp $ +# $Id: questionnaire.cgi,v 1.27 2008-04-14 16:06:03 matthew Exp $ use strict; use Standard; @@ -180,7 +180,7 @@ sub display_questionnaire { my $x_tile = int($x); my $y_tile = int($y); my $px = Page::os_to_px($problem->{easting}, $x_tile); - my $py = Page::os_to_px($problem->{northing}, $y_tile); + my $py = Page::os_to_px($problem->{northing}, $y_tile, 1); my $pins = Page::display_pin($q, $px, $py, $problem->{state} eq 'fixed'?'green':'red'); my $problem_text = Page::display_problem_text($q, $problem); |