diff options
| author | Unknwon <u@gogs.io> | 2015-04-24 05:21:10 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-04-24 05:21:10 -0400 |
| commit | c08baee0855807d24a1b86adfcea86d0731e2a3a (patch) | |
| tree | c033d0fd4a4c4104b0b6304ec9f2a26c6047ce10 /templates | |
| parent | 7a7c096fd09035f759168800402389457648f47e (diff) | |
| parent | f92bdf875b4ccb2a8eadaa571d112ebf653986d6 (diff) | |
Merge branch 'develop' of github.com:gogits/gogs into develop
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 6 | ||||
| -rw-r--r-- | templates/admin/auth/new.tmpl | 6 | ||||
| -rw-r--r-- | templates/explore/repos.tmpl | 34 | ||||
| -rw-r--r-- | templates/user/auth/signin.tmpl | 7 |
4 files changed, 34 insertions, 19 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index a178b717..12d1d1f8 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -91,6 +91,12 @@ <label class="req" for="smtp_port">{{.i18n.Tr "admin.auths.smtpport"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtp_port" name="smtp_port" value="{{.Source.SMTP.Port}}" /> </div> + + {{else if eq $type 4}} + <div class="field"> + <label class="req" for="pam_service_name">{{.i18n.Tr "admin.auths.pam_service_name"}}</label> + <input class="ipt ipt-large ipt-radius {{if .Err_PAMServiceName}}ipt-error{{end}}" id="pam_service_name" name="pam_service_name" value="{{.Source.PAM.ServiceName}}" /> + </div> {{end}} <div class="field"> diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 0d1f2ab4..36b90cfb 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -86,6 +86,12 @@ <input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtp_port" name="smtp_port" value="{{.smtp_port}}" /> </div> </div> + <div class="pam hidden"> + <div class="field"> + <label class="req" for="pam_service_name">{{.i18n.Tr "admin.auths.pam_service_name"}}</label> + <input class="ipt ipt-large ipt-radius {{if .Err_PAMServiceName}}ipt-error{{end}}" id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}" /> + </div> + </div> <div class="field"> <div class="smtp hidden"> <label></label> diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl index 954d0b06..1e0143f5 100644 --- a/templates/explore/repos.tmpl +++ b/templates/explore/repos.tmpl @@ -2,24 +2,26 @@ {{template "ng/base/header" .}} <div id="setting-wrapper" class="main-wrapper"> <div id="org-setting" class="container clear"> - {{template "explore/nav" .}} + {{template "explore/nav" .}} <div class="grid-4-5 left"> <div class="setting-content"> - <div id="org-repo-list"> - {{range .Repos}} - <div class="org-repo-item"> - <ul class="org-repo-status right"> - <li><i class="octicon octicon-star"></i> {{.NumStars}}</li> - <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li> - </ul> - <h2><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></h2> - <p class="org-repo-description">{{.Description}}</p> - <p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> - </div> - {{end}} - </div> - </div> + <div id="org-repo-list"> + {{range .Repos}} + <div class="org-repo-item"> + <ul class="org-repo-status right"> + <li><i class="octicon octicon-star"></i> {{.NumStars}}</li> + <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li> + </ul> + <h2> + <a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Owner.Name}} / {{.Name}}</a> + </h2> + <p class="org-repo-description">{{.Description}}</p> + <p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> + </div> + {{end}} + </div> + </div> </div> </div> </div> -{{template "ng/base/footer" .}}
\ No newline at end of file +{{template "ng/base/footer" .}} diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl index 455df63a..bc0b0f2d 100644 --- a/templates/user/auth/signin.tmpl +++ b/templates/user/auth/signin.tmpl @@ -17,8 +17,9 @@ </div> {{if not .IsSocialLogin}} <div class="field"> - <span class="form-label"></span> - <input class="ipt-chk" id="remember" name="remember" type="checkbox"/> <strong>{{.i18n.Tr "auth.remember_me"}}</strong> + <label class="chk-label"> + <input class="ipt-chk" id="remember" name="remember" type="checkbox"/> <strong>{{.i18n.Tr "auth.remember_me"}}</strong> + </label> </div> {{end}} <div class="field"> @@ -41,4 +42,4 @@ </div> </form> </div> -{{template "ng/base/footer" .}}
\ No newline at end of file +{{template "ng/base/footer" .}} |