diff --git a/module/doc/control.php b/module/doc/control.php index 47642c5548..208ab5dd89 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -527,12 +527,6 @@ class doc extends control if(!(defined('RUN_MODE') && RUN_MODE == 'api')) $this->locate($browseLink); } - if($doc->contentType == 'markdown') - { - $doc->content = commonModel::processMarkdown($doc->content); - $doc->digest = commonModel::processMarkdown($doc->digest); - } - /* Check priv when lib is product or project. */ $lib = $this->doc->getLibByID($doc->lib); $type = $lib->type; @@ -998,12 +992,6 @@ class doc extends control $doc->keywords = str_replace(",", ',', $doc->keywords); $doc->keywords = explode(',', $doc->keywords); } - - if($doc->contentType == 'markdown') - { - $doc->content = commonModel::processMarkdown($doc->content); - $doc->digest = commonModel::processMarkdown($doc->digest); - } } if(isset($doc) and ($doc->type == 'text' || $doc->type == 'article')) diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css index 01c2431ed2..0215993c68 100644 --- a/module/doc/css/objectlibs.css +++ b/module/doc/css/objectlibs.css @@ -18,6 +18,8 @@ #content .title {max-width: 54%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} #content .detail-content {padding-left: 10px;} #mainContent .scrollbar-hover {max-height: 2000px; overflow: scroll;} +#content .editor-preview {background: #fff} +#content .CodeMirror{border: none} #sidebar {width: 275px;} #sidebar>.cell {width: 100%;} #sidebar>.sidebar-toggle {left: 3px; right: auto;} diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index d1ecb68883..c627cecee1 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -100,6 +100,10 @@ echo ""; } } + elseif($doc->contentType == 'markdown') + { + echo ""; + } else { echo $doc->content; @@ -283,3 +287,16 @@ +contentType == 'markdown'):?> + + +content);?> + +