coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UI fix

This commit is contained in:
Unknwon 2014-09-13 22:12:11 -04:00
parent a5926f2689
commit b9560374cd
9 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/locale/locale_en-US.ini
View File

@ -173,6 +173,7 @@ ssh_keys = SSH Keys
social = Social Accounts social = Social Accounts
orgs = Organizations orgs = Organizations
delete = Delete Account delete = Delete Account
uid = Uid
public_profile = Public Profile public_profile = Public Profile
profile_desc = Your Email address is public and will be used for any account related notifications, and any web based operations made via the site. profile_desc = Your Email address is public and will be used for any account related notifications, and any web based operations made via the site.

1
conf/locale/locale_zh-CN.ini
View File

@ -173,6 +173,7 @@ ssh_keys = 管理 SSH 密钥
social = 社交帐号绑定 social = 社交帐号绑定
orgs = 管理组织 orgs = 管理组织
delete = 删除帐户 delete = 删除帐户
uid = 用户 ID
public_profile = 公开信息 public_profile = 公开信息
profile_desc = 您的邮箱地址将会被公开，并被用于接收帐户的所有提醒和通知。 profile_desc = 您的邮箱地址将会被公开，并被用于接收帐户的所有提醒和通知。

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.5.0.0912 Beta" const APP_VER = "0.5.0.0913 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
modules/auth/repo_form.go
View File

@ -33,7 +33,7 @@ func (f *CreateRepoForm) Validate(ctx *macaron.Context, errs *binding.Errors, l
} }
type MigrateRepoForm struct { type MigrateRepoForm struct {
HttpsUrl string `form:"url" binding:"Url"` HttpsUrl string `form:"url" binding:"Required;Url"`
AuthUserName string `form:"auth_username"` AuthUserName string `form:"auth_username"`
AuthPasswd string `form:"auth_password"` AuthPasswd string `form:"auth_password"`
Uid int64 `form:"uid" binding:"Required"` Uid int64 `form:"uid" binding:"Required"`

3
public/ng/css/ui.css
View File

@ -525,6 +525,9 @@ input[readonly]:focus {
.form-align .field { .form-align .field {
margin-bottom: 1em; margin-bottom: 1em;
} }
label.text-left {
text-align: left;
}
label.req:after { label.req:after {
content: "*"; content: "*";
color: #d9453d; color: #d9453d;

9
public/ng/less/ui/form.less
View File

@ -176,7 +176,6 @@ input[readonly] {
margin-bottom: 1em; margin-bottom: 1em;
} }
} }
.form-align { .form-align {
label, label,
.form-label { .form-label {
@ -189,10 +188,14 @@ input[readonly] {
margin-bottom: 1em; margin-bottom: 1em;
} }
} }
label {
label.req { &.text-left {
text-align: left;
}
&.req {
&:after { &:after {
content: "*"; content: "*";
color: @labelRedColor; color: @labelRedColor;
} }
} }
}

2
templates/.VERSION
View File

@ -1 +1 @@
0.5.0.0912 Beta 0.5.0.0913 Beta

4
templates/org/team/sidebar.tmpl
View File

@ -11,8 +11,8 @@
<p class="desc">{{if .Team.Description}}{{.Team.Description}}{{else}}{{.i18n.Tr "org.teams.no_desc"}}{{end}}</p> <p class="desc">{{if .Team.Description}}{{.Team.Description}}{{else}}{{.i18n.Tr "org.teams.no_desc"}}{{end}}</p>
<hr> <hr>
<div class="team-stats"> <div class="team-stats">
<a class="text-black" href="{{.OrgLink}}/teams/{{.Team.LowerName}}"><span class="octicon octicon-person"></span> <strong>{{.Team.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> · <a href="{{.OrgLink}}/teams/{{.Team.LowerName}}"><span class="octicon octicon-person"></span> <strong>{{.Team.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
<a class="text-black" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/repositories"><span class="octicon octicon-repo"></span> <strong>{{.Team.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a> <a href="{{.OrgLink}}/teams/{{.Team.LowerName}}/repositories"><span class="octicon octicon-repo"></span> <strong>{{.Team.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
</div> </div>
<p class="desc"> <p class="desc">
{{if eq .Team.LowerName "owners"}} {{if eq .Team.LowerName "owners"}}

4
templates/user/settings/profile.tmpl
View File

@ -14,6 +14,10 @@
<form class="form form-align panel-body" id="user-profile-form" action="/user/settings" method="post"> <form class="form form-align panel-body" id="user-profile-form" action="/user/settings" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="text-center panel-desc">{{.i18n.Tr "settings.profile_desc"}}</div> <div class="text-center panel-desc">{{.i18n.Tr "settings.profile_desc"}}</div>
<div class="field">
<label>{{.i18n.Tr "settings.uid"}}</label>
<label class="text-left">{{.SignedUser.Id}}</label>
</div>
<div class="field"> <div class="field">
<label class="req" for="username">{{.i18n.Tr "username"}}</label> <label class="req" for="username">{{.i18n.Tr "username"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.SignedUser.Name}}" data-uname="{{.SignedUser.Name}}" required /> <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.SignedUser.Name}}" data-uname="{{.SignedUser.Name}}" required />