Merge branch 'master' of github.com:gogits/gogs

.gitignore

@@ -4,3 +4,4 @@ gogs
 .DS_Store
 *.db
 *.log
+conf/custom.ini

conf/app.ini

@@ -3,7 +3,6 @@ RUN_USER = lunny
 
 [repository]
 ROOT = /Users/lunny/git/gogs-repositories
-ROOT_jiahuachen = /Users/jiahuachen/git/gogs-repositories
 
 [server]
 HTTP_ADDR = 
@@ -15,7 +14,6 @@ HOST =
 NAME = gogs
 USER = root
 PASSWD =
-PASSWD_jiahua = root
 
 [security]
 USER_PASSWD_SALT = !#@FDEWREWR&*(

models/models.go

@@ -7,7 +7,6 @@ package models
 import (
 	"fmt"
 	"os"
-	"os/user"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/lunny/xorm"
@@ -47,16 +46,7 @@ func setEngine() {
 	dbUser := base.Cfg.MustValue("database", "USER")
 	dbPwd := base.Cfg.MustValue("database", "PASSWD")
 
-	uname, err := user.Current()
-	if err != nil {
-		fmt.Printf("models.init -> fail to get user: %s\n", err)
-		os.Exit(2)
-	}
-
-	if uname.Username == "jiahuachen" {
-		dbPwd = base.Cfg.MustValue("database", "PASSWD_jiahua")
-	}
-
+	var err error
 	switch dbType {
 	case "mysql":
 		orm, err = xorm.NewEngine("mysql", fmt.Sprintf("%v:%v@%v/%v?charset=utf8",
@@ -83,9 +73,6 @@ func setEngine() {
 	//log.Trace("Initialized database -> %s", dbName)
 
 	RepoRootPath = base.Cfg.MustValue("repository", "ROOT")
-	if uname.Username == "jiahuachen" {
-		RepoRootPath = base.Cfg.MustValue("repository", "ROOT_jiahuachen")
-	}
 }
 
 func init() {

modules/base/conf.go

@@ -11,6 +11,7 @@ import (
 	"path"
 	"path/filepath"
 
+	"github.com/Unknwon/com"
 	"github.com/Unknwon/goconfig"
 )
 
@@ -36,11 +37,20 @@ func init() {
 		os.Exit(2)
 	}
 
-	cfgPath := filepath.Join(workDir, "conf", "app.ini")
+	cfgPathPrefix := filepath.Join(workDir, "conf")
+	cfgPath := filepath.Join(cfgPathPrefix, "app.ini")
 	Cfg, err = goconfig.LoadConfigFile(cfgPath)
 	if err != nil {
 		fmt.Printf("Cannot load config file '%s'\n", cfgPath)
 		os.Exit(2)
 	}
+
+	cfgPath = filepath.Join(cfgPathPrefix, "custom.ini")
+	if com.IsFile(cfgPath) {
+		if err = Cfg.AppendFiles(cfgPath); err != nil {
+			fmt.Printf("Cannot load config file '%s'\n", cfgPath)
+			os.Exit(2)
+		}
+	}
 	Cfg.BlockMode = false
 }

public/css/gogs.css

@@ -234,7 +234,7 @@ body {
 
 /* gogits user setting */
 
-#gogs-user-setting-nav > h4, #gogs-user-setting-container > h4 ,#gogs-ssh-keys > h4{
+#gogs-user-setting-nav > h4, #gogs-user-setting-container > h4, #gogs-ssh-keys > h4, #gogs-user-delete > h4 {
     padding-bottom: 18px;
     margin-bottom: 18px;
     border-bottom: 1px solid #CCC;

public/js/app.js

@@ -104,7 +104,7 @@ function initUserSetting(){
         var $this = $(this);
         Gogits.ajaxDelete("",{"id":$this.data("del")},function(json){
             if(json.ok){
-                $this.parent().remove();
+                window.location.reload();
             }else{
                 alert(json.err);
             }

routers/user/setting.go

@@ -56,6 +56,7 @@ func SettingSSHKeys(form auth.AddSSHKeyForm, r render.Render, data base.TmplData
 				"ok": true,
 			})
 		}
+		return
 	}
 
 	// Add new SSH key.

routers/user/user.go

@@ -134,7 +134,7 @@ func SignUp(form auth.RegisterForm, data base.TmplData, req *http.Request, r ren
 
 // TODO: unfinished
 func Delete(data base.TmplData, req *http.Request, r render.Render) {
-	data["Title"] = "Delete user"
+	data["Title"] = "Delete Account"
 
 	if req.Method == "GET" {
 		r.HTML(200, "user/delete", data)

templates/user/delete.tmpl

@@ -1,12 +1,34 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div class="container" id="gogs-body">
-	<form action="/user/delete" method="post" class="form-horizontal">
+<div id="gogs-body" class="container">
+    <div id="gogs-user-setting-nav" class="col-md-3">
+        <h4>Account Setting</h4>
+        <ul class="list-group">
+            <li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
+            <li class="list-group-item"><a href="#">Emails and Password</a></li>
+            <li class="list-group-item"><a href="#">Notifications</a></li>
+            <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
+            <li class="list-group-item"><a href="#">Security</a></li>
+            <li class="list-group-item list-group-item-success"><a href="/user/delete">Delete Account</a></li>
+        </ul>
+    </div>
+    <div id="gogs-user-setting-container" class="col-md-9">
+        <form action="/user/delete" method="post" class="form-horizontal" id="gogs-user-delete">
+            <h4>Delete Account</h4>
+            <p class="alert alert-danger">Deleting your account is permanent. Sorry to see you go, if you have any feedback you can contact us.</p>
             <div class="form-group">
-		    <div class="col-md-offset-4 col-md-3">
-		    	<button type="submit" class="btn btn-danger">Delete user</button>
+                <div class="col-md-3">
+                    <button type="submit" class="btn btn-danger btn-lg">Delete Account</button>
                 </div>
             </div>
         </form>
     </div>
+</div>
+<script>
+    $(function(){
+       $('#gogs-user-delete').on('submit',function(){
+           return confirm("Are you sure ?");
+       })
+    });
+</script>
 {{template "base/footer" .}}

templates/user/publickey.tmpl

@@ -9,7 +9,7 @@
             <li class="list-group-item"><a href="#">Notifications</a></li>
             <li class="list-group-item list-group-item-success"><a href="/user/setting/ssh/">SSH Keys</a></li>
             <li class="list-group-item"><a href="#">Security</a></li>
-            <li class="list-group-item"><a href="#">Kill Myself</a></li>
+            <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
         </ul>
     </div>
 

templates/user/setting.tmpl

@@ -9,7 +9,7 @@
             <li class="list-group-item"><a href="#">Notifications</a></li>
             <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
             <li class="list-group-item"><a href="#">Security</a></li>
-            <li class="list-group-item"><a href="#">Kill Myself</a></li>
+            <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
         </ul>
     </div>
     <div id="gogs-user-setting-container" class="col-md-9">