diff --git a/README.md b/README.md index 286a2b0d..1cbd48d2 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,11 @@ go build -ldflags "-w" -o mindoc main.go bee run ``` +## 旧版本运行 可更新部分数据库配置 +```base +./mindoc update +``` + MinDoc 如果使用MySQL储存数据，则编码必须是`utf8mb4_general_ci`。请在安装前，把数据库配置填充到项目目录下的 `conf/app.conf` 中。 如果使用 `SQLite` 数据库，则直接在配置文件中配置数据库路径即可. @@ -189,39 +194,44 @@ docker run -p 8181:8181 --name mindoc -e DB_ADAPTER=mysql -e MYSQL_PORT_3306_TCP **创建项目** -![创建项目](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501204438.png) +![创建项目](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/create.png?raw=true) **项目列表** -![项目列表](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501203542.png) +![项目列表](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/project_list.png?raw=true) **项目概述** -![项目概述](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501203619.png) +![项目概述](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/intro.png?raw=true) **项目成员** -![项目成员](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501203637.png) +![项目成员](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/member.png?raw=true) **项目设置** -![项目设置](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501203656.png) +![项目设置](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/project_setting.png?raw=true) **基于Editor.md开发的Markdown编辑器** -![基于Editor.md开发的Markdown编辑器](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501203854.png) +![基于Editor.md开发的Markdown编辑器](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/editor_md.png?raw=true) **基于wangEditor开发的富文本编辑器** -![基于wangEditor开发的富文本编辑器](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501204651.png) +![基于wangEditor开发的富文本编辑器](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/wang_editor.png?raw=true) + + +**基于cherryMarkdown开发的编辑器** + +![基于cherry-markdown开发的编辑器](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/cheery-markdown.png?raw=true) **项目预览** -![项目预览](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501204609.png) +![项目预览](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/preview.png?raw=true) **超级管理员后台** -![超级管理员后台](https://raw.githubusercontent.com/lifei6671/mindoc/master/uploads/20170501204710.png) +![超级管理员后台](https://github.com/mindoc-org/mindoc/blob/master/uploads/docs/admin.png?raw=true) # 使用的技术(TODO: 最新技术栈整理中，使用的第三方库升级中) @@ -229,6 +239,7 @@ docker run -p 8181:8181 --name mindoc -e DB_ADAPTER=mysql -e MYSQL_PORT_3306_TCP - [Beego](https://github.com/beego/beego) ~~1.10.0~~ - MySQL 5.6 - [editor.md](https://github.com/pandao/editor.md) Markdown 编辑器 +- [cherry-markdown](https://github.com/Tencent/cherry-markdown) Cherry Markdown Writer - [Bootstrap](https://github.com/twbs/bootstrap) 3.2 - [jQuery](https://github.com/jquery/jquery) 库 - [WebUploader](https://github.com/fex-team/webuploader) 文件上传框架 @@ -250,13 +261,13 @@ docker run -p 8181:8181 --name mindoc -e DB_ADAPTER=mysql -e MYSQL_PORT_3306_TCP # 主要功能 -- 项目管理，可以对项目进行编辑更改，成员添加等。 +- 项目管理，可以对项目进行编辑更改，成员添加, 项目排序等。 - 文档管理，添加和删除文档等。 - 评论管理，可以管理文档评论和自己发布的评论。 - 用户管理，添加和禁用用户，个人资料更改等。 - 用户权限管理 ， 实现用户角色的变更。 - 项目加密，可以设置项目公开状态，私有项目需要通过Token访问。 -- 站点配置，可开启匿名访问、验证码等。 +- 站点配置，多语言切换, 可开启匿名访问、验证码等。 # 参与开发 diff --git a/commands/command.go b/commands/command.go index 63a01a2a..dbe2b9c9 100644 --- a/commands/command.go +++ b/commands/command.go @@ -143,6 +143,11 @@ func RegisterModel() { gob.Register(models.Document{}) gob.Register(models.Template{}) //migrate.RegisterMigration() + err := orm.RunSyncdb("default", false, true) + if err != nil { + logs.Error("注册Model失败 ->", err) + os.Exit(1) + } } // RegisterLogger 注册日志 @@ -229,6 +234,9 @@ func RegisterCommand() { } else if len(os.Args) >= 2 && os.Args[1] == "version" { CheckUpdate() os.Exit(0) + } else if len(os.Args) >= 2 && os.Args[1] == "update" { + Update() + os.Exit(0) } } diff --git a/commands/update.go b/commands/update.go index 205d39cb..ae2f99e6 100644 --- a/commands/update.go +++ b/commands/update.go @@ -3,15 +3,17 @@ package commands import ( "encoding/json" "fmt" + "github.com/mindoc-org/mindoc/models" "io/ioutil" "net/http" "os" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" ) -//检查最新版本. +// 检查最新版本. func CheckUpdate() { fmt.Println("MinDoc current version => ", conf.VERSION) @@ -47,3 +49,23 @@ func CheckUpdate() { os.Exit(0) } + +func Update() { + fmt.Println("Update...") + RegisterDataBase() + RegisterModel() + err := orm.RunSyncdb("default", false, true) + if err == nil { + UpdateInitialization() + } else { + panic(err.Error()) + } + fmt.Println("Update Successfully!") + os.Exit(0) +} +func UpdateInitialization() { + err := models.NewOption().Update() + if err != nil { + panic(err.Error()) + } +} diff --git a/conf/lang/en-us.ini b/conf/lang/en-us.ini index 04d9da11..b5935cb6 100644 --- a/conf/lang/en-us.ini +++ b/conf/lang/en-us.ini @@ -318,6 +318,7 @@ next = next no = no edit_title = Edit Blog private_blog_tips = Private blog, please enter password to access +print_text = Enable Printing [doc] modify_doc = Modify Document @@ -501,6 +502,9 @@ edit_user = Edit User pwd_tips = Please leave it blank if you do not change the password, only local users can change the password [mgr] +language = Default Language +zh_cn = 简体中文 +en_us = English dashboard_menu = Dashboard user_menu = User team_menu = Team diff --git a/conf/lang/zh-cn.ini b/conf/lang/zh-cn.ini index 0dd2e254..d44b2c3c 100644 --- a/conf/lang/zh-cn.ini +++ b/conf/lang/zh-cn.ini @@ -318,6 +318,7 @@ next = 下一篇 no = 无 edit_title = 编辑文章 private_blog_tips = 加密文章，请输入密码访问 +print_text = 开启打印 [doc] modify_doc = 修改文档 @@ -501,6 +502,9 @@ edit_user = 编辑用户 pwd_tips = 不修改密码请留空,只支持本地用户修改密码 [mgr] +language = 默认语言 +zh_cn = 简体中文 +en_us = English dashboard_menu = 仪表盘 user_menu = 用户管理 team_menu = 团队管理 diff --git a/controllers/BaseController.go b/controllers/BaseController.go index 4d7d27dc..0b8451d1 100644 --- a/controllers/BaseController.go +++ b/controllers/BaseController.go @@ -83,7 +83,7 @@ func (c *BaseController) Prepare() { c.SetLang() } -//判断用户是否登录. +// 判断用户是否登录. func (c *BaseController) isUserLoggedIn() bool { return c.Member != nil && c.Member.MemberId > 0 } @@ -127,7 +127,7 @@ func (c *BaseController) JsonResult(errCode int, errMsg string, data ...interfac c.StopRun() } -//如果错误不为空，则响应错误信息到浏览器. +// 如果错误不为空，则响应错误信息到浏览器. func (c *BaseController) CheckJsonError(code int, err error) { if err == nil { @@ -182,7 +182,7 @@ func (c *BaseController) BaseUrl() string { return baseUrl } -//显示错误信息页面. +// 显示错误信息页面. func (c *BaseController) ShowErrorPage(errCode int, errMsg string) { c.TplName = "errors/error.tpl" @@ -217,7 +217,11 @@ func (c *BaseController) SetLang() { } if len(lang) == 0 || !i18n.IsExist(lang) { - lang, _ = web.AppConfig.String("default_lang") + if c.Data["language"] != nil { + lang = c.Data["language"].(string) + } else { + lang, _ = web.AppConfig.String("default_lang") + } } if !hasCookie { c.Ctx.SetCookie("lang", lang, 1<<31-1, "/") diff --git a/controllers/BookController.go b/controllers/BookController.go index 095e82fb..f636dd0d 100644 --- a/controllers/BookController.go +++ b/controllers/BookController.go @@ -122,6 +122,7 @@ func (c *BookController) Setting() { if book.PrivateToken != "" { book.PrivateToken = conf.URLFor("DocumentController.Index", ":key", book.Identify, "token", book.PrivateToken) } + c.Data["Model"] = book } @@ -153,6 +154,7 @@ func (c *BookController) SaveBook() { isUseFirstDocument := strings.TrimSpace(c.GetString("is_use_first_document")) == "on" autoSave := strings.TrimSpace(c.GetString("auto_save")) == "on" itemId, _ := c.GetInt("itemId") + pringState := strings.TrimSpace(c.GetString("print_state")) == "on" if strings.Count(description, "") > 500 { c.JsonResult(6004, i18n.Tr(c.Lang, "message.project_desc_tips")) @@ -211,6 +213,11 @@ func (c *BookController) SaveBook() { } else { book.AutoSave = 0 } + if pringState { + book.PrintSate = 1 + } else { + book.PrintSate = 0 + } if err := book.Update(); err != nil { c.JsonResult(6006, i18n.Tr(c.Lang, "message.failed")) } @@ -456,6 +463,7 @@ func (c *BookController) Create() { description := strings.TrimSpace(c.GetString("description", "")) privatelyOwned, _ := strconv.Atoi(c.GetString("privately_owned")) commentStatus := c.GetString("comment_status") + editor := c.GetString("editor") itemId, _ := c.GetInt("itemId") if bookName == "" { @@ -522,6 +530,7 @@ func (c *BookController) Create() { book.CommentCount = 0 book.PrivatelyOwned = privatelyOwned book.CommentStatus = commentStatus + book.Identify = identify book.DocCount = 0 book.MemberId = c.Member.MemberId @@ -531,8 +540,7 @@ func (c *BookController) Create() { book.IsDownload = 1 book.AutoRelease = 0 book.ItemId = itemId - - book.Editor = "markdown" + book.Editor = editor book.Theme = "default" if err := book.Insert(c.Lang); err != nil { diff --git a/controllers/ManagerController.go b/controllers/ManagerController.go index 8a065775..3abc43d0 100644 --- a/controllers/ManagerController.go +++ b/controllers/ManagerController.go @@ -133,7 +133,7 @@ func (c *ManagerController) CreateMember() { c.JsonResult(0, "ok", member) } -//更新用户状态. +// 更新用户状态. func (c *ManagerController) UpdateMemberStatus() { c.Prepare() @@ -166,7 +166,7 @@ func (c *ManagerController) UpdateMemberStatus() { c.JsonResult(0, "ok", member) } -//变更用户权限. +// 变更用户权限. func (c *ManagerController) ChangeMemberRole() { c.Prepare() @@ -199,7 +199,7 @@ func (c *ManagerController) ChangeMemberRole() { c.JsonResult(0, "ok", member) } -//编辑用户信息. +// 编辑用户信息. func (c *ManagerController) EditMember() { c.Prepare() c.TplName = "manager/edit_users.tpl" @@ -251,7 +251,7 @@ func (c *ManagerController) EditMember() { c.Data["Model"] = member } -//删除一个用户，并将该用户的所有信息转移到超级管理员上. +// 删除一个用户，并将该用户的所有信息转移到超级管理员上. func (c *ManagerController) DeleteMember() { c.Prepare() member_id, _ := c.GetInt("id", 0) @@ -283,7 +283,7 @@ func (c *ManagerController) DeleteMember() { c.JsonResult(0, "ok") } -//项目列表. +// 项目列表. func (c *ManagerController) Books() { c.Prepare() c.TplName = "manager/books.tpl" @@ -313,7 +313,7 @@ func (c *ManagerController) Books() { c.Data["Lists"] = books } -//编辑项目. +// 编辑项目. func (c *ManagerController) EditBook() { c.Prepare() @@ -460,7 +460,7 @@ func (c *ManagerController) CreateToken() { } } -//项目设置. +// 项目设置. func (c *ManagerController) Setting() { c.Prepare() c.TplName = "manager/setting.tpl" @@ -541,7 +541,7 @@ func (c *ManagerController) Comments() { } -//DeleteComment 标记评论为已删除 +// DeleteComment 标记评论为已删除 func (c *ManagerController) DeleteComment() { c.Prepare() @@ -565,7 +565,7 @@ func (c *ManagerController) DeleteComment() { c.JsonResult(0, "ok", comment) } -//设置项目私有状态. +// 设置项目私有状态. func (c *ManagerController) PrivatelyOwned() { c.Prepare() status := c.GetString("status") @@ -603,7 +603,7 @@ func (c *ManagerController) PrivatelyOwned() { c.JsonResult(0, "ok") } -//附件列表. +// 附件列表. func (c *ManagerController) AttachList() { c.Prepare() c.TplName = "manager/attach_list.tpl" @@ -634,7 +634,7 @@ func (c *ManagerController) AttachList() { c.Data["Lists"] = attachList } -//附件清理. +// 附件清理. func (c *ManagerController) AttachClean() { c.Prepare() @@ -669,7 +669,7 @@ func (c *ManagerController) AttachClean() { c.JsonResult(0, "ok") } -//附件详情. +// 附件详情. func (c *ManagerController) AttachDetailed() { c.Prepare() c.TplName = "manager/attach_detailed.tpl" @@ -698,7 +698,7 @@ func (c *ManagerController) AttachDetailed() { c.Data["Model"] = attach } -//删除附件. +// 删除附件. func (c *ManagerController) AttachDelete() { c.Prepare() attachId, _ := c.GetInt("attach_id") @@ -721,7 +721,7 @@ func (c *ManagerController) AttachDelete() { c.JsonResult(0, "ok") } -//标签列表 +// 标签列表 func (c *ManagerController) LabelList() { c.Prepare() c.TplName = "manager/label_list.tpl" @@ -743,7 +743,7 @@ func (c *ManagerController) LabelList() { c.Data["Lists"] = labels } -//删除标签 +// 删除标签 func (c *ManagerController) LabelDelete() { labelId, err := strconv.Atoi(c.Ctx.Input.Param(":id")) if err != nil { @@ -936,7 +936,7 @@ func (c *ManagerController) TeamMemberList() { } } -//搜索团队用户. +// 搜索团队用户. func (c *ManagerController) TeamSearchMember() { c.Prepare() @@ -1015,7 +1015,7 @@ func (c *ManagerController) TeamChangeMemberRole() { } -//团队项目列表. +// 团队项目列表. func (c *ManagerController) TeamBookList() { c.Prepare() c.TplName = "manager/team_book_list.tpl" @@ -1062,7 +1062,7 @@ func (c *ManagerController) TeamBookList() { } } -//给团队增加项目. +// 给团队增加项目. func (c *ManagerController) TeamBookAdd() { c.Prepare() @@ -1086,7 +1086,7 @@ func (c *ManagerController) TeamBookAdd() { } } -//搜索未参与的项目. +// 搜索未参与的项目. func (c *ManagerController) TeamSearchBook() { c.Prepare() @@ -1106,7 +1106,7 @@ func (c *ManagerController) TeamSearchBook() { } -//删除团队项目. +// 删除团队项目. func (c *ManagerController) TeamBookDelete() { c.Prepare() teamRelationshipId, _ := c.GetInt("teamRelId") @@ -1123,7 +1123,7 @@ func (c *ManagerController) TeamBookDelete() { c.JsonResult(0, "OK") } -//项目空间列表. +// 项目空间列表. func (c *ManagerController) Itemsets() { c.Prepare() c.TplName = "manager/itemsets.tpl" @@ -1151,7 +1151,7 @@ func (c *ManagerController) Itemsets() { c.Data["Lists"] = items } -//编辑或添加项目空间. +// 编辑或添加项目空间. func (c *ManagerController) ItemsetsEdit() { c.Prepare() itemId, _ := c.GetInt("itemId") @@ -1186,7 +1186,7 @@ func (c *ManagerController) ItemsetsEdit() { c.JsonResult(0, "OK") } -//删除项目空间. +// 删除项目空间. func (c *ManagerController) ItemsetsDelete() { c.Prepare() itemId, _ := c.GetInt("itemId") diff --git a/models/BookModel.go b/models/BookModel.go index d46d2ff5..cfe7cfbc 100644 --- a/models/BookModel.go +++ b/models/BookModel.go @@ -82,7 +82,8 @@ type Book struct { //是否使用第一篇文章项目为默认首页,0 否/1 是 IsUseFirstDocument int `orm:"column(is_use_first_document);type(int);default(0);description(是否使用第一篇文章项目为默认首页,0 否/1 是)" json:"is_use_first_document"` //是否开启自动保存：0 否/1 是 - AutoSave int `orm:"column(auto_save);type(tinyint);default(0);description(是否开启自动保存：0 否/1 是)" json:"auto_save"` + AutoSave int `orm:"column(auto_save);type(tinyint);default(0);description(是否开启自动保存：0 否/1 是)" json:"auto_save"` + PrintSate int `orm:"column(print_state);type(tinyint);default(1);description(启用打印：0 否/1 是)" json:"print_state"` } func (book *Book) String() string { diff --git a/models/BookResult.go b/models/BookResult.go index 0ea535bc..de2ada58 100644 --- a/models/BookResult.go +++ b/models/BookResult.go @@ -71,6 +71,7 @@ type BookResult struct { IsDisplayComment bool `json:"is_display_comment"` IsDownload bool `json:"is_download"` AutoSave bool `json:"auto_save"` + PrintState bool `json:"print_state"` Lang string } @@ -213,6 +214,7 @@ func (m *BookResult) ToBookResult(book Book) *BookResult { m.HistoryCount = book.HistoryCount m.IsDownload = book.IsDownload == 0 m.AutoSave = book.AutoSave == 1 + m.PrintState = book.PrintSate == 1 m.ItemId = book.ItemId m.RoleId = conf.BookRoleNoSpecific diff --git a/models/Options.go b/models/Options.go index 8673b9ff..4c337767 100644 --- a/models/Options.go +++ b/models/Options.go @@ -164,5 +164,30 @@ func (m *Option) Init() error { } } + if !o.QueryTable(m.TableNameWithPrefix()).Filter("option_name", "language").Exist() { + option := NewOption() + option.OptionValue = "zh-cn" + option.OptionName = "language" + option.OptionTitle = "站点语言" + if _, err := o.Insert(option); err != nil { + return err + } + } + + return nil +} + +func (m *Option) Update() error { + o := orm.NewOrm() + + if !o.QueryTable(m.TableNameWithPrefix()).Filter("option_name", "language").Exist() { + option := NewOption() + option.OptionValue = "zh-cn" + option.OptionName = "language" + option.OptionTitle = "站点语言" + if _, err := o.Insert(option); err != nil { + return err + } + } return nil } diff --git a/static/cherry/cherry-markdown.css b/static/cherry/cherry-markdown.css index 88349c05..69be091e 100644 --- a/static/cherry/cherry-markdown.css +++ b/static/cherry/cherry-markdown.css @@ -2656,7 +2656,7 @@ div[data-type=codeBlock] .token.inserted { } .cherry[data-toolbar-theme=dark] .cherry-insert-table-menu-item.active { - background-color: #d7e6fe; + background-color: #4b4b4b; } .cherry-dropdown { @@ -2692,17 +2692,18 @@ div[data-type=codeBlock] .token.inserted { } [data-toolbar-theme=dark] .cherry-dropdown { - background: #20304b; + background: #ffffff; } [data-toolbar-theme=dark] .cherry-dropdown .cherry-dropdown-item { background: transparent; - color: #d7e6fe; + color: #4b4b4b; } [data-toolbar-theme=dark] .cherry-dropdown .cherry-dropdown-item:hover { - background: rgba(255, 255, 255, 0.1); - color: #fff; + background: #e4e4e4; + color: #0a001f; + transition: all .3s; } .cherry-toolbar { @@ -2710,7 +2711,7 @@ div[data-type=codeBlock] .token.inserted { display: flex; justify-content: space-between; padding: 0 20px; - height: 48px; + height: 34px; font-size: 16px; line-height: 2.3; flex-basis: 100%; @@ -2720,6 +2721,7 @@ div[data-type=codeBlock] .token.inserted { box-shadow: 0 0 10px rgba(128, 145, 165, 0.2); background: white; overflow: hidden; + align-items: center; } .cherry-toolbar .icon-loading.loading { @@ -2742,25 +2744,25 @@ div[data-type=codeBlock] .token.inserted { } [data-toolbar-theme=dark] .cherry-toolbar { - background: #20304b; + background: #ffffff; box-shadow: 0 0 10px rgba(128, 145, 165, 0.2); } [data-toolbar-theme=dark] .cherry-toolbar .cherry-toolbar-button { - color: #d7e6fe; + color: #4b4b4b; background: transparent; } [data-toolbar-theme=dark] .cherry-toolbar .cherry-toolbar-button:hover { - color: #fff; - background: rgba(255, 255, 255, 0.1); + color: #0a001f; + transition: all .3s; + background: #e4e4e4; } .cherry-toolbar .toolbar-left, .cherry-toolbar .toolbar-right { display: flex; align-items: center; - height: 48px; overflow: hidden; } @@ -2935,12 +2937,12 @@ div[data-type=codeBlock] .token.inserted { } [data-toolbar-theme=dark] .cherry-bubble { - border-color: #20304b; - background: #20304b; + border-color: #ffffff; + background: #ffffff; } [data-toolbar-theme=dark] .cherry-bubble .cherry-toolbar-button { - color: #d7e6fe; + color: #4b4b4b; background: transparent; } @@ -2950,15 +2952,15 @@ div[data-type=codeBlock] .token.inserted { } [data-toolbar-theme=dark] .cherry-bubble .cherry-bubble-top { - border-bottom-color: #20304b; + border-bottom-color: #ffffff; } [data-toolbar-theme=dark] .cherry-bubble .cherry-bubble-bottom { - border-top-color: #20304b; + border-top-color: #ffffff; } [data-toolbar-theme=dark] .cherry-bubble .cherry-toolbar-button:hover { - border-color: #20304b; + border-color: #ffffff; } .cherry-switch-paste .switch-btn--bg { @@ -3012,7 +3014,7 @@ div[data-type=codeBlock] .token.inserted { } [data-toolbar-theme=dark] .cherry-switch-paste[data-type=text] .cherry-text-btn { - color: #d7e6fe; + color: #4b4b4b; } [data-toolbar-theme=dark] .cherry-switch-paste[data-type=text] .cherry-md-btn { @@ -3020,7 +3022,7 @@ div[data-type=codeBlock] .token.inserted { } [data-toolbar-theme=dark] .cherry-switch-paste[data-type=md] .cherry-md-btn { - color: #d7e6fe; + color: #4b4b4b; } [data-toolbar-theme=dark] .cherry-switch-paste[data-type=md] .cherry-text-btn { @@ -3192,7 +3194,7 @@ div[data-type=codeBlock] .token.inserted { } .cherry-editor .cm-s-default .cm-url { - background: #d7e6fe; + background: #4b4b4b; font-family: "Menlo", "Liberation Mono", "Consolas", "DejaVu Sans Mono", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; font-size: 0.9em; } @@ -3347,7 +3349,7 @@ div[data-type=codeBlock] .token.inserted { } [data-toolbar-theme=dark] .cherry-color-wrap h3 { - color: #d7e6fe; + color: #4b4b4b; } .cherry-color-wrap .cherry-color-text { @@ -3522,7 +3524,7 @@ div[data-type=codeBlock] .token.inserted { .cherry.theme__dark .cherry-floatmenu .cherry-toolbar-button, .cherry.theme__dark .cherry-bubble .cherry-toolbar-button, .cherry.theme__dark .cherry-sidebar .cherry-toolbar-button { - color: #d7e6fe; + color: #4b4b4b; } .cherry.theme__dark .cherry-toolbar .cherry-toolbar-button:hover, @@ -3547,7 +3549,7 @@ div[data-type=codeBlock] .token.inserted { } .cherry.theme__dark .cherry-dropdown .cherry-dropdown-item { - color: #d7e6fe; + color: #4b4b4b; } .cherry.theme__dark .cherry-dropdown .cherry-dropdown-item:hover { @@ -3561,7 +3563,7 @@ div[data-type=codeBlock] .token.inserted { } .cherry.theme__dark .cherry-dropdown.cherry-color-wrap h3 { - color: #d7e6fe; + color: #4b4b4b; } .cherry.theme__dark .cherry-dropdown.cherry-color-wrap .cherry-color-item { diff --git a/static/cherry/cherry-markdown.js b/static/cherry/cherry-markdown.js index a166a4f8..847d987d 100644 --- a/static/cherry/cherry-markdown.js +++ b/static/cherry/cherry-markdown.js @@ -22792,7 +22792,7 @@ var $lineNum = Math.max(0, lineNum); this.jumpToLine($lineNum, endLine, percent); - Logger.log('滚动预览区域，左侧应scroll to ', $lineNum); + // Logger.log('滚动预览区域，左侧应scroll to ', $lineNum); } /** * @@ -42219,7 +42219,7 @@ { // 生产环境屏蔽 - Logger.log('markdown引擎渲染了：', str); + // Logger.log('markdown引擎渲染了：', str); } } @@ -56924,7 +56924,7 @@ onScroll = function onScroll() { if (_this2.applyingDomChanges) { - Logger.log(new Date(), 'sync scroll locked'); + // Logger.log(new Date(), 'sync scroll locked'); return; } @@ -57253,13 +57253,13 @@ return obj[index].sign; }); var res = myersDiff.doDiff(); - Logger.log(res); + // Logger.log(res); this.$dealWithMyersDiffResult(res, oldHtmlList.list, newHtmlList.list, domContainer); } else if (newHtmlList.list.length && !oldHtmlList.list.length) { var _context8; // 全新增 - Logger.log('add all'); + // Logger.log('add all'); forEach$3(_context8 = newHtmlList.list).call(_context8, function (piece) { domContainer.appendChild(piece.dom); @@ -57268,7 +57268,7 @@ var _context9; // 全删除 - Logger.log('delete all'); + // Logger.log('delete all'); forEach$3(_context9 = oldHtmlList.list).call(_context9, function (piece) { domContainer.removeChild(piece.dom); diff --git a/static/css/markdown.preview.css b/static/css/markdown.preview.css index bf23a4ff..2c96303f 100644 --- a/static/css/markdown.preview.css +++ b/static/css/markdown.preview.css @@ -56,6 +56,20 @@ flex-direction: column; } +/*.content > .whole-article-wrap {*/ +/* flex-direction: row-reverse;*/ +/*}*/ + +.content > .whole-article-wrap > .markdown-toc { + right: 30px; + margin-left: 10px; + max-height: 550px; +} + +.content > .whole-article-wrap > .markdown-article { + width: 100%; +} + .article-body .markdown-toc{ position: fixed; right: 50px; @@ -90,7 +104,7 @@ /*margin-right: 250px;*/ } .article-body.content .markdown-toc{ - position: relative; + position: fixed; margin-top: 0; } .article-body.content .markdown-article{ diff --git a/static/js/kancloud.js b/static/js/kancloud.js index eaae2174..97422bb1 100644 --- a/static/js/kancloud.js +++ b/static/js/kancloud.js @@ -228,7 +228,23 @@ function initHighlighting() { } } +function handleEvent(event) { + switch (event.keyCode) { + case 70: // ctrl + f 打开搜索面板 并获取焦点 + $(".navg-item[data-mode='search']").click(); + document.getElementById('searchForm').querySelector('input').focus(); + event.preventDefault(); + break; + case 27: // esc 关闭搜索面板 + $(".navg-item[data-mode='view']").click(); + event.preventDefault(); + break; + } +} + $(function () { + window.addEventListener('keydown', handleEvent) + checkMarkdownTocElement(); $(".view-backtop").on("click", function () { $('.manual-right').animate({ scrollTop: '0px' }, 200); @@ -334,6 +350,11 @@ $(function () { $(".m-manual").removeClass("manual-mode-view manual-mode-collect manual-mode-search").addClass("manual-mode-" + mode); }); + const input = document.getElementById('searchForm').querySelector('input'); + input.addEventListener('input', function() { + $("#btnSearch").click(); + }); + /** * 项目内搜索 */ @@ -420,7 +441,6 @@ function loadCopySnippets() { } function checkMarkdownTocElement() { - console.log(111) let toc = $(".markdown-toc-list"); let articleComment = $("#articleComment"); if (toc.length) { diff --git a/uploads/docs/admin.png b/uploads/docs/admin.png new file mode 100644 index 00000000..1ef25c5b Binary files /dev/null and b/uploads/docs/admin.png differ diff --git a/uploads/docs/cheery-markdown.png b/uploads/docs/cheery-markdown.png new file mode 100644 index 00000000..f6ec4d9a Binary files /dev/null and b/uploads/docs/cheery-markdown.png differ diff --git a/uploads/docs/create.png b/uploads/docs/create.png new file mode 100644 index 00000000..0c43b60f Binary files /dev/null and b/uploads/docs/create.png differ diff --git a/uploads/docs/editor_md.png b/uploads/docs/editor_md.png new file mode 100644 index 00000000..37e1cb9d Binary files /dev/null and b/uploads/docs/editor_md.png differ diff --git a/uploads/docs/intro.png b/uploads/docs/intro.png new file mode 100644 index 00000000..f1f51996 Binary files /dev/null and b/uploads/docs/intro.png differ diff --git a/uploads/docs/member.png b/uploads/docs/member.png new file mode 100644 index 00000000..9b721fa0 Binary files /dev/null and b/uploads/docs/member.png differ diff --git a/uploads/docs/preview.png b/uploads/docs/preview.png new file mode 100644 index 00000000..38ee1819 Binary files /dev/null and b/uploads/docs/preview.png differ diff --git a/uploads/docs/project_list.png b/uploads/docs/project_list.png new file mode 100644 index 00000000..5bfd020b Binary files /dev/null and b/uploads/docs/project_list.png differ diff --git a/uploads/docs/project_setting.png b/uploads/docs/project_setting.png new file mode 100644 index 00000000..22b527ca Binary files /dev/null and b/uploads/docs/project_setting.png differ diff --git a/uploads/docs/wang_editor.png b/uploads/docs/wang_editor.png new file mode 100644 index 00000000..a45e6cd5 Binary files /dev/null and b/uploads/docs/wang_editor.png differ diff --git a/views/book/index.tpl b/views/book/index.tpl index 9cb1951e..cc4be564 100644 --- a/views/book/index.tpl +++ b/views/book/index.tpl @@ -180,6 +180,25 @@
+ +
+ +
+ + + + +
+
+
diff --git a/views/book/setting.tpl b/views/book/setting.tpl index 5d8e6113..e0a612d7 100644 --- a/views/book/setting.tpl +++ b/views/book/setting.tpl @@ -128,6 +128,15 @@
{{end}} +
+ +
+
+ +
+
+
+
diff --git a/views/document/default_read.tpl b/views/document/default_read.tpl index 334932de..039daa3c 100644 --- a/views/document/default_read.tpl +++ b/views/document/default_read.tpl @@ -88,7 +88,9 @@
{{end}} {{end}} + {{if .Model.PrintState}} {{i18n .Lang "doc.print"}} + {{end}}
{{if eq .Model.PrivatelyOwned 0}} {{if .Model.IsEnableShare}} diff --git a/views/manager/setting.tpl b/views/manager/setting.tpl index 479fbb9f..c54ca01c 100644 --- a/views/manager/setting.tpl +++ b/views/manager/setting.tpl @@ -44,6 +44,13 @@

{{i18n .Lang "mgr.site_desc_tips"}}

+
+
+ +
@@ -123,6 +130,7 @@ },success : function (res) { if(res.errcode === 0) { showSuccess({{i18n .Lang "message.success"}}) + window.location.reload() }else{ showError(res.message); } diff --git a/views/widgets/footer.tpl b/views/widgets/footer.tpl index 6f27a9d8..55e0d145 100644 --- a/views/widgets/footer.tpl +++ b/views/widgets/footer.tpl @@ -1,13 +1,13 @@
- {{i18n .Lang "common.official_website"}} + {{i18n .Lang "common.official_website"}}  ·  {{i18n .Lang "common.feedback"}}  ·  {{i18n .Lang "common.source_code"}}  ·  - {{i18n .Lang "common.manual"}} + {{i18n .Lang "common.manual"}}
{{if .site_beian}}