diff --git a/extension/lite/kanban/ext/model/lite.php b/extension/lite/kanban/ext/model/lite.php index 5415abe686..4bf7cd4d85 100644 --- a/extension/lite/kanban/ext/model/lite.php +++ b/extension/lite/kanban/ext/model/lite.php @@ -115,7 +115,7 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu if($browseType == 'task') { if($searchValue != '' and strpos($object->name, $searchValue) === false) continue; - $cardData['name'] = $object->name; + $cardData['name'] = $object->name; $cardData['status'] = $object->status; $cardData['left'] = $object->left; } @@ -195,9 +195,10 @@ public function getCardGroupByExecution($executionID, $browseType = 'all', $orde if($cell->type == 'task') { - $cardData['name'] = $object->name; - $cardData['status'] = $object->status; - $cardData['left'] = $object->left; + $cardData['name'] = $object->name; + $cardData['status'] = $object->status; + $cardData['left'] = $object->left; + $cardData['estStarted'] = $object->estStarted; } else { diff --git a/module/kanban/control.php b/module/kanban/control.php index b50660f759..702ffdc8ec 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -21,7 +21,7 @@ class kanban extends control * @access public * @return void */ - public function space($browseType = 'private', $recTotal = 0, $recPerPage = 15, $pageID = 1) + public function space($browseType = 'involved', $recTotal = 0, $recPerPage = 15, $pageID = 1) { /* Load pager. */ $this->app->loadClass('pager', $static = true); diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css index c7774e094e..530e43b212 100644 --- a/module/kanban/css/space.css +++ b/module/kanban/css/space.css @@ -3,15 +3,15 @@ #spaceList .spaceTitle > div {display: inline-block;} #spaceList .spaceTitle .label-closed {background: #AAA !important; color: #FFF;} #spaceList .spaceTitle .icon-zone {color: #838a9d; margin-top:100px;} -#spaceList .spaceActions {margin-top: 10px;} +#spaceList .spaceActions {margin-top: -4px;} #spaceList .spaceActions > a{margin-left: 10px;} .space .menu {margin-left: 5px; margin-right:5px;} .space .table-empty-tip {padding: 40px 10px;} -.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 155px)} +.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 200px)} .spaceName {font-size: 16px; font-weight: bold;} .spaceTitle .icon-cube {font-size: 16px;} -.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;} -#more .setting {margin-left: -25px; min-width: 80px} +.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 0;} +#setting .setting {margin-left: -25px; min-width: 80px} .kanbans > .col {width: 25% !important;} @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}} @@ -43,4 +43,5 @@ a.disabled {pointer-events: none;} -.noBorder{border: 0px;} +.noBorder {border: 0px;} +.position {padding-right: 5px;} diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index fac08cbca6..331c09cda7 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -47,6 +47,10 @@ $lang->kanban->deleteCard = 'Delete Card'; $lang->kanban->removeCard = 'Remove Card'; $lang->kanban->assigntoCard = 'Assign'; $lang->kanban->setting = 'Setting'; +$lang->kanban->settingSpace = 'Setting Space'; +$lang->kanban->activateSpace = 'Activate Space'; +$lang->kanban->closeSpace = 'Close Space'; +$lang->kanban->deleteSpace = 'Delete Space'; $lang->kanban->enableArchived = 'Enable Archived'; $lang->kanban->archive = 'Archive'; $lang->kanban->performable = 'Set progress management'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 2922cf5ac4..870a18253f 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -47,6 +47,10 @@ $lang->kanban->deleteCard = '删除卡片'; $lang->kanban->removeCard = '移除卡片'; $lang->kanban->assigntoCard = '指派'; $lang->kanban->setting = '设置'; +$lang->kanban->settingSpace = '设置空间'; +$lang->kanban->activateSpace = '激活空间'; +$lang->kanban->closeSpace = '关闭空间'; +$lang->kanban->deleteSpace = '删除空间'; $lang->kanban->enableArchived = '设置归档功能'; $lang->kanban->archive = '归档功能'; $lang->kanban->performable = '设置进度管理'; diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index 839f2b2346..5bac19e397 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -52,17 +52,17 @@
status == 'closed' ? 'disabled' : '';?> - status != 'closed' and $browseType != 'involved' and !empty($unclosedSpace)) common::printLink('kanban', 'create', "spaceID={$space->id}&type={$space->type}", ' ' . $lang->kanban->create, '', "class='iframe' data-width='75%'", '', true);?> -
- kanban->setting;?> -