From 381c4dd4d8a013008264730137f442daecba1f5d Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Thu, 29 Sep 2016 15:46:47 +0000
Subject: Bug 1305671 - Bogus </a> after GitHub sign-in button

---
 .../hook/account/auth/login-additional_methods.html.tmpl     | 12 +++++-------
 .../account/auth/login-small-additional_methods.html.tmpl    |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
index 17bcb3e42..225b6f8a0 100644
--- a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
+++ b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
@@ -7,14 +7,12 @@
   #%]
 [% USE Bugzilla %]
 [% IF Param('user_info_class').split(',').contains('GitHubAuth') %]
-  <p>
-    <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 %]">
-      <input type="image" src="extensions/GitHubAuth/web/images/github_sign_in.png"
+  <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 %]">
+    <input type="image" src="extensions/GitHubAuth/web/images/github_sign_in.png"
            alt="Sign in with GitHub"
            title="Sign in with GitHub"
            width="185" height="25">
-    </form>
-  </p>
+  </form>
 [% END %]
\ No newline at end of file
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 f32b34a59..adcd9e067 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
@@ -24,7 +24,7 @@
       <input type="hidden" name="target_uri" value="[% Bugzilla.cgi.target_uri FILTER html %]">
         <input type="image" src="extensions/GitHubAuth/web/images/sign_in.png" height="22" width="75" align="absmiddle"
              alt="Sign in with GitHub"
-             title="Sign in with GitHub"></a> or
+             title="Sign in with GitHub"> or
     </form>
   </span>
 [% END %]
-- 
cgit v1.2.3-24-g4f1b