Skip to content

Fix and use use_login_page for the BlockIP pre-rendered page #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dylanwh merged 4 commits into from
Feb 13, 2021
Merged

Fix and use use_login_page for the BlockIP pre-rendered page #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e6690b
template/en/default: Fix use_login_page
CyberShadow Nov 23, 2020
9a88d55
template/en/default/global/ip-blocked.html.tmpl: Use use_login_page
CyberShadow Nov 23, 2020
31b218e
index.cgi: Disable use_login_page for the front page
CyberShadow Nov 23, 2020
5852444
Merge branch 'master' into use_login_page
dylanwh Feb 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions index.cgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ else {
$vars->{'release'} = Bugzilla::Update::get_notifications();
}

$vars->{use_login_page} = 1;

# Generate and return the UI (HTML page) from the appropriate template.
$template->process("index.html.tmpl", $vars)
or ThrowTemplateError($template->error());
Expand Down
9 changes: 8 additions & 1 deletion template/en/default/account/auth/login-small.html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@
[% END %]
[% script_url = login_target _ connector _ "GoAheadAndLogIn=1" %]
<a id="login_link[% qs_suffix %]" href="[% script_url FILTER html %]"
class='show_mini_login_form' data-qs-suffix="[% qs_suffix FILTER html %]">Log In</a>
[% IF !use_login_page %]
class='show_mini_login_form'
[% END %]
data-qs-suffix="[% qs_suffix FILTER html %]">Log In</a>

[% IF !use_login_page %]
<div id="mini_login[% qs_suffix FILTER html %]" class="mini-popup mini_login bz_default_hidden">
[% Hook.process('additional_methods') %]

Expand Down Expand Up @@ -86,7 +90,9 @@
</a>
</form>
</div>
[% END %]
</li>
[% IF !use_login_page %]
<li id="forgot_container[% qs_suffix %]">
<a id="forgot_link[% qs_suffix %]" href="[% script_url FILTER html %]#forgot"
class='show_forgot_form'
Expand All @@ -104,3 +110,4 @@
</form>
</div>
</li>
[% END %]
2 changes: 1 addition & 1 deletion template/en/default/global/header.html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@
<ul id="header-login" class="links">
[% PROCESS "account/auth/signup-small.html.tmpl" qs_suffix = "_top" %]
[% IF user.authorizer.can_login %]
[% PROCESS "account/auth/login-small.html.tmpl" qs_suffix = "_top" %]
[% PROCESS "account/auth/login-small.html.tmpl" qs_suffix = "_top" use_login_page = use_login_page %]
[% END %]
</ul>
[% END %]
Expand Down
1 change: 1 addition & 0 deletions template/en/default/global/ip-blocked.html.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[% title = "Too Many Requests" %]

[% PROCESS global/header.html.tmpl
use_login_page = 1
robots = 'noindex' %]

<h1>[% title FILTER html %]</h1>
Expand Down