diff --git a/module/block/lang/de.php b/module/block/lang/de.php index 5ec93666e4..7dfb0894f1 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -355,7 +355,7 @@ $lang->block->default['doc']['5']['grid'] = 4; if($config->vision == 'rnd') { - $lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; + $lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document'; $lang->block->default['doc']['6']['block'] = 'productdoc'; $lang->block->default['doc']['6']['grid'] = 8; } @@ -364,7 +364,7 @@ $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; $lang->block->default['doc']['7']['block'] = 'doccollectlist'; $lang->block->default['doc']['7']['grid'] = 4; -$lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document'; +$lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document'; $lang->block->default['doc']['8']['block'] = 'projectdoc'; $lang->block->default['doc']['8']['grid'] = 8; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 305f2f3f90..5238f79c50 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -355,7 +355,7 @@ $lang->block->default['doc']['5']['grid'] = 4; if($config->vision == 'rnd') { - $lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; + $lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document'; $lang->block->default['doc']['6']['block'] = 'productdoc'; $lang->block->default['doc']['6']['grid'] = 8; } @@ -364,7 +364,7 @@ $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; $lang->block->default['doc']['7']['block'] = 'doccollectlist'; $lang->block->default['doc']['7']['grid'] = 4; -$lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document'; +$lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document'; $lang->block->default['doc']['8']['block'] = 'projectdoc'; $lang->block->default['doc']['8']['grid'] = 8; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 486cc2a7a1..125ac6768e 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -355,7 +355,7 @@ $lang->block->default['doc']['5']['grid'] = 4; if($config->vision == 'rnd') { - $lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; + $lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document'; $lang->block->default['doc']['6']['block'] = 'productdoc'; $lang->block->default['doc']['6']['grid'] = 8; } @@ -364,7 +364,7 @@ $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; $lang->block->default['doc']['7']['block'] = 'doccollectlist'; $lang->block->default['doc']['7']['grid'] = 4; -$lang->block->default['doc']['8']['title'] = $lang->projectCommon . 'Document'; +$lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document'; $lang->block->default['doc']['8']['block'] = 'projectdoc'; $lang->block->default['doc']['8']['grid'] = 8; diff --git a/module/block/view/doccollectlistblock.html.php b/module/block/view/doccollectlistblock.html.php index 4dfffdff8e..2a2920e7c9 100644 --- a/module/block/view/doccollectlistblock.html.php +++ b/module/block/view/doccollectlistblock.html.php @@ -17,7 +17,8 @@ .block-doccollectlist .doc-list > .doc-title > .label-rank-1 {color: #FC5959; background-color: #FFE2D9;} .block-doccollectlist .doc-list > .doc-title > .label-rank-2 {color: #FF8058; background-color: #FFE2D9;} .block-doccollectlist .doc-list > .doc-title > .label-rank-3 {color: #FF9F46; background-color: #FFECDB;} -.block-doccollectlist .doc-list > .doc-title > .doc-name {overflow: hidden; max-width: calc(100% - 110px);} +.block-doccollectlist .doc-list > .doc-title > .doc-name {overflow: hidden; max-width: calc(100% - 130px);} +[lang^=zh] .block-doccollectlist .doc-list > .doc-title > .doc-name {max-width: calc(100% - 110px);} .block-doccollectlist .doc-list > .doc-title > .label-collect-count {margin-left: 10px;} .block-doccollectlist .doc-list > .doc-title > .label-collect-count > .icon-flame {margin-bottom: 3px;} .block-doccollectlist .doc-list > .doc-title > .label-collect-count > .icon-flame.gray {filter: grayscale(100%);} diff --git a/module/doc/control.php b/module/doc/control.php index 7fc73089d9..e7d181ae5f 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -158,6 +158,7 @@ class doc extends control if($type == 'execution' and $this->post->execution) $objectID = $this->post->execution; if($type == 'custom') $objectID = 0; + $type = $type == 'execution' && $this->app->tab != 'execution' ? 'project' : $type; $this->action->create('docLib', $libID, 'Created'); @@ -185,7 +186,6 @@ class doc extends control } } - if($type == 'execution') { $objects = $this->execution->getPairs(0, 'sprint,stage', 'multiple,leaf,noprefix,withobject'); @@ -550,7 +550,7 @@ class doc extends control if(!empty($changes)) $this->action->logHistory($actionID, $changes); } - $link = $this->createLink('doc', 'view', "docID={$docID}") . "#app={$this->app->tab}"; + $link = $this->createLink('doc', 'view', "docID={$docID}"); $oldLib = $doc->lib; $doc = $this->doc->getById($docID); $lib = $this->doc->getLibById($doc->lib); diff --git a/module/doc/css/view.css b/module/doc/css/view.css index 5e62f6160e..239737b7a8 100644 --- a/module/doc/css/view.css +++ b/module/doc/css/view.css @@ -79,9 +79,12 @@ #hostory::-moz-scrollbar {height: 0px; width: 0px; background: transparent;} .main-col iframe {min-height: unset;} -#editorBox > .btn-group > button {margin: 2px 6px 0 4px; color: #838A9D;} -#editorMenu {max-height: 200px; overflow: auto; margin-left: 4px;} -#editorMenu > li {color: #838A9D; font-weight: 400; padding: 5px 12px;} +#editorBox > .btn-group.noDropdown {top: 6px; overflow: hidden;} +#editorBox > .btn-group > button {margin: 2px 12px 0 4px; color: #838A9D;} +#editorBox > .btn-group > span.text {color: #838A9D; font-weight: 400; padding: 5px 12px; overflow: hidden; text-overflow: clip; white-space: nowrap; font-size: 13px;} +#editorMenu {max-height: 200px; overflow-y: auto; overflow-x: hidden; margin-left: 4px; max-width: 100%;} +[lang^=zh] #editorMenu {max-width: calc(100% - 10px);} +#editorMenu > li {color: #838A9D; font-weight: 400; padding: 5px 12px; text-overflow: clip; white-space: nowrap;} .doc-version-menu {padding: 10px 5px;} #changeBtn > i {font-size: 24px;} diff --git a/module/doc/js/common.js b/module/doc/js/common.js index 3a7720840d..76aefbbb1c 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -333,17 +333,23 @@ function locateNewLib(type, objectID, libID) { var method = 'teamSpace'; var params = 'objectID=' + objectID + '&libID=' + libID; + var module = 'doc'; if(type == 'product' || type == 'project') { method = type + 'Space'; } + else if(type == 'execution') + { + module = 'execution'; + method = 'doc'; + } else if(type == 'mine') { method = 'mySpace'; params = 'type=mine&libID=' + libID; } - location.href = createLink('doc', method, params); + location.href = createLink(module, method, params); } /** diff --git a/module/doc/model.php b/module/doc/model.php index 63a6756afd..12d00e8d6c 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -3185,7 +3185,7 @@ class docModel extends model $objectID = zget($lib, $lib->type, 0); $class = $from == 'list' ? 'btn-info' : 'btn-primary'; $html = "
"; - $html .= html::a(helper::createLink('doc', 'create', "objectType={$lib->type}&objectID=$objectID&libID={$lib->id}&moduleID=$moduleID&type=html"), " {$this->lang->doc->create}", '', "class='btn $class'"); + $html .= html::a(helper::createLink('doc', 'create', "objectType={$lib->type}&objectID=$objectID&libID={$lib->id}&moduleID=$moduleID&type=html"), " {$this->lang->doc->create}", '', "class='btn $class' data-app='{$this->app->tab}'"); $html .= ""; $html .= "
-
+ +
- + + +
diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php index bea12af9ff..e295b3c45d 100644 --- a/module/doc/view/lefttree.html.php +++ b/module/doc/view/lefttree.html.php @@ -261,6 +261,7 @@ $(function() initialState: 'active', itemCreator: function($li, item) { + if(item.type == 'apiDoc' && release) item.hasAction = false; if(typeof item.hasAction == 'undefined') item.hasAction = true; if(typeof item.active == 'undefined') item.active = 0; if(typeof docID != 'undefined' && item.id == docID) item.active = 1; @@ -270,7 +271,7 @@ $(function() var libClass = ['lib', 'annex', 'api', 'execution'].indexOf(objectType) !== -1 ? 'lib' : ''; var moduleClass = item.type == 'doc' || item.type == 'apiDoc' ? 'catalog' : ''; var sortClass = ''; - if(config.currentMethod != 'view' && ((item.type == 'doc' && canSortDocCatalog) || (item.type == 'apiDoc' && canSortAPICatalog))) sortClass = 'sort-module'; + if(config.currentMethod != 'view' && ((item.type == 'doc' && canSortDocCatalog) || (item.type == 'apiDoc' && canSortAPICatalog && !release))) sortClass = 'sort-module'; var hasChild = item.children ? !!item.children.length : false; var link = item.type != 'execution' || item.hasAction ? '###' : '#';