diff --git a/conf/wide.json b/conf/wide.json index 6376b83..bc97fbb 100644 --- a/conf/wide.json +++ b/conf/wide.json @@ -17,10 +17,7 @@ "Password": "admin", "Workspace": "{pwd}/data/user_workspaces/admin", "LatestSessionContent": { - "FileTree": [ - "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest", - "E:\\Work\\go\\src\\github.com\\b3log\\wide\\data\\user_workspaces\\admin\\src\\mytest\\hello" - ], + "FileTree": [], "Files": [], "CurrentFile": "" } diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json index 7478b7a..f805294 100644 --- a/i18n/zh_CN.json +++ b/i18n/zh_CN.json @@ -5,6 +5,7 @@ "file": "文件", "login": "登录", "username": "用户名", + "current_user": "当前用户", "password": "密码", "login_failed": "登录失败", "run": "运行", @@ -56,5 +57,6 @@ "confirm_save": "请确认所有文件已保存", "workspace": "工作空间", "project_address": "项目地址", - "community": "社区" + "community": "社区", + "colon": ":" } diff --git a/main.go b/main.go index 1be85a3..a50efa6 100644 --- a/main.go +++ b/main.go @@ -186,9 +186,10 @@ func startHandler(w http.ResponseWriter, r *http.Request) { httpSession.Save(r, w) username := httpSession.Values["username"].(string) + userWorkspace := conf.Wide.GetUserWorkspace(username) model := map[string]interface{}{"conf": conf.Wide, "i18n": i18n.GetAll(r), "locale": i18n.GetLocale(r), - "username": username, "ver": Ver} + "username": username, "workspace": userWorkspace, "ver": Ver} t, err := template.ParseFiles("view/start.html") diff --git a/view/start.html b/view/start.html index 73f5dbc..6b1742c 100644 --- a/view/start.html +++ b/view/start.html @@ -2,30 +2,28 @@