From a495a6547612c404cdde6eedd83b5c8e2d0e5ee7 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 4 Jul 2021 18:27:21 +0200 Subject: [PATCH] formatting fixes, bug fixes and support impl. --- Controller/BackendController.php | 2 +- Controller/Controller.php | 2 +- Models/KanbanBoard.php | 2 +- Models/KanbanCardComment.php | 2 +- Models/KanbanColumn.php | 2 +- Models/styles.tpl.json | 0 Theme/Backend/css/styles.css | 7 +++++++ Theme/Backend/css/styles.scss | 13 ++++++++++++- Theme/Backend/kanban-board.tpl.php | 7 +++++-- Theme/Backend/kanban-card.tpl.php | 27 +++++++++++++++++++++++++-- 10 files changed, 54 insertions(+), 10 deletions(-) mode change 100644 => 100755 Models/styles.tpl.json diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 7226d1a..7b467cb 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -26,7 +26,7 @@ use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; /** - * Task class. + * Kanban backend controller class. * * @package Modules\Kanban * @license OMS License 1.0 diff --git a/Controller/Controller.php b/Controller/Controller.php index d7f138a..00a94ef 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -17,7 +17,7 @@ namespace Modules\Kanban\Controller; use phpOMS\Module\ModuleAbstract; /** - * Task class. + * Kanban controller class. * * @package Modules\Kanban * @license OMS License 1.0 diff --git a/Models/KanbanBoard.php b/Models/KanbanBoard.php index 5196ee1..265a27e 100755 --- a/Models/KanbanBoard.php +++ b/Models/KanbanBoard.php @@ -19,7 +19,7 @@ use Modules\Admin\Models\NullAccount; use Modules\Tag\Models\Tag; /** - * Task class. + * Kanban board class. * * @package Modules\Kanban\Models * @license OMS License 1.0 diff --git a/Models/KanbanCardComment.php b/Models/KanbanCardComment.php index e1d09f4..48f7adf 100755 --- a/Models/KanbanCardComment.php +++ b/Models/KanbanCardComment.php @@ -18,7 +18,7 @@ use Modules\Admin\Models\Account; use Modules\Admin\Models\NullAccount; /** - * Task class. + * Kanban card comment class. * * @package Modules\Kanban\Models * @license OMS License 1.0 diff --git a/Models/KanbanColumn.php b/Models/KanbanColumn.php index 4e67519..9a13726 100755 --- a/Models/KanbanColumn.php +++ b/Models/KanbanColumn.php @@ -15,7 +15,7 @@ declare(strict_types=1); namespace Modules\Kanban\Models; /** - * Task class. + * Kanban column class. * * @package Modules\Kanban\Models * @license OMS License 1.0 diff --git a/Models/styles.tpl.json b/Models/styles.tpl.json old mode 100644 new mode 100755 diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css index e69de29..1053388 100755 --- a/Theme/Backend/css/styles.css +++ b/Theme/Backend/css/styles.css @@ -0,0 +1,7 @@ +.kanban-column .portlet-head { + display: flex; + flex-direction: row; } + .kanban-column .portlet-head > a { + flex: 1; } + .kanban-column .portlet-head div { + flex: 0; } diff --git a/Theme/Backend/css/styles.scss b/Theme/Backend/css/styles.scss index 9cb4a20..1ecf2ce 100755 --- a/Theme/Backend/css/styles.scss +++ b/Theme/Backend/css/styles.scss @@ -1,3 +1,14 @@ -.m-kanban { +.kanban-column { + .portlet-head { + display: flex; + flex-direction: row; + > a { + flex: 1; + } + + div { + flex: 0; + } + } } \ No newline at end of file diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php index 0f6d7b8..ace48b5 100755 --- a/Theme/Backend/kanban-board.tpl.php +++ b/Theme/Backend/kanban-board.tpl.php @@ -25,13 +25,16 @@ $columns = $board->getColumns(); -->
getCards(); ?> -
+
printHtml($column->name); ?>
getId()); ?>
-
printHtml($card->name); ?>getCommentCount(); ?>
+
+ printHtml($card->name); ?> +
getCommentCount(); ?>
+
description; ?>
diff --git a/Theme/Backend/kanban-card.tpl.php b/Theme/Backend/kanban-card.tpl.php index 15936e8..29b34cb 100755 --- a/Theme/Backend/kanban-card.tpl.php +++ b/Theme/Backend/kanban-card.tpl.php @@ -1,8 +1,31 @@ -getData('card'); +getData('card'); + $comments = $card->getComments(); ?> + +