diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
| commit | 592924059a07a5a30e8a09dfc4ca8dea56c5c77a (patch) | |
| tree | c99e86d3e3f780427bbf7a9ec0ae5187b697dfa5 /perllib/CrossSell.pm | |
| parent | 65066d275557e16448aa99ecdfa4df62d4d79649 (diff) | |
| parent | d92bbef188eff6c14adf0f0c7b032846b1be85a6 (diff) | |
Merge remote-tracking branch 'origin/master' into send-report-rewrite
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'perllib/CrossSell.pm')
| -rw-r--r-- | perllib/CrossSell.pm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/perllib/CrossSell.pm b/perllib/CrossSell.pm index 4a0f31ea8..f9a02a61b 100644 --- a/perllib/CrossSell.pm +++ b/perllib/CrossSell.pm @@ -189,25 +189,25 @@ sub display_advert ($$;$%) { #$c->stash->{scratch} = 'advert=demclub0'; #return display_democracyclub(); - return <<EOF; -<div id="advert_thin"> -<p>Do you have an issue that’s too big for FixMyStreet? -It could be time to petition your council. Try our new site: -<h2 style="margin-top:0; font-size: 150%"> -<a href="http://www.petitionyourcouncil.com/">PetitionYourCouncil</a></p> -</h2> -</div> -EOF +# return <<EOF; +#<div id="advert_thin"> +#<p>Do you have an issue that’s too big for FixMyStreet? +#It could be time to petition your council. Try our new site: +#<h2 style="margin-top:0; font-size: 150%"> +#<a href="http://www.petitionyourcouncil.com/">PetitionYourCouncil</a></p> +#</h2> +#</div> +#EOF #unless (defined $data{done_tms} && $data{done_tms}==1) { - #$c->stash->{scratch} = 'advert=news'; - #my $auth_signature = ''; - #unless (defined $data{emailunvalidated} && $data{emailunvalidated}==1) { - # $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET')); - #} - #return '<div style="margin: 0 5em; border-top: dotted 1px #666666;">' - # . display_news_form(email => $email, name => $name, signed_email => $auth_signature) - # . '</div>'; + $c->stash->{scratch} = 'advert=news'; + my $auth_signature = ''; + unless (defined $data{emailunvalidated} && $data{emailunvalidated}==1) { + $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET')); + } + return '<div style="margin: 0 5em; border-top: dotted 1px #666666;">' + . display_news_form(email => $email, name => $name, signed_email => $auth_signature) + . '</div>'; #} my @adverts = ( |