more on change avatar

diff --git a/cmd/serve.go b/cmd/serve.go
index 15d48dcbfe41349d5a85770e0d1bed9c75047a11..239096234202ef6c9dc4027a27208e17e63c67f6 100644 (file)
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -164,7 +164,7 @@ func runServ(k *cli.Context) {
                        log.GitLogger.Fatal(2, "User %s has no right to read repository %s", user.Name, repoPath)
                }
        default:
-               println("Unknown command")
+               println("Unknown command: " + cmd)
                return
        }
 

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 6334966602ae3afd26dedc46ae2774984193f1f7..f82e834c2e78db2ed151dba7aae6b18e75402c1d 100644 (file)
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -202,10 +202,13 @@ change_username = Username Changed
 change_username_desc = Username has been changed, do you want to continue? This will affect all links relate to your account.
 continue = Continue
 cancel = Cancel
+
+enable_custom_avatar = Enable Custom Avatar
+enable_custom_avatar_helper = Enable this to disable fetch from Gravatar
 choose_new_avatar = Choose new avatar
-upload_avatar = Upload Avatar
-uploaded_avatar_not_a_image = Uploaded file is not a image
-upload_avatar_success = Your new avatar has been uploaded successfully.
+update_avatar = Update Avatar Setting
+uploaded_avatar_not_a_image = Uploaded file is not a image.
+update_avatar_success = Your avatar setting has been updated successfully.
 
 change_password = Change Password
 old_password = Current Password

diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 02cf77c5c97f3347bc7916b4a2096db0fe60202e..09030a387f1588590cfd8360a6a68bdca01b5ec9 100755 (executable)
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -173,6 +173,7 @@ target_branch_not_exist=目标分支不存在。
 \r
 [user]\r
 change_avatar=到 gravatar.com 上修改您的头像\r
+change_custom_avatar=到个人设置中修改头像\r
 join_on=加入于\r
 repositories=仓库列表\r
 activity=公开活动\r
@@ -202,6 +203,13 @@ change_username_desc=用户名被修改，您确定要继续操作吗？这将
 continue=继续操作\r
 cancel=取消操作\r
 \r
+enable_custom_avatar=启动自定义头像\r
+enable_custom_avatar_helper=激活该选项来禁止从 Gravatar 获取头像\r
+choose_new_avatar=选择新的头像\r
+update_avatar=更新头像设置\r
+uploaded_avatar_not_a_image=上传的文件不是一张图片！\r
+update_avatar_success=您的头像设置更新成功！\r
+\r
 change_password=修改密码\r
 old_password=当前密码\r
 new_password=新的密码\r

diff --git a/models/user.go b/models/user.go
index 1337ca23509a2bbc01744469f8724ebc28cc343b..c68ae31067fc531047fac4687dad913f69c3389b 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -163,6 +163,7 @@ func (u *User) UploadAvatar(data []byte) error {
                return err
        }
 
+       os.MkdirAll(setting.AvatarUploadPath, os.ModePerm)
        fw, err := os.Create(savePath)
        if err != nil {
                sess.Rollback()

diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go
index afdd8be0c94ebd0b28b6f52a13031bd966189524..4dfe2499f190dad81932f6488ba5573402594fc4 100644 (file)
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -89,7 +89,8 @@ func (f *UpdateProfileForm) Validate(ctx *macaron.Context, errs binding.Errors)
 }
 
 type UploadAvatarForm struct {
-       Avatar *multipart.FileHeader `form:"avatar" binding:"Required"`
+       Enable bool                  `form:"enable"`
+       Avatar *multipart.FileHeader `form:"avatar"`
 }
 
 func (f *UploadAvatarForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 49bd11c4c25270de0760cf8bc340ce73f5839b7b..cf34c2edc63926bc6ebd39992294d2a2db028fd1 100644 (file)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -20,7 +20,7 @@ import (
        "github.com/macaron-contrib/session"
 
        "github.com/gogits/gogs/modules/log"
-       // "github.com/gogits/gogs-ng/modules/ssh"
+       // "github.com/gogits/gogs/modules/ssh"
 )
 
 type Scheme string
@@ -488,5 +488,5 @@ func NewServices() {
        newRegisterMailService()
        newNotifyMailService()
        newWebhookService()
-       // ssh.Listen("2022")
+       // ssh.Listen("2222")
 }

diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go
index 814a3dd1f4acf01fdb05fabdd447fc9dd5e1ac92..26169e0f3d33901efabe09c3cec5a2ae2e2cdb27 100644 (file)
--- a/modules/ssh/ssh.go
+++ b/modules/ssh/ssh.go
@@ -13,9 +13,8 @@ import (
        "os/exec"
        "strings"
 
-       "code.google.com/p/go.crypto/ssh"
-
        "github.com/Unknwon/com"
+       "golang.org/x/crypto/ssh"
 
        "github.com/gogits/gogs/modules/log"
 )
@@ -35,8 +34,11 @@ func handleServerConn(keyId string, chans <-chan ssh.NewChannel) {
                go func(in <-chan *ssh.Request) {
                        defer channel.Close()
                        for req := range in {
-                               ok, payload := false, strings.TrimLeft(string(req.Payload), "\x00")
+                               ok, payload := false, strings.TrimLeft(string(req.Payload), "\x00&")
                                fmt.Println("Request:", req.Type, req.WantReply, payload)
+                               if req.WantReply {
+                                       fmt.Println(req.Reply(true, nil))
+                               }
                                switch req.Type {
                                case "env":
                                        args := strings.Split(strings.Replace(payload, "\x00", "", -1), "\v")
@@ -54,7 +56,7 @@ func handleServerConn(keyId string, chans <-chan ssh.NewChannel) {
                                case "exec":
                                        os.Setenv("SSH_ORIGINAL_COMMAND", strings.TrimLeft(payload, "'("))
                                        log.Info("Payload: %v", strings.TrimLeft(payload, "'("))
-                                       cmd := exec.Command("/Users/jiahuachen/Applications/Go/src/github.com/gogits/gogs-ng/gogs-ng", "serv", "key-"+keyId)
+                                       cmd := exec.Command("/Users/jiahuachen/Applications/Go/src/github.com/gogits/gogs/gogs", "serv", "key-"+keyId)
                                        cmd.Stdout = channel
                                        cmd.Stdin = channel
                                        cmd.Stderr = channel.Stderr()
@@ -65,7 +67,6 @@ func handleServerConn(keyId string, chans <-chan ssh.NewChannel) {
                                        }
                                }
                                fmt.Println("Done:", ok)
-                               req.Reply(ok, nil) // BUG: Git on Mac seems not know this reply and hang?
                        }
                        fmt.Println("Done!!!")
                }(requests)
@@ -101,7 +102,7 @@ func Listen(port string) {
        config := &ssh.ServerConfig{
                PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
                        // keyCache[string(ssh.MarshalAuthorizedKey(key))] = 2
-                       return &ssh.Permissions{Extensions: map[string]string{"key-id": "2"}}, nil
+                       return &ssh.Permissions{Extensions: map[string]string{"key-id": "1"}}, nil
                },
        }
 

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 961ad6a8653519a1921ffdf14440258533c13ddc..1bb1e84ad14158b6751cf609e12a51e97480e282 100644 (file)
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -2414,5 +2414,5 @@ textarea#issue-add-content {
   border-bottom: 2px solid #D26911;
 }
 #profile-body {
-  margin-left: 10px;
+  margin-left: 20px;
 }

diff --git a/public/ng/less/gogs/profile.less b/public/ng/less/gogs/profile.less
index ae0a2b2201bec946afb78803d26dac87752386ed..1102ef7820357688153d7a5412e39eb8281ba47a 100644 (file)
--- a/public/ng/less/gogs/profile.less
+++ b/public/ng/less/gogs/profile.less
@@ -55,5 +55,5 @@
        }
 }
 #profile-body {
-       margin-left: 10px;
+       margin-left: 20px;
 }
\ No newline at end of file

diff --git a/routers/user/setting.go b/routers/user/setting.go
index 559e10fd89f1bfadfc14f7aa1e5a2fc2efd76856..7aeb349727e6aa67733071aa09c803418cb0d9c4 100644 (file)
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -88,6 +88,11 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
 func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) {
        defer ctx.Redirect(setting.AppSubUrl + "/user/settings")
 
+       ctx.User.UseCustomAvatar = form.Enable
+       if err := models.UpdateUser(ctx.User); err != nil {
+               ctx.Flash.Error(err.Error())
+       }
+
        if form.Avatar != nil {
                fr, err := form.Avatar.Open()
                if err != nil {
@@ -108,8 +113,8 @@ func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) {
                        ctx.Flash.Error(err.Error())
                        return
                }
-               ctx.Flash.Success(ctx.Tr("settings.upload_avatar_success"))
        }
+       ctx.Flash.Success(ctx.Tr("settings.update_avatar_success"))
 }
 
 func SettingsPassword(ctx *middleware.Context) {

diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 85db6f8951f26de6edfdc5db0b90d28f29a7ffa2..827586faead4521de5fe6147d6e8870880959c49 100644 (file)
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -58,13 +58,18 @@
                             <hr>
                             <form class="form form-align" id="user-profile-form" action="{{AppSubUrl}}/user/settings/avatar" method="post" enctype="multipart/form-data">
                                 {{.CsrfTokenHtml}}
+                                <div class="field">
+                                    <label for="enable">{{.i18n.Tr "settings.enable_custom_avatar"}}</label>
+                                    <input class="ipt-chk" id="enable" name="enable" type="checkbox" {{if .SignedUser.UseCustomAvatar}}checked{{end}} />
+                                    <span>{{.i18n.Tr "settings.enable_custom_avatar_helper"}}</span>
+                                </div>
                                 <div class="field">
                                     <label>{{.i18n.Tr "settings.choose_new_avatar"}}</label>
-                                    <input name="avatar" type="file" required />
+                                    <input name="avatar" type="file" />
                                 </div>
                                 <div class="field">
                                     <label></label>
-                                    <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "settings.upload_avatar"}}</button>
+                                    <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "settings.update_avatar"}}</button>
                                 </div>
                             </form>
                         </div>