Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #23543 #23434 #23427 #23419.

Browse Source
This commit is contained in:
zhouxudong
2022-06-13 04:24:33 +00:00
parent d282416028
commit 26a57e00cd
6 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+1 -1
View File
@@ -21,7 +21,7 @@ class kanban extends control
* @access public
* @return void
*/
public function space($browseType = 'private', $recTotal = 0, $recPerPage = 15, $pageID = 1)
public function space($browseType = 'involved', $recTotal = 0, $recPerPage = 15, $pageID = 1)
{
/* Load pager. */
$this->app->loadClass('pager', $static = true);
module/kanban/css/space.css
+6 -5
View File
@@ -3,15 +3,15 @@
#spaceList .spaceTitle > div {display: inline-block;}
#spaceList .spaceTitle .label-closed {background: #AAA !important; color: #FFF;}
#spaceList .spaceTitle .icon-zone {color: #838a9d; margin-top:100px;}
#spaceList .spaceActions {margin-top: 10px;}
#spaceList .spaceActions {margin-top: -4px;}
#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% - 155px)}
.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 200px)}
.spaceName {font-size: 16px; font-weight: bold;}
.spaceTitle .icon-cube {font-size: 16px;}
.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}
#more .setting {margin-left: -25px; min-width: 80px}
.spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 0;}
#setting .setting {margin-left: -25px; min-width: 80px}
.kanbans > .col {width: 25% !important;}
@media screen and (max-width: 1500px) {.kanbans > .col {width: 25%;}}
@@ -43,4 +43,5 @@
a.disabled {pointer-events: none;}
.noBorder{border: 0px;}
.noBorder {border: 0px;}
.position {padding-right: 5px;}
module/kanban/lang/en.php
+4
View File
@@ -47,6 +47,10 @@ $lang->kanban->deleteCard = 'Delete Card';
$lang->kanban->removeCard = 'Remove Card';
$lang->kanban->assigntoCard = 'Assign';
$lang->kanban->setting = 'Setting';
$lang->kanban->settingSpace = 'Setting Space';
$lang->kanban->activateSpace = 'Activate Space';
$lang->kanban->closeSpace = 'Close Space';
$lang->kanban->deleteSpace = 'Delete Space';
$lang->kanban->enableArchived = 'Enable Archived';
$lang->kanban->archive = 'Archive';
$lang->kanban->performable = 'Set progress management';
module/kanban/lang/zh-cn.php
+4
View File
@@ -47,6 +47,10 @@ $lang->kanban->deleteCard = '删除卡片';
$lang->kanban->removeCard = '移除卡片';
$lang->kanban->assigntoCard = '指派';
$lang->kanban->setting = '设置';
$lang->kanban->settingSpace = '设置空间';
$lang->kanban->activateSpace = '激活空间';
$lang->kanban->closeSpace = '关闭空间';
$lang->kanban->deleteSpace = '删除空间';
$lang->kanban->enableArchived = '设置归档功能';
$lang->kanban->archive = '归档功能';
$lang->kanban->performable = '设置进度管理';
module/kanban/view/space.html.php
+8 -8
View File
@@ -52,17 +52,17 @@
</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 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>
<?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 btn btn-link' data-width='75%'", '', true);?>
<div class="btn-group" id="setting?">
<a href="javascript:;" data-toggle="dropdown" class="btn btn-link " style="border-radius: 4px;"><i class="icon icon-cog-outline position"></i><?php echo $lang->kanban->setting;?><span class="caret"></span></a>
<ul class="dropdown-menu setting pull-right">
<li><?php common::printLink('kanban', 'editSpace', "spaceID={$space->id}", '<i class="icon icon-cog-outline"></i> ' . $lang->kanban->settingSpace, '', "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 common::printLink('kanban', 'activateSpace', "spaceID={$space->id}", '<i class="icon icon-magic"></i> ' . $lang->kanban->activateSpace, '', "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 common::printLink('kanban', 'closeSpace', "spaceID={$space->id}", '<i class="icon icon-off"></i> ' . $lang->kanban->closeSpace, '', "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>
<li><?php common::printLink('kanban', 'deleteSpace', "spaceID={$space->id}", '<i class="icon icon-trash"></i> ' . $lang->kanban->deleteSpace, 'hiddenwin', '', '', true);?></li>
<ul>
</div>
</div>