diff --git a/README.md b/README.md index a45faf99b395c9414f794c0a2135bb65688e7c38..99ffcf88785be1ca6e2d99f97dc6ae44afb87329 100644 --- a/README.md +++ b/README.md @@ -284,6 +284,11 @@ Tips: | 赞助时间 | 赞助人 | 赞助金额 | 附言 | 答复 | | ------------ | ------------ | ------------ | ------------ | ------------ | +| 2018-04-22 | 匿名 | 15.00(微信) | - | 谢谢对开源的支持,会坚持把开源做好 | +| 2018-04-20 | 信仰的虫子 | 10.00(码云-支付宝) | 感谢您的开源项目! | 感谢! | +| 2018-04-20 | 匿名 | 10.00(微信) | 完美 | 没有最好,只有更好。做不到完美,但是会争取做得更好。谢谢支持。 | +| 2018-04-17 | 匿名 | 11.00(微信) | 他们才给10块 | 每个人都在为开源献上自己力所能及的力量。感谢支持。 | +| 2018-04-15 | [南宁引力互动科技](http://www.gxyinli.com/) | 6666.66(支付宝) | 支持开源 | 感谢好基友的支持,祝创业成功 | | 2018-03-07 | 匿名 | 10.00(微信) | 加油 | 非常感谢支持,你们的认可是我最大的动力 | | 2018-03-05 | 金飞 | 10.00(支付宝) | 很赞的BookStack开源项目,加油! | 感谢!希望这个项目能帮到更多人 | | 2018-03-05 | 安典 | 10.00(微信) | 保密 | 感谢支持和认可 | diff --git a/change.md b/change.md index 20f2b0f4ee7833cc67eeefac3a1103f5219ee5a1..a3fb11fbf9540b3249b6c9d4d12696abd0625320 100644 --- a/change.md +++ b/change.md @@ -21,7 +21,8 @@ - [ ] 增加邀请好友注册功能,每成功邀请一个注册用户,奖励一定的金币 - [ ] 增加签到功能,签到可以获得金币 - [ ] 增加财富排行榜和阅读排行榜 -- [ ] 积分兑换商城,勤奋读书,有机会兑换实体书。 +- [ ] 积分兑换商城,勤奋读书,有机会兑换实体书。 +- [ ] 增加对数学公式的支持 https://github.com/Khan/KaTeX diff --git a/models/ads.go b/models/ads.go new file mode 100644 index 0000000000000000000000000000000000000000..2640e7f93eab1e86aeb41382d2c54933d93c06cc --- /dev/null +++ b/models/ads.go @@ -0,0 +1 @@ +package models diff --git a/models/bookmarks.go b/models/bookmarks.go new file mode 100644 index 0000000000000000000000000000000000000000..2640e7f93eab1e86aeb41382d2c54933d93c06cc --- /dev/null +++ b/models/bookmarks.go @@ -0,0 +1 @@ +package models diff --git a/models/config.go b/models/config.go new file mode 100644 index 0000000000000000000000000000000000000000..2640e7f93eab1e86aeb41382d2c54933d93c06cc --- /dev/null +++ b/models/config.go @@ -0,0 +1 @@ +package models diff --git a/models/note.go b/models/note.go new file mode 100644 index 0000000000000000000000000000000000000000..2640e7f93eab1e86aeb41382d2c54933d93c06cc --- /dev/null +++ b/models/note.go @@ -0,0 +1 @@ +package models diff --git a/models/plan.go b/models/plan.go new file mode 100644 index 0000000000000000000000000000000000000000..2640e7f93eab1e86aeb41382d2c54933d93c06cc --- /dev/null +++ b/models/plan.go @@ -0,0 +1 @@ +package models diff --git a/static/css/bookstack.css b/static/css/bookstack.css index 38da68836be43865e6b7a2d87b2397490e8392f4..dc2995ba334172f63e982f748f2e80ae691c0c5f 100644 --- a/static/css/bookstack.css +++ b/static/css/bookstack.css @@ -1183,4 +1183,5 @@ li.L1, li.L3, li.L5, li.L7, li.L9{background-color: transparent;} .bookstack-bars li:last-child{border-bottom:0px;} .bookstack-bars li:hover{background-color: #EFEFEF} .bookstack-bars li:hover a{color: #10af88} -.editormd-preview-container code, .editormd-html-preview code{padding-top: 7px;} +.editormd-preview-container code, .editormd-html-preview code{padding-top: 4px;} +.editormd-preview-container blockquote, .editormd-html-preview blockquote{font-style: normal;color: #777;} \ No newline at end of file diff --git a/static/js/editor.js b/static/js/editor.js index c026e094ebf7bfbb16b5fb77ba130033994e10b5..e4638b1e7a53811cff1dcffc9f9c989f14d9af40 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -88,7 +88,7 @@ function openDeleteDocumentDialog($node) { layer.close(index); if(res.errcode === 0){ window.treeCatalog.delete_node($node); - resetEditor($node); + // resetEditor($node); }else{ layer.msg("删除失败",{icon : 2}) } diff --git a/static/js/markdown.js b/static/js/markdown.js index 1b86fe4239d9bc8baa8c9e2d1276e8826d568b5b..649d0d623f146a37fde3f2abcff4e50f04df98c4 100644 --- a/static/js/markdown.js +++ b/static/js/markdown.js @@ -4,6 +4,7 @@ $(function () { width : "100%", height : "100%", path : "/static/editor.md/lib/", + tex : true, toolbar : true, placeholder: "本编辑器支持Markdown编辑,左边编写,右边预览", imageUpload: true, @@ -60,9 +61,14 @@ $(function () { }, onchange : function () { resetEditorChanged(true); - } + }, }); + window.editor.katexURL={ + js : "https://cdn.staticfile.org/KaTeX/0.7.1/katex.min.js", + css :"https://cdn.staticfile.org/KaTeX/0.7.1/katex.min.css", + }; + /** * 实现标题栏操作 */ diff --git a/views/document/default_read.html b/views/document/default_read.html index 2362e5b6f37df349a4462a8665b97daad7baebdd..8ca44c709870c1cff92debb2d5a67f3d1f45c0f2 100644 --- a/views/document/default_read.html +++ b/views/document/default_read.html @@ -26,7 +26,7 @@ {{end}} - + {{/**/}} {{/**/}} @@ -208,6 +208,8 @@ + + diff --git a/views/document/markdown_edit_template.html b/views/document/markdown_edit_template.html index 46486dbc3752acead06053fd799d80d62bba8e55..421e3ed374a822f86aa8fcfff73741da04072dd1 100644 --- a/views/document/markdown_edit_template.html +++ b/views/document/markdown_edit_template.html @@ -4,7 +4,6 @@ - 编辑文档 @@ -437,8 +434,6 @@ {{/**/}} - -