From deb452fb011ba36617752eb4c12247655aba6c0d Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 26 Jan 2022 01:49:27 +0000
Subject: [PATCH 1/3] Fix bug #18843.

---
 module/kanban/model.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/kanban/model.php b/module/kanban/model.php
index e4da1c8797..4cd10beb6e 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -2807,11 +2807,11 @@ class kanbanModel extends model
 
     /**
      * Set column width.
-     * 
-     * @param  int    $kanbanID 
-     * @param  string $from 
+     *
+     * @param  int    $kanbanID
+     * @param  string $from
      * @access public
-     * @return bool|void 
+     * @return bool|void
      */
     public function setColumnWidth($kanbanID, $from = 'kanban')
     {
@@ -2830,6 +2830,9 @@ class kanbanModel extends model
      */
     public function setHeaderActions($kanban)
     {
+        $blackButton = '';
+        if($this->app->cookie->theme == 'blue') $blackButton = 'style="color:#000000"';
+
         $printSetHeightBtn = false;
         if(common::hasPriv('kanban', 'setLaneHeight'))
         {
@@ -2845,13 +2848,13 @@ class kanbanModel extends model
 
         $actions  = '';
         $actions .= "<div class='btn-group'>";
-        $actions .= "<a href='javascript:fullScreen();' id='fullScreenBtn' class='btn btn-link'><i class='icon icon-fullscreen'></i> {$this->lang->kanban->fullScreen}</a>";
+        $actions .= "<a href='javascript:fullScreen();' id='fullScreenBtn' $blackButton class='btn btn-link'><i class='icon icon-fullscreen'></i> {$this->lang->kanban->fullScreen}</a>";
 
         $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeightBtn or common::hasPriv('kanban', 'performable') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete'));
 
         if($printSettingBtn)
         {
-            $actions .= "<a data-toggle='dropdown' class='btn btn-link dropdown-toggle setting' type='button'>" . '<i class="icon icon-cog-outline"></i> ' . $this->lang->kanban->setting . '</a>';
+            $actions .= "<a data-toggle='dropdown' $blackButton class='btn btn-link dropdown-toggle setting' type='button'>" . '<i class="icon icon-cog-outline"></i> ' . $this->lang->kanban->setting . '</a>';
             $actions .= "<ul id='kanbanActionMenu' class='dropdown-menu text-left'>";
             if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$kanban->id", '', true), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createRegion, '', "class='iframe btn btn-link'") . '</li>';
             if(common::hasPriv('kanban', 'import')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'import', "kanbanID=$kanban->id", '', true), '<i class="icon icon-import"></i>' . $this->lang->kanban->import, '', "class='iframe btn btn-link'") . '</li>';

From 2b284939d5d6a9ee4adce7e7354b377996e7b342 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 26 Jan 2022 01:59:31 +0000
Subject: [PATCH 2/3] Fix bug #18845.

---
 module/kanban/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/kanban/model.php b/module/kanban/model.php
index 4cd10beb6e..bd57d54b3e 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -2866,7 +2866,7 @@ class kanbanModel extends model
 
             }
             if(common::hasPriv('kanban', 'setColumnWidth')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'setColumnWidth', "kanbanID=$kanban->id", '', true), '<i class="icon icon-size-width"></i>' . $this->lang->kanban->columnWidth, '', "class='iframe btn btn-link' data-width=30%") . '</li>';
-            if(common::hasPriv('kanban', 'performable')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'performable', "kanbanID=$kanban->id", '', true), '<i class="icon icon-checked"></i>' . $this->lang->kanban->doneFunction, '', "class='iframe btn btn-link'") . '</li>';
+            if(common::hasPriv('kanban', 'performable')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'performable', "kanbanID=$kanban->id", '', true), '<i class="icon icon-checked"></i>' . $this->lang->kanban->doneFunction, '', "class='iframe btn btn-link' data-width=40%") . '</li>';
 
             $kanbanActions = '';
             $attr          = $kanban->status == 'closed' ? "disabled='disabled'" : '';

From 4284a2331fa8ffcdf6df83897dee352cd6266246 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 26 Jan 2022 02:40:18 +0000
Subject: [PATCH 3/3] Change blackButton to btnColor.

---
 module/kanban/model.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/kanban/model.php b/module/kanban/model.php
index bd57d54b3e..6fd2ffb6c2 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -2830,8 +2830,8 @@ class kanbanModel extends model
      */
     public function setHeaderActions($kanban)
     {
-        $blackButton = '';
-        if($this->app->cookie->theme == 'blue') $blackButton = 'style="color:#000000"';
+        $btnColor = '';
+        if($this->app->cookie->theme == 'blue') $btnColor = 'style="color:#000000"';
 
         $printSetHeightBtn = false;
         if(common::hasPriv('kanban', 'setLaneHeight'))
@@ -2848,13 +2848,13 @@ class kanbanModel extends model
 
         $actions  = '';
         $actions .= "<div class='btn-group'>";
-        $actions .= "<a href='javascript:fullScreen();' id='fullScreenBtn' $blackButton class='btn btn-link'><i class='icon icon-fullscreen'></i> {$this->lang->kanban->fullScreen}</a>";
+        $actions .= "<a href='javascript:fullScreen();' id='fullScreenBtn' $btnColor class='btn btn-link'><i class='icon icon-fullscreen'></i> {$this->lang->kanban->fullScreen}</a>";
 
         $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeightBtn or common::hasPriv('kanban', 'performable') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete'));
 
         if($printSettingBtn)
         {
-            $actions .= "<a data-toggle='dropdown' $blackButton class='btn btn-link dropdown-toggle setting' type='button'>" . '<i class="icon icon-cog-outline"></i> ' . $this->lang->kanban->setting . '</a>';
+            $actions .= "<a data-toggle='dropdown' $btnColor class='btn btn-link dropdown-toggle setting' type='button'>" . '<i class="icon icon-cog-outline"></i> ' . $this->lang->kanban->setting . '</a>';
             $actions .= "<ul id='kanbanActionMenu' class='dropdown-menu text-left'>";
             if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$kanban->id", '', true), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createRegion, '', "class='iframe btn btn-link'") . '</li>';
             if(common::hasPriv('kanban', 'import')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'import', "kanbanID=$kanban->id", '', true), '<i class="icon icon-import"></i>' . $this->lang->kanban->import, '', "class='iframe btn btn-link'") . '</li>';