aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rwxr-xr-xweb/alert.cgi8
-rwxr-xr-xweb/contact.cgi9
-rw-r--r--web/css/core.css2
-rwxr-xr-xweb/index.cgi12
-rwxr-xr-xweb/questionnaire.cgi4
-rwxr-xr-xweb/tms-signup.cgi4
6 files changed, 18 insertions, 21 deletions
diff --git a/web/alert.cgi b/web/alert.cgi
index c7a279618..c22717041 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.43 2009-08-31 17:23:09 louise Exp $
+# $Id: alert.cgi,v 1.44 2009-09-03 13:36:47 louise Exp $
use strict;
use Standard;
@@ -88,7 +88,7 @@ sub alert_list {
if mySociety::PostcodeUtil::is_valid_postcode($input{pc});
my $errors = '';
- $errors = '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>' if @errors;
+ $errors = '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>' if @errors;
my @types = (@$mySociety::VotingArea::council_parent_types, @$mySociety::VotingArea::council_child_types);
my %councils = map { $_ => 1 } @$mySociety::VotingArea::council_parent_types;
@@ -263,7 +263,7 @@ sub alert_front_page {
my $q = shift;
my $error = shift;
my $errors = '';
- $errors = '<ul id="error"><li>' . $error . '</li></ul>' if $error;
+ $errors = '<ul class="error"><li>' . $error . '</li></ul>' if $error;
my %input_h = map { $_ => $q->param($_) ? ent($q->param($_)) : '' } qw(pc);
my $out = $q->h1(_('Local RSS feeds and email alerts'));
@@ -310,7 +310,7 @@ sub alert_updates_form {
my %input_h = map { $_ => $q->param($_) ? ent($q->param($_)) : '' } @vars;
my $out = '';
if (@errors) {
- $out .= '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
+ $out .= '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
}
$out .= $q->p(_('Receive email when updates are left on this problem.'));
my $label = _('Email:');
diff --git a/web/contact.cgi b/web/contact.cgi
index fa9596f55..6518259b3 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.40 2009-07-22 21:56:38 matthew Exp $
+# $Id: contact.cgi,v 1.41 2009-09-03 13:36:47 louise Exp $
use strict;
use Standard;
@@ -83,9 +83,9 @@ sub contact_page {
my $out = $q->h1(_('Contact the team'));
if (@errors) {
- $out .= '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
+ $out .= '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
}
- $out .= '<form method="post">';
+ $out .= '<form method="post" action="/contact">';
my $id = $q->param('id');
$id = undef unless $id && $id =~ /^[1-9]\d*$/;
@@ -129,7 +129,6 @@ please <a href="/">go to the front page</a> and follow the instructions.'));
my $label_message = _('Message:');
my $label_submit = _('Post');
$out .= <<EOF;
-<fieldset>
<input type="hidden" name="submit_form" value="1">
<div><label for="form_name">$label_name</label>
<input type="text" name="name" id="form_name" value="$input_h{name}" size="30"></div>
@@ -140,9 +139,7 @@ please <a href="/">go to the front page</a> and follow the instructions.'));
<div><label for="form_message">$label_message</label>
<textarea name="message" id="form_message" rows="7" cols="50">$input_h{message}</textarea></div>
<div class="checkbox"><input type="submit" value="$label_submit"></div>
-</fieldset>
</form>
-</div>
EOF
return $out;
}
diff --git a/web/css/core.css b/web/css/core.css
index ce034ad61..27201bfb8 100644
--- a/web/css/core.css
+++ b/web/css/core.css
@@ -44,7 +44,7 @@ dt {
background-color: #cccccc;
}
-p#error {
+p.error {
text-align: center;
color: #cc0000;
font-size: larger;
diff --git a/web/index.cgi b/web/index.cgi
index 371a62966..7bb3d8aba 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.278 2009-08-31 12:20:55 louise Exp $
+# $Id: index.cgi,v 1.279 2009-09-03 13:36:47 louise Exp $
use strict;
use Standard;
@@ -121,7 +121,7 @@ sub front_page {
#EOF
# }
#}
- $out .= '<p id="error">' . $error . '</p>' if ($error);
+ $out .= '<p class="error">' . $error . '</p>' if ($error);
my $fixed = Problems::recent_fixed();
my $updates = Problems::number_comments();
my $new = Problems::recent_new('1 week');
@@ -554,7 +554,7 @@ please specify the closest point on land.')) unless @$all_councils;
$category = _('Property type:');
}
$category = $q->div($q->label({'for'=>'form_category'}, $category),
- $q->popup_menu(-name=>'category', -values=>\@categories,
+ $q->popup_menu(-name=>'category', -values=>\@categories, -id=>'form_category',
-attributes=>{id=>'form_category'})
) if $category;
@@ -669,7 +669,7 @@ photo of the problem if you have one), etc.';
<input type="hidden" name="northing" value="' . $northing . '">';
if (@errors) {
- $out .= '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
+ $out .= '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
}
my $anon = ($input{anonymous}) ? ' checked' : ($input{title} ? '' : ' checked');
$out .= '<div id="problem_form">';
@@ -833,7 +833,7 @@ sub display_location {
</p>
EOF
if (@errors) {
- $out .= '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
+ $out .= '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
}
my $skipurl = NewURL($q, -retain=>1, 'submit_map'=>1, skipped=>1);
#$out .= $q->h1('Report a problem');
@@ -963,7 +963,7 @@ EOF
$out .= $q->p($q->small(_('Please note that updates are not sent to the council.')))
unless $q->{site} eq 'emptyhomes'; # No council blurb
if (@errors) {
- $out .= '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
+ $out .= '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
}
my $fixed = ($input{fixed}) ? ' checked' : '';
diff --git a/web/questionnaire.cgi b/web/questionnaire.cgi
index be411168d..f06719fe6 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.40 2009-07-10 16:10:22 matthew Exp $
+# $Id: questionnaire.cgi,v 1.41 2009-09-03 13:36:48 louise Exp $
use strict;
use Standard;
@@ -238,7 +238,7 @@ EOF
$out .= ' ' . _('Please take a look at the updates that have been left.') if $updates;
$out .= '</p>';
if (@errors) {
- $out .= '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
+ $out .= '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
}
$out .= '<p>';
$out .= _('An update marked this problem as fixed.') . ' ' if $problem->{state} eq 'fixed';
diff --git a/web/tms-signup.cgi b/web/tms-signup.cgi
index ceaf2e779..12cd47fb3 100755
--- a/web/tms-signup.cgi
+++ b/web/tms-signup.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: tms-signup.cgi,v 1.3 2008-10-07 16:27:35 matthew Exp $
+# $Id: tms-signup.cgi,v 1.4 2009-09-03 13:36:48 louise Exp $
use strict;
use Standard;
@@ -53,7 +53,7 @@ sub tms_updates_form {
my %input = map { $_ => $q->param($_) || '' } @vars;
my $out = '';
if (@errors) {
- $out .= '<ul id="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
+ $out .= '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>';
}
$out .= CrossSell::display_tms_form(%input);
return $out;