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

* code for task 6244,6242.

Browse Source
This commit is contained in:
jinianlan
2019-08-21 10:25:32 +08:00
parent 5cde119e9d
commit f1ef72dfbb
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+1 -1
View File
@@ -45,7 +45,7 @@ class doc extends control
$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-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
$this->lang->modulePageActions .= common::hasPriv('doc', 'create') ? $this->doc->setCreateDocMenu() : '';
$this->lang->modulePageActions .= common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc() : '';
$actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID");
$this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index');
module/doc/model.php
+13 -13
View File
@@ -147,7 +147,7 @@ class docModel extends model
}
elseif($type == 'all')
{
/* Associated display Settings -> shows only unclosed projects.*/
/* Show all undeleted doclibs,if display settings selected shows only unclosed projects then shows only unclosed projects doclibs. */
$undoneSql = $this->dao->select('id')->from(TABLE_PROJECT)->where('deleted')->eq(0)->andWhere('status')->notin('done,closed')->get();
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('deleted')->eq(0)
@@ -1614,30 +1614,30 @@ class docModel extends model
}
/**
* Set document module index page create document button.
* Build document module index page create document button.
*
* @access public
* @return void
* @return string
*/
public function setCreateDocMenu()
public function buildCreateButton4Doc()
{
$libID = $this->dao->select('id')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->orderBy('id desc')->limit('1')->fetch('id');
$actions = "";
$html = "";
if($libID)
{
$actions .= "<div class='dropdown' id='createDropdown'>";
$actions .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->create . "<span class='caret'></span></button>";
$actions .= "<ul class='dropdown-menu' style='left:0px'>";
$html .= "<div class='dropdown' id='createDropdown'>";
$html .= "<button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i>" . $this->lang->doc->create . "<span class='caret'></span></button>";
$html .= "<ul class='dropdown-menu' style='left:0px'>";
foreach($this->lang->doc->typeList as $typeKey => $typeName)
{
$class = strpos($this->config->doc->officeTypes, $typeKey) !== false ? 'iframe' : '';
$actions .= "<li>";
$actions .= html::a(helper::createLink('doc', 'create', "libID=$libID&moduleID=0&type=$typeKey"), $typeName, '', "class='$class'");
$actions .= "</li>";
$html .= "<li>";
$html .= html::a(helper::createLink('doc', 'create', "libID=$libID&moduleID=0&type=$typeKey"), $typeName, '', "class='$class'");
$html .= "</li>";
}
$actions .="</ul></div>";
$html .="</ul></div>";
}
return $actions;
return $html;
}
public function setFastMenu($fastLib)
module/extension/lang/de.php
+3 -3
View File
@@ -29,9 +29,9 @@ $lang->extension->eraseAction = 'Erase Extension';
$lang->extension->upgrade = 'Erweiterung Upgraden';
$lang->extension->agreeLicense = 'Lizenz';
$lang->extension->structure = 'Struktur';
$lang->extension->extstructure = 'Struktur';
$lang->extension->installed = 'Installiert';
$lang->extension->structure = 'Struktur';
$lang->extension->structureAction = 'Struktur';
$lang->extension->installed = 'Installiert';
$lang->extension->deactivated = 'Deaktiviert';
$lang->extension->available = 'Heruntergeladen';
module/extension/lang/en.php
+1 -1
View File
@@ -30,7 +30,7 @@ $lang->extension->upgrade = 'Upgrade Extension';
$lang->extension->agreeLicense = 'I agree to the license.';
$lang->extension->structure = 'Structure';
$lang->extension->extstructure = 'Extension Structure';
$lang->extension->structureAction = 'Extension Structure';
$lang->extension->installed = 'Installed';
$lang->extension->deactivated = 'Deactivated';
$lang->extension->available = 'Downloaded';
module/extension/lang/zh-cn.php
+3 -3
View File
@@ -29,9 +29,9 @@ $lang->extension->eraseAction = '清除插件';
$lang->extension->upgrade = '升级插件';
$lang->extension->agreeLicense = '我同意该授权';
$lang->extension->structure = '目录结构';
$lang->extension->extstructure = '目录结构';
$lang->extension->installed = '已安装';
$lang->extension->structure = '目录结构';
$lang->extension->structureAction = '目录结构';
$lang->extension->installed = '已安装';
$lang->extension->deactivated = '被禁用';
$lang->extension->available = '已下载';
module/extension/lang/zh-tw.php
+3 -3
View File
@@ -29,9 +29,9 @@ $lang->extension->eraseAction = '清除插件';
$lang->extension->upgrade = '升級插件';
$lang->extension->agreeLicense = '我同意該授權';
$lang->extension->structure = '目錄結構';
$lang->extension->extstructure = '目錄結構';
$lang->extension->installed = '已安裝';
$lang->extension->structure = '目錄結構';
$lang->extension->structureAction = '目錄結構';
$lang->extension->installed = '已安裝';
$lang->extension->deactivated = '被禁用';
$lang->extension->available = '已下載';
module/group/lang/resource.php
+1 -1
View File
@@ -930,7 +930,7 @@ $lang->admin->methodOrder[20] = 'sso';
$lang->resource->extension = new stdclass();
$lang->resource->extension->browse = 'browse';
$lang->resource->extension->obtain = 'obtain';
$lang->resource->extension->structure = 'extstructure';
$lang->resource->extension->structure = 'structureAction';
$lang->resource->extension->install = 'install';
$lang->resource->extension->uninstall = 'uninstallAction';
$lang->resource->extension->activate = 'activateAction';