From b9560374cd9d06b9009eb48ef0f0cefe04a4daed Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 13 Sep 2014 22:12:11 -0400 Subject: [PATCH] UI fix --- conf/locale/locale_en-US.ini | 1 + conf/locale/locale_zh-CN.ini | 1 + gogs.go | 2 +- modules/auth/repo_form.go | 2 +- public/ng/css/ui.css | 3 +++ public/ng/less/ui/form.less | 17 ++++++++++------- templates/.VERSION | 2 +- templates/org/team/sidebar.tmpl | 4 ++-- templates/user/settings/profile.tmpl | 4 ++++ 9 files changed, 24 insertions(+), 12 deletions(-) diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 2d69b48df5..1c7c60c7b3 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -173,6 +173,7 @@ ssh_keys = SSH Keys social = Social Accounts orgs = Organizations delete = Delete Account +uid = Uid 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. diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 2022361f82..957d9b4dc2 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -173,6 +173,7 @@ ssh_keys = 管理 SSH 密钥 social = 社交帐号绑定 orgs = 管理组织 delete = 删除帐户 +uid = 用户 ID public_profile = 公开信息 profile_desc = 您的邮箱地址将会被公开，并被用于接收帐户的所有提醒和通知。 diff --git a/gogs.go b/gogs.go index 6f32b747a2..b94cf0e002 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.0.0912 Beta" +const APP_VER = "0.5.0.0913 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 52f6c6554f..233f7b1063 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -33,7 +33,7 @@ func (f *CreateRepoForm) Validate(ctx *macaron.Context, errs *binding.Errors, l } type MigrateRepoForm struct { - HttpsUrl string `form:"url" binding:"Url"` + HttpsUrl string `form:"url" binding:"Required;Url"` AuthUserName string `form:"auth_username"` AuthPasswd string `form:"auth_password"` Uid int64 `form:"uid" binding:"Required"` diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css index 644fd83886..7c385c1349 100644 --- a/public/ng/css/ui.css +++ b/public/ng/css/ui.css @@ -525,6 +525,9 @@ input[readonly]:focus { .form-align .field { margin-bottom: 1em; } +label.text-left { + text-align: left; +} label.req:after { content: "*"; color: #d9453d; diff --git a/public/ng/less/ui/form.less b/public/ng/less/ui/form.less index 80d948662c..4a681994de 100644 --- a/public/ng/less/ui/form.less +++ b/public/ng/less/ui/form.less @@ -176,7 +176,6 @@ input[readonly] { margin-bottom: 1em; } } - .form-align { label, .form-label { @@ -189,10 +188,14 @@ input[readonly] { margin-bottom: 1em; } } - -label.req { - &:after { - content: "*"; - color: @labelRedColor; - } +label { + &.text-left { + text-align: left; + } + &.req { + &:after { + content: "*"; + color: @labelRedColor; + } + } } \ No newline at end of file diff --git a/templates/.VERSION b/templates/.VERSION index e53dedcbf4..8d423d667c 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.0.0912 Beta \ No newline at end of file +0.5.0.0913 Beta \ No newline at end of file diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 2015884f45..d6d9251947 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -11,8 +11,8 @@

{{if .Team.Description}}{{.Team.Description}}{{else}}{{.i18n.Tr "org.teams.no_desc"}}{{end}}

- {{.Team.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · - {{.Team.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}} + {{.Team.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · + {{.Team.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

{{if eq .Team.LowerName "owners"}} diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 3fff074842..663d8bdb05 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -14,6 +14,10 @@

{{.CsrfTokenHtml}}
{{.i18n.Tr "settings.profile_desc"}}
+
+ + +