summaryrefslogtreecommitdiffstats
path: root/templates/user
diff options
context:
space:
mode:
authorskyblue <ssx205@gmail.com>2014-04-12 09:42:09 +0800
committerskyblue <ssx205@gmail.com>2014-04-12 09:42:09 +0800
commit5c1312f38e8968e068125a1b1dd59060f3f29bfe (patch)
tree92f442d78974645e98465de73679d3e163f681bb /templates/user
parent4c6e0e94995b95d3493c6641fbb5a528c6d6c134 (diff)
downloadgitea-5c1312f38e8968e068125a1b1dd59060f3f29bfe.tar.gz
gitea-5c1312f38e8968e068125a1b1dd59060f3f29bfe.zip
clean oauth2 code
Diffstat (limited to 'templates/user')
-rw-r--r--templates/user/signin.tmpl14
-rw-r--r--templates/user/signup.tmpl4
2 files changed, 12 insertions, 6 deletions
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index a06e3ca8a0..6ccad79e73 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -3,7 +3,15 @@
<div class="container" id="body" data-page="user-signin">
<form action="/user/login" method="post" class="form-horizontal card" id="login-card">
{{.CsrfTokenHtml}}
- <h3>Log in</h3>
+ <h3>Log in
+ {{if .OauthEnabled}}
+ <small class="pull-right">social login:
+ {{if .OauthGitHubEnabled}}
+ <a href="/user/login/github?next=/user/sign_up"><i class="fa fa-github-square fa-2x"></i></a>
+ {{end}}
+ </small>
+ {{end}}
+ </h3>
{{template "base/alert" .}}
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
<label class="col-md-4 control-label">Username: </label>
@@ -43,12 +51,12 @@
</div>
</div>
- {{if .OauthEnabled}}
+ <!-- {{if .OauthEnabled}}
<div class="form-group text-center" id="social-login">
<h4>Log In with Social Accounts</h4>
{{if .OauthGitHubEnabled}}<a href="/user/login/github?next=/user/sign_up"><i class="fa fa-github-square fa-3x"></i></a>{{end}}
</div>
- {{end}}
+ {{end}} -->
</form>
</div>
{{template "base/footer" .}}
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index b12333a257..6cf48a4d80 100644
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -12,8 +12,6 @@
<h3>Sign Up</h3>
{{end}}
{{template "base/alert" .}}
- {{if .IsSocialLogin}}
- {{end}}
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
<label class="col-md-4 control-label">Username: </label>
<div class="col-md-6">
@@ -23,7 +21,7 @@
<div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
<label class="col-md-4 control-label">Email: </label>
<div class="col-md-6">
- <input name="email" class="form-control" placeholder="Type your e-mail address" value="{{.email}}{{.socialEmail}}" required="required" title="Email is not valid">
+ <input name="email" class="form-control" placeholder="Type your e-mail address" value="{{.email}}" required="required" title="Email is not valid">
</div>
</div>