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

* finish task #6020,#6009,#6007,#5949

Browse Source
This commit is contained in:
jinianlan
2019-07-10 13:41:13 +08:00
parent e5bdaba463
commit 60e7014ef7
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/datatable.fix.html.php
+1 -1
View File
@@ -49,7 +49,7 @@ $(function()
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
<h4 class="modal-title"><i class="icon-cog"></i> <?php echo $lang->datatable->showModule?></h4>
<h4 class="modal-title" style="font-size:14px;"><i class="icon-cog"></i> <?php echo $lang->datatable->showModule?></h4>
</div>
<div class="modal-body">
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('datatable', 'ajaxSave')?>'>
module/doc/control.php
+3 -3
View File
@@ -44,7 +44,7 @@ class doc extends control
$pager = new pager(0, 5, 1);
$this->lang->modulePageActions = $this->doc->setFastMenu($this->lang->doc->fast);
$this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
$this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
$actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID");
$this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index');
@@ -334,7 +334,7 @@ class doc extends control
$this->product->setMenu($this->product->getPairs(), $lib->product);
$this->lang->set('menugroup.doc', 'product');
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
}
elseif($this->from == 'project')
{
@@ -343,7 +343,7 @@ class doc extends control
$this->project->setMenu($this->project->getPairs('nocode'), $lib->project);
$this->lang->set('menugroup.doc', 'project');
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
}
else
{
module/doc/model.php
+1 -1
View File
@@ -102,7 +102,7 @@ class docModel extends model
}
$actions = $this->setFastMenu($fastLib);
$actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : '';
$actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), "<i class='icon icon-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : '';
$this->lang->modulePageActions = $actions;
}
module/doc/view/index.html.php
+1 -1
View File
@@ -125,7 +125,7 @@
<div class="col-sm-7">
<div class="panel block-files block-sm" style="height: 290px;">
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->project->undone . ($app->getClientLang() == 'en' ? ' ' : '') ."{$lang->projectCommon}s";?></div>
<div class="panel-title"><?php echo $lang->project->undone . ($app->getClientLang() == 'en' ? ' ' : '') .($app->getClientLang()=='en'? "{$lang->projectCommon}s": "$lang->projectCommon");?></div>
<nav class="panel-actions nav nav-default">
<li><?php echo html::a($this->createLink('doc', 'allLibs', 'type=project'), '<i class="icon icon-more icon-sm"></i>', '', "title='{$lang->more}'");?></li>
</nav>
module/mail/lang/en.php
+1 -1
View File
@@ -99,7 +99,7 @@ $lang->mail->sendCloudHelp = <<<EOD
EOD;
$lang->mail->sendCloudSuccess = 'Done';
$lang->mail->closeSendCloud = 'Close SendCloud';
$lang->mail->addressWhiteList = 'Add it to the whiltelist of your email server to avoid being blocked';
$lang->mail->addressWhiteList = 'Add it to the whiltelist of your email server to avoid being blocked.';
$lang->mail->ztCloudNotice = <<<EOD
module/user/lang/en.php
+1 -1
View File
@@ -102,7 +102,7 @@ $lang->user->closedBy = 'ClosedBy%s';
$lang->user->reviewedBy = 'ReviewedBy%s';
$lang->user->canceledBy = 'CancelledBy%s';
$lang->user->testTask2Him = 'AssignTo%s';
$lang->user->testTask2Him = 'AssignedTo%s';
$lang->user->case2Him = 'CaseAssignedTo%s';
$lang->user->caseByHim = 'CaseCreatedBy%s';
module/webhook/lang/en.php
+1 -1
View File
@@ -56,7 +56,7 @@ $lang->webhook->trimWords = '';
$lang->webhook->note = new stdClass();
$lang->webhook->note->async = 'If the sending type is asynchronous, you have to go to Admin-System to turn on the cron.';
$lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of {$lang->productCommon} will trigger it.";
$lang->webhook->note->product = "All actions will trigger the hook if {$lang->productCommon} is empty, or only actions of selected {$lang->productCommon} will trigger it.";
$lang->webhook->note->project = "All actions will trigger the hook if {$lang->projectCommon} is empty, or only actions of selected {$lang->projectCommon} will trigger it.";
$lang->webhook->note->typeList['bearychat'] = 'Add a ZenTao bot in bearychat and get the webhook url.';