diff --git a/conf/enumerate.go b/conf/enumerate.go index 9dd4c55c..b4a4fa1c 100644 --- a/conf/enumerate.go +++ b/conf/enumerate.go @@ -40,6 +40,12 @@ const ( BookObserver = 3 ) +const ( + //本地账户校验 + AuthMethodLocal = "local" + //LDAP用户校验 + AuthMethodLDAP = "ldap" +) var ( VERSION string BUILD_TIME string diff --git a/controllers/account.go b/controllers/account.go index a68eddd8..9d1a9ba9 100644 --- a/controllers/account.go +++ b/controllers/account.go @@ -172,7 +172,9 @@ func (c *AccountController) FindPassword() { if member.Status != 0 { c.JsonResult(6007,"账号已被禁用") } - + if member.AuthMethod == conf.AuthMethodLDAP { + c.JsonResult(6011,"当前用户不支持找回密码") + } count,err := models.NewMemberToken().FindSendCount(email,time.Now().Add(-1*time.Hour),time.Now()) diff --git a/controllers/book.go b/controllers/book.go index 0f013bc8..841079c1 100644 --- a/controllers/book.go +++ b/controllers/book.go @@ -508,7 +508,7 @@ func (c *BookController) Release() { book_id := 0 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator() { book,err := models.NewBook().FindByFieldFirst("identify",identify) if err != nil { @@ -550,21 +550,32 @@ func (c *BookController) SaveSort() { c.Abort("404") } - bookResult,err := models.NewBookResult().FindByIdentify(identify,c.Member.MemberId) + book_id := 0 + if c.Member.IsAdministrator() { + book,err := models.NewBook().FindByFieldFirst("identify",identify) + if err != nil { - if err != nil { - beego.Error("DocumentController.Edit => ",err) + } + book_id = book.BookId + }else{ + bookResult,err := models.NewBookResult().FindByIdentify(identify,c.Member.MemberId) + if err != nil { + beego.Error("DocumentController.Edit => ",err) - c.Abort("403") - } - if bookResult.RoleId == conf.BookObserver { - c.JsonResult(6002,"项目不存在或权限不足") + c.Abort("403") + } + if bookResult.RoleId == conf.BookObserver { + c.JsonResult(6002,"项目不存在或权限不足") + } + book_id = bookResult.BookId } + + content := c.Ctx.Input.RequestBody var docs []map[string]interface{} - err = json.Unmarshal(content,&docs) + err := json.Unmarshal(content,&docs) if err != nil { beego.Error(err) @@ -578,7 +589,7 @@ func (c *BookController) SaveSort() { beego.Error(err) continue; } - if doc.BookId != bookResult.BookId { + if doc.BookId != book_id { logs.Info("%s","权限错误") continue; } @@ -593,7 +604,7 @@ func (c *BookController) SaveSort() { continue } if parent_id > 0 { - if parent,err := models.NewDocument().Find(int(parent_id)); err != nil || parent.BookId != bookResult.BookId { + if parent,err := models.NewDocument().Find(int(parent_id)); err != nil || parent.BookId != book_id { continue } } diff --git a/controllers/document.go b/controllers/document.go index 405df9cf..c8cdc973 100644 --- a/controllers/document.go +++ b/controllers/document.go @@ -37,7 +37,7 @@ func isReadable(identify, token string, c *DocumentController) *models.BookResul beego.Error(err) c.Abort("500") } - if c.Member != nil && c.Member.Role == conf.MemberSuperRole { + if c.Member != nil && c.Member.IsAdministrator(){ bookResult := book.ToBookResult() return bookResult } @@ -208,7 +208,7 @@ func (c *DocumentController) Edit() { bookResult := models.NewBookResult() var err error //如果是超级管理者，则不判断权限 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator(){ book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { c.JsonResult(6002, "项目不存在或权限不足") @@ -289,7 +289,7 @@ func (c *DocumentController) Create() { } book_id := 0 //如果是超级管理员则不判断权限 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator(){ book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { beego.Error(err) @@ -370,7 +370,7 @@ func (c *DocumentController) Upload() { } book_id := 0 //如果是超级管理员，则不判断权限 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator(){ book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { @@ -584,7 +584,7 @@ func (c *DocumentController) Delete() { book_id := 0 //如果是超级管理员则忽略权限判断 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator(){ book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { beego.Error("FindByIdentify => ", err) @@ -637,7 +637,7 @@ func (c *DocumentController) Content() { } book_id := 0 //如果是超级管理员，则忽略权限 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator() { book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { c.JsonResult(6002, "项目不存在或权限不足") @@ -740,7 +740,7 @@ func (c *DocumentController) Export() { return } bookResult := models.NewBookResult() - if c.Member != nil && c.Member.Role == conf.MemberSuperRole { + if c.Member != nil && c.Member.IsAdministrator(){ book, err := models.NewBook().FindByIdentify(identify) if err != nil { beego.Error(err) @@ -899,7 +899,7 @@ func (c *DocumentController) History() { book_id := 0 //如果是超级管理员则忽略权限判断 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator(){ book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { beego.Error("FindByIdentify => ", err) @@ -970,7 +970,7 @@ func (c *DocumentController) DeleteHistory() { } book_id := 0 //如果是超级管理员则忽略权限判断 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator(){ book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { beego.Error("FindByIdentify => ", err) @@ -1022,7 +1022,7 @@ func (c *DocumentController) RestoreHistory() { } book_id := 0 //如果是超级管理员则忽略权限判断 - if c.Member.Role == conf.MemberSuperRole { + if c.Member.IsAdministrator(){ book, err := models.NewBook().FindByFieldFirst("identify", identify) if err != nil { beego.Error("FindByIdentify => ", err) diff --git a/controllers/manager.go b/controllers/manager.go index ff56efa9..afeeafa3 100644 --- a/controllers/manager.go +++ b/controllers/manager.go @@ -28,9 +28,6 @@ func (c *ManagerController) Prepare (){ func (c *ManagerController) Index() { c.TplName = "manager/index.tpl" - if !c.Member.IsAdministrator() { - c.Abort("403") - } c.Data["Model"] = models.NewDashboard().Query() } @@ -40,10 +37,6 @@ func (c *ManagerController) Users() { c.Prepare() c.TplName = "manager/users.tpl" - if !c.Member.IsAdministrator() { - c.Abort("403") - } - pageIndex, _ := c.GetInt("page", 0) members, totalCount, err := models.NewMember().FindToPager(pageIndex, 15) @@ -73,9 +66,6 @@ func (c *ManagerController) Users() { // 添加用户. func (c *ManagerController) CreateMember() { c.Prepare() - if !c.Member.IsAdministrator() { - c.Abort("403") - } account := strings.TrimSpace(c.GetString("account")) password1 := strings.TrimSpace(c.GetString("password1")) @@ -131,10 +121,6 @@ func (c *ManagerController) CreateMember() { func (c *ManagerController) UpdateMemberStatus() { c.Prepare() - if !c.Member.IsAdministrator() { - c.Abort("403") - } - member_id, _ := c.GetInt("member_id", 0) status, _ := c.GetInt("status", 0) @@ -168,10 +154,6 @@ func (c *ManagerController) UpdateMemberStatus() { func (c *ManagerController) ChangeMemberRole() { c.Prepare() - if !c.Member.IsAdministrator() { - c.Abort("403") - } - member_id, _ := c.GetInt("member_id", 0) role, _ := c.GetInt("role", 0) if member_id <= 0 { @@ -204,9 +186,7 @@ func (c *ManagerController) ChangeMemberRole() { func (c *ManagerController) EditMember() { c.Prepare() c.TplName = "manager/edit_users.tpl" - if !c.Member.IsAdministrator() { - c.Abort("403") - } + member_id,_ := c.GetInt(":id",0) if member_id <= 0 { @@ -231,7 +211,7 @@ func (c *ManagerController) EditMember() { if password1 != "" && password2 != password1 { c.JsonResult(6001,"确认密码不正确") } - if password1 != "" { + if password1 != "" && member.AuthMethod != conf.AuthMethodLDAP{ member.Password = password1 } if err := member.Valid(password1 == "");err != nil { @@ -280,10 +260,10 @@ func (c *ManagerController) Books() { //编辑项目 func (c *ManagerController) EditBook() { + c.Prepare() + c.TplName = "manager/edit_book.tpl" - if !c.Member.IsAdministrator() { - c.Abort("403") - } + identify := c.GetString(":key") if identify == "" { @@ -334,9 +314,6 @@ func (c *ManagerController) EditBook() { // 删除项目. func (c *ManagerController) DeleteBook() { c.Prepare() - if !c.Member.IsAdministrator() { - c.Abort("403") - } book_id, _ := c.GetInt("book_id", 0) @@ -359,7 +336,7 @@ func (c *ManagerController) DeleteBook() { // CreateToken 创建访问来令牌. func (c *ManagerController) CreateToken() { - + c.Prepare() action := c.GetString("action") identify := c.GetString("identify") @@ -396,10 +373,6 @@ func (c *ManagerController) Setting() { c.Prepare() c.TplName = "manager/setting.tpl" - if !c.Member.IsAdministrator() { - c.Abort("403") - } - options, err := models.NewOption().All() if c.Ctx.Input.IsPost() { @@ -480,9 +453,7 @@ func (c *ManagerController) Comments() { //DeleteComment 标记评论为已删除 func (c *ManagerController) DeleteComment() { c.Prepare() - if !c.Member.IsAdministrator() { - c.Abort("403") - } + comment_id, _ := c.GetInt("comment_id", 0) if comment_id <= 0 { @@ -505,7 +476,7 @@ func (c *ManagerController) DeleteComment() { //设置项目私有状态. func (c *ManagerController) PrivatelyOwned() { - + c.Prepare() status := c.GetString("status") identify := c.GetString("identify") diff --git a/controllers/setting.go b/controllers/setting.go index c533af75..1a31d758 100644 --- a/controllers/setting.go +++ b/controllers/setting.go @@ -12,6 +12,7 @@ import ( "github.com/lifei6671/godoc/models" "github.com/lifei6671/godoc/utils" "github.com/lifei6671/godoc/graphics" + "github.com/lifei6671/godoc/conf" ) type SettingController struct { @@ -45,6 +46,9 @@ func (c *SettingController) Password() { c.TplName = "setting/password.tpl" if c.Ctx.Input.IsPost() { + if c.Member.AuthMethod == conf.AuthMethodLDAP { + c.JsonResult(6009,"当前用户不支持修改密码") + } password1 := c.GetString("password1") password2 := c.GetString("password2") password3 := c.GetString("password3") diff --git a/models/errors.go b/models/errors.go index da5239e9..4f20f8f1 100644 --- a/models/errors.go +++ b/models/errors.go @@ -14,6 +14,7 @@ var ( ErrMemberEmailFormatError = errors.New("邮箱格式不正确") ErrMemberPasswordFormatError = errors.New("密码必须在6-50个字符之间") ErrMemberAccountFormatError = errors.New("账号只能由英文字母数字组成，且在3-50个字符") + ErrMemberRoleError = errors.New("用户权限不正确") // ErrorMemberPasswordError 密码错误. ErrorMemberPasswordError = errors.New("用户密码错误") //ErrorMemberAuthMethodInvalid 不支持此认证方式 diff --git a/models/member.go b/models/member.go index 621641bd..f7f20a1b 100644 --- a/models/member.go +++ b/models/member.go @@ -277,6 +277,12 @@ func (m *Member) Valid(is_hash_password bool) error { if strings.Count(m.Description,"") > 500 { return ErrMemberDescriptionTooLong } + if m.Role != conf.MemberGeneralRole && m.Role != conf.MemberSuperRole && m.Role != conf.MemberAdminRole { + return ErrMemberRoleError + } + if m.Status != 0 && m.Status != 1 { + m.Status = 0 + } //邮箱格式校验 if ok,err := regexp.MatchString(conf.RegexpEmail,m.Email); !ok || err != nil || m.Email == "" { return ErrMemberEmailFormatError @@ -296,6 +302,7 @@ func (m *Member) Valid(is_hash_password bool) error { return ErrMemberEmailExist } } + if m.MemberId > 0{ //校验用户是否存在 if _,err := NewMember().Find(m.MemberId);err != nil { @@ -312,6 +319,7 @@ func (m *Member) Valid(is_hash_password bool) error { } } + return nil } diff --git a/static/css/main.css b/static/css/main.css index 84f037bb..8c3727da 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -492,6 +492,7 @@ textarea{ background-color: #f9f9f9; border: 1px solid #fff; cursor: pointer; + color: #333; } .manager .dashboard-item:hover{ background-color: #563D7C; diff --git a/static/css/markdown.css b/static/css/markdown.css index 2393180b..9e5e408e 100644 --- a/static/css/markdown.css +++ b/static/css/markdown.css @@ -215,6 +215,7 @@ body{ margin-left: 10px; cursor: pointer; } +/***************附件管理的样式*******************/ .attach-drop-panel{ display: block; position: relative; @@ -286,20 +287,80 @@ body{ .attach-list .attach-item .close:hover { color: #333; } - - - - - - - - - - - - - - +/***********选择模板时的样式**************/ +.template-list .container{ + margin-top: 60px; + margin-bottom: 40px; + padding: 0 15px; + box-sizing: border-box; +} +.template-list .container .section{ + position: relative; + margin: 0 15px; + padding-top: 60px; + float: left; + width: 150px; + height: 236px; + background: #fdfefe; + border: 1px solid #ddddd9; + text-align: center +} +.template-list .container .section>h3 a{ + font-size: 20px; + font-weight: 200; + text-decoration: none; + color: #5d606b +} +.template-list .container .section>a { + display: inline-block; + position: absolute; + left: 50%; + top: -28px; + width: 56px; + height: 56px; + margin-left: -28px +} +.template-list .container .section>a .fa { + display: inline-block; + width: 56px; + height: 56px; + background-color: #fbfefe; + border: 1px solid #ddddd9; + border-radius: 50%; + line-height: 54px; + font-size: 24px; + color: #ddddd9 +} +.template-list .container .section:hover { + border-color: #44b035 +} + +.template-list .container .section:hover>a { + background-color: #44b035; + padding: 5px; + border-radius: 50%; + width: 66px; + height: 66px; + margin-left: -33px; + top: -33px +} +.template-list .container .section:hover>a .fa { + background-color: #78c56d; + color: #fff; + border: 0; + line-height: 54px +} +.template-list .container .section ul { + margin-top: 35px; + padding-left: 0; + list-style: none +} +.template-list .container .section ul li { + margin-bottom: 10px; + padding: 0 10px; + line-height: 1.2; + color: #8e8d8d +} diff --git a/static/css/markdown.preview.css b/static/css/markdown.preview.css new file mode 100644 index 00000000..f82a07a2 --- /dev/null +++ b/static/css/markdown.preview.css @@ -0,0 +1,33 @@ +/*************表格样式****************/ + +.editormd-preview-container table thead tr{ + background-color: #0088CC; + color: #ffffff; +} +.editormd-preview-container table tr:nth-child(2n) { + background-color: #f8f8f8 +} +.editormd-preview-container-body blockquote,.editormd-preview-container blockquote p { + font-size: 14px; + color: #999 +} +/***********代码样式*****************/ +.markdown-body .highlight pre, .markdown-body pre{ + padding: 0; + font-size: 12px; + border-radius:0; + line-height: 1.4em; +} +.editormd-preview-container pre.prettyprint, .editormd-html-preview pre.prettyprint{ + padding: 0; +} +.editormd-preview-container ol.linenums, .editormd-html-preview ol.linenums{ + color: #999; +} +.editormd-preview-container ol.linenums>li:first-child,.editormd-html-preview ol.linenums>li:first-child{ + padding-top: 10px; +} +.editormd-preview-container ol.linenums>li:last-child ,.editormd-html-preview ol.linenums>li:last-child{ + padding-bottom: 10px; +} + diff --git a/static/js/jquery.highlight.js b/static/js/jquery.highlight.js new file mode 100644 index 00000000..0d177f93 --- /dev/null +++ b/static/js/jquery.highlight.js @@ -0,0 +1,27 @@ +jQuery.fn.highlight = function(pat) { + function innerHighlight(node, pat) { + var skip = 0; + if (node.nodeType === 3) { + var pos = node.data.toUpperCase().indexOf(pat); + if (pos >= 0) { + var spannode = document.createElement('em'); + spannode.className = 'search-highlight'; + var middlebit = node.splitText(pos); + var endbit = middlebit.splitText(pat.length); + var middleclone = middlebit.cloneNode(true); + spannode.appendChild(middleclone); + middlebit.parentNode.replaceChild(spannode, middlebit); + skip = 1; + } + } + else if (node.nodeType === 1 && node.childNodes && !/(script|style)/i.test(node.tagName)) { + for (var i = 0; i < node.childNodes.length; ++i) { + i += innerHighlight(node.childNodes[i], pat); + } + } + return skip; + } + return this.each(function() { + innerHighlight(this, pat.toUpperCase()); + }); +}; \ No newline at end of file diff --git a/static/js/kancloud.js b/static/js/kancloud.js new file mode 100644 index 00000000..cb0ac7fe --- /dev/null +++ b/static/js/kancloud.js @@ -0,0 +1,207 @@ +/*** + * 加载文档到阅读区 + * @param $url + * @param $id + * @param $callback + */ +function loadDocument($url,$id,$callback) { + $.ajax({ + url : $url, + type : "GET", + beforeSend :function (xhr) { + var body = events.data('body_' + $id); + var title = events.data('title_' + $id); + var doc_title = events.data('doc_title_' + $id); + + if(body && title && doc_title){ + + if (typeof $callback === "function") { + body = $callback(body); + } + $("#page-content").html(body); + $("title").text(title); + $("#article-title").text(doc_title); + + events.trigger('article.open',{ $url : $url, $init : false , $id : $id }); + + return false; + } + NProgress.start(); + }, + success : function (res) { + if(res.errcode === 0){ + var body = res.data.body; + var doc_title = res.data.doc_title; + var title = res.data.title; + + $body = body; + if (typeof $callback === "function" ){ + $body = $callback(body); + } + $("#page-content").html($body); + $("title").text(title); + $("#article-title").text(doc_title); + + events.data('body_' + $id,body); + events.data('title_' + $id,title); + events.data('doc_title_' + $id,doc_title); + + events.trigger('article.open',{ $url : $url, $init : true, $id : $id }); + + }else{ + layer.msg("加载失败"); + } + }, + complete : function () { + NProgress.done(); + } + }); +} + +function initHighlighting() { + $('pre code').each(function (i, block) { + hljs.highlightBlock(block); + }); + + hljs.initLineNumbersOnLoad(); +} + +var events = $("body"); + +$(function () { + $(".view-backtop").on("click", function () { + $('.manual-right').animate({ scrollTop: '0px' }, 200); + }); + $(".manual-right").scroll(function () { + var top = $(".manual-right").scrollTop(); + if(top > 100){ + $(".view-backtop").addClass("active"); + }else{ + $(".view-backtop").removeClass("active"); + } + }); + window.isFullScreen = false; + + initHighlighting(); + + window.jsTree = $("#sidebar").jstree({ + 'plugins':["wholerow","types"], + "types": { + "default" : { + "icon" : false // 删除默认图标 + } + }, + 'core' : { + 'check_callback' : true, + "multiple" : false , + 'animation' : 0 + } + }).on('select_node.jstree',function (node,selected,event) { + $(".m-manual").removeClass('manual-mobile-show-left'); + var url = selected.node.a_attr.href; + + if(url === window.location.href){ + return false; + } + loadDocument(url,selected.node.id); + + }); + + $("#slidebar").on("click",function () { + $(".m-manual").addClass('manual-mobile-show-left'); + }); + $(".manual-mask").on("click",function () { + $(".m-manual").removeClass('manual-mobile-show-left'); + }); + + /** + * 关闭侧边栏 + */ + $(".manual-fullscreen-switch").on("click",function () { + isFullScreen = !isFullScreen; + if (isFullScreen) { + $(".m-manual").addClass('manual-fullscreen-active'); + } else { + $(".m-manual").removeClass('manual-fullscreen-active'); + } + }); + + //处理打开事件 + events.on('article.open', function (event, $param) { + + if ('pushState' in history) { + if ($param.$init === false) { + window.history.replaceState($param , $param.$id , $param.$url); + } else { + window.history.pushState($param, $param.$id , $param.$url); + } + + } else { + window.location.hash = $param.$url; + } + initHighlighting(); + $(".manual-right").scrollTop(0); + }); + + $(".navg-item[data-mode]").on("click",function () { + var mode = $(this).data('mode'); + $(this).siblings().removeClass('active').end().addClass('active'); + $(".m-manual").removeClass("manual-mode-view manual-mode-collect manual-mode-search").addClass("manual-mode-" + mode); + }); + + /** + * 项目内搜索 + */ + $("#searchForm").ajaxForm({ + beforeSubmit : function () { + var keyword = $.trim($("#searchForm").find("input[name='keyword']").val()); + if(keyword === ""){ + $(".search-empty").show(); + $("#searchList").html(""); + return false; + } + $("#btnSearch").attr("disabled","disabled").find("i").removeClass("fa-search").addClass("loading"); + window.keyword = keyword; + }, + success :function (res) { + var html = ""; + if(res.errcode === 0){ + for(var i in res.data){ + var item = res.data[i]; + html += '
  • '+ item.doc_name +'
    • '; + } + } + if(html !== ""){ + $(".search-empty").hide(); + }else{ + $(".search-empty").show(); + } + $("#searchList").html(html); + }, + complete : function () { + $("#btnSearch").removeAttr("disabled").find("i").removeClass("loading").addClass("fa-search"); + } + }); + + window.onpopstate = function (e) { + + var $param = e.state; + console.log($param); + if($param.hasOwnProperty("$url")) { + window.jsTree.jstree().deselect_all(); + + window.jsTree.jstree().select_node({ id : $param.$id }); + $param.$init = false; + //events.trigger('article.open', $param ); + }else{ + console.log($param); + } + }; + + // var $node = window.jsTree.jstree().get_selected(); + // + // if(typeof $node === "object") { + // $node = window.jsTree.jstree().get_node({ id : $node[0] }); + // events.trigger('article.open',{ $url : $node.a_attr.href , $init : false, $id : $node.a_attr.id }); + // } +}); \ No newline at end of file diff --git a/static/js/markdown.js b/static/js/markdown.js index 798cc165..bd228ea5 100644 --- a/static/js/markdown.js +++ b/static/js/markdown.js @@ -64,7 +64,8 @@ $(function () { window.documentHistory(); }else if(name === "save"){ saveDocument(false); - + }else if(name === "template"){ + $("#documentTemplateModal").modal("show"); }else if(name === "sidebar"){ $("#manualCategory").toggle(0,"swing",function () { @@ -151,7 +152,7 @@ $(function () { layer.close(index); layer.msg("文档加载失败"); }); - } + }; /** * 保存文档到服务器 @@ -341,4 +342,17 @@ $(function () { loadDocument(selected); }).on("move_node.jstree",jstree_save); + + $("#documentTemplateModal").on("click",".section>a[data-type]",function () { + var $this = $(this).attr("data-type"); + var body = $("#template-" + $this).html(); + if (body) { + window.isLoad = true; + window.editor.clear(); + window.editor.insertValue(body); + window.editor.setCursor({line: 0, ch: 0}); + resetEditorChanged(true); + } + $("#documentTemplateModal").modal('hide'); + }); }); \ No newline at end of file diff --git a/static/prettify/themes/atelier-estuary-dark.min.css b/static/prettify/themes/atelier-estuary-dark.min.css new file mode 100644 index 00000000..e40fafa8 --- /dev/null +++ b/static/prettify/themes/atelier-estuary-dark.min.css @@ -0,0 +1,2 @@ +/*! Color themes for Google Code Prettify | MIT License | github.com/jmblog/color-themes-for-google-code-prettify */ +.prettyprint{background:#22221b;font-family:Menlo,Bitstream Vera Sans Mono,DejaVu Sans Mono,Monaco,Consolas,monospace;border:0!important}.pln{color:#f4f3ec}ol.linenums{margin-top:0;margin-bottom:0;color:#6c6b5a}li.L0,li.L1,li.L2,li.L3,li.L4,li.L5,li.L6,li.L7,li.L8,li.L9{padding-left:1em;background-color:#22221b;list-style-type:decimal}@media screen{.str{color:#7d9726}.kwd{color:#5f9182}.com{color:#6c6b5a}.typ{color:#36a166}.lit{color:#ae7313}.pun{color:#f4f3ec}.opn{color:#f4f3ec}.clo{color:#f4f3ec}.tag{color:#ba6236}.atn{color:#ae7313}.atv{color:#5b9d48}.dec{color:#ae7313}.var{color:#ba6236}.fun{color:#36a166}} \ No newline at end of file diff --git a/views/document/default_read.tpl b/views/document/default_read.tpl index 48bdd273..fa48abaa 100644 --- a/views/document/default_read.tpl +++ b/views/document/default_read.tpl @@ -17,6 +17,8 @@ {{if eq .Model.Editor "markdown"}} + + {{else}} {{end}} @@ -226,196 +228,20 @@ + + \ No newline at end of file diff --git a/views/document/markdown_edit_template.tpl b/views/document/markdown_edit_template.tpl index ff1aff9a..849f970f 100644 --- a/views/document/markdown_edit_template.tpl +++ b/views/document/markdown_edit_template.tpl @@ -29,6 +29,8 @@ + +