diff --git a/module/doc/model.php b/module/doc/model.php index 60bea0d7c5..e006c2b08a 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2914,6 +2914,7 @@ class docModel extends model $item->name = $module->name; $item->type = $module->type == 'api' ? 'apiDoc' : $module->type; $item->active = $module->id == $moduleID ? 1 : 0; + $item->order = $module->order; $item->children = $this->getModuleTree($rootID, $moduleID, $type, $module->id, $modules); $showDoc = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=doc&key=showDoc'); $showDoc = $showDoc === '0' ? 0 : 1; @@ -2984,6 +2985,7 @@ class docModel extends model $item->id = $lib->id; $item->type = $lib->type == 'api' ? 'api' : 'lib'; $item->name = $lib->name; + $item->order = $lib->order; $item->objectType = $type; $item->objectID = $objectID; $item->active = $lib->id == $libID && $browseType != 'bysearch' ? 1 : 0; diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php index 07687cceb0..f50a6fa785 100644 --- a/module/doc/view/lefttree.html.php +++ b/module/doc/view/lefttree.html.php @@ -57,6 +57,16 @@ i.btn-info, i.btn-info:hover {border: none; background: #fff; box-shadow: unset; #leftBar .selectBox #currentItem > .text {overflow: hidden; text-align: left; flex: 0 1 100%;} .dropdown-in-tree {max-height: 293px; overflow-y: auto;} .before-tree-item {flex: 0 0 14px; margin-right: 5px; margin-bottom: 2px;} + +/* Catalog sort style. */ +.sortable-sorting li >.tree-group {opacity: .5;} +.sortable-sorting .drop-here .tree-group {background-color: #fff3e0;} +.sortable-sorting .drop-here .tree-group > * {opacity: .1;} +.sortable-sorting .drag-shadow .tree-group {opacity: 1!important;} +.sortable-sorting .drag-shadow .tree-actions {visibility: hidden;} +.is-sorting > li > .tree-group {opacity: 1; border-radius: 4px;} +.is-sorting > li ul {display: none!important;} +li.drag-shadow ul {display: none!important;} doc->spaceMethod); +js::set('canSortCatalog', common::hasPriv('doc', 'sortCatalog')); ?>