diff --git a/module/kanban/config.php b/module/kanban/config.php index 344fb4e96f..cb0915a92e 100644 --- a/module/kanban/config.php +++ b/module/kanban/config.php @@ -83,4 +83,5 @@ $config->kanban->taskColumnStatusList['pause'] = 'pause'; $config->kanban->taskColumnStatusList['canceled'] = 'cancel'; $config->kanban->taskColumnStatusList['closed'] = 'closed'; -$config->kanban->laneColorList = array('#7ec5ff', '#333', '#2b529c', '#e48600', '#d2323d', '#229f24', '#777', '#d2691e', '#008b8b', '#2e8b57', '#4169e1', '#4b0082', '#fa8072', '#ba55d3', '#2e8b57', '#6b8e23'); +$config->kanban->laneColorList = array('#7ec5ff', '#333', '#2b529c', '#e48600', '#d2323d', '#229f24', '#777', '#d2691e', '#008b8b', '#2e8b57', '#4169e1', '#4b0082', '#fa8072', '#ba55d3', '#2e8b57', '#6b8e23'); +$config->kanban->columnColorList = array('#333', '#2b519c', '#e48610', '#d2313d', '#2a9f23', '#777', '#d2691e', '#2e8b8b', '#2f8b58', '#4168e0', '#4b0082', '#f58072', '#ba55d3', '#6a8e22'); diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index da4cb1c40e..de75293401 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -624,15 +624,15 @@ function createColumnMenu(options) if(!privs.length) return []; var items = []; - if(privs.includes('setWIP')) items.push({label: kanbanLang.WIP, icon: '', url: createLink('kanban', 'setWIP', 'columnID=' + column.id), attrs: {'data-toggle': 'modal'}}); - if(privs.includes('editColumn')) items.push({label: kanbanLang.editColumn, icon: '', url: createLink('kanban', 'editColumn', 'columnID=' + column.id), attrs: {'data-toggle': 'modal'}}); + if(privs.includes('setWIP')) items.push({label: kanbanLang.WIP, icon: '', url: createLink('kanban', 'setWIP', 'columnID=' + column.id), className: 'iframe', attrs: {'data-toggle': 'modal'}}); + if(privs.includes('editColumn')) items.push({label: kanbanLang.editColumn, icon: '', url: createLink('kanban', 'setColumn', 'columnID=' + column.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal'}}); if(privs.includes('createColumn')) { - items.push({label: kanbanLang.createColumnOnLeft, icon: '', url: createLink('kanban', 'createColumn', 'columnID=' + column.id + '&position=left'), attrs: {'data-toggle': 'modal'}}); - items.push({label: kanbanLang.createColumnOnRight, icon: '', url: createLink('kanban', 'createColumn', 'columnID=' + column.id + '&position=right'), attrs: {'data-toggle': 'modal'}}); + items.push({label: kanbanLang.createColumnOnLeft, icon: '', url: createLink('kanban', 'createColumn', 'columnID=' + column.id + '&position=left'), className: 'iframe', attrs: {'data-toggle': 'modal'}}); + items.push({label: kanbanLang.createColumnOnRight, icon: '', url: createLink('kanban', 'createColumn', 'columnID=' + column.id + '&position=right'), className: 'iframe', attrs: {'data-toggle': 'modal'}}); } - if(privs.includes('copyColumn')) items.push({label: kanbanLang.copyColumn, icon: '', url: createLink('kanban', 'copyColumn', 'columnID=' + column.id), attrs: {'data-toggle': 'modal'}}); - if(privs.includes('splitColumn')) items.push({label: kanbanLang.splitColumn, icon: '', url: createLink('kanban', 'splitColumn', 'columnID=' + column.id), attrs: {'data-toggle': 'modal'}}); + if(privs.includes('copyColumn')) items.push({label: kanbanLang.copyColumn, icon: '', url: createLink('kanban', 'copyColumn', 'columnID=' + column.id), className: 'iframe', attrs: {'data-toggle': 'modal'}}); + if(privs.includes('splitColumn')) items.push({label: kanbanLang.splitColumn, icon: '', url: createLink('kanban', 'splitColumn', 'columnID=' + column.id), className: 'iframe', attrs: {'data-toggle': 'modal'}}); if(privs.includes('archiveColumn')) items.push({label: kanbanLang.archiveColumn, icon: '', url: createLink('kanban', 'archiveColumn', 'columnID=' + column.id), className: 'confirmer', attrs: {'data-confirmTitle': kanbancolumnLang.confirmArchive, 'data-confirmDetail': kanbancolumnLang.confirmArchiveDetail, 'data-confirmButton': lang.archive, 'data-confirming': lang.archiving}}); if(privs.includes('deleteColumn')) items.push({label: kanbanLang.deleteColumn, icon: '', url: createLink('kanban', 'deleteColumn', 'columnID=' + column.id), className: 'confirmer', attrs: {'data-confirmTitle': kanbancolumnLang.confirmDelete, 'data-confirmDetail': kanbancolumnLang.confirmDeleteDetail}}); diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index ed1cdfdf78..4e20905255 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -100,6 +100,9 @@ $lang->kanban->laneGroup = 'Lane Group'; $lang->kanban->cardsSort = 'Cards Sortting'; $lang->kanban->moreAction = 'More Action'; $lang->kanban->noGroup = 'None'; +$lang->kanban->limitExceeded = 'Limit Exceeded'; +$lang->kanban->fullScreen = 'Full Screen'; +$lang->kanban->setting = 'Setting'; $lang->kanban->error = new stdclass(); $lang->kanban->error->mustBeInt = 'The WIPs must be positive integer.'; @@ -178,8 +181,11 @@ $lang->kanbancolumn->limit = $lang->kanban->WIPCount; $lang->kanbanlane = new stdclass(); $lang->kanbanlane->name = $lang->kanban->laneName; +$lang->kanbanlane->common = 'Lane'; $lang->kanbanlane->default = 'Default Lane'; $lang->kanbanregion = new stdclass(); $lang->kanbanregion->name = 'Kanban Region'; $lang->kanbanregion->default = 'Default Region'; + +$lang->kanbancard = new stdclass(); diff --git a/module/kanban/model.php b/module/kanban/model.php index dfc2d786b3..d354bf90c9 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -152,6 +152,7 @@ class kanbanModel extends model $lane->region = $regionID; $lane->type = 'common'; $lane->lastEditedTime = helper::now(); + $lane->color = '#7ec5ff'; $this->dao->insert(TABLE_KANBANLANE)->data($lane)->exec(); $laneID = $this->dao->lastInsertId(); @@ -180,6 +181,7 @@ class kanbanModel extends model $column->name = $columnName; $column->type = $index; $column->limit = -1; + $column->color = '#333'; $this->dao->insert(TABLE_KANBANCOLUMN)->data($column)->exec();