Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-05-21 15:52:41 +08:00
parent dd21f477a5 169867f280
commit 4a90c9fc54
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+1 -1
View File
@@ -668,7 +668,7 @@ class commonModel extends model
global $lang;
if(!commonModel::hasPriv('action', 'comment', $object)) return false;
echo html::commonButton('<i class="icon icon-chat-line"></i> ' . $lang->action->create, "title='$lang->comment'", 'btn btn-link pull-right btn-comment');
echo html::commonButton('<i class="icon icon-chat-line"></i> ' . $lang->action->create, '', 'btn btn-link pull-right btn-comment');
echo <<<EOD
<div class="modal fade modal-comment">
<div class="modal-dialog">
module/doc/config.php
+1 -1
View File
@@ -20,7 +20,7 @@ $config->doc->custom->objectLibs = $config->doc->customObjectLibs;
$config->doc->editor = new stdclass();
$config->doc->editor->create = array('id' => 'content', 'tools' => 'fullTools');
$config->doc->editor->edit = array('id' => 'content', 'tools' => 'fullTools');
$config->doc->editor->view = array('id' => 'comment,lastComment', 'tools' => 'fullTools');
$config->doc->editor->view = array('id' => 'comment,lastComment', 'tools' => 'simple');
$config->doc->markdown = new stdclass();
$config->doc->markdown->create = array('id' => 'contentMarkdown', 'tools' => 'withchange');
module/doc/view/view.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/ueditor.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php echo css::internal($keTableCSS);?>
<?php $browseLink = $this->session->docList ? $this->session->docList : inlink('browse');?>
<div id="mainMenu" class="clearfix">