From 02e7d183c7f7cb503677f63655ed7e7ed69404f2 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 7 Jun 2022 07:01:44 +0000
Subject: [PATCH 1/8] * Finish task #56379.

---
 module/kanban/lang/en.php    | 4 ++--
 module/kanban/lang/zh-cn.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 661b6b5100..a536b8e3df 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -275,10 +275,10 @@ $lang->kanbanspace->empty = 'No Space';
 $lang->kanbanspace->aclList['open']    = 'Open (Accessible with kanban view permissions)';
 $lang->kanbanspace->aclList['private'] = 'Private (For the space owner, team and whitelist members only)';
 
-$lang->kanbanspace->featureBar['private']     = 'Private Space';
+$lang->kanbanspace->featureBar['involved']    = 'Involved';
 $lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->featureBar['public']      = 'Public Space';
-$lang->kanbanspace->featureBar['involved']    = 'Involved';
+$lang->kanbanspace->featureBar['private']     = 'Private Space';
 
 $lang->kanbanspace->typeList['private']     = 'Private Space';
 $lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index a706e5927f..30e70ec19d 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -275,10 +275,10 @@ $lang->kanbanspace->empty = '暂时没有空间';
 $lang->kanbanspace->aclList['open']    = '公开（有看板空间视图权限即可访问）';
 $lang->kanbanspace->aclList['private'] = '私有（只有看板空间负责人、团队成员、白名单可访问）';
 
-$lang->kanbanspace->featureBar['private']     = '私人空间';
+$lang->kanbanspace->featureBar['involved']    = '我参与的';
 $lang->kanbanspace->featureBar['cooperation'] = '协作空间';
 $lang->kanbanspace->featureBar['public']      = '公共空间';
-$lang->kanbanspace->featureBar['involved']    = '我参与的';
+$lang->kanbanspace->featureBar['private']     = '私人空间';
 
 $lang->kanbanspace->typeList['private']     = '私人空间';
 $lang->kanbanspace->typeList['cooperation'] = '协作空间';

From 4ecda5bee6c6c1a417418f6feeeea716812b0f72 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 7 Jun 2022 07:44:21 +0000
Subject: [PATCH 2/8] * Finish task #56380 #56379.

---
 module/kanban/view/createspace.html.php | 2 +-
 module/kanban/view/editspace.html.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/kanban/view/createspace.html.php b/module/kanban/view/createspace.html.php
index 4d385cf203..bd8af29a43 100644
--- a/module/kanban/view/createspace.html.php
+++ b/module/kanban/view/createspace.html.php
@@ -20,7 +20,7 @@
     <table class='table table-form'>
       <tr>
         <th><?php echo $lang->kanbanspace->type;?></th>
-        <td><?php echo html::select('type', $typeList, $type, "onchange='changeType(this.value)' class='form-control chosen'");?></td>
+        <td><?php echo html::radio('type', $typeList, $type, "onchange='changeType(this.value)'");?></td>
         <td></td>
       </tr>
       <tr>
diff --git a/module/kanban/view/editspace.html.php b/module/kanban/view/editspace.html.php
index df5eaeeca7..b775bf3808 100644
--- a/module/kanban/view/editspace.html.php
+++ b/module/kanban/view/editspace.html.php
@@ -20,7 +20,7 @@
     <table class='table table-form'>
       <tr>
         <th><?php echo $lang->kanbanspace->type;?></th>
-        <td><?php echo html::select('type', $typeList, $defaultType, "onchange='changeType(this.value)' class='form-control chosen'");?></td>
+        <td><?php echo html::radio('type', $typeList, $defaultType, "onchange='changeType(this.value)'");?></td>
         <td></td>
       </tr>
       <tr>

From b4a27adf49e9483d1b1c0625080a7bce7884c000 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 7 Jun 2022 08:16:04 +0000
Subject: [PATCH 3/8] * Finish task #56379 #56382 #56380.

---
 module/kanban/css/space.css       | 1 +
 module/kanban/lang/en.php         | 2 +-
 module/kanban/lang/zh-cn.php      | 2 +-
 module/kanban/view/space.html.php | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index 0af2b80557..d7f725d1b3 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -8,6 +8,7 @@
 .space .menu {margin-left: 5px; margin-right:5px;}
 .space .table-empty-tip {padding: 40px 10px;}
 .space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 255px)}
+.desc-style {font-size: 13px; color: #838A9D; margin: 10px 0 16px 0;}
 
 .kanbans > .col {width: 25% !important;}
 @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index a536b8e3df..2e85b9cf10 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -280,9 +280,9 @@ $lang->kanbanspace->featureBar['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->featureBar['public']      = 'Public Space';
 $lang->kanbanspace->featureBar['private']     = 'Private Space';
 
-$lang->kanbanspace->typeList['private']     = 'Private Space';
 $lang->kanbanspace->typeList['cooperation'] = 'Cooperation Space';
 $lang->kanbanspace->typeList['public']      = 'Public Space';
+$lang->kanbanspace->typeList['private']     = 'Private Space';
 
 $lang->kanbancolumn = new stdclass();
 $lang->kanbancolumn->name       = $lang->kanban->columnName;
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 30e70ec19d..18534a0637 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -280,9 +280,9 @@ $lang->kanbanspace->featureBar['cooperation'] = '协作空间';
 $lang->kanbanspace->featureBar['public']      = '公共空间';
 $lang->kanbanspace->featureBar['private']     = '私人空间';
 
-$lang->kanbanspace->typeList['private']     = '私人空间';
 $lang->kanbanspace->typeList['cooperation'] = '协作空间';
 $lang->kanbanspace->typeList['public']      = '公共空间';
+$lang->kanbanspace->typeList['private']     = '私人空间';
 
 $lang->kanbancolumn = new stdclass();
 $lang->kanbancolumn->name       = $lang->kanban->columnName;
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index c98e90e271..3d29541658 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -47,6 +47,7 @@
               <?php echo $space->name;?>
             </h4>
           </div>
+          <p class="desc-style text-ellipsis text-primary" title='<?php echo $space->desc;?>'><?php echo $space->desc;?></p>
         </div>
         <div class='spaceActions pull-right'>
           <?php $class = $space->status == 'closed' ? 'disabled' : '';?>

From dd10aa75f00b281f6e86f64c2124ec44ca2ffec4 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 8 Jun 2022 01:06:07 +0000
Subject: [PATCH 4/8] * Finish task #56366 #56379 #56382 #56380

---
 module/kanban/css/space.css       |  4 ++--
 module/kanban/lang/en.php         |  1 +
 module/kanban/lang/zh-cn.php      |  1 +
 module/kanban/view/space.html.php | 21 +++++++++++++--------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index d7f725d1b3..bc779ee065 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -7,8 +7,8 @@
 #spaceList .spaceActions > a{margin-left: 10px;}
 .space .menu {margin-left: 5px; margin-right:5px;}
 .space .table-empty-tip {padding: 40px 10px;}
-.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 255px)}
-.desc-style {font-size: 13px; color: #838A9D; margin: 10px 0 16px 0;}
+.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 150px)}
+.desc-style {font-size: 13px; color: #838A9D; margin: -5px 0 16px 18px;}
 
 .kanbans > .col {width: 25% !important;}
 @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 2e85b9cf10..ada1af7205 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -26,6 +26,7 @@ $lang->kanban->columnWidth         = 'Column Width';
 $lang->kanban->setColumnWidth      = 'Set Column Width';
 $lang->kanban->deleteLane          = 'Delete Lane';
 $lang->kanban->createColumn        = 'Create Column';
+$lang->kanban->emptyDesc           = 'No description';
 $lang->kanban->editColumn          = 'Edit Column';
 $lang->kanban->sortColumn          = 'Sort Column';
 $lang->kanban->deleteColumn        = 'Delete Column';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 18534a0637..8fab1ef0f2 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -26,6 +26,7 @@ $lang->kanban->columnWidth         = '列宽度';
 $lang->kanban->setColumnWidth      = '设置列宽度';
 $lang->kanban->deleteLane          = '删除泳道';
 $lang->kanban->createColumn        = '创建看板列';
+$lang->kanban->emptyDesc           = '暂无描述';
 $lang->kanban->editColumn          = '编辑看板列';
 $lang->kanban->sortColumn          = '看板列排序';
 $lang->kanban->deleteColumn        = '删除看板列';
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index 3d29541658..bd42d1074a 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -47,18 +47,23 @@
               <?php echo $space->name;?>
             </h4>
           </div>
-          <p class="desc-style text-ellipsis text-primary" title='<?php echo $space->desc;?>'><?php echo $space->desc;?></p>
+          <p class="desc-style text-ellipsis text-primary" title='<?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?>'><?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?></p>
         </div>
         <div class='spaceActions pull-right'>
           <?php $class = $space->status == 'closed' ? 'disabled' : '';?>
           <?php if($space->status != 'closed' and $browseType != 'involved' and !empty($unclosedSpace)) common::printLink('kanban', 'create', "spaceID={$space->id}&type={$space->type}", '<i class="icon icon-plus"></i> ' . $lang->kanban->create, '', "class='iframe' data-width='75%'", '', true);?>
-          <?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?>
-          <?php if($class == 'disabled'):?>
-          <?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>
-          <?php else:?>
-          <?php common::printLink('kanban', 'closeSpace', "spaceID={$space->id}", '<i class="icon icon-off"></i> ' . $lang->close, '', "class='iframe'", '', true);?>
-          <?php endif;?>
-          <?php common::printLink('kanban', 'deleteSpace', "spaceID={$space->id}", '<i class="icon icon-trash"></i> ' . $lang->delete, 'hiddenwin', '', '', true);?>
+          <div class="btn-group" id="more">
+            <a href="javascript:;" data-toggle="dropdown" class="btn btn-link " style="border-radius: 4px;"><?php echo $lang->kanban->setting;?><span class="caret"></span></a>
+            <ul class="dropdown-menu">
+              <li><?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?></li>
+              <li><?php if($class == 'disabled'):?>
+              <?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>
+              <?php else:?>
+              <?php common::printLink('kanban', 'closeSpace', "spaceID={$space->id}", '<i class="icon icon-off"></i> ' . $lang->close, '', "class='iframe'", '', true);?>
+              <?php endif;?></li>
+              <li><?php common::printLink('kanban', 'deleteSpace', "spaceID={$space->id}", '<i class="icon icon-trash"></i> ' . $lang->delete, 'hiddenwin', '', '', true);?></li>
+            <ul>
+         </div>
         </div>
       </div>
       <?php if(isset($space->kanbans)):?>

From 56419e17a86b317774f876587f9910f9829ec652 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 8 Jun 2022 01:39:24 +0000
Subject: [PATCH 5/8] * Finish task #56379.

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

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index bc779ee065..90577df686 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -8,7 +8,7 @@
 .space .menu {margin-left: 5px; margin-right:5px;}
 .space .table-empty-tip {padding: 40px 10px;}
 .space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 150px)}
-.desc-style {font-size: 13px; color: #838A9D; margin: -5px 0 16px 18px;}
+.desc-style {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}
 
 .kanbans > .col {width: 25% !important;}
 @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}

From 757b86bf3369a5047da0155e3971e7ee360f4bb9 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 8 Jun 2022 01:52:34 +0000
Subject: [PATCH 6/8] * Finish task #56379.

---
 module/kanban/css/space.css       | 1 +
 module/kanban/view/space.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index 90577df686..8eabd3cb10 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -9,6 +9,7 @@
 .space .table-empty-tip {padding: 40px 10px;}
 .space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 150px)}
 .desc-style {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}
+.menu-style {margin-left: -25px; min-width: 80px}
 
 .kanbans > .col {width: 25% !important;}
 @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index bd42d1074a..a4c478d57c 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -54,7 +54,7 @@
           <?php if($space->status != 'closed' and $browseType != 'involved' and !empty($unclosedSpace)) common::printLink('kanban', 'create', "spaceID={$space->id}&type={$space->type}", '<i class="icon icon-plus"></i> ' . $lang->kanban->create, '', "class='iframe' data-width='75%'", '', true);?>
           <div class="btn-group" id="more">
             <a href="javascript:;" data-toggle="dropdown" class="btn btn-link " style="border-radius: 4px;"><?php echo $lang->kanban->setting;?><span class="caret"></span></a>
-            <ul class="dropdown-menu">
+            <ul class="dropdown-menu menu-style">
               <li><?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?></li>
               <li><?php if($class == 'disabled'):?>
               <?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>

From 16e9d31d15d9d835bd374cd9afa1f6be4ce922cd Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 8 Jun 2022 06:36:13 +0000
Subject: [PATCH 7/8] * Finish task #56379.

---
 module/kanban/css/space.css       | 4 ++--
 module/kanban/view/space.html.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index 8eabd3cb10..32b8bd052b 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -8,8 +8,8 @@
 .space .menu {margin-left: 5px; margin-right:5px;}
 .space .table-empty-tip {padding: 40px 10px;}
 .space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 150px)}
-.desc-style {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}
-.menu-style {margin-left: -25px; min-width: 80px}
+.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}
+.settingDropdown {margin-left: -25px; min-width: 80px}
 
 .kanbans > .col {width: 25% !important;}
 @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index a4c478d57c..b80fd960eb 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -47,14 +47,14 @@
               <?php echo $space->name;?>
             </h4>
           </div>
-          <p class="desc-style text-ellipsis text-primary" title='<?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?>'><?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?></p>
+          <p class="spaceDesc text-ellipsis text-primary" title='<?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?>'><?php echo empty($space->desc) ? $lang->kanban->emptyDesc : $space->desc;?></p>
         </div>
         <div class='spaceActions pull-right'>
           <?php $class = $space->status == 'closed' ? 'disabled' : '';?>
           <?php if($space->status != 'closed' and $browseType != 'involved' and !empty($unclosedSpace)) common::printLink('kanban', 'create', "spaceID={$space->id}&type={$space->type}", '<i class="icon icon-plus"></i> ' . $lang->kanban->create, '', "class='iframe' data-width='75%'", '', true);?>
           <div class="btn-group" id="more">
             <a href="javascript:;" data-toggle="dropdown" class="btn btn-link " style="border-radius: 4px;"><?php echo $lang->kanban->setting;?><span class="caret"></span></a>
-            <ul class="dropdown-menu menu-style">
+            <ul class="dropdown-menu settingDropdown">
               <li><?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?></li>
               <li><?php if($class == 'disabled'):?>
               <?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>

From b2cff31389ae97361df242b2626d31e2bd64943d Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 8 Jun 2022 06:41:28 +0000
Subject: [PATCH 8/8] * Finish task #56379.

---
 module/kanban/css/space.css       | 2 +-
 module/kanban/view/space.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index 32b8bd052b..a5e7c3e778 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -9,7 +9,7 @@
 .space .table-empty-tip {padding: 40px 10px;}
 .space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 150px)}
 .spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}
-.settingDropdown {margin-left: -25px; min-width: 80px}
+#more .setting {margin-left: -25px; min-width: 80px}
 
 .kanbans > .col {width: 25% !important;}
 @media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index b80fd960eb..198f59780b 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -54,7 +54,7 @@
           <?php if($space->status != 'closed' and $browseType != 'involved' and !empty($unclosedSpace)) common::printLink('kanban', 'create', "spaceID={$space->id}&type={$space->type}", '<i class="icon icon-plus"></i> ' . $lang->kanban->create, '', "class='iframe' data-width='75%'", '', true);?>
           <div class="btn-group" id="more">
             <a href="javascript:;" data-toggle="dropdown" class="btn btn-link " style="border-radius: 4px;"><?php echo $lang->kanban->setting;?><span class="caret"></span></a>
-            <ul class="dropdown-menu settingDropdown">
+            <ul class="dropdown-menu setting">
               <li><?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->setting, '', "class='iframe' data-width='75%'", '', true);?></li>
               <li><?php if($class == 'disabled'):?>
               <?php common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->activate, '', "class='iframe'", '', true);?>