playground
/
gogs
mirror of https://github.com/gogits/gogs.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

new sign in page

pull/1662/head
Unknwon 9 years ago
parent
f5c7f22cc8
commit
e4ecbcdf4a
6 changed files with 55 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      modules/auth/user_form.go
  2. 2
      public/css/gogs.min.css
  3. 1
      public/less/_form.less
  4. 0
      templates/base/social.tmpl
  5. 63
      templates/user/auth/signin.tmpl

6
modules/auth/user_form.go
Unescape View File

@ -70,9 +70,9 @@ func (f *RegisterForm) Validate(ctx *macaron.Context, errs binding.Errors) bindi
} }
type SignInForm struct { type SignInForm struct {
UserName string `form:"uname" binding:"Required;MaxSize(254)"` UserName string `binding:"Required;MaxSize(254)"`
Password string `form:"password" binding:"Required;MaxSize(255)"` Password string `binding:"Required;MaxSize(255)"`
Remember bool `form:"remember"` Remember bool
} }
func (f *SignInForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { func (f *SignInForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

2
public/css/gogs.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
public/less/_form.less
Unescape View File

@ -46,6 +46,7 @@
} }
} }
.signin,
.signup { .signup {
@input-padding: 200px!important; @input-padding: 200px!important;
#create-page-form; #create-page-form;

0
templates/ng/base/social.tmpl → templates/base/social.tmpl
Unescape View File

63
templates/user/auth/signin.tmpl
Unescape View File

@ -1,45 +1,52 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="signin">
<div id="sign-wrapper"> <div class="ui middle very relaxed page grid">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/login" method="post"> <div class="column">
<div class="panel-header"> <form class="ui form" action="{{.Link}}" method="post">
<h2>{{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_in"}}{{end}}</h2> {{.CsrfTokenHtml}}
</div> <h3 class="ui top attached header">
<div class="panel-content"> {{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_in"}}{{end}}
{{template "ng/base/alert" .}} </h3>
<div class="field"> <div class="ui attached segment">
<label class="req" for="username">{{.i18n.Tr "home.uname_holder"}}</label> {{template "base/alert" .}}
<input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.uname}}" required/> <div class="required inline field {{if .Err_UserName}}error{{end}}">
</div> <label for="user_name">{{.i18n.Tr "home.uname_holder"}}</label>
<div class="field"> <input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
<label class="req" for="password">{{.i18n.Tr "password"}}</label> </div>
<input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" required/> <div class="required inline field {{if .Err_Password}}error{{end}}">
<label for="password">{{.i18n.Tr "password"}}</label>
<input id="password" name="password" type="password" value="{{.password}}" required>
</div> </div>
{{if not .IsSocialLogin}} {{if not .IsSocialLogin}}
<div class="field"> <div class="inline field">
<label class="chk-label"> <label></label>
<input class="ipt-chk" id="remember" name="remember" type="checkbox"/>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{{.i18n.Tr "auth.remember_me"}}</strong> <div class="ui checkbox">
</label> <label>{{.i18n.Tr "auth.remember_me"}}</label>
<input name="remember" type="checkbox">
</div>
</div> </div>
{{end}} {{end}}
<div class="field">
<span class="form-label"></span> <div class="inline field">
<button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "sign_in"}}</button>&nbsp;&nbsp;&nbsp;&nbsp; <label></label>
<button class="ui green button">{{.i18n.Tr "sign_in"}}</button>
{{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}} {{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}}
</div> </div>
{{if .ShowRegistrationButton}} {{if .ShowRegistrationButton}}
<div class="field"> <div class="inline field">
<label></label> <label></label>
<a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a> <a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
</div> </div>
{{end}} {{end}}
{{if and (not .IsSocialLogin) .OauthEnabled}} {{if and (not .IsSocialLogin) .OauthEnabled}}
<hr/> <div class="inline field">
<div id="sign-social" class="text-center social-buttons"> <label></label>
{{template "ng/base/social" .}} {{template "base/social" .}}
</div> </div>
{{end}} {{end}}
</div> </div>
</form> </form>
</div> </div>
{{template "ng/base/footer" .}} </div>
</div>
{{template "base/footer" .}}

Write Preview
Loading…
Cancel
Save