UI fix

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 2d69b48df568c451925095656f104af77848c540..1c7c60c7b3d6dbe2e80604b9c560ce8cc6ca440f 100644 (file)
--- 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 2022361f82e6e816957d41299ac4779e413a32f6..957d9b4dc26cfeb3edb92104dbdd4a5686c3be2d 100644 (file)
--- 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 6f32b747a22ee6abe654b66879df159f9ecc51d4..b94cf0e0029239b8e4e2723557effa8d54910e00 100644 (file)
--- 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 52f6c6554f75171147b31705ad861d0767901958..233f7b1063bb71c744180c90bce8f7f06bfdd8c1 100644 (file)
--- 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 644fd838867f667909ad42bc5b993ef4d0c9a1a7..7c385c1349aa97f1da0025cd9e9881a9883904a7 100644 (file)
--- 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 80d948662cdb0e047aec3fad8f25651e70121a63..4a681994de99054e4bb74705f83852d999936280 100644 (file)
--- 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 e53dedcbf44e429e813f1a70739930cfe83c5a35..8d423d667cd02a800532e225461eaa6bbc2e75e3 100644 (file)
--- 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 2015884f457c3334a7c321369031b470ff781210..d6d9251947180d47547afa7e1c01fdf63ae5bc3c 100644 (file)
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -11,8 +11,8 @@
        <p class="desc">{{if .Team.Description}}{{.Team.Description}}{{else}}{{.i18n.Tr "org.teams.no_desc"}}{{end}}</p>
        <hr>
        <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 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}}"><span class="octicon octicon-person"></span> <strong>{{.Team.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</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>
        <p class="desc">
                {{if eq .Team.LowerName "owners"}}

diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 3fff0748426d2cb030619c0fee66124464ace350..663d8bdb0511b9fa0a1488e187ba763a4cfe2152 100644 (file)
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -14,6 +14,10 @@
                         <form class="form form-align panel-body" id="user-profile-form" action="/user/settings" method="post">
                             {{.CsrfTokenHtml}}
                                <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">
                                 <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 />