diff --git a/models/DocumentModel.go b/models/DocumentModel.go index 1b2677d4..3dc16efe 100644 --- a/models/DocumentModel.go +++ b/models/DocumentModel.go @@ -256,7 +256,7 @@ func (item *Document) ReleaseContent() error { if conf.BaseUrl != "" && !strings.HasPrefix(src, conf.BaseUrl) { contentSelection.SetAttr("target", "_blank") if html, err := content.Html(); err == nil { - item.Release = html + item.Release = strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(html),""),"") } } } @@ -305,7 +305,15 @@ func (doc *Document) AppendInfo() *Document { docCreator, err := NewMember().Find(doc.MemberId,"real_name","account") - if strings.TrimSpace(doc.Release) != "" { + doc.Release = strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(doc.Release),""),"") + suffix := "" + if doc.Release != "" { + beego.Info(doc.Release) + if strings.HasPrefix(doc.Release,"
") + suffix = "
" + } doc.Release += "
文档更新时间: " + doc.ModifyTime.Local().Format("2006-01-02 15:04") + "   作者："; if err == nil && docCreator != nil { if docCreator.RealName != "" { @@ -314,7 +322,8 @@ func (doc *Document) AppendInfo() *Document { doc.Release += docCreator.Account } } - doc.Release += "
" + doc.Release += "" + suffix } + return doc } \ No newline at end of file diff --git a/static/css/kancloud.css b/static/css/kancloud.css index a99f04ca..222c9147 100644 --- a/static/css/kancloud.css +++ b/static/css/kancloud.css @@ -486,6 +486,7 @@ table>tbody>tr:hover{ list-style: none; border-top: 1px solid #DDDDDD; padding-top: 15px; + clear: both; } .manual-article .wiki-bottom{ border-top: 1px solid #E5E5E5; diff --git a/static/css/markdown.preview.css b/static/css/markdown.preview.css index 11864362..df1b97ee 100644 --- a/static/css/markdown.preview.css +++ b/static/css/markdown.preview.css @@ -32,9 +32,74 @@ } /**************TOC*******************/ -.markdown-toc{ - padding: 16px 11px 4px; - border: 1px solid #f0f0f0; +.editormd-preview-container{ + position: relative; + height: auto; + width: 100%; +} + +.article-body .markdown-toc{ + position: fixed; + right: 0; + width: 260px; + font-size: 12px; +} +.markdown-toc ul{ + list-style:none; +} +.markdown-toc .markdown-toc-list>li{ + padding: 3px 10px 3px 16px; + line-height: 18px; + border-left: 2px solid #e8e8e8; + color: #595959; +} +.markdown-toc .markdown-toc-list>li.active{ + border-right: 2px solid #25b864; +} + +.article-body .markdown-article{ + margin-right: 200px; +} +.markdown-toc-list .directory-item { + padding: 3px 10px 3px 16px; + line-height: 18px; + border-left: 2px solid #e8e8e8; + color: #595959; +} +.markdown-toc-list .directory-item-link { + width: 100%; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: #595959; +} +.markdown-toc-list .directory-item-link:hover { + color: #8C8C8C; +} +.markdown-toc-list .directory-item-link-1 { + padding-left: 0; +} +.markdown-toc-list .directory-item-link-2 { + padding-left: 1.2em; +} +.markdown-toc-list .directory-item-link-3 { + padding-left: 2.4em; +} +.markdown-toc-list .directory-item-link-4 { + padding-left: 3.6em; +} +.markdown-toc-list .directory-item-link-5 { + padding-left: 4.8em; +} +.markdown-toc-list .directory-item-active { + border-left: 2px solid #25b864; +} +.markdown-toc-list .directory-item-active a { + color: #25b864; +} +.markdown-toc-list .directory-item-active a:hover { + color: #7CD4A2; } /***********代码样式*****************/ .markdown-body .highlight pre, .markdown-body pre{ diff --git a/static/editor.md/editormd.js b/static/editor.md/editormd.js index 31f12679..997bc9dd 100644 --- a/static/editor.md/editormd.js +++ b/static/editor.md/editormd.js @@ -3713,20 +3713,24 @@ text = trim(text); var escapedText = text.toLowerCase().replace(/[^\w]+/g, "-"); + + // var isChinese = /^[\u4e00-\u9fa5]+$/.test(text); + // var id = (isChinese) ? escape(text).replace(/\%/g, "") : text.toLowerCase().replace(/[^\w]+/g, "-"); + + var id = Math.floor(Math.random() * 1000000000 ).toString(36); + var toc = { text : text, level : level, - slug : escapedText + slug : escapedText, + id : id }; - var isChinese = /^[\u4e00-\u9fa5]+$/.test(text); - var id = (isChinese) ? escape(text).replace(/\%/g, "") : text.toLowerCase().replace(/[^\w]+/g, "-"); - markdownToC.push(toc); - var headingHTML = ""; + var headingHTML = ""; - headingHTML += ""; + headingHTML += ""; headingHTML += ""; headingHTML += (hasLinkReg) ? this.atLink(this.emoji(linkText)) : this.atLink(this.emoji(text)); headingHTML += ""; @@ -3761,7 +3765,7 @@ text = (isTeXLine) ? text.replace(/\$/g, "") : text; } - var tocHTML = "
" + text + "
"; + var tocHTML = "
" + text + "
"; return (isToC) ? ( (isToCMenu) ? "
" + tocHTML + "

" : tocHTML ) : ( (pageBreakReg.test(text)) ? this.pageBreak(text) : "" + this.atLink(this.emoji(text)) + "

\n" ); @@ -3849,6 +3853,7 @@ { var text = toc[i].text; var level = toc[i].level; + var id = toc[i].id; if (level < startLevel) { continue; @@ -3860,16 +3865,17 @@ } else if (level < lastLevel) { - html += (new Array(lastLevel - level + 2)).join(""); + // html += (new Array(lastLevel - level + 2)).join(""); } else { - html += ""; + // html += ""; } - html += "
  • " + text + "
      "; + html += "
    • " + text + "
      • "; lastLevel = level; } + console.log(html); var tocContainer = container.find(".markdown-toc");