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

Merge branch 'sprint200_leiyong_task_56367' into 'sprint_200'

Browse Source 
Sprint200 leiyong task 56367

See merge request easycorp/zentaopms!3795
This commit is contained in:
王怡栋
2022-06-08 08:45:55 +00:00
parent fbab734791 da49166f81
commit 7f967e8091
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/css/space.css
+3 -1
View File
@@ -16,7 +16,7 @@
.kanbans .panel {margin: 0 0; border: 1px solid #DCDCDC; border-radius: 4px; box-shadow: none; cursor: pointer; height: 160px; margin-bottom: 5px;}
.kanbans .panel:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,100,.25);}
.kanbans .panel-heading {padding: 4px 2px 10px 16px;}
.kanbans .kanban-name {overflow: hidden; white-space:nowrap; width: 88%; float: left; padding-top: 8px;}
.kanbans .kanban-name {overflow: hidden; white-space:nowrap; width: 78%; float: left; padding-top: 8px;}
.kanbans .panel .label-closed {background: #AAA !important; color: #FFF; margin-top:-1px !important;}
.kanbans .kanban-actions {float: right; visibility: hidden;}
.kanbans .kanban-actions .dropdown-menu.pull-right {top:31px; right: -84px; left: auto;}
@@ -36,6 +36,8 @@
.kanbans .kanban-members > span:after {right: -4px;}
.kanbans .kanban-members-total {display: inline-block; margin-left: 6px; position: relative; top: 3px}
.kanbans .kanbanAcl {position: absolute; right: 0px; bottom: 2px; color: #838a9d;}
.kanbans .kanban-label {margin: 6px 6px 0px 0px; float: left; color: #ff8a53; border: 1px solid #ff8a53;}
@media screen and (max-width: 1366px){.kanbans .kanban-name {width: 68%;}}
a.disabled {pointer-events: none;}
module/kanban/css/view.css
+6 -2
View File
@@ -9,10 +9,10 @@
.dropdown-menu > li {padding: 0 10px;}
.dropdown-menu > li > a > .icon {position: relative; left: -5px;}
#kanbanContainer {padding-bottom: 0; margin-bottom: 0;}
#kanbanContainer {padding-bottom: 0; margin-bottom: 0; border: unset;}
#kanbanContainer.fullscreen {overflow: auto;}
.region {border: 1px solid #dcdcdc; background-color: #fff;}
.region {border: 0px solid #dcdcdc; background-color: #fff;}
.region + .region {margin-top: 20px;}
.region .region-header {padding: 10px;}
.region .region-header strong {font-size: 14px; color: #999EAB}
@@ -136,3 +136,7 @@
@-moz-document url-prefix(){ .region .kanban-lane-items{scrollbar-width:thin; padding:5px 0px 5px 5px !important;} .region .kanban-card .info .user{right: -6px !important;}}
#archivedCards .table-empty-tip {border-style: hidden;}
#archivedColumns .table-empty-tip {border-style: hidden;}
#main > .container {padding: 0px 0px 0px 10px; margin: -10px 0px 0px 0px;}
@media screen and (max-width: 1366px){#main > .container {padding: 0px 10px 0px 10px; margin: -10px 0px 0px 0px;}}
.panel-body {padding: 0px;}
module/kanban/lang/en.php
+1
View File
@@ -79,6 +79,7 @@ $lang->kanban->importBuild = 'Build';
$lang->kanban->allKanban = 'All Kanban';
$lang->kanban->allProjects = 'All ' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : 'Projects');
$lang->kanban->allProducts = 'All Products';
$lang->kanban->mine = 'Mine';
/* Fields. */
$lang->kanban->space = 'Space';
module/kanban/lang/zh-cn.php
+1
View File
@@ -79,6 +79,7 @@ $lang->kanban->importBuild = '版本';
$lang->kanban->allKanban = '所有看板';
$lang->kanban->allProjects = '所有' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : '项目');
$lang->kanban->allProducts = '所有产品';
$lang->kanban->mine = '我负责';
/* Fields. */
$lang->kanban->space = '所属空间';
module/kanban/view/space.html.php
+3
View File
@@ -66,6 +66,9 @@
<div class='col' data-id='<?php echo $kanbanID?>'>
<div class='panel' data-url='<?php echo $this->createLink('kanban', 'view', "kanbanID=$kanbanID");?>'>
<div class='panel-heading'>
<?php if($kanban->space == 2 and $kanban->owner == $this->app->user->account):?>
<span class="label label-outline label-info kanban-label"><?php echo $lang->kanban->mine;?></span>
<?php endif;?>
<div class='kanban-name'>
<?php if($kanban->status == 'closed'):?>
<span class="label label-closed"><?php echo $lang->kanban->closed;?></span>