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

* fix bug #2035 and finish task #5134.

Browse Source
This commit is contained in:
Catouse
2018-11-15 16:25:55 +08:00
parent 66f6f1d761
commit 138b2bdafb
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/js/kanban.js
+6 -4
View File
@@ -4,23 +4,25 @@ $(function()
var adjustBoardsHeight = function()
{
var $cBoards = $('.c-boards');
var viewHeight = $(window).height() - $('#header').height() - $('#footer').height() - 111;
if ($cBoards.length === 1)
{
var $boardsWrapper = $cBoards.find('.boards-wrapper');
$boardsWrapper.css('min-height', $(window).height() - $('#header').height() - $('#footer').height() - 111);
$boardsWrapper.css('min-height', viewHeight);
if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
{
$boardsWrapper.find('.boards').css(isFirefox ? 'height' : 'min-height', $boardsWrapper.height() - 1);
}
return
}
$cBoards.each(function()
{
var $theBoards = $(this);
var height = $(window).height() - $('#header').height() - $('#footer').height() - 111;
var $boardsWrapper = $theBoards.find('.boards-wrapper');
var minHeight = Math.min($theBoards.prev().outerHeight() - 1, height);
$boardsWrapper.css({maxHeight: height, minHeight: minHeight});
var minHeight = Math.min($theBoards.prev().find('.board-story').outerHeight() + 4, viewHeight);
$boardsWrapper.css({maxHeight: viewHeight, minHeight: minHeight});
if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
{
var $boards = $boardsWrapper.find('.boards');
module/project/view/kanban.html.php
+1 -1
View File
@@ -115,7 +115,7 @@ $account = $this->app->user->account;
<div class='board-story' data-id='<?php echo $story->id;?>'>
<?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', 'class="kanbaniframe group-title" title="' . $story->title . '"');?>
<div class="small group-info">
<span class='story-id board-id' title='<?php echo $lang->story->id?>'><?php echo $story->id?></span>
<span class='story-id board-id' title='<?php echo $lang->story->id?>'>#<?php echo $story->id?></span>
<span class='label-pri label-pri-<?php echo $story->pri?>' title='<?php echo $lang->story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span>
<span class='story-stage' title='<?php echo $lang->story->stage?>'><span class="label label-dot"></span> <?php echo $lang->story->stageList[$story->stage];?></span>
<div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . 'h ';?></div>