diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css index 0af2b80557..a5e7c3e778 100644 --- a/module/kanban/css/space.css +++ b/module/kanban/css/space.css @@ -7,7 +7,9 @@ #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% - 255px)} +.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 150px)} +.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;} +#more .setting {margin-left: -25px; min-width: 80px} .kanbans > .col {width: 25% !important;} @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}} diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 661b6b5100..ada1af7205 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -26,6 +26,7 @@ $lang->kanban->columnWidth = 'Column Width'; $lang->kanban->setColumnWidth = 'Set Column Width'; $lang->kanban->deleteLane = 'Delete Lane'; $lang->kanban->createColumn = 'Create Column'; +$lang->kanban->emptyDesc = 'No description'; $lang->kanban->editColumn = 'Edit Column'; $lang->kanban->sortColumn = 'Sort Column'; $lang->kanban->deleteColumn = 'Delete Column'; @@ -275,14 +276,14 @@ $lang->kanbanspace->empty = 'No Space'; $lang->kanbanspace->aclList['open'] = 'Open (Accessible with kanban view permissions)'; $lang->kanbanspace->aclList['private'] = 'Private (For the space owner, team and whitelist members only)'; -$lang->kanbanspace->featureBar['private'] = 'Private Space'; +$lang->kanbanspace->featureBar['involved'] = 'Involved'; $lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space'; $lang->kanbanspace->featureBar['public'] = 'Public Space'; -$lang->kanbanspace->featureBar['involved'] = 'Involved'; +$lang->kanbanspace->featureBar['private'] = 'Private Space'; -$lang->kanbanspace->typeList['private'] = 'Private Space'; $lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space'; $lang->kanbanspace->typeList['public'] = 'Public Space'; +$lang->kanbanspace->typeList['private'] = 'Private Space'; $lang->kanbancolumn = new stdclass(); $lang->kanbancolumn->name = $lang->kanban->columnName; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index a706e5927f..8fab1ef0f2 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -26,6 +26,7 @@ $lang->kanban->columnWidth = '列宽度'; $lang->kanban->setColumnWidth = '设置列宽度'; $lang->kanban->deleteLane = '删除泳道'; $lang->kanban->createColumn = '创建看板列'; +$lang->kanban->emptyDesc = '暂无描述'; $lang->kanban->editColumn = '编辑看板列'; $lang->kanban->sortColumn = '看板列排序'; $lang->kanban->deleteColumn = '删除看板列'; @@ -275,14 +276,14 @@ $lang->kanbanspace->empty = '暂时没有空间'; $lang->kanbanspace->aclList['open'] = '公开(有看板空间视图权限即可访问)'; $lang->kanbanspace->aclList['private'] = '私有(只有看板空间负责人、团队成员、白名单可访问)'; -$lang->kanbanspace->featureBar['private'] = '私人空间'; +$lang->kanbanspace->featureBar['involved'] = '我参与的'; $lang->kanbanspace->featureBar['cooperation'] = '协作空间'; $lang->kanbanspace->featureBar['public'] = '公共空间'; -$lang->kanbanspace->featureBar['involved'] = '我参与的'; +$lang->kanbanspace->featureBar['private'] = '私人空间'; -$lang->kanbanspace->typeList['private'] = '私人空间'; $lang->kanbanspace->typeList['cooperation'] = '协作空间'; $lang->kanbanspace->typeList['public'] = '公共空间'; +$lang->kanbanspace->typeList['private'] = '私人空间'; $lang->kanbancolumn = new stdclass(); $lang->kanbancolumn->name = $lang->kanban->columnName; diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php index 5b846d738a..924bfcf17f 100644 --- a/module/kanban/view/createspace.html.php +++ b/module/kanban/view/createspace.html.php @@ -20,7 +20,7 @@ - + diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php index 1087b3d4f3..13ca616cda 100644 --- a/module/kanban/view/editspace.html.php +++ b/module/kanban/view/editspace.html.php @@ -20,7 +20,7 @@
kanbanspace->type;?>
- + diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index c35594682e..389ba7e45a 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -47,17 +47,23 @@ name;?> +

desc) ? $lang->kanban->emptyDesc : $space->desc;?>

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);?> - id}", ' ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?> - - id}", ' ' . $lang->activate, '', "class='iframe'", '', true);?> - - id}", ' ' . $lang->close, '', "class='iframe'", '', true);?> - - id}", ' ' . $lang->delete, 'hiddenwin', '', '', true);?> +
+ kanban->setting;?> +
kanbans)):?>
kanbanspace->type;?>