diff options
Diffstat (limited to 'web')
| -rwxr-xr-x | web/alert.cgi | 8 | ||||
| -rwxr-xr-x | web/confirm.cgi | 6 | ||||
| -rwxr-xr-x | web/contact.cgi | 4 | ||||
| -rw-r--r-- | web/css.css | 7 | ||||
| -rwxr-xr-x | web/questionnaire.cgi | 5 |
5 files changed, 18 insertions, 12 deletions
diff --git a/web/alert.cgi b/web/alert.cgi index 31a4cbe83..3f721e971 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.23 2008-01-28 15:27:00 matthew Exp $ +# $Id: alert.cgi,v 1.24 2008-01-30 18:27:48 matthew Exp $ use strict; use Standard; @@ -305,7 +305,7 @@ sub alert_signed_input { my $alert_id = mySociety::Alert::create($email, 'new_updates', $id); mySociety::Alert::confirm($alert_id); $out = $q->p(_('You have successfully subscribed to that alert.')); - $out .= CrossSell::display_advert($email); + $out .= CrossSell::display_advert($q, $email); } else { $out = $q->p(_('We could not validate that alert.')); } @@ -321,11 +321,11 @@ sub alert_token { if ($type eq 'subscribe') { mySociety::Alert::confirm($id); $out = $q->p(_('You have successfully confirmed your alert.')); - $out .= CrossSell::display_advert($email); + $out .= CrossSell::display_advert($q, $email); } elsif ($type eq 'unsubscribe') { mySociety::Alert::delete($id); $out = $q->p(_('You have successfully deleted your alert.')); - $out .= CrossSell::display_advert($email); + $out .= CrossSell::display_advert($q, $email); } return $out; } diff --git a/web/confirm.cgi b/web/confirm.cgi index 6990e7499..cae90154d 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.32 2008-01-28 16:29:46 matthew Exp $ +# $Id: confirm.cgi,v 1.33 2008-01-30 18:27:48 matthew Exp $ use strict; use Standard; @@ -72,7 +72,7 @@ sub confirm_update { $out = '<form action="/alert" method="post">'; $out .= $q->p(sprintf(_('You have successfully confirmed your update and you can now <a href="%s">view it on the site</a>.'), "/?id=$problem_id#update_$id")); if ($fixed) { - $out .= CrossSell::display_advert($email, $name); + $out .= CrossSell::display_advert($q, $email, $name); } else { $out .= advertise_updates($q, $problem_id, $email); } @@ -152,7 +152,7 @@ sub add_questionnaire { ms_current_timestamp(), ?, 'confirmed', 'fixed');", {}, $problem_id, $reported) unless $already; my $out = $q->p(sprintf('Thank you — you can <a href="%s">view your updated problem</a> on the site.', "/?id=$problem_id")); - $out .= CrossSell::display_advert($email, $name); + $out .= CrossSell::display_advert($q, $email, $name); return $out; } diff --git a/web/contact.cgi b/web/contact.cgi index cfbf952da..4979f7344 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.26 2008-01-28 15:27:00 matthew Exp $ +# $Id: contact.cgi,v 1.27 2008-01-30 18:27:48 matthew Exp $ use strict; use Standard; @@ -67,7 +67,7 @@ sub contact_submit { my $result = mySociety::EmailUtil::send_email($email, $input{em}, mySociety::Config::get('CONTACT_EMAIL')); if ($result == mySociety::EmailUtil::EMAIL_SUCCESS) { my $out = $q->p("Thanks for your feedback. We'll get back to you as soon as we can!"); - $out .= CrossSell::display_advert($input{em}, $input{name}); + $out .= CrossSell::display_advert($q, $input{em}, $input{name}); return $out; } else { return $q->p('Failed to send message. Please try again, or <a href="mailto:' . mySociety::Config::get('CONTACT_EMAIL') . '">email us</a>.'); diff --git a/web/css.css b/web/css.css index a1d7d99a5..c45ea8be6 100644 --- a/web/css.css +++ b/web/css.css @@ -176,6 +176,11 @@ ul#error { padding: 2px 4px; } +#advert_thin { + width: 50%; + margin: 0 auto; +} + /* Front page */ #expl { @@ -464,7 +469,7 @@ ol#current img { margin-right: 1em; } -/* Printign */ +/* Printing */ @media print { #map_box { float: none; margin: 0 auto; } #content { max-width: none; } diff --git a/web/questionnaire.cgi b/web/questionnaire.cgi index 92b488b2c..4268a9eed 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.18 2008-01-28 15:27:00 matthew Exp $ +# $Id: questionnaire.cgi,v 1.19 2008-01-30 18:27:48 matthew Exp $ use strict; use Standard; @@ -128,7 +128,8 @@ EOF my $out = <<EOF; <p>Thank you very much for filling in our questionnaire; glad to hear it's been fixed.</p> EOF - $out .= CrossSell::display_advert($problem->{email}, $problem->{name}); + $out .= CrossSell::display_advert($q, $problem->{email}, $problem->{name}, + council => $problem->{council}); } } |