diff options
Diffstat (limited to 'templates')
4 files changed, 37 insertions, 7 deletions
diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index d856dc19a..253dc26a1 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -14,13 +14,23 @@ <input type="hidden" name="r" value="[% c.req.params.r | html %]"> -[% IF NOT oauth_need_email AND c.config.FACEBOOK_APP_ID %] +[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% END %] @@ -56,7 +66,7 @@ [% END %] </div> -[% IF NOT oauth_need_email AND c.config.FACEBOOK_APP_ID %] +[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] </div> [% END %] diff --git a/templates/web/base/report/new/form_user_loggedout.html b/templates/web/base/report/new/form_user_loggedout.html index 6657c87a1..889834580 100644 --- a/templates/web/base/report/new/form_user_loggedout.html +++ b/templates/web/base/report/new/form_user_loggedout.html @@ -1,12 +1,22 @@ -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] <h3>[% loc("Now to submit your report…") %]</h3> + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% PROCESS 'report/new/form_user_loggedout_email.html' required = 0 %] [% ELSE %] @@ -20,6 +30,6 @@ [% PROCESS 'report/new/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] </div> [% END %] diff --git a/templates/web/base/report/update/form_user_loggedout.html b/templates/web/base/report/update/form_user_loggedout.html index 4176633f1..fa26eb8f4 100644 --- a/templates/web/base/report/update/form_user_loggedout.html +++ b/templates/web/base/report/update/form_user_loggedout.html @@ -1,11 +1,21 @@ -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] <h3>[% loc("Now to submit your update…") %]</h3> + [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> Log in with Facebook </button> </div> + [% END %] + [% IF c.config.TWITTER_KEY %] + <div class="form-box"> + <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> + <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> + Log in with Twitter + </button> + </div> + [% END %] <div id="js-social-email-hide"> [% INCLUDE 'report/update/form_user_loggedout_email.html' required=0 %] [% ELSE %] @@ -19,6 +29,6 @@ [% INCLUDE 'report/update/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID %] +[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] </div> [% END %] diff --git a/templates/web/fixmystreet.com/report/new/unresponsive_body.html b/templates/web/fixmystreet.com/report/new/unresponsive_body.html index 2ad3b7992..d0f16d188 100644 --- a/templates/web/fixmystreet.com/report/new/unresponsive_body.html +++ b/templates/web/fixmystreet.com/report/new/unresponsive_body.html @@ -8,5 +8,5 @@ reports from third party reporting sites such as FixMyStreet. </p> <p>We can make your report public, but we can’t send it to the council.</p> - <a href="/unresponsive?body=[% body_id %][% IF category %];category=[% category | uri %][% END %]">What can I do instead?</a> + <a href="[% c.cobrand.base_url %]/unresponsive?body=[% body_id %][% IF category %];category=[% category | uri %][% END %]">What can I do instead?</a> </div> |