summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-03-28 23:21:10 +0200
committerDave Lawrence <dlawrence@mozilla.com>2012-03-28 23:21:10 +0200
commita4c234e96660489c24ec68c08d4d66f3fe1b1e19 (patch)
treedfa83366708e87fdee96a90e8bb815a82998e778 /template/en
parent399f0b45f6fb796941b92ed2899fcc17e3ab0ea9 (diff)
parentc89d334af4b6d288f6294cfe8acfa939744fcec6 (diff)
downloadbugzilla-a4c234e96660489c24ec68c08d4d66f3fe1b1e19.tar.gz
bugzilla-a4c234e96660489c24ec68c08d4d66f3fe1b1e19.tar.xz
merged with bugzilla/4.0
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/account/auth/login-small.html.tmpl3
-rw-r--r--template/en/default/account/auth/login.html.tmpl2
-rw-r--r--template/en/default/admin/users/search.html.tmpl3
-rw-r--r--template/en/default/email/bugmail.html.tmpl2
4 files changed, 9 insertions, 1 deletions
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 14efbc367..b073c79cc 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -39,6 +39,9 @@
[% script_name = login_target _ connector _ "GoAheadAndLogIn=1" %]
<a id="login_link[% qs_suffix %]" href="[% script_name FILTER html %]"
onclick="return show_mini_login_form('[% qs_suffix %]')">Log In</a>
+
+ [% Hook.process('additional_methods') %]
+
<form action="[% login_target FILTER html %]" method="POST"
class="mini_login bz_default_hidden"
id="mini_login[% qs_suffix FILTER html %]"
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index f11c33cdc..ec8c11e24 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -91,6 +91,8 @@
</p>
</form>
+[% Hook.process('additional_methods') %]
+
[%# Allow the user to create a new account, or request a token to change
# their password, assuming that our auth method allows that.
#%]
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index 82e0afda7..36ca48ed8 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -62,6 +62,9 @@
[% END %]
</select></p>
[% END %]
+
+[% Hook.process('end') %]
+
</form>
[% IF editusers %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index fa3a447d7..e42b5564d 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -124,5 +124,5 @@
</tr>
[% END %]
[% END %]
- </table>
+ [% '</table>' IF in_table %]
[% END %]