diff --git a/module/kanban/css/create.css b/module/kanban/css/create.css index 8274439982..57fb15f270 100644 --- a/module/kanban/css/create.css +++ b/module/kanban/css/create.css @@ -1,6 +1,9 @@ +#mainContent .table-form>tbody>tr>th {width: 105px;} #mainContent {padding-left: 0px;} -#mainContent .laneHeightBox, #mainContent .importBox {display: grid;} -#mainContent .laneHeightBox .radio-inline+.radio-inline, #mainContent .importBox .radio-inline+.radio-inline {margin-left: 0px; padding-top: 5px;} +#mainContent .importBox .radio-inline+.radio-inline {padding-left: 20px;} #mainContent .objectBox {padding-top: 2px;} #mainContent .objectBox .checkbox-primary {display: inline-block;} #mainContent .objectBox .checkbox-primary:not(:first-child) {margin-left: 10px;} +#mainContent .objectBox .checkbox-primary>label:not(:first-child) {padding-left: 20px;} +#mainContent .objectBox .checkbox-primary>label:before {top: 1px; left: -2px;} +#mainContent .objectBox .checkbox-primary>label:after {width: 14px; height: 14px;} diff --git a/module/kanban/css/edit.css b/module/kanban/css/edit.css index 8274439982..4c852c6e5a 100644 --- a/module/kanban/css/edit.css +++ b/module/kanban/css/edit.css @@ -1,6 +1,10 @@ +#mainContent .table-form>tbody>tr>th {width: 105px;} #mainContent {padding-left: 0px;} -#mainContent .laneHeightBox, #mainContent .importBox {display: grid;} -#mainContent .laneHeightBox .radio-inline+.radio-inline, #mainContent .importBox .radio-inline+.radio-inline {margin-left: 0px; padding-top: 5px;} +#mainContent .laneHeightBox .radio-inline+.radio-inline, #mainContent .importBox .radio-inline+.radio-inline {margin-left: 20px;} #mainContent .objectBox {padding-top: 2px;} #mainContent .objectBox .checkbox-primary {display: inline-block;} #mainContent .objectBox .checkbox-primary:not(:first-child) {margin-left: 10px;} +#mainContent .objectBox .checkbox-primary>label:not(:first-child) {padding-left: 20px;} +#mainContent .laneHeightBox .tip {color: #999;} +#mainContent .objectBox .checkbox-primary>label:before {top: 1px; left: -2px;} +#mainContent .objectBox .checkbox-primary>label:after {width: 14px; height: 14px;} diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php index 4e5a92b40f..0c0a103f1b 100644 --- a/module/kanban/lang/de.php +++ b/module/kanban/lang/de.php @@ -54,7 +54,7 @@ $lang->kanban->deleteSpace = 'Delete Space'; $lang->kanban->enableArchived = 'Enable Archived'; $lang->kanban->archive = 'Archive'; $lang->kanban->performable = 'Set progress management'; -$lang->kanban->manageProgress = 'Manage Progress'; +$lang->kanban->manageProgress = 'Progress'; $lang->kanban->splitColumn = 'Split Column'; $lang->kanban->createColumnOnLeft = 'Create Column On Left'; $lang->kanban->createColumnOnRight = 'Create Column On Right'; @@ -323,8 +323,8 @@ $lang->kanbanlane->confirmDeleteTip = 'Are you sure to delete this lane? After d $lang->kanbanlane->modeList['sameAsOther'] = 'Use the same Kanban column'; $lang->kanbanlane->modeList['independent'] = 'Independent Kanban column'; -$lang->kanbanlane->heightTypeList['auto'] = 'Adaptive (Adaptive to card height and lane name height)'; -$lang->kanbanlane->heightTypeList['custom'] = 'Custom (Customize lane height based on number of cards)'; +$lang->kanbanlane->heightTypeList['auto'] = "Adaptive (Adaptive to card height and lane name height)"; +$lang->kanbanlane->heightTypeList['custom'] = "Custom (Customize lane height based on number of cards)"; $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed'; $lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width'; diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 4e5a92b40f..0c0a103f1b 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -54,7 +54,7 @@ $lang->kanban->deleteSpace = 'Delete Space'; $lang->kanban->enableArchived = 'Enable Archived'; $lang->kanban->archive = 'Archive'; $lang->kanban->performable = 'Set progress management'; -$lang->kanban->manageProgress = 'Manage Progress'; +$lang->kanban->manageProgress = 'Progress'; $lang->kanban->splitColumn = 'Split Column'; $lang->kanban->createColumnOnLeft = 'Create Column On Left'; $lang->kanban->createColumnOnRight = 'Create Column On Right'; @@ -323,8 +323,8 @@ $lang->kanbanlane->confirmDeleteTip = 'Are you sure to delete this lane? After d $lang->kanbanlane->modeList['sameAsOther'] = 'Use the same Kanban column'; $lang->kanbanlane->modeList['independent'] = 'Independent Kanban column'; -$lang->kanbanlane->heightTypeList['auto'] = 'Adaptive (Adaptive to card height and lane name height)'; -$lang->kanbanlane->heightTypeList['custom'] = 'Custom (Customize lane height based on number of cards)'; +$lang->kanbanlane->heightTypeList['auto'] = "Adaptive (Adaptive to card height and lane name height)"; +$lang->kanbanlane->heightTypeList['custom'] = "Custom (Customize lane height based on number of cards)"; $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed'; $lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width'; diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php index 4e5a92b40f..0c0a103f1b 100644 --- a/module/kanban/lang/fr.php +++ b/module/kanban/lang/fr.php @@ -54,7 +54,7 @@ $lang->kanban->deleteSpace = 'Delete Space'; $lang->kanban->enableArchived = 'Enable Archived'; $lang->kanban->archive = 'Archive'; $lang->kanban->performable = 'Set progress management'; -$lang->kanban->manageProgress = 'Manage Progress'; +$lang->kanban->manageProgress = 'Progress'; $lang->kanban->splitColumn = 'Split Column'; $lang->kanban->createColumnOnLeft = 'Create Column On Left'; $lang->kanban->createColumnOnRight = 'Create Column On Right'; @@ -323,8 +323,8 @@ $lang->kanbanlane->confirmDeleteTip = 'Are you sure to delete this lane? After d $lang->kanbanlane->modeList['sameAsOther'] = 'Use the same Kanban column'; $lang->kanbanlane->modeList['independent'] = 'Independent Kanban column'; -$lang->kanbanlane->heightTypeList['auto'] = 'Adaptive (Adaptive to card height and lane name height)'; -$lang->kanbanlane->heightTypeList['custom'] = 'Custom (Customize lane height based on number of cards)'; +$lang->kanbanlane->heightTypeList['auto'] = "Adaptive (Adaptive to card height and lane name height)"; +$lang->kanbanlane->heightTypeList['custom'] = "Custom (Customize lane height based on number of cards)"; $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed'; $lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 1600d75b85..076d6abda6 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -323,8 +323,8 @@ $lang->kanbanlane->confirmDeleteTip = '您确认删除该泳道吗?删除泳 $lang->kanbanlane->modeList['sameAsOther'] = '与其他泳道使用相同看板列'; $lang->kanbanlane->modeList['independent'] = '采用独立的看板列'; -$lang->kanbanlane->heightTypeList['auto'] = '自适应(根据卡片高度和泳道名称高度自适应)'; -$lang->kanbanlane->heightTypeList['custom'] = '自定义(根据卡片数量自定义泳道高度)'; +$lang->kanbanlane->heightTypeList['auto'] = "自适应(根据卡片高度和泳道名称高度自适应)"; +$lang->kanbanlane->heightTypeList['custom'] = "自定义(根据卡片数量自定义泳道高度)"; $lang->kanbancolumn->fluidBoardList['0'] = '固定列宽'; $lang->kanbancolumn->fluidBoardList['1'] = '自适应列宽'; diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index 1ce17c60f2..d54fcbe88d 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -60,10 +60,10 @@ kanban->import?> - kanban->importList, 'off'));?> + kanban->importList, 'off'));?> - kanban->importObjectList, array());?> + kanban->importObjectList, array());?> kanban->error->importObjNotEmpty;?> diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index 7c2ebb4872..be47e9aa6a 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -50,7 +50,7 @@ 1):?> kanban->laneHeight;?> - kanbanlane->heightTypeList, $heightType, "onclick='setCardCount(this.value);'"));?> + kanbanlane->heightTypeList, $heightType, "onclick='setCardCount(this.value);'"));?> kanban->cardCount;?> @@ -59,10 +59,10 @@ kanban->import?> - kanban->importList, $enableImport));?> + kanban->importList, $enableImport));?> - kanban->importObjectList, $importObjects);?> + kanban->importObjectList, $importObjects);?> kanban->error->importObjNotEmpty;?>