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

Merge branch 'sprint202_leiyong_fix_bug_23874' into 'master'

Browse Source 
* Adjust CSS.

See merge request easycorp/zentaopms!4006
This commit is contained in:
孙广明
2022-06-17 06:15:47 +00:00
parent 0a00dfe217 eb6e217f3c
commit 6d815e5c33
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/js/view.js
+10 -8
View File
@@ -799,7 +799,7 @@ function moveCard(cardID, fromColID, toColID, fromLaneID, toLaneID, kanbanID, re
$('.kanban-group-header').hide();
$(".title").attr("disabled", true).css("pointer-events", "none");
}
setTooltip();
setToolTip();
},
error: function(xhr, status, error)
{
@@ -1228,10 +1228,7 @@ function createColumnMenu(options)
if(privs.includes('copyColumn')) items.push({label: kanbanLang.copyColumn, icon: 'copy', url: createLink('kanban', 'copyColumn', 'columnID=' + column.id), className: 'iframe', attrs: {'data-toggle': 'modal'}});
var otherActions = ((privs.includes('archiveColumn') && kanban.archived == '1') || privs.includes('deleteColumn')) ? true : false;
if(columnActions && otherActions)
{
items.push({type: 'divider'});
}
if(columnActions && otherActions) items.push({type: 'divider'});
if(privs.includes('archiveColumn') && kanban.archived == '1') items.push({label: kanbanLang.archiveColumn, icon: 'card-archive', url: createLink('kanban', 'archiveColumn', 'columnID=' + column.id), attrs: {'target': 'hiddenwin'}});
if(privs.includes('deleteColumn')) items.push({label: kanbanLang.deleteColumn, icon: 'trash', url: createLink('kanban', 'deleteColumn', 'columnID=' + column.id), attrs: {'target': 'hiddenwin'}});
@@ -1486,7 +1483,7 @@ $(function()
resetRegionHeight('open');
if(!CRKanban && kanbanInfo.status == 'closed') $('.kanban-col.kanban-header-col').css('padding', '0px 0px 0px 0px');
setTooltip();
setToolTip();
});
function initSortable()
@@ -1700,7 +1697,6 @@ function resetRegionHeight(fold)
{
$('.region').css('height', regionHeaderHeight);
}
}
$(document).on('click', '.dropdown-menu', function()
@@ -1708,7 +1704,13 @@ $(document).on('click', '.dropdown-menu', function()
$.zui.ContextMenu.hide();
});
function setTooltip()
/**
* Alerts for exceeding the limit.
*
* @access public
* @return void
*/
function setToolTip()
{
$('[data-toggle="tooltip"]').tooltip({container: 'body'});
}
module/task/css/view.css
+9
View File
@@ -9,3 +9,12 @@
#assignedTo a {border-color: transparent;}
#assignedTo a:hover {border-color: rgba(0,0,0,.2);}
#childrenTable tbody > tr:nth-child(odd) {background-color: #f5f5f5;}
.c-id {width: 50px;}
.c-pri {width: 40px;}
.c-deadline {width: 100px;}
.c-assignedTo {width: 120px;}
.c-status {width: 80px;}
.c-consumedAB {width: 60px;}
.c-leftAB {width: 60px;}
.c-actions {width: 175px;}
module/task/view/view.html.php
+8 -8
View File
@@ -108,15 +108,15 @@
<table class='table table-hover table-fixed' id='childrenTable'>
<thead>
<tr class='text-center'>
<th class='w-50px'> <?php echo $lang->task->id;?></th>
<th class='w-40px'> <?php echo $lang->task->lblPri;?></th>
<th class='c-id'> <?php echo $lang->task->id;?></th>
<th class='c-lblPri'> <?php echo $lang->task->lblPri;?></th>
<th> <?php echo $lang->task->name;?></th>
<th class='w-100px'><?php echo $lang->task->deadline;?></th>
<th class='w-120px'> <?php echo $lang->task->assignedTo;?></th>
<th class='w-80px'> <?php echo $lang->task->status;?></th>
<th class='w-60px visible-lg'><?php echo $lang->task->consumedAB . $lang->task->lblHour;?></th>
<th class='w-60px visible-lg'><?php echo $lang->task->leftAB . $lang->task->lblHour;?></th>
<th class='w-170px'><?php echo $lang->actions;?></th>
<th class='c-deadline'><?php echo $lang->task->deadline;?></th>
<th class='c-assignedTo'> <?php echo $lang->task->assignedTo;?></th>
<th class='c-status'> <?php echo $lang->task->status;?></th>
<th class='visible-lg c-consumedAB'><?php echo $lang->task->consumedAB . $lang->task->lblHour;?></th>
<th class='visible-lg c-leftAB'><?php echo $lang->task->leftAB . $lang->task->lblHour;?></th>
<th class='c-actions'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>