- lib}&moduleID=0&apiID={$api->id}&version=0&release=$release");?>">
+ lib}&moduleID=0&apiID={$api->id}&version=0&release=$release");?>" data-app="tab;?>">
method;?>
path;?>
title;?>
diff --git a/module/api/view/content.html.php b/module/api/view/content.html.php
index 0f6fe16205..d62e2d3e37 100644
--- a/module/api/view/content.html.php
+++ b/module/api/view/content.html.php
@@ -23,14 +23,13 @@
', '', "title='{$lang->fullscreen}' class='btn btn-link fullscreen-btn'");
if(!$isRelease)
{
if(common::hasPriv('api', 'edit')) echo html::a(inlink('edit', "apiID=$api->id"), '', '', "title='{$lang->api->edit}' class='btn btn-link' data-app='{$this->app->tab}'");
if(common::hasPriv('api', 'delete'))
{
- $deleteURL = $this->createLink('api', 'delete', "apiID=$api->id&confirm=yes");
- echo html::a("javascript:ajaxDeleteApi(\"$deleteURL\", confirmDelete)", '', '', "title='{$lang->api->delete}' class='btn btn-link'");
+ $deleteURL = $this->createLink('api', 'delete', "apiID=$api->id");
+ echo html::a($deleteURL, '', '', "title='{$lang->api->delete}' class='btn btn-link' target='hiddenwin'");
}
}
?>
diff --git a/module/api/view/create.html.php b/module/api/view/create.html.php
index 34b1ffff60..f79574454f 100644
--- a/module/api/view/create.html.php
+++ b/module/api/view/create.html.php
@@ -38,12 +38,10 @@ js::set('struct_paramsType', $lang->struct->paramsType);
| - | - |
| + | + |
+
+
diff --git a/module/dimension/view/ajaxgetdropmenu.html.php b/module/dimension/view/ajaxgetdropmenu.html.php
index 1c5870dd6b..1d05849796 100644
--- a/module/dimension/view/ajaxgetdropmenu.html.php
+++ b/module/dimension/view/ajaxgetdropmenu.html.php
@@ -25,14 +25,7 @@
#dropMenu.has-search-text .hide-in-search {display: flex;}
#swapper li>.selected {color: #0c64eb!important; background: #e9f2fb!important;}
#dropMenu .col-left {padding-bottom: 0px;}
-#dropMenu .col-footer {text-align: center}
-#dropMenu .btn-manage {line-height:24px}
-
-
-
$dimension) $dimensionNames[$id] = $dimension->name;
diff --git a/module/doc/control.php b/module/doc/control.php
index 5b6bd3ab42..4d2fd3236b 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -151,7 +151,7 @@ class doc extends control
if($type == 'product') $objects = $this->product->getPairs();
if($type == 'project')
{
- $objects = $this->project->getPairsByProgram();
+ $objects = $this->project->getPairsByProgram('', 'all', false, 'order_asc', 'kanban');
if($this->app->tab == 'doc')
{
$this->view->executionPairs = array(0 => '') + $this->execution->getPairs($objectID, 'all', 'multiple,leaf,noprefix');
@@ -275,7 +275,7 @@ class doc extends control
* @param int $libID
* @param string $confirm yes|no
* @param string $type lib|book
- * @param string $from tableContents|objectLibs
+ * @param string $from tableContents|view
* @access public
* @return void
*/
@@ -284,8 +284,7 @@ class doc extends control
if($libID == 'product' or $libID == 'execution') return;
if($confirm == 'no')
{
- $deleteTip = $type == 'book' ? $this->lang->doc->confirmDeleteBook : $this->lang->doc->confirmDeleteLib;
- return print(js::confirm($deleteTip, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes&type=$type&from=$from")));
+ return print(js::confirm($this->lang->doc->confirmDeleteLib, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes&type=$type&from=$from")));
}
else
{
@@ -293,11 +292,6 @@ class doc extends control
if(!empty($lib->main)) return print(js::alert($this->lang->doc->errorMainSysLib));
$this->doc->delete(TABLE_DOCLIB, $libID);
- if(isonlybody())
- {
- unset($_GET['onlybody']);
- return print(js::locate($this->createLink('doc', 'objectLibs', 'type=book'), 'parent.parent'));
- }
if($this->app->tab == 'doc' and $from == 'tableContents') return print(js::reload('parent'));
$objectType = $lib->type;
@@ -354,8 +348,8 @@ class doc extends control
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $docID));
$objectID = zget($lib, $lib->type, 0);
- $params = "type=$linkType&objectID=$objectID&libID={$lib->id}&docID=" . $docResult['id'];
- $link = isonlybody() ? 'parent' : $this->createLink('doc', 'objectLibs', $params);
+ $params = "docID=" . $docResult['id'];
+ $link = isonlybody() ? 'parent' : $this->createLink('doc', 'view', $params);
$response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link);
return $this->send($response);
@@ -391,13 +385,13 @@ class doc extends control
$objects = array();
if($objectType == 'project')
{
- $objects = $this->loadModel('project')->getPairs();
- $this->view->executions = array(0 => '') + $this->loadModel('execution')->getPairs($objectID, 'all', 'multiple,leaf,noprefix');
+ $objects = $this->project->getPairsByProgram('', 'all', false, 'order_asc', 'kanban');
+ $this->view->executions = array(0 => '') + $this->loadModel('execution')->getPairs($objectID, 'sprint,stage', 'multiple,leaf,noprefix');
}
elseif($objectType == 'execution')
{
$execution = $this->loadModel('execution')->getById($objectID);
- $objects = $this->execution->getPairs($execution->project, 'all', "multiple,leaf,noprefix");
+ $objects = $this->execution->getPairs($execution->project, 'sprint,stage', "multiple,leaf,noprefix");
}
elseif($objectType == 'product')
{
@@ -506,7 +500,7 @@ class doc extends control
if(!empty($objectType) and $objectType != 'doc' and $doc->type != 'chapter' and $doc->type != 'article')
{
- $link = $this->createLink('doc', 'objectLibs', "type={$lib->type}&objectID=$objectID&libID={$doc->lib}&docID=$docID") . "#app={$this->app->tab}";
+ $link = $this->createLink('doc', 'view', "docID=$docID") . "#app={$this->app->tab}";
}
if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
@@ -552,7 +546,7 @@ class doc extends control
$objects = array();
if($objectType == 'project')
{
- $objects = $this->loadModel('project')->getPairs();
+ $objects = $this->project->getPairsByProgram('', 'all', false, 'order_asc', 'kanban');
}
elseif($objectType == 'execution')
{
@@ -585,67 +579,6 @@ class doc extends control
$this->display();
}
- /**
- * View a doc.
- *
- * @param int $docID
- * @param int $version
- * @access public
- * @return void
- */
- public function view($docID, $version = 0)
- {
- /* Get doc. */
- $docID = (int)$docID;
- $doc = $this->doc->getById($docID, $version, true);
- if(!$doc)
- {
- if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
- return print(js::error($this->lang->notFound) . js::locate($this->createLink('doc', 'index')));
- }
-
- /* The global search opens in the document library. */
- if(!isonlybody())
- {
- $docLib = $this->doc->getLibById($doc->lib);
- if($docLib->type == 'custom')
- {
- $libID = $doc->lib;
- $objectID = 0;
- $type = 'custom';
- }
- else
- {
- $libID = $docLib->id;
- $type = $docLib->type;
- $objectID = $docLib->$type;
- }
-
- $browseLink = inLink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID=$docID");
- if(!(defined('RUN_MODE') && RUN_MODE == 'api')) $this->locate($browseLink);
- }
-
- /* Check priv when lib is product or project. */
- $lib = $this->doc->getLibByID($doc->lib);
- $type = $lib->type;
-
- $this->view->title = "DOC #$doc->id $doc->title - " . $lib->name;
- $this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$doc->lib"), $lib->name);
- $this->view->position[] = $this->lang->doc->view;
-
- $this->view->doc = $doc;
- $this->view->lib = $lib;
- $this->view->type = $type;
- $this->view->version = $version ? $version : $doc->version;
- $this->view->actions = $this->action->getList('doc', $docID);
- $this->view->users = $this->user->getPairs('noclosed,noletter');
- $this->view->preAndNext = $this->loadModel('common')->getPreAndNextObject('doc', $docID);
- $this->view->keTableCSS = $this->doc->extractKETableCSS($doc->content);
- $this->view->autoloadPage = $this->doc->checkAutoloadPage($doc);
-
- $this->display();
- }
-
/**
* Delete a doc.
*
@@ -697,8 +630,25 @@ class doc extends control
if($from == 'lib')
{
- $objectID = $objectType == 'project' ? $doc->project : $doc->product;
- $response['locate'] = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID={$objectID}&libID={$doc->lib}");
+ $method = 'tableContents';
+ $objectID = 0;
+ if($objectType == 'product')
+ {
+ $method = 'productSpace';
+ $objectID = $doc->product;
+ }
+ elseif(in_array($objectType, array('project', 'execution')) and $this->app->tab != 'execution')
+ {
+ $method = 'projectSpace';
+ $objectID = $doc->project;
+ }
+ elseif($this->app->tab == 'execution')
+ {
+ $objectID = $doc->execution;
+ }
+ $params = "objectID={$objectID}&libID={$doc->lib}";
+ if($method == 'tableContents') $params = "type=$objectType&" . $params;
+ $response['locate'] = $this->createLink('doc', $method, $params);
}
}
return $this->send($response);
@@ -1079,53 +1029,6 @@ class doc extends control
$this->display();
}
- /**
- * Show all libs by type.
- *
- * @param string $type
- * @param string $product
- * @param int $recTotal
- * @param int $recPerPage
- * @param int $pageID
- * @access public
- * @return void
- */
- public function allLibs($type, $product = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
- {
- setcookie('product', $product, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
-
- $libName = $this->lang->doc->libTypeList[$type];
- $crumb = html::a(inlink('allLibs', "type=$type&product=$product"), $libName);
- if($product and $type == 'executionCommon') $crumb = $this->doc->getProductCrumb($product);
-
- $this->view->title = $libName;
- $this->view->position[] = $libName;
-
- /* Load pager. */
- $this->app->loadClass('pager', $static = true);
- $pager = new pager($recTotal, $recPerPage, $pageID);
-
- $libs = $this->doc->getAllLibsByType($type, $pager);
- $subLibs = array();
- if($type == 'product' or $type == 'execution')
- {
- $subLibs = $this->doc->getSubLibGroups($type, array_keys($libs));
- if($this->cookie->browseType == 'bylist') $this->view->users = $this->user->getPairs('noletter');
- }
- else
- {
- $this->view->itemCounts = $this->doc->statLibCounts(array_keys($libs));
- }
-
- $this->view->type = $type;
- $this->view->libs = $libs;
- $this->view->subLibs = $subLibs;
- $this->view->pager = $pager;
- $this->view->product = $product;
- $this->view->from = $this->lang->navGroup->doc == 'project' ? 'project' : 'doc';
- $this->display();
- }
-
/**
* Show accessDenied response.
*
@@ -1145,28 +1048,32 @@ class doc extends control
}
/**
- * Show libs for product or project.
+ * Document details page.
*
- * @param string $type
- * @param int $objectID projectID|productID
- * @param int $libID
- * @param int $docID
- * @param int $version
- * @param int $appendLib
+ * @param int $docID
+ * @param int $version
+ * @param int $appendLib
* @access public
* @return void
*/
- public function objectLibs($type, $objectID = 0, $libID = 0, $docID = 0, $version = 0, $appendLib = 0)
+ public function view($docID = 0, $version = 0, $appendLib = 0)
{
- $lib = $this->doc->getLibById($libID);
- if(!empty($lib) and $lib->deleted == '1') $appendLib = $libID;
+ $doc = $this->doc->getById($docID);
+ if(!$doc)
+ {
+ if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
+ return print(js::error($this->lang->notFound) . js::locate($this->inlink('index')));
+ }
- list($libs, $libID, $object, $objectID) = $this->doc->setMenuByType($type, $objectID, $libID, $appendLib);
+ $lib = $this->doc->getLibById($doc->lib);
+ if(!empty($lib) and $lib->deleted == '1') $appendLib = $doc->id;
- /* Set Custom. */
- foreach(explode(',', $this->config->doc->customObjectLibs) as $libType) $customObjectLibs[$libType] = $this->lang->doc->customObjectLibs[$libType];
+ $objectType = isset($lib->type) ? $lib->type : 'custom';
+ $type = $objectType == 'execution' && $this->app->tab != 'execution' ? 'project' : $objectType;
+ $objectID = isset($doc->{$type}) ? $doc->{$type} : 0;
+ list($libs, $libID, $object, $objectID) = $this->doc->setMenuByType($type, $objectID, $doc->lib, $appendLib);
- $moduleTree = $type == 'book' ? $this->doc->getBookStructure($libID) : $this->doc->getTreeMenu($type, $objectID, $libID, 0, $docID);
+ $moduleTree = $this->doc->getTreeMenu($type, $objectID, $libID, 0, $docID);
/* Get doc. */
if($docID)
@@ -1181,7 +1088,7 @@ class doc extends control
}
}
- if(isset($doc) and ($doc->type == 'text' || $doc->type == 'article'))
+ if(isset($doc) and $doc->type == 'text')
{
/* Split content into an array. */
$content = explode("\n", $doc->content);
@@ -1247,36 +1154,30 @@ class doc extends control
$doc = $docID ? $doc : '';
- $this->view->customObjectLibs = $customObjectLibs;
- $this->view->showLibs = $this->config->doc->custom->objectLibs;
-
- $this->view->title = ($type == 'book' or $type == 'custom') ? $this->lang->doc->customAB : $object->name;
- $this->view->position[] = ($type == 'book' or $type == 'custom') ? $this->lang->doc->customAB : $object->name;
-
+ $this->view->title = $type == 'custom' ? $this->lang->doc->customAB : $object->name;
$this->view->docID = $docID;
$this->view->doc = $doc;
- $this->view->type = $type;
$this->view->version = $version;
$this->view->object = $object;
$this->view->objectID = $objectID;
- $this->view->objectType = $type;
+ $this->view->objectType = $objectType;
+ $this->view->type = $type;
$this->view->libID = $libID;
$this->view->lib = isset($libs[$libID]) ? $libs[$libID] : new stdclass();
$this->view->libs = $this->doc->getLibsByObject($type, $objectID);
- $this->view->moduleTree = $moduleTree;
$this->view->canBeChanged = common::canModify($type, $object); // Determines whether an object is editable.
$this->view->actions = $docID ? $this->action->getList('doc', $docID) : array();
$this->view->users = $this->user->getPairs('noclosed,noletter');
- $this->view->preAndNext = $this->doc->getPreAndNextDoc($docID, $libID);
$this->view->autoloadPage = $this->doc->checkAutoloadPage($doc);
+ $this->view->libTree = $this->doc->getLibTree($libID, $libs, $type, $doc->module, $objectID);
$this->display();
}
/**
- * Show the catalog of the doc library.
+ * Show team Space.
*
- * @param string $type
+ * @param string $type custom|product|project|execution
* @param int $objectID
* @param int $libID
* @param int $moduleID
@@ -1289,25 +1190,26 @@ class doc extends control
* @access public
* @return void
*/
- public function tableContents($type, $objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+ public function tableContents($type = 'custom', $objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
+ $isFirstLoad = $libID == 0 ? true : false;
$this->session->set('createProjectLocate', $this->app->getURI(true), 'doc');
+ $this->session->set('structList', $this->app->getURI(true), 'doc');
+ $this->session->set('spaceType', $type, 'doc');
if(empty($browseType)) $browseType = 'all';
list($libs, $libID, $object, $objectID, $objectDropdown) = $this->doc->setMenuByType($type, $objectID, $libID);
- $libID = (int)$libID;
- $moduleTree = $type == 'book' ? $this->doc->getBookStructure($libID) : $this->doc->getTreeMenu($type, $objectID, $libID);
-
- $libTree = $this->doc->getLibTree($libID, $libs, $type, $moduleID, $objectID, $browseType);
-
- $title = ($type == 'book' or $type == 'custom') ? $this->lang->doc->tableContents : $object->name . $this->lang->colon . $this->lang->doc->tableContents;
+ $libID = (int)$libID;
+ $title = $type == 'custom' ? $this->lang->doc->tableContents : $object->name . $this->lang->colon . $this->lang->doc->tableContents;
$lib = $this->doc->getLibById($libID);
$libType = isset($lib->type) && $lib->type == 'api' ? 'api' : 'lib';
/* Build the search form. */
- $queryID = $browseType == 'bySearch' ? (int)$param : 0;
- $actionURL = $this->createLink('doc', 'tableContents', "type=$type&objectID=$objectID&libID=$libID&moduleID=0&browseType=bySearch&orderBy=$orderBy¶m=myQueryID");
+ $queryID = $browseType == 'bySearch' ? (int)$param : 0;
+ $params = "objectID=$objectID&libID=$libID&moduleID=0&browseType=bySearch&orderBy=$orderBy¶m=myQueryID";
+ if($this->app->rawMethod == 'tablecontents') $params = "type=$type&" . $params;
+ $actionURL = $this->createLink('doc', $this->app->rawMethod, $params);
if($libType == 'api')
{
$this->loadModel('api')->buildSearchForm($lib, $queryID, $actionURL, $libs, $type);
@@ -1318,11 +1220,8 @@ class doc extends control
}
/* Load pager. */
- $rawMethod = $this->app->rawMethod;
- $this->app->rawMethod = 'tableContents';
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
- $this->app->rawMethod = $rawMethod;
if($libType == 'api')
{
@@ -1349,9 +1248,10 @@ class doc extends control
$this->view->type = $type;
$this->view->objectType = $type;
$this->view->browseType = $browseType;
+ $this->view->isFirstLoad = $isFirstLoad;
$this->view->param = $queryID;
$this->view->users = $this->user->getPairs('noletter');
- $this->view->libTree = $libTree;
+ $this->view->libTree = $this->doc->getLibTree($libID, $libs, $type, $moduleID, $objectID, $browseType);
$this->view->libID = $libID;
$this->view->moduleID = $moduleID;
$this->view->objectDropdown = $objectDropdown;
@@ -1360,13 +1260,54 @@ class doc extends control
$this->view->pager = $pager;
$this->view->objectID = $objectID;
$this->view->orderBy = $orderBy;
- $this->view->exportMethod = $type . '2export';
- $this->view->canExport = common::hasPriv('doc', $type . '2export');
+ $this->view->canExport = $libType == 'api' ? common::hasPriv('api', 'export') : common::hasPriv('doc', $type . '2export');
+ $this->view->exportMethod = $libType == 'api' ? 'export' : $type . '2export';
$this->view->apiLibID = key($apiLibs);
+
$this->display();
}
+ /**
+ * Show product space.
+ *
+ * @param int $objectID
+ * @param int $libID
+ * @param int $moduleID
+ * @param string $browseType all|draft|bysearch
+ * @param string $orderBy
+ * @param int $param
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
+ * @access public
+ * @return void
+ */
+ public function productSpace($objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+ {
+ echo $this->fetch('doc', 'tableContents', "type=product&objectID=$objectID&libID=$libID&moduleID=$moduleID&browseType=$browseType&orderBy=$orderBy¶m=$param&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+ }
+
+ /**
+ * Show project space.
+ *
+ * @param int $objectID
+ * @param int $libID
+ * @param int $moduleID
+ * @param string $browseType all|draft|bysearch
+ * @param string $orderBy
+ * @param int $param
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
+ * @access public
+ * @return void
+ */
+ public function projectSpace($objectID = 0, $libID = 0, $moduleID = 0, $browseType = 'all', $orderBy = 'status,id_desc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+ {
+ echo $this->fetch('doc', 'tableContents', "type=project&objectID=$objectID&libID=$libID&moduleID=$moduleID&browseType=$browseType&orderBy=$orderBy¶m=$param&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+ }
+
/**
* Select lib type.
*
@@ -1400,26 +1341,6 @@ class doc extends control
$this->display();
}
- /**
- * Sort libs.
- * @param string $type
- * @param int $objectID
- *
- * @access public
- * @return void
- */
- public function sortLibs($type, $objectID)
- {
- if(!empty($_POST))
- {
- $this->doc->updateLibOrder();
- return print(js::reload('parent.parent'));
- }
- $this->view->title = $this->lang->doc->sortLibs;
- $this->view->libs = $this->doc->getLibs($type, '', '', $objectID);
- $this->display();
- }
-
/**
* Ajax get objectType drop menu.
*
@@ -1455,10 +1376,58 @@ class doc extends control
public function ajaxGetExecution($projectID)
{
$executions = $this->execution->getList($projectID);
- $executionPairs = array(0 => '') + $this->execution->getPairs($projectID, 'all', 'multiple,leaf,noprefix');
+ $executionPairs = array(0 => '') + $this->execution->getPairs($projectID, 'sprint,stage', 'multiple,leaf,noprefix');
$project = $this->project->getById($projectID);
$disabled = $project->multiple ? '' : 'disabled';
return print(html::select('execution', $executionPairs, 0, "class='form-control' data-placeholder='{$this->lang->doclib->tip->selectExecution}' $disabled data-drop_direction='down' data-drop-direction='down'"));
}
+
+ /**
+ * Edit a catalog.
+ *
+ * @param int $moduleID
+ * @param string $type doc|api
+ * @access public
+ * @return void
+ */
+ public function editCatalog($moduleID, $type)
+ {
+ echo $this->fetch('tree', 'edit', "moduleID=$moduleID&type=$type");
+ }
+
+ /**
+ * Delete a catalog.
+ *
+ * @param int $rootID
+ * @param int $moduleID
+ * @param string $confirm yes|no
+ * @access public
+ * @return void
+ */
+ public function deleteCatalog($rootID, $moduleID, $confirm = 'no')
+ {
+ echo $this->fetch('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=$confirm");
+ }
+
+ /**
+ * Display setting.
+ *
+ * @access public
+ * @return void
+ */
+ public function displaySetting()
+ {
+ $this->loadModel('setting');
+ if($_POST)
+ {
+ $this->setting->setItem($this->app->user->account . '.doc.showDoc', $this->post->showDoc);
+ return print(js::reload('parent.parent'));
+ }
+
+ $showDoc = $this->setting->getItem('owner=' . $this->app->user->account . '&module=doc&key=showDoc');
+ $this->view->showDoc = $showDoc === '0' ? '0' : '1';
+
+ $this->display();
+ }
}
diff --git a/module/doc/css/displaysetting.css b/module/doc/css/displaysetting.css
new file mode 100644
index 0000000000..9bc5605e9b
--- /dev/null
+++ b/module/doc/css/displaysetting.css
@@ -0,0 +1,2 @@
+td.titleBox {width: 100px;}
+td.titleBox + td > .radio-inline + .radio-inline{margin-left: 30px;}
diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
deleted file mode 100644
index a6377b60a1..0000000000
--- a/module/doc/css/objectlibs.css
+++ /dev/null
@@ -1,53 +0,0 @@
-.lib {width: 130px; margin-bottom: 10px;}
-.addbtn {padding-top: 22px; height: 63px; border: 1px dashed #ddd; width: 60px;}
-.addbtn .icon-plus {font-size: 18px; display: block; opacity: 0.5; transition: opacity .2s; text-shadow: 1px 1px 3px rgba(0,0,0,.2);}
-.addbtn:hover .icon-plus {opacity: .9; animation: flash-icon 1s linear alternate infinite;}
-#subHeader #dropMenu {min-width: 250px; box-sizing: inherit; max-height: inherit;}
-#subHeader #dropMenu .table-col .list-group {padding-top: 10px;}
-.main-col .block-files .panel-heading {padding-right: 20px;}
-.main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
-.side-col .action a {margin: 0 auto 3px; display: block; max-width: 200px;}
-.side-col .tips {padding: 0 10px;}
-.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 15px;}
-.main-col .doc-title .title {margin-right: 10px; line-height: 32px; font-size: 25px;}
-.main-col .doc-title .info {flex: 1 1 0;}
-.main-col .doc-title .version a {font-size: 13px; color: #8c8c8c;}
-.main-col .doc-title .version .dropdown-menu a:hover {color: #ffffff;}
-.main-col .doc-title .actions a + a {margin-left: 8px;}
-.main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
-#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;}
-.hide-sidebar #sidebar>.cell {display: none;}
-.hide-sidebar #sidebar>.sidebar-toggle>.icon:before {content: "\e314";}
-.detail.empty {line-height: 200px;}
-.main-col+.side-col {padding-left: 16px;}
-.main-col iframe {min-height: 380px;}
-.article-content .keywords {margin-bottom: 15px;}
-
-.article-content {width: 100%; display: inline-block;}
-.outline {position: relative;}
-.outline .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;}
-.outline .outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
-.outline .outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
-.outline ul li {list-style: none;}
-.outline-content {display: none; padding-top: 18px;}
-.outline-content a {color: #838A9D;}
-.outline-content li.text-ellipsis.active>a {font-weight: 700; color: #0c64eb;}
-#outline li.has-list.open:before {content: unset;}
-
-.title {font-size: 20px !important;}
-.article-content.comment {width: 100% !important;}
-
-.tree-group {position: relative;}
-.tree-group > .module-name {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width: 100%; display: block;}
-.tree-group .tree-actions {display: none; position: absolute; right: 0; top: 0; background-color: #fff; white-space: nowrap;}
-.tree-group:hover > .module-name {width: calc(100% - 20px);}
-.tree-group:hover .tree-actions {display: block}
-.tree li.has-list.open:before {left: 6px;}
-.sortable-sorting .tree-group:hover .tree-actions {display: none;}
diff --git a/module/doc/css/sortlibs.css b/module/doc/css/sortlibs.css
deleted file mode 100644
index de9080726c..0000000000
--- a/module/doc/css/sortlibs.css
+++ /dev/null
@@ -1,5 +0,0 @@
-#mainContent .doclib-name {font-size: 13px; font-weight: 550; padding: 10px 0px;}
-#mainContent #libs {padding-bottom: 10px;}
-#mainContent #libs .lib {padding-bottom: 5px;}
-#mainContent #libs .lib .lib-name{cursor: pointer;}
-#mainContent #libs .lib .icon-move {padding-left: 4px; font-size:13px; vertical-align: text-top; cursor: pointer;}
diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css
index 871ee3c37b..ed62b56ae8 100644
--- a/module/doc/css/tablecontents.css
+++ b/module/doc/css/tablecontents.css
@@ -31,7 +31,7 @@
span.item>a {padding-left: 6px;}
span.dotted-line+a {display: block;}
#modules li.doc:before, .chapterNode:before, .independent:before {content: " "; width: 100%; border-bottom: 1px dashed #b5b9c5; position: absolute; top: 13px; right: 0; left: 30px;}
-.doc-title ,.item{display: inline-block !important; position: relative; padding-right: 10px; max-width:80%; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;}
+.doc-title ,.item{display: inline-block !important; position: relative; padding-right: 10px; max-width:80%; white-space: nowrap; text-overflow: clip; overflow: hidden;}
#modules i.icon-file-text {color: #D0D2D6; font-size: 14px;}
.sortable-sorting .module-name > a {cursor: move;}
diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index 71656e2804..d4e4b007b8 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -1,25 +1,49 @@
-.versions .dropdown-menu {max-height: 260px; overflow-y: auto;}
-.table-data > tbody > tr > th.w-80px {width: 80px;}
-.detail-content .file-image {position: relative; padding: 0 10px; margin-right: 10px;}
-.detail-content .file-image > span.right-icon {position: absolute; right: -10px; top: 0;}
-#urlIframe {border: 0px;}
+.main-col .block-files .panel-heading {padding-right: 20px;}
+.main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
+.main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 15px;}
+.main-col .doc-title .title {margin-right: 10px; line-height: 32px; font-size: 25px;}
+.main-col .doc-title .info {flex: 1 1 0;}
+.main-col .doc-title .version a {font-size: 13px; color: #8c8c8c;}
+.main-col .doc-title .version .dropdown-menu a:hover {color: #ffffff;}
+.main-col .doc-title .actions a + a {margin-left: 8px;}
+.main-col .doc-title .actions i {font-size: 15px; color: #8c8c8c;}
+#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;}
+.hide-sidebar #sidebar>.cell {display: none;}
+.hide-sidebar #sidebar>.sidebar-toggle>.icon:before {content: "\e314";}
+.detail.empty {line-height: 200px;}
+.main-col iframe {min-height: 380px;}
+.article-content .keywords {margin-bottom: 15px;}
-#urlCard {border: 1px solid #ccc; width: 100%; min-height: 100px; padding: 8px; border-radius: 4px; margin: 103px 0;
- -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 6px 0 rgba(0,0,0,.045);
- box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 6px 0 rgba(0,0,0,.045);
-}
-#urlCard .url-icon {float: left; width: 45px; height: 45px; margin-right: 5px;}
-#urlCard .url-content {padding-left: 55px;}
-#urlCard .url-title {font-weight:bold; font-size: 16px; min-height: 20px;}
-#urlCard .url-href a {color: #888;}
+.article-content {width: 100%; display: inline-block;}
+.outline {position: relative;}
+.outline .outline-toggle i.icon-angle-right, i.icon-angle-left {width: 18px; height: 18px; border-radius: 50%; position: absolute; padding-left: 2px; padding-top: 1px;}
+.outline .outline-toggle i.icon-angle-right:before {content: "\e314"; cursor: pointer;}
+.outline .outline-toggle i.icon-angle-left:before {content: "\e315"; cursor: pointer;}
+.outline ul li {list-style: none;}
+.outline-content {display: none; padding-top: 18px;}
+.outline-content a {color: #838A9D;}
+.outline-content li.text-ellipsis.active>a {font-weight: 700; color: #0c64eb;}
+#outline li.has-list.open:before {content: unset;}
-.main-row > .side-col {transition: width .2s;}
-.main-row > .main-col .article-content {transition: max-width; margin: 0 auto !important;}
-.main-row > .side-col > .cell {transition: opacity .2s; margin-bottom: 10px;}
-.doc-fullscreen .main-row > .side-col {width: 0; position: relative; overflow: hidden;}
-.doc-fullscreen .fullscreen-btn > .icon-fullscreen:before {content: '\e972';}
-.right-icon a {color: #1183fb;}
-.cell th,td {word-break: break-word;}
-.main-actions {width: 100% !important;}
-.main-col .editor-preview {background: #fff}
-.main-col .CodeMirror{border: none}
+.title {font-size: 20px !important;}
+.article-content.comment {width: 100% !important;}
+
+.flex {display: flex;}
+.flex-none {flex: none;}
+.flex-auto {flex: auto;}
+.flex-full > .panel {box-shadow: none;}
+.float-r {float: right;}
+.h-full {height: 100%;}
+.w-full {width: 100%;}
+.overflow-x-auto {overflow-x: auto;}
+.overflow-auto {overflow: auto;}
+.overflow-visible {overflow: visible;}
+.overflow-hidden {overflow: hidden;}
+#mainContent > .panel {margin-bottom: 0; height: calc(100vh - 125px); overflow-y: auto;}
diff --git a/module/doc/js/objectlibs.js b/module/doc/js/objectlibs.js
deleted file mode 100644
index 7f8d8f5f36..0000000000
--- a/module/doc/js/objectlibs.js
+++ /dev/null
@@ -1,202 +0,0 @@
-$(function()
-{
- if($.cookie('isFullScreen') == 1) fullScreen();
-
- $('.menu-actions > a').click(function()
- {
- $(this).parent().hasClass('open') ? $(this).css('background', 'none') : $(this).css('background', '#f1f1f1');
- })
-
- $('.menu-actions > a').blur(function() {$(this).css('background', 'none');})
-})
-
-/**
- * Ajax delete doc.
- *
- * @param string $link
- * @param int $replaceID
- * @param stirng $notice
- * @access public
- * @return void
- */
-function ajaxDeleteDoc(link, replaceID, notice)
-{
- if(confirm(notice))
- {
- $.get(link, function(data)
- {
- location.href = JSON.parse(data).locate;
- });
- }
-}
-
-/**
- * Delete a file.
- *
- * @param int $fileID
- * @access public
- * @return void
- */
-function deleteFile(fileID)
-{
- if(!fileID) return;
- hiddenwin.location.href = createLink('file', 'delete', 'fileID=' + fileID);
-}
-
-/**
- * Display the document in full screen.
- *
- * @access public
- * @return void
- */
-function fullScreen()
-{
- var element = document.getElementById('content');
- var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullscreen;
- if(requestMethod)
- {
- var afterEnterFullscreen = function()
- {
- $('#mainActions').removeClass('hidden');
- $('#content').addClass('scrollbar-hover');
- $('#content .actions').addClass('hidden');
- $('#content .file-image .right-icon').addClass('hidden');
- $('#content .detail').eq(1).addClass('hidden');
- $.cookie('isFullScreen', 1);
- };
-
- var whenFailEnterFullscreen = function(error)
- {
- $.cookie('isFullScreen', 0);
- };
-
- try
- {
- var result = requestMethod.call(element);
- if(result && (typeof result.then === 'function' || result instanceof window.Promise))
- {
- result.then(afterEnterFullscreen).catch(whenFailEnterFullscreen);
- }
- else
- {
- afterEnterFullscreen();
- }
- }
- catch (error)
- {
- whenFailEnterFullscreen(error);
- }
- }
-
- $('.main-col iframe').css('min-height', $(window).height() + 'px');
-}
-
-/**
- * Exit full screen.
- *
- * @access public
- * @return void
- */
-function exitFullScreen()
-{
- $('#mainActions').addClass('hidden');
- $('#content').removeClass('scrollbar-hover');
- $('#content .actions').removeClass('hidden');
- $('#content .file-image .right-icon').removeClass('hidden');
- $('#content .detail').eq(1).removeClass('hidden');
- $('.main-col iframe').css('min-height', '380px');
- $.cookie('isFullScreen', 0);
-}
-
-document.addEventListener('fullscreenchange', function (e)
-{
- if(!document.fullscreenElement) exitFullScreen();
-});
-
-document.addEventListener('webkitfullscreenchange', function (e)
-{
- if(!document.webkitFullscreenElement) exitFullScreen();
-});
-
-document.addEventListener('mozfullscreenchange', function (e)
-{
- if(!document.mozFullScreenElement) exitFullScreen();
-});
-
-document.addEventListener('msfullscreenChange', function (e)
-{
- if(!document.msfullscreenElement) exitFullScreen();
-});
-
-$(function()
-{
- $(document).keydown(function(event)
- {
- if($.cookie('isFullScreen') == 1)
- {
- if(event.keyCode == 37) $('#prevPage').click();
- if(event.keyCode == 39) $('#nextPage').click();
- }
- });
-
- $('.outline').height($('.article-content').height());
-
- $('#content').on('click', '.outline .outline-toggle i.icon-angle-right', function()
- {
- $('.article-content').css('width', '85%');
- $('.outline').css({'min-width' : '180px', 'border-left' : '2px solid #efefef'});
- $(this).removeClass('icon-angle-right').addClass('icon-angle-left').css('left', '-9px');
- $('.outline-content').show();
- if($('#sidebar>.cell').is(':visible')) $('#sidebar .icon.icon-angle-right').trigger("click");
- }).on('click', '.outline .outline-toggle i.icon-angle-left', function()
- {
- $('.article-content').width('100%');
- $(this).removeClass('icon-angle-left').addClass('icon-angle-right');
- $('.outline-content').hide();
- }).on('click', '#outline li', function(e)
- {
- $('#outline li.active').removeClass('active');
- $(e.target).closest('li').addClass('active');
- });
-
- $('#outline li.has-list').addClass('open in');
- $('#outline li.has-list>i+ul').prev('i').remove();
-
- $(document).on('click', '.detail-content a', function(event)
- {
- var target = $(this).attr('target');
- if($.cookie('isFullScreen') == 1 && target != '_blank') exitFullScreen();
- })
-
- /* Update doc content silently on switch doc version, story #40503 */
- $(document).on('click', '.doc-version-menu a, #mainActions .container a', function(event)
- {
- var $tmpDiv = $('
+
+
+
+
+
+ dev->moduleList?>
+
+
+
+
+
+
+
+
+
+
+
+ method;?>
+ path;?>
+
+
+
+
+
+ params['query']):?>
+
+
+
+
+ ';
+ $field = '';
+ for($i = 0; $i < $level; $i++) $field .= ' '. ($i == $level-1 ? '∟' : ' ') . ' ';
+ $field .= $data['field'];
+ $str .= '' . $field . ' ';
+ $str .= '' . zget($typeList, $data['paramsType'], '') . ' ';
+ $str .= '' . zget($lang->api->boolList, $data['required'], '') . ' ';
+ $str .= '' . $data['desc'] . ' ';
+ $str .= '';
+ if(isset($data['children']) && count($data['children']) > 0)
+ {
+ $level++;
+ foreach($data['children'] as $item) $str .= parseTree($item, $typeList, $level);
+ }
+ return $str;
+ }
+ ?>
+ params['params']):?>
+
+
+
+
+ paramsExample):?>
+
+
+
+
+ responseExample):?>
+
+ title;?>
+desc;?>
+ params['header']):?>
+ api->header;?>
+| api->req->name;?> | +api->req->type;?> | +api->req->required;?> | +api->req->desc;?> | +
|---|---|---|---|
| + | String | +api->boolList[$param['required']];?> | ++ |
api->query;?>
+| api->req->name;?> | +api->req->type;?> | +api->req->required;?> | +api->req->desc;?> | +
|---|---|---|---|
| + | String | +api->boolList[$param['required']];?> | ++ |
api->params;?>
+| api->req->name;?> | +api->req->type;?> | +api->req->required;?> | +api->req->desc;?> | +
|---|
api->paramsExample;?>
+paramsExample;?>api->response;?>
+| api->req->name;?> | +api->req->type;?> | +api->req->required;?> | +api->req->desc;?> | +
|---|
api->responseExample;?>
+responseExample;?>');
- $tmpDiv.load($(this).data('url') + ' #mainContent', function()
- {
- $('#content').html($tmpDiv.find('#content').html());
- $('#sidebarContent').html($tmpDiv.find('#sidebarContent').html());
- $('#actionbox .histories-list').html($tmpDiv.find('#actionbox .histories-list').html());
- if($.cookie('isFullScreen') == 1) fullScreen();
- $('#content [data-ride="tree"]').tree();
- $('#outline li.has-list').addClass('open in');
- $('#outline li.has-list>i+ul').prev('i').remove();
- if($('#markdownContent').val())
- {
- var simplemde = new SimpleMDE({element: $("#markdownContent")[0],toolbar:false, status: false});
- simplemde.value(String($('#markdownContent').val()));
- simplemde.togglePreview();
- }
- });
- });
-
- $('#sidebar .icon.icon-angle-right').click(function()
- {
- if($('#sidebar>.cell').is(':hidden') && $('.outline-content').is(':visible'))
- {
- $('.outline .outline-toggle i.icon-angle-left').trigger("click");
- }
- })
-
- $('.outline .outline-toggle i.icon-angle-right').trigger("click");
-})
diff --git a/module/doc/js/sortlibs.js b/module/doc/js/sortlibs.js
deleted file mode 100644
index 7086d79cf0..0000000000
--- a/module/doc/js/sortlibs.js
+++ /dev/null
@@ -1,40 +0,0 @@
-$(function()
-{
- /* Make libs sortable. */
- $('#libs').sortable(
- {
- trigger: '.lib > .icon-move, .lib > .lib-name',
- dropToClass: 'sort-to',
- stopPropagation: true,
- nested: true,
- selector: 'div',
- dragCssClass: 'drop-here',
- canMoveHere: function($ele, $target)
- {
- var maxTop = $('#libs .libList').height() - $ele.height();
- if(parseFloat($('.drag-shadow').css('top')) < 0) $('.drag-shadow').css('top', '0');
- if(parseFloat($('.drag-shadow').css('left')) != 0) $('.drag-shadow').css('left', '0');
- if(parseFloat($('.drag-shadow').css('top')) > maxTop) $('.drag-shadow').css('top', maxTop + 'px');
- if(parseFloat($('.drag-shadow').css('bottom')) > $('#libs').height()) $('.drag-shadow').css('bottom', '0');
- return true;
- },
- targetSelector: function($ele, $root)
- {
- var $libs = $ele.closest('#libs .libList');
- return $libs.children('div.lib');
- },
- always: function()
- {
- $('#libs,#libs .is-sorting').removeClass('is-sorting');
- },
- finish: function(e)
- {
- var orders = ',';
- $('#libs .libList').find('div.lib').each(function()
- {
- orders += $(this).attr('data-id') + ',';
- });
- $('#libIdList').attr('value', orders);
- }
- });
-});
diff --git a/module/doc/js/view.js b/module/doc/js/view.js
index 99bb339fee..7f8d8f5f36 100644
--- a/module/doc/js/view.js
+++ b/module/doc/js/view.js
@@ -1,42 +1,202 @@
$(function()
{
- var isFullscreen = $.cookie('docFullscreen') == 'true';
- $('body').toggleClass('doc-fullscreen', isFullscreen);
- $('.side-col').toggleClass('hidden', isFullscreen);
- $('#mainMenu .fullscreen-btn').attr('title', isFullscreen ? retrack : fullscreen);
- $('#mainMenu .fullscreen-btn').html(' ' + (isFullscreen ? retrack : fullscreen));
+ if($.cookie('isFullScreen') == 1) fullScreen();
- $('#mainMenu .fullscreen-btn').click(function()
+ $('.menu-actions > a').click(function()
{
- $('.side-col').toggleClass('hidden');
- $('body').toggleClass('doc-fullscreen');
+ $(this).parent().hasClass('open') ? $(this).css('background', 'none') : $(this).css('background', '#f1f1f1');
+ })
- var isFullscreen = $('body').hasClass('doc-fullscreen');
- $('#mainMenu .fullscreen-btn').attr('title', isFullscreen ? retrack : fullscreen);
- $('#mainMenu .fullscreen-btn').html(' ' + (isFullscreen ? retrack : fullscreen));
- $.cookie('docFullscreen', isFullscreen);
-
- setTimeout($.resetToolbarPosition, 50);
- });
-
- if(!canDeleteFile)
- {
- $('.detail-content .files-list li').each(function()
- {
- $(this).find('a[onclick^=deleteFile]').remove();
- });
- }
-
- if($('#urlIframe').size() > 0)
- {
- var defaultHeight = $('#mainContent .main-col').height() - 50;
- $('#urlIframe').height(defaultHeight);
- setTimeout($.resetToolbarPosition, 50);
- }
+ $('.menu-actions > a').blur(function() {$(this).css('background', 'none');})
})
+/**
+ * Ajax delete doc.
+ *
+ * @param string $link
+ * @param int $replaceID
+ * @param stirng $notice
+ * @access public
+ * @return void
+ */
+function ajaxDeleteDoc(link, replaceID, notice)
+{
+ if(confirm(notice))
+ {
+ $.get(link, function(data)
+ {
+ location.href = JSON.parse(data).locate;
+ });
+ }
+}
+
+/**
+ * Delete a file.
+ *
+ * @param int $fileID
+ * @access public
+ * @return void
+ */
function deleteFile(fileID)
{
if(!fileID) return;
- hiddenwin.location.href =createLink('doc', 'deleteFile', 'docID=' + docID + '&fileID=' + fileID);
+ hiddenwin.location.href = createLink('file', 'delete', 'fileID=' + fileID);
}
+
+/**
+ * Display the document in full screen.
+ *
+ * @access public
+ * @return void
+ */
+function fullScreen()
+{
+ var element = document.getElementById('content');
+ var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullscreen;
+ if(requestMethod)
+ {
+ var afterEnterFullscreen = function()
+ {
+ $('#mainActions').removeClass('hidden');
+ $('#content').addClass('scrollbar-hover');
+ $('#content .actions').addClass('hidden');
+ $('#content .file-image .right-icon').addClass('hidden');
+ $('#content .detail').eq(1).addClass('hidden');
+ $.cookie('isFullScreen', 1);
+ };
+
+ var whenFailEnterFullscreen = function(error)
+ {
+ $.cookie('isFullScreen', 0);
+ };
+
+ try
+ {
+ var result = requestMethod.call(element);
+ if(result && (typeof result.then === 'function' || result instanceof window.Promise))
+ {
+ result.then(afterEnterFullscreen).catch(whenFailEnterFullscreen);
+ }
+ else
+ {
+ afterEnterFullscreen();
+ }
+ }
+ catch (error)
+ {
+ whenFailEnterFullscreen(error);
+ }
+ }
+
+ $('.main-col iframe').css('min-height', $(window).height() + 'px');
+}
+
+/**
+ * Exit full screen.
+ *
+ * @access public
+ * @return void
+ */
+function exitFullScreen()
+{
+ $('#mainActions').addClass('hidden');
+ $('#content').removeClass('scrollbar-hover');
+ $('#content .actions').removeClass('hidden');
+ $('#content .file-image .right-icon').removeClass('hidden');
+ $('#content .detail').eq(1).removeClass('hidden');
+ $('.main-col iframe').css('min-height', '380px');
+ $.cookie('isFullScreen', 0);
+}
+
+document.addEventListener('fullscreenchange', function (e)
+{
+ if(!document.fullscreenElement) exitFullScreen();
+});
+
+document.addEventListener('webkitfullscreenchange', function (e)
+{
+ if(!document.webkitFullscreenElement) exitFullScreen();
+});
+
+document.addEventListener('mozfullscreenchange', function (e)
+{
+ if(!document.mozFullScreenElement) exitFullScreen();
+});
+
+document.addEventListener('msfullscreenChange', function (e)
+{
+ if(!document.msfullscreenElement) exitFullScreen();
+});
+
+$(function()
+{
+ $(document).keydown(function(event)
+ {
+ if($.cookie('isFullScreen') == 1)
+ {
+ if(event.keyCode == 37) $('#prevPage').click();
+ if(event.keyCode == 39) $('#nextPage').click();
+ }
+ });
+
+ $('.outline').height($('.article-content').height());
+
+ $('#content').on('click', '.outline .outline-toggle i.icon-angle-right', function()
+ {
+ $('.article-content').css('width', '85%');
+ $('.outline').css({'min-width' : '180px', 'border-left' : '2px solid #efefef'});
+ $(this).removeClass('icon-angle-right').addClass('icon-angle-left').css('left', '-9px');
+ $('.outline-content').show();
+ if($('#sidebar>.cell').is(':visible')) $('#sidebar .icon.icon-angle-right').trigger("click");
+ }).on('click', '.outline .outline-toggle i.icon-angle-left', function()
+ {
+ $('.article-content').width('100%');
+ $(this).removeClass('icon-angle-left').addClass('icon-angle-right');
+ $('.outline-content').hide();
+ }).on('click', '#outline li', function(e)
+ {
+ $('#outline li.active').removeClass('active');
+ $(e.target).closest('li').addClass('active');
+ });
+
+ $('#outline li.has-list').addClass('open in');
+ $('#outline li.has-list>i+ul').prev('i').remove();
+
+ $(document).on('click', '.detail-content a', function(event)
+ {
+ var target = $(this).attr('target');
+ if($.cookie('isFullScreen') == 1 && target != '_blank') exitFullScreen();
+ })
+
+ /* Update doc content silently on switch doc version, story #40503 */
+ $(document).on('click', '.doc-version-menu a, #mainActions .container a', function(event)
+ {
+ var $tmpDiv = $('
');
+ $tmpDiv.load($(this).data('url') + ' #mainContent', function()
+ {
+ $('#content').html($tmpDiv.find('#content').html());
+ $('#sidebarContent').html($tmpDiv.find('#sidebarContent').html());
+ $('#actionbox .histories-list').html($tmpDiv.find('#actionbox .histories-list').html());
+ if($.cookie('isFullScreen') == 1) fullScreen();
+ $('#content [data-ride="tree"]').tree();
+ $('#outline li.has-list').addClass('open in');
+ $('#outline li.has-list>i+ul').prev('i').remove();
+ if($('#markdownContent').val())
+ {
+ var simplemde = new SimpleMDE({element: $("#markdownContent")[0],toolbar:false, status: false});
+ simplemde.value(String($('#markdownContent').val()));
+ simplemde.togglePreview();
+ }
+ });
+ });
+
+ $('#sidebar .icon.icon-angle-right').click(function()
+ {
+ if($('#sidebar>.cell').is(':hidden') && $('.outline-content').is(':visible'))
+ {
+ $('.outline .outline-toggle i.icon-angle-left').trigger("click");
+ }
+ })
+
+ $('.outline .outline-toggle i.icon-angle-right').trigger("click");
+})
diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php
index 4469f75ff3..089e739982 100644
--- a/module/doc/lang/de.php
+++ b/module/doc/lang/de.php
@@ -11,7 +11,7 @@
*/
$lang->doclib = new stdclass();
$lang->doclib->name = 'Name';
-$lang->doclib->control = 'Zugriffskontrolle';
+$lang->doclib->control = 'Zugang';
$lang->doclib->group = 'Gruppe';
$lang->doclib->user = 'Benutzer';
$lang->doclib->files = 'Dateien';
@@ -164,8 +164,8 @@ $lang->doc->cancelCollection = 'Favorit entfernen';
$lang->doc->deleteFile = 'Delete File';
$lang->doc->menuTitle = 'Menu';
$lang->doc->api = 'API';
-
-$lang->doc->collectAction = 'Add Favorite';
+$lang->doc->displaySetting = 'Display Settings';
+$lang->doc->collectAction = 'Add Favorite';
$lang->doc->libName = 'Name';
$lang->doc->libType = 'Kategorie';
@@ -187,6 +187,7 @@ $lang->doc->titlePlaceholder = 'Please enter the title';
$lang->doc->confirm = 'Confirm';
$lang->doc->docSummary = 'Total: %s.';
$lang->doc->docCheckedSummary = 'Seleted: %total%.';
+$lang->doc->showDoc = 'Whether to display documents';
global $config;
/* Query condition list. */
@@ -327,3 +328,6 @@ $lang->doc->libDropdown['delModule'] = 'Delete Directory';
$lang->doc->featureBar['tableContents']['all'] = 'All';
$lang->doc->featureBar['tableContents']['draft'] = 'Draft';
+
+$lang->doc->showDocList[1] = 'Yes';
+$lang->doc->showDocList[0] = 'No';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 2e6b76a7c7..83a9379396 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -164,8 +164,8 @@ $lang->doc->cancelCollection = 'Remove Favorite';
$lang->doc->deleteFile = 'Delete File';
$lang->doc->menuTitle = 'Direcotory';
$lang->doc->api = 'API';
-
-$lang->doc->collectAction = 'Add Favorite';
+$lang->doc->displaySetting = 'Display Settings';
+$lang->doc->collectAction = 'Add Favorite';
$lang->doc->libName = 'Document Library';
$lang->doc->libType = 'Category';
@@ -187,6 +187,7 @@ $lang->doc->titlePlaceholder = 'Please enter the title';
$lang->doc->confirm = 'Confirm';
$lang->doc->docSummary = 'Total: %s.';
$lang->doc->docCheckedSummary = 'Seleted: %total%.';
+$lang->doc->showDoc = 'Whether to display documents';
global $config;
/* Query condition list. */
@@ -327,3 +328,6 @@ $lang->doc->libDropdown['delModule'] = 'Delete Directory';
$lang->doc->featureBar['tableContents']['all'] = 'All';
$lang->doc->featureBar['tableContents']['draft'] = 'Draft';
+
+$lang->doc->showDocList[1] = 'Yes';
+$lang->doc->showDocList[0] = 'No';
diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php
index c2896eb533..3adaf439eb 100644
--- a/module/doc/lang/fr.php
+++ b/module/doc/lang/fr.php
@@ -11,7 +11,7 @@
*/
$lang->doclib = new stdclass();
$lang->doclib->name = 'Nom';
-$lang->doclib->control = "Contrôle d'Accès";
+$lang->doclib->control = 'Droit';
$lang->doclib->group = 'Groupe';
$lang->doclib->user = 'Utilisateur';
$lang->doclib->files = 'Pièces Jointes';
@@ -164,8 +164,8 @@ $lang->doc->cancelCollection = 'Retirer des Favoris';
$lang->doc->deleteFile = 'Supprimer Fichier';
$lang->doc->menuTitle = 'Menu';
$lang->doc->api = 'API';
-
-$lang->doc->collectAction = 'Add Favorite';
+$lang->doc->displaySetting = 'Display Settings';
+$lang->doc->collectAction = 'Add Favorite';
$lang->doc->libName = 'Bibliothèque de Documents';
$lang->doc->libType = 'Catégorie';
@@ -187,6 +187,7 @@ $lang->doc->titlePlaceholder = 'Veuillez saisir le titre';
$lang->doc->confirm = 'Confirm';
$lang->doc->docSummary = 'Total: %s.';
$lang->doc->docCheckedSummary = 'Seleted: %total%.';
+$lang->doc->showDoc = 'Whether to display documents';
global $config;
/* Query condition list. */
@@ -328,3 +329,6 @@ $lang->doc->libDropdown['delModule'] = 'Delete Directory';
$lang->doc->featureBar['tableContents']['all'] = 'All';
$lang->doc->featureBar['tableContents']['draft'] = 'Draft';
+
+$lang->doc->showDocList[1] = 'Yes';
+$lang->doc->showDocList[0] = 'No';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 36dc342099..3650f9c138 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -164,8 +164,8 @@ $lang->doc->cancelCollection = '取消收藏';
$lang->doc->deleteFile = '删除附件';
$lang->doc->menuTitle = '目录';
$lang->doc->api = '接口';
-
-$lang->doc->collectAction = '收藏文档';
+$lang->doc->displaySetting = '显示设置';
+$lang->doc->collectAction = '收藏文档';
$lang->doc->libName = '库名称';
$lang->doc->libType = '库类型';
@@ -187,6 +187,7 @@ $lang->doc->titlePlaceholder = '请输入标题';
$lang->doc->confirm = '确认';
$lang->doc->docSummary = '本页共 %s 个文档。';
$lang->doc->docCheckedSummary = '共选中 %total% 个文档。';
+$lang->doc->showDoc = '是否显示文档';
global $config;
/* 查询条件列表 */
@@ -327,3 +328,6 @@ $lang->doc->libDropdown['delModule'] = '删除目录';
$lang->doc->featureBar['tableContents']['all'] = '全部';
$lang->doc->featureBar['tableContents']['draft'] = '草稿';
+
+$lang->doc->showDocList[1] = '是';
+$lang->doc->showDocList[0] = '否';
diff --git a/module/doc/model.php b/module/doc/model.php
index 75f0f47109..148fee61b9 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -19,7 +19,8 @@ class docModel extends model
public $action;
// api doc type
- const DOC_TYPE_API = 'api';
+ const DOC_TYPE_API = 'api';
+ const DOC_TYPE_REST = 'restapi';
/**
* Get library by id.
@@ -985,8 +986,8 @@ class docModel extends model
$this->config->doc->search['module'] = 'contributeDoc';
$products = $this->product->getPairs();
- $this->config->doc->search['params']['project']['values'] = array('' => '') + $this->loadModel('project')->getPairsByProgram() + array('all' => $this->lang->doc->allProjects);
- $this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs(0, 'all', 'multiple,leaf,noprefix') + array('all' => $this->lang->doc->allExecutions);
+ $this->config->doc->search['params']['project']['values'] = array('' => '') + $this->loadModel('project')->getPairsByProgram('', 'all', false, 'order_asc', 'kanban') + array('all' => $this->lang->doc->allProjects);
+ $this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs(0, 'sprint,stage', 'multiple,leaf,noprefix') + array('all' => $this->lang->doc->allExecutions);
$this->config->doc->search['params']['lib']['values'] = array('' => '') + $this->loadModel('doc')->getLibs('all', 'withObject') + array('all' => $this->lang->doclib->all);
$this->config->doc->search['params']['product']['values'] = array('' => '') + $products + array('all' => $this->lang->doc->allProduct);
@@ -1007,7 +1008,7 @@ class docModel extends model
if($type == 'project')
{
- $this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'multiple,leaf,noprefix') + array('all' => $this->lang->doc->allExecutions);
+ $this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project, 'sprint,stage', 'multiple,leaf,noprefix') + array('all' => $this->lang->doc->allExecutions);
}
else
{
@@ -1023,7 +1024,7 @@ class docModel extends model
else
{
$products = $this->product->getPairs('nocode', $this->session->project);
- $this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project, 'all', 'multiple,leaf,noprefix') + array('all' => $this->lang->doc->allExecutions);
+ $this->config->doc->search['params']['execution']['values'] = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project, 'sprint,stage', 'multiple,leaf,noprefix') + array('all' => $this->lang->doc->allExecutions);
$this->config->doc->search['params']['lib']['values'] = array('' => '', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
$this->config->doc->search['params']['product']['values'] = array('' => '') + $products + array('all' => $this->lang->doc->allProduct);
}
@@ -1035,7 +1036,7 @@ class docModel extends model
$moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($libID, 'doc', $startModuleID = 0);
$this->config->doc->search['params']['module']['values'] = $moduleOptionMenu;
- if($type == 'index' || $type == 'objectLibs' || ($this->app->rawMethod != 'contribute' and $libID == 0))
+ if($type == 'index' || $type == 'view' || ($this->app->rawMethod != 'contribute' and $libID == 0))
{
unset($this->config->doc->search['fields']['module']);
unset($this->config->doc->search['fields']['lib']);
@@ -1586,6 +1587,7 @@ class docModel extends model
->leftjoin(TABLE_DOCLIB)->alias('t2')->on('t2.project=t1.id')
->where("CONCAT(',', t2.users, ',')")->like("%,{$this->app->user->account},%")
->andWhere('t1.vision')->eq($this->config->vision)
+ ->andWhere('t1.model')->ne('kanban')
->andWhere('t1.deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi()
->fetchPairs();
@@ -1595,6 +1597,7 @@ class docModel extends model
->where('type')->eq('project')
->andWhere('vision')->eq($this->config->vision)
->andWhere('deleted')->eq(0)
+ ->andWhere('model')->ne('kanban')
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->orderBy('order_asc')
->fetchAll('id');
@@ -1962,37 +1965,6 @@ class docModel extends model
return $node;
}
- /**
- * Get product crumb.
- *
- * @param int $productID
- * @param int $executionID
- * @access public
- * @return string
- */
- public function getProductCrumb($productID, $executionID = 0)
- {
- if(empty($productID)) return '';
- if($executionID)
- {
- $executionProduct = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($productID)->andWhere('project')->eq($executionID)->fetch();
- if(empty($executionProduct))
- {
- setcookie('product', 0, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
- return html::a(helper::createLink('doc', 'allLibs', "type=execution"), $this->lang->executionCommon) . $this->lang->doc->separator;
- }
- }
- $object = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->eq($productID)->fetch();
- if(empty($object)) return '';
-
- $crumb = '';
- $crumb .= html::a(helper::createLink('doc', 'allLibs', "type=product"), $this->lang->productCommon) . $this->lang->doc->separator;
- $crumb .= html::a(helper::createLink('doc', 'objectLibs', "type=product&objectID=$productID"), $object->name) . $this->lang->doc->separator;
- $crumb .= html::a(helper::createLink('doc', 'allLibs', "type=execution&product=$productID"), $this->lang->doclib->execution);
- if($executionID) $crumb .= $this->lang->doc->separator;
- return $crumb;
- }
-
/**
* Set lib users.
*
@@ -2058,9 +2030,9 @@ class docModel extends model
$today = date('Y-m-d');
$lately = date('Y-m-d', strtotime('-3 day'));
- $statisticInfo = $this->dao->select("count(id) as totalDocs, count(editedDate like '{$today}%' or null) as todayEditedDocs,
- count(editedDate > '{$lately}' or null) as lastEditedDocs, count(addedDate > '{$lately}' or null) as lastAddedDocs,
- count(collector like '%,{$this->app->user->account},%' or null) as myCollection, count(addedBy = '{$this->app->user->account}' or null) as myDocs")->from(TABLE_DOC)
+ $statisticInfo = $this->dao->select("count(id) as totalDocs, count(IF(editedDate like '{$today}%', 1, null)) as todayEditedDocs,
+ count(IF(editedDate > '{$lately}', 1, null)) as lastEditedDocs, count(IF(addedDate > '{$lately}', 1, null)) as lastAddedDocs,
+ count(IF(collector like '%,{$this->app->user->account},%', 1, null)) as myCollection, count(IF(addedBy = '{$this->app->user->account}', 1, null)) as myDocs")->from(TABLE_DOC)
->where('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->andWhere('id')->in($docIdList)
@@ -2273,8 +2245,8 @@ class docModel extends model
{
if(!in_array($type, array('product', 'project'))) return '';
- $currentModule = $this->app->getModuleName();
- $currentMethod = $this->app->getMethodName();
+ $currentModule = $this->app->rawModule;
+ $currentMethod = $this->app->rawMethod;
$dropMenuLink = helper::createLink('doc', 'ajaxGetDropMenu', "objectType=$type&objectID=$objectID&module=$currentModule&method=$currentMethod");
$output = "