summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-05-09 16:48:30 +0200
committerDylan William Hardison <dylan@hardison.net>2017-05-09 16:48:43 +0200
commit342db201b111da43ebcf7feaf1421aff1f7c6375 (patch)
tree2c8d89aa6bcb13fb04e7860eee46b117e8d57dba
parent318651ceaba13b359b97e383ef25c5761aeddc7e (diff)
downloadbugzilla-342db201b111da43ebcf7feaf1421aff1f7c6375.tar.gz
bugzilla-342db201b111da43ebcf7feaf1421aff1f7c6375.tar.xz
Bug 1359797 - GitHub login not appearing on show_bug.cgi
-rw-r--r--extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl2
-rw-r--r--js/global.js1
-rw-r--r--template/en/default/account/auth/login-small.html.tmpl4
3 files changed, 4 insertions, 3 deletions
diff --git a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
index a472156f9..5fcf5d72b 100644
--- a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
+++ b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
@@ -8,7 +8,7 @@
[% USE Bugzilla %]
[% IF Param('user_info_class').split(',').contains('GitHubAuth') %]
- <span id="github_mini_login[% qs_suffix FILTER html %]" class="bz_default_hidden">
+ <span id="github_mini_login[% qs_suffix FILTER html %]" class="bz_default_hidden mini_login[% qs_suffix FILTER html %]">
<form method="post" action="[% urlbase FILTER html %]github.cgi">
<input type="hidden" name="github_secret" value="[% Bugzilla.github_secret FILTER html %]">
<input type="hidden" name="target_uri" value="[% Bugzilla.cgi.target_uri FILTER html %]">
diff --git a/js/global.js b/js/global.js
index 7d89473da..102ab05af 100644
--- a/js/global.js
+++ b/js/global.js
@@ -87,6 +87,7 @@ function manage_old_lists() {
function show_mini_login_form( suffix ) {
$('#login_link' + suffix).addClass('bz_default_hidden');
$('#mini_login' + suffix).removeClass('bz_default_hidden');
+ $('.mini_login' + suffix).removeClass('bz_default_hidden');
$('#new_account_container' + suffix).addClass('bz_default_hidden');
return false;
}
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index b182ddef3..7ca0a44d9 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -43,9 +43,8 @@
[% Hook.process('additional_methods') %]
<form action="[% login_target FILTER html %]" method="POST"
- class="mini_login bz_default_hidden"
+ class="mini_login bz_default_hidden "
id="mini_login[% qs_suffix FILTER html %]"
- class="check_mini_login_fields"
data-qs-suffix="[% qs_suffix FILTER html %]"
>
@@ -76,6 +75,7 @@
<input type="hidden" name="Bugzilla_login_token"
value="[% get_login_request_token() FILTER html %]">
<input type="submit" name="GoAheadAndLogIn" value="Log in"
+ class="check_mini_login_fields"
id="log_in[% qs_suffix %]">
<a href="#" id="hide_mini_login[% qs_suffix FILTER html %]"
class="hide_mini_login_form" data-qs-suffix="[% qs_suffix FILTER html %]">[x]</a>