diff --git a/module/kanban/config.php b/module/kanban/config.php index d643efc087..fc6374a1ff 100644 --- a/module/kanban/config.php +++ b/module/kanban/config.php @@ -34,10 +34,6 @@ $config->kanban->editregion->requiredFields = 'name'; $config->kanban->splitcolumn->requiredFields = 'name,limit'; $config->kanban->editor = new stdclass(); -$config->kanban->editor->create = array('id' => 'desc', 'tools' => 'simpleTools'); -$config->kanban->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools'); -$config->kanban->editor->createspace = array('id' => 'desc', 'tools' => 'simpleTools'); -$config->kanban->editor->editspace = array('id' => 'desc', 'tools' => 'simpleTools'); $config->kanban->editor->closespace = array('id' => 'comment', 'tools' => 'simpleTools'); $config->kanban->editor->activatespace = array('id' => 'comment', 'tools' => 'simpleTools'); $config->kanban->editor->createcard = array('id' => 'desc', 'tools' => 'simpleTools'); @@ -108,7 +104,7 @@ $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', '#6b8e23'); +$config->kanban->laneColorList = array('#3C4353', '#838A9D', '#476BDA', '#A65BD4', '#449C9D', '#D75557', '#CE814C', '#E7D057', '#73BE60', '#F6998A', '#8DA8ED', '#93DAF6', '#B9E78C', '#E58CE7', '#EDE590', '#CFB5FA'); $config->kanban->columnColorList = array('#333', '#2b519c', '#e48610', '#d2313d', '#2a9f23', '#777', '#d2691e', '#2e8b8b', '#2f8b58', '#4168e0', '#4b0082', '#f58072', '#ba55d3', '#6a8e22'); $config->kanban->cardColorList = array('#fff', '#b10b0b', '#cfa227', '#2a5f29'); diff --git a/module/kanban/control.php b/module/kanban/control.php index 1b83d01bfb..3b6c728653 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -90,6 +90,7 @@ class kanban extends control } $space = $this->kanban->getSpaceById($spaceID); + $space->desc = strip_tags($space->desc); $typeList = $this->lang->kanbanspace->typeList; if($space->type == 'cooperation' or $space->type == 'public') unset($typeList['private']); @@ -254,7 +255,9 @@ class kanban extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); } - $kanban = $this->kanban->getByID($kanbanID); + $kanban = $this->kanban->getByID($kanbanID); + $kanban->desc = strip_tags($kanban->desc); + $space = $this->kanban->getSpaceById($kanban->space); $spaceUsers = trim($space->owner) . ',' . trim($space->team); $users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $spaceUsers); diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index 7d955d6ea4..8405826405 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -46,6 +46,10 @@ .region .kanban-header-parent-col > .actions {position: absolute; right: 0px; top: 0px !important;} .region .kanban-header-sub-cols .actions {position: absolute; right: 0px; top: 0px !important;} +.kanban-affixed .kanban-header-col > .title > .count {opacity:1; color: #fff!important;} +.kanban-affixed .kanban-header-col > .title > .text-grey {opacity:1; color: #fff!important;} +.kanban-affixed .kanban-header-col > .actions > .btn > .icon {opacity:1; color: #fff!important;} + .region .kanban-lane {position: relative; border-bottom: none!important; min-height: 200px !important} .region .kanban-lane > .kanban-lane-name > .text {margin: auto 0; max-height: 150px; overflow: hidden; text-overflow: ellipsis} diff --git a/module/kanban/model.php b/module/kanban/model.php index 09b45f0eb1..1dd11d7c73 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1808,8 +1808,6 @@ class kanbanModel extends model if(strpos(",{$space->team},", ",$account,") === false) $space->team .= ",$account"; if(strpos(",{$space->team},", ",$space->owner,") === false) $space->team .= ",$space->owner"; - $space = $this->loadModel('file')->processImgURL($space, $this->config->kanban->editor->createspace['id'], $this->post->uid); - $this->dao->insert(TABLE_KANBANSPACE)->data($space) ->autoCheck() ->batchCheck($this->config->kanban->createspace->requiredFields, 'notempty') @@ -1819,7 +1817,7 @@ class kanbanModel extends model { $spaceID = $this->dao->lastInsertID(); $this->dao->update(TABLE_KANBANSPACE)->set('`order`')->eq($spaceID)->where('id')->eq($spaceID)->exec(); - $this->file->saveUpload('kanbanspace', $spaceID); + $this->loadModel('file')->saveUpload('kanbanspace', $spaceID); $this->file->updateObjectID($this->post->uid, $spaceID, 'kanbanspace'); return $spaceID; @@ -1848,8 +1846,6 @@ class kanbanModel extends model if($type == 'cooperation' or $type == 'public') $space->whitelist = ''; - $space = $this->loadModel('file')->processImgURL($space, $this->config->kanban->editor->editspace['id'], $this->post->uid); - $this->dao->update(TABLE_KANBANSPACE)->data($space) ->autoCheck() ->batchCheck($this->config->kanban->editspace->requiredFields, 'notempty') @@ -1867,7 +1863,7 @@ class kanbanModel extends model if(!dao::isError()) { - $this->file->saveUpload('kanbanspace', $spaceID); + $this->loadModel('file')->saveUpload('kanbanspace', $spaceID); $this->file->updateObjectID($this->post->uid, $spaceID, 'kanbanspace'); return common::createChanges($oldSpace, $space); } @@ -2061,8 +2057,6 @@ class kanbanModel extends model if(strpos(",{$kanban->team},", ",$account,") === false) $kanban->team .= ",$account"; if(strpos(",{$kanban->team},", ",$kanban->owner,") === false) $kanban->team .= ",$kanban->owner"; - $kanban = $this->loadModel('file')->processImgURL($kanban, $this->config->kanban->editor->create['id'], $this->post->uid); - if(!empty($kanban->space)) { $maxOrder = $this->dao->select('MAX(`order`) AS maxOrder')->from(TABLE_KANBAN) @@ -2086,7 +2080,7 @@ class kanbanModel extends model $kanban = $this->getByID($kanbanID); $this->createDefaultRegion($kanban); - $this->file->saveUpload('kanban', $kanbanID); + $this->loadModel('file')->saveUpload('kanban', $kanbanID); $this->file->updateObjectID($this->post->uid, $kanbanID, 'kanban'); return $kanbanID; @@ -2114,8 +2108,6 @@ class kanbanModel extends model ->remove('uid,contactListMenu') ->get(); - $kanban = $this->loadModel('file')->processImgURL($kanban, $this->config->kanban->editor->edit['id'], $this->post->uid); - $this->dao->update(TABLE_KANBAN)->data($kanban) ->autoCheck() ->batchCheck($this->config->kanban->edit->requiredFields, 'notempty') @@ -2124,7 +2116,7 @@ class kanbanModel extends model if(!dao::isError()) { - $this->file->saveUpload('kanban', $kanbanID); + $this->loadModel('file')->saveUpload('kanban', $kanbanID); $this->file->updateObjectID($this->post->uid, $kanbanID, 'kanban'); return common::createChanges($oldKanban, $kanban); diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php index 0c7fbcd708..bebf80e5dc 100644 --- a/module/kanban/view/create.html.php +++ b/module/kanban/view/create.html.php @@ -50,7 +50,6 @@ kanban->desc;?> - fetch('user', 'ajaxPrintTemplates', 'type=kanban&link=desc');?> diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php index 924bfcf17f..795511426c 100644 --- a/module/kanban/view/createspace.html.php +++ b/module/kanban/view/createspace.html.php @@ -43,7 +43,6 @@ kanbanspace->desc;?> - fetch('user', 'ajaxPrintTemplates', 'type=kanbanSpace&link=desc');?> diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php index 12733487a0..706d49ef31 100644 --- a/module/kanban/view/edit.html.php +++ b/module/kanban/view/edit.html.php @@ -43,7 +43,6 @@ kanban->desc;?> - fetch('user', 'ajaxPrintTemplates', 'type=kanban&link=desc');?> desc, "rows='10' class='form-control'");?> diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php index 13ca616cda..02b097a6b4 100644 --- a/module/kanban/view/editspace.html.php +++ b/module/kanban/view/editspace.html.php @@ -44,7 +44,6 @@ kanbanspace->desc;?> - fetch('user', 'ajaxPrintTemplates', 'type=kanbanSpace&link=desc');?> desc, "rows='10' class='form-control'");?> diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php index b86967cac7..d6ef933cc3 100644 --- a/module/kanban/view/space.html.php +++ b/module/kanban/view/space.html.php @@ -47,7 +47,8 @@ name;?>

-

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

+ desc = empty($space->desc) ? $lang->kanban->emptyDesc : strip_tags($space->desc);?> +

desc;?>

status == 'closed' ? 'disabled' : '';?>