From 2712a9c0abea163f5f209d333fedbce8520dea1c Mon Sep 17 00:00:00 2001
From: Gervase Markham
Date: Mon, 26 Mar 2012 12:11:16 +0100
Subject: Add hooks for alternative login methods. r,a=LpSolit.
https://bugzilla.mozilla.org/show_bug.cgi?id=698418
---
template/en/default/account/auth/login-small.html.tmpl | 3 +++
template/en/default/account/auth/login.html.tmpl | 2 ++
2 files changed, 5 insertions(+)
(limited to 'template/en/default')
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 39984aeaf..fbe40fb43 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" %]
Log In
+
+ [% Hook.process('additional_methods') %]
+
+[% 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.
#%]
--
cgit v1.2.3-24-g4f1b
From 122b723664f9db002fcd46bf3c66af9b4029ba9c Mon Sep 17 00:00:00 2001
From: Francisco Donalisio
Date: Mon, 26 Mar 2012 17:10:18 -0400
Subject: Bug 734471 - Need new hook edituser search template r=timello,
a=LpSolit
---
template/en/default/admin/users/search.html.tmpl | 3 +++
1 file changed, 3 insertions(+)
(limited to 'template/en/default')
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 %]
[% END %]
+
+[% Hook.process('end') %]
+
[% IF editusers %]
--
cgit v1.2.3-24-g4f1b
From c89d334af4b6d288f6294cfe8acfa939744fcec6 Mon Sep 17 00:00:00 2001
From: Tiago Mello
Date: Wed, 28 Mar 2012 09:47:59 -0500
Subject: Bug 735821: Fix broken HTML code in bugmail.html.tmpl. r/a=LpSolit
---
template/en/default/email/bugmail.html.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'template/en/default')
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 @@
[% END %]
[% END %]
-
+ [% '' IF in_table %]
[% END %]
--
cgit v1.2.3-24-g4f1b