diff options
Diffstat (limited to 'templates/web/base')
| -rw-r--r-- | templates/web/base/admin/report_blocks.html | 2 | ||||
| -rw-r--r-- | templates/web/base/admin/user-form.html | 6 | ||||
| -rw-r--r-- | templates/web/base/admin/users.html | 2 | ||||
| -rw-r--r-- | templates/web/base/auth/general.html | 4 | ||||
| -rw-r--r-- | templates/web/base/report/new/form_user_loggedout.html | 4 | ||||
| -rw-r--r-- | templates/web/base/report/update/form_user_loggedout.html | 4 |
6 files changed, 14 insertions, 8 deletions
diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html index 8e8b56393..4c52b14bb 100644 --- a/templates/web/base/admin/report_blocks.html +++ b/templates/web/base/admin/report_blocks.html @@ -15,7 +15,7 @@ SET state_groups = c.cobrand.state_groups_admin; [% BLOCK abuse_button -%] [% IF allowed_pages.abuse_edit -%] -[% IF username_in_abuse %]<small>[% loc('(User in abuse table)') %]</small>[% ELSE %]<input type="submit" class="btn" name="banuser" value="[% loc('Ban user') %]" />[% END %] +[% IF username_in_abuse %]<small>[% loc('User in abuse table') %]</small>[% ELSE %]<input type="submit" class="btn" name="banuser" value="[% loc('Ban user') %]" />[% END %] [%- END %] [%- END %] diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html index 5637252e2..7b27f7497 100644 --- a/templates/web/base/admin/user-form.html +++ b/templates/web/base/admin/user-form.html @@ -33,6 +33,12 @@ <input type="hidden" name="phone_verified" value="0"> [% END %] + [% IF username_in_abuse %] + <li> + <p class="error">[% loc('User in abuse table') %] <input name="unban" type="submit" value="[% loc('Unban') %]"></p> + </li> + [% END %] + [% IF c.user.is_superuser || c.cobrand.moniker == 'zurich' %] <li> <div class="admin-hint"> diff --git a/templates/web/base/admin/users.html b/templates/web/base/admin/users.html index d367c18d8..6dfcf4204 100644 --- a/templates/web/base/admin/users.html +++ b/templates/web/base/admin/users.html @@ -29,7 +29,7 @@ [% IF user.is_superuser %] * [% END %] </td> [% IF c.cobrand.moniker != 'zurich' %] - <td>[% user.flagged == 2 ? loc('(User in abuse table)') : user.flagged ? loc('Yes') : ' ' %]</td> + <td>[% user.flagged == 2 ? loc('User in abuse table') : user.flagged ? loc('Yes') : ' ' %]</td> [% END %] <td>[% IF user.id %]<a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a>[% END %]</td> </tr> diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index d630dd415..76426f5d8 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -16,7 +16,7 @@ <input type="hidden" name="r" value="[% c.req.params.r | html %]"> -[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] +[% IF NOT oauth_need_email AND c.cobrand.social_auth_enabled %] [% 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"> @@ -64,7 +64,7 @@ [% END %] </div> -[% IF NOT oauth_need_email AND (c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY) %] +[% IF NOT oauth_need_email AND c.cobrand.social_auth_enabled %] </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 4142f4582..d7bbbf588 100644 --- a/templates/web/base/report/new/form_user_loggedout.html +++ b/templates/web/base/report/new/form_user_loggedout.html @@ -1,4 +1,4 @@ -[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] +[% IF c.cobrand.social_auth_enabled %] [% 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"> @@ -27,6 +27,6 @@ [% PROCESS 'report/new/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] +[% IF c.cobrand.social_auth_enabled %] </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 d9f67e06e..19295b94c 100644 --- a/templates/web/base/report/update/form_user_loggedout.html +++ b/templates/web/base/report/update/form_user_loggedout.html @@ -1,4 +1,4 @@ -[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] +[% IF c.cobrand.social_auth_enabled %] <h3>[% loc("Now to submit your update…") %]</h3> [% IF c.config.FACEBOOK_APP_ID %] <div class="form-box"> @@ -29,6 +29,6 @@ [% INCLUDE 'report/update/form_user_loggedout_by_email.html' %] </div> -[% IF c.config.FACEBOOK_APP_ID OR c.config.TWITTER_KEY %] +[% IF c.cobrand.social_auth_enabled %] </div> [% END %] |