Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/common/view/header.html.php

@@ -7,6 +7,7 @@ include 'chosen.html.php';
 <?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
 <?php $this->app->loadConfig('sso');?>
 <?php if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
+<?php if($config->showMainMenu):?>
 <header id='header'>
   <div id='mainHeader'>
     <div class='container'>
@@ -44,6 +45,11 @@ include 'chosen.html.php';
   }
   ?>
 </header>
+<?php else:?>
+<header id='header'>
+  <div id='mainHeader' style="height: 0;"></div>
+</header>
+<?php endif;?>
 
 <?php endif;?>
 <script>

module/common/view/kindeditor.html.php

@@ -36,7 +36,16 @@ $uid = uniqid('');
     'indent', 'outdent', 'subscript', 'superscript', '|',
     'table', 'code', 'pagebreak',
     'fullscreen', 'source', 'preview', 'about'];
-    var editorToolsMap = {fullTools: fullTools, simpleTools: simpleTools, bugTools: bugTools};
+    var docTools =
+    [ 'formatblock', 'fontname', 'fontsize', 'lineheight', '|', 'forecolor', 'hilitecolor', '|', 'bold', 'italic','underline', 'strikethrough', '|',
+    'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', '|',
+    'insertorderedlist', 'insertunorderedlist', '|',
+    'emoticons', 'image', 'insertfile', 'hr', '|', 'link', '|',
+    'undo', 'redo', '|', 'selectall', 'cut', 'copy', 'paste', '|', 'plainpaste', 'wordpaste', '|', 'removeformat', 'clearhtml','quickformat', '|',
+    'indent', 'outdent', 'subscript', 'superscript', '|',
+    'table', 'code', 'pagebreak',
+    'source'];
+    var editorToolsMap = {fullTools: fullTools, simpleTools: simpleTools, bugTools: bugTools, docTools: docTools};
 
     /* Kindeditor default options. */
     var editorDefaults =