diff options
Diffstat (limited to 'web')
-rwxr-xr-x | web/about.cgi | 4 | ||||
-rwxr-xr-x | web/alert.cgi | 4 | ||||
-rwxr-xr-x | web/confirm.cgi | 4 | ||||
-rwxr-xr-x | web/contact.cgi | 4 | ||||
-rwxr-xr-x | web/faq.cgi | 4 | ||||
-rwxr-xr-x | web/index.cgi | 22 | ||||
-rwxr-xr-x | web/questionnaire.cgi | 4 | ||||
-rwxr-xr-x | web/report.cgi | 6 |
8 files changed, 26 insertions, 26 deletions
diff --git a/web/about.cgi b/web/about.cgi index baba299e1..a302eb3f0 100755 --- a/web/about.cgi +++ b/web/about.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: about.cgi,v 1.2 2006-09-25 18:39:54 matthew Exp $ +# $Id: about.cgi,v 1.3 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -20,7 +20,7 @@ use Page; # Main code for index.cgi sub main { my $q = shift; - print Page::header($q, 'About'); + print Page::header($q, title=>'About'); print about_page(); print Page::footer(); } diff --git a/web/alert.cgi b/web/alert.cgi index 47d576c3a..050f3cf9b 100755 --- a/web/alert.cgi +++ b/web/alert.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: alert.cgi,v 1.5 2007-05-09 11:18:36 matthew Exp $ +# $Id: alert.cgi,v 1.6 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -97,7 +97,7 @@ EOF $out = $q->p(_('Subscribe from a problem page!')); } - print Page::header($q, _('Confirmation')); + print Page::header($q, title=>_('Confirmation')); print $out; print Page::footer(); dbh()->rollback(); diff --git a/web/confirm.cgi b/web/confirm.cgi index b8b214222..9c18726c7 100755 --- a/web/confirm.cgi +++ b/web/confirm.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: confirm.cgi,v 1.18 2007-05-15 13:56:03 matthew Exp $ +# $Id: confirm.cgi,v 1.19 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -100,7 +100,7 @@ and we'll look into it. EOF } - print Page::header($q, _('Confirmation')); + print Page::header($q, title=>_('Confirmation')); print $out; print Page::footer(); dbh()->rollback(); diff --git a/web/contact.cgi b/web/contact.cgi index 2301bab55..971b9793a 100755 --- a/web/contact.cgi +++ b/web/contact.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: contact.cgi,v 1.18 2007-05-15 15:17:06 matthew Exp $ +# $Id: contact.cgi,v 1.19 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -36,7 +36,7 @@ BEGIN { # Main code for index.cgi sub main { my $q = shift; - print Page::header($q, 'Contact Us'); + print Page::header($q, title=>'Contact Us'); my $out = ''; if ($q->param('submit_form')) { $out = contact_submit($q); diff --git a/web/faq.cgi b/web/faq.cgi index 19b7e0379..859a6d6ab 100755 --- a/web/faq.cgi +++ b/web/faq.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: faq.cgi,v 1.19 2007-05-15 15:12:22 matthew Exp $ +# $Id: faq.cgi,v 1.20 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -20,7 +20,7 @@ use Page; # Main code for index.cgi sub main { my $q = shift; - print Page::header($q, _('FAQ')); + print Page::header($q, title=>_('FAQ')); print faq($q); print Page::footer(); } diff --git a/web/index.cgi b/web/index.cgi index ffca900b1..563f12d41 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.135 2007-05-21 17:42:52 matthew Exp $ +# $Id: index.cgi,v 1.136 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -56,27 +56,26 @@ sub main { my $q = shift; my $out = ''; - my $title = ''; my %params; if ($q->param('submit_problem')) { - $title = 'Submitting your problem'; + $params{title} = 'Submitting your problem'; $out = submit_problem($q); } elsif ($q->param('submit_update')) { - $title = 'Submitting your update'; + $params{title} = 'Submitting your update'; ($out) = submit_update($q); } elsif ($q->param('submit_map')) { - $title = 'Reporting a problem'; + $params{title} = 'Reporting a problem'; $out = display_form($q); } elsif ($q->param('id')) { - ($out, $title, %params) = display_problem($q); - $title .= ' - Viewing a problem'; + ($out, %params) = display_problem($q); + $params{title} .= ' - Viewing a problem'; } elsif ($q->param('pc') || ($q->param('x') && $q->param('y'))) { - $title = 'Viewing a location'; ($out, %params) = display_location($q); + $params{title} = 'Viewing a location'; } else { $out = front_page($q); } - print Page::header($q, $title, %params); + print Page::header($q, %params); print $out; print Page::footer(); dbh()->rollback(); @@ -635,9 +634,10 @@ EOF $out .= Page::display_map_end(0); my %params = ( - rss => [ 'Updates to this problem, Neighbourhood Fix-It', "/rss/$input_h{id}" ] + rss => [ 'Updates to this problem, Neighbourhood Fix-It', "/rss/$input_h{id}" ], + title => $problem->{title} ); - return ($out, $problem->{title}, %params); + return ($out, %params); } sub map_pins { diff --git a/web/questionnaire.cgi b/web/questionnaire.cgi index 9d0c91dc9..bf6e78195 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.9 2007-05-18 20:05:06 matthew Exp $ +# $Id: questionnaire.cgi,v 1.10 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -43,7 +43,7 @@ sub main { } else { $out = display_questionnaire($q); } - print Page::header($q, _('Questionnaire')); + print Page::header($q, title=>_('Questionnaire')); print $out; print Page::footer(); dbh()->rollback(); diff --git a/web/report.cgi b/web/report.cgi index 54666951b..5a8d84fa9 100755 --- a/web/report.cgi +++ b/web/report.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: report.cgi,v 1.34 2007-05-15 15:28:05 matthew Exp $ +# $Id: report.cgi,v 1.35 2007-06-01 14:24:41 matthew Exp $ use strict; require 5.8.0; @@ -76,7 +76,7 @@ sub main { } my $areas_info = mySociety::MaPit::get_voting_areas_info([keys %councils]); if (!$one_council) { - print Page::header($q, 'Summary reports'); + print Page::header($q, title=>'Summary reports'); print $q->p(_('This is a summary of all reports on this site that have been sent to a council; select a particular council to see the reports sent there.')); my $c = 0; print '<table cellpadding="3" cellspacing="1" border="0">'; @@ -97,7 +97,7 @@ sub main { print '</table>'; } else { my $name = Page::canonicalise_council($areas_info->{$one_council}->{name}); - print Page::header($q, "$name - Summary reports", rss => [ "Problems within $name, Neighbourhood Fix-It", "/rss/council/$one_council" ]); + print Page::header($q, title=>"$name - Summary reports", rss => [ "Problems within $name, Neighbourhood Fix-It", "/rss/council/$one_council" ]); print $q->p( $q->a({href => "/rss/council/$one_council"}, '<img align="right" src="/i/feed.png" width="16" height="16" title="RSS feed" alt="RSS feed of problems in this council" border="0" hspace="4">'), 'This is a summary of all reports for one council. You can ' . |