From 75589d210df2cad6a63f104d4b4da71b6b390560 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 16:43:15 +0800 Subject: [PATCH 1/4] * adjust task #2777. --- module/project/view/kanban.html.php | 2 +- module/task/view/batchcreate.html.php | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php index 74e3c618ff..07c401e6b8 100644 --- a/module/project/view/kanban.html.php +++ b/module/project/view/kanban.html.php @@ -70,7 +70,7 @@
createLink('task', 'create', "projectID=$story->project&storyID=$story->story&moduleID=$story->module", '', true), $lang->project->wbs, '', "class='kanbanFrame'") : ''; - echo (common::hasPriv('task', 'batchCreate')) ? html::a($this->createLink('task', 'batchCreate', "projectID=$story->project&storyID=$story->story&iframe=true", '', true), $lang->project->batchWBS, '', "class='kanbanFrame'") : ''; + echo (common::hasPriv('task', 'batchCreate')) ? html::a($this->createLink('task', 'batchCreate', "projectID=$story->project&storyID=$story->story&iframe=true", '', true), $lang->project->batchWBS, '', "class='kanbanFrame' data-width='95%'") : ''; echo (common::hasPriv('project', 'unlinkStory')) ? html::a($this->createLink('project', 'unlinkStory', "projectID=$story->project&storyID=$story->story&confirm=no", '', true), $lang->project->unlinkStory, 'hiddenwin') : ''; echo (common::hasPriv('story', 'activate') and storyModel::isClickable($story, 'activate')) ? html::a($this->createLink('story', 'activate', "storyID=$story->id", '', 'true'), $lang->story->activate, '', "class='kanbanFrame'") : ''; echo (common::hasPriv('story', 'close') and storyModel::isClickable($story, 'close')) ? html::a($this->createLink('story', 'close', "storyID=$story->id", '', 'true'), $lang->story->close, '', "class='kanbanFrame'") : ''; diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 36d61ba004..ed367bf7a1 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -29,6 +29,9 @@ foreach(explode(',', $showFields) as $field) { if($field)$visibleFields[$field] = ''; } +$colspan = count($visibleFields) + 3; +$hiddenStory = (isonlybody() and $storyID) ? ' hidden' : ''; +if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1; ?>
@@ -36,7 +39,7 @@ foreach(explode(',', $showFields) as $field) - + @@ -72,7 +75,7 @@ foreach(explode(',', $showFields) as $field) - - +
idAB;?> '>task->module?>'>task->story;?>'>task->story;?> task->name;?> typeAB;?> '>task->assignedTo;?>
style='overflow:visible'>id, $i)'")?> style='overflow: visible'> + style='overflow: visible'>
@@ -95,7 +98,7 @@ foreach(explode(',', $showFields) as $field)
>task->priList, $pri, 'class=form-control');?>
@@ -103,7 +106,7 @@ foreach(explode(',', $showFields) as $field) - - + @@ -43,8 +43,8 @@ include '../../common/view/tablesorter.html.php'; - + diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 22122a9cbb..02cbc4dcbb 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -71,8 +71,8 @@ - + @@ -100,8 +100,8 @@ id));?> + -
%s style='overflow:visible'>id, \"%s\")'")?> style='overflow: visible'> + style='overflow: visible'>
From 82b61dc1dab28b369f259d1133a7786006581853 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 16:59:45 +0800 Subject: [PATCH 2/4] * adjust the style of create button group. --- module/bug/css/browse.css | 2 -- module/bug/view/browse.html.php | 6 +++--- module/product/css/browse.css | 2 -- module/product/view/browse.html.php | 6 +++--- module/project/css/task.css | 2 -- module/project/view/taskheader.html.php | 4 ++-- module/testcase/css/browse.css | 1 - module/testcase/view/caseheader.html.php | 4 ++-- 8 files changed, 10 insertions(+), 17 deletions(-) diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index a9853afde4..f0bd370a0f 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -13,5 +13,3 @@ .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;} .dropdown-list > li > a:hover, .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} - -#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;} diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index c914b0e0fc..1510075847 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -67,16 +67,16 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows if(commonModel::isTutorialMode()) { $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID"); - echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"), "" . $lang->bug->create, '', "class='btn btn-bug-create'"); + echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"), "" . $lang->bug->create, '', "class='btn btn-primary btn-bug-create'"); } else { - $misc = common::hasPriv('bug', 'create') ? "class='btn'" : "class='btn disabled'"; + $misc = common::hasPriv('bug', 'create') ? "class='btn btn-primary'" : "class='btn btn-primary disabled'"; $link = common::hasPriv('bug', 'create') ? $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID") : '#'; echo html::a($link, "" . $lang->bug->create, '', $misc); } ?> -
    diff --git a/module/product/css/browse.css b/module/product/css/browse.css index 647722cddc..7e6f398628 100644 --- a/module/product/css/browse.css +++ b/module/product/css/browse.css @@ -11,6 +11,4 @@ a.removeModule{color:#ddd} a.removeModule:hover{color:red} -#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;} - tbody > tr > td > .btn-icon {margin-right: 3px;} diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index c59d29fa73..5344eed959 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -60,16 +60,16 @@ if(commonModel::isTutorialMode()) { $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID"); - echo html::a($this->createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams"), "" . $lang->story->create, '', 'create-story-btn'); + echo html::a($this->createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams"), "" . $lang->story->create, '', "class='create-story-btn btn btn-primary'"); } else { - $misc = common::hasPriv('story', 'create') ? "class='btn'" : "class='btn disabled'"; + $misc = common::hasPriv('story', 'create') ? "class='btn btn-primary'" : "class='btn btn-primary disabled'"; $link = common::hasPriv('story', 'create') ? $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#'; echo html::a($link, "" . $lang->story->create, '', $misc); } ?> -
      diff --git a/module/project/css/task.css b/module/project/css/task.css index 26ad89d94b..8881756cd2 100644 --- a/module/project/css/task.css +++ b/module/project/css/task.css @@ -21,6 +21,4 @@ .pl-5px{padding-left:5px;} -#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;} - tbody > tr > td > .btn-icon {margin-right: 2px} diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php index 33b780d9df..51c21197ac 100644 --- a/module/project/view/taskheader.html.php +++ b/module/project/view/taskheader.html.php @@ -123,11 +123,11 @@
      createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#'; echo html::a($link, "" . $lang->task->create, '', $misc); ?> -
        diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css index 41a68ee0f9..e3768a108e 100644 --- a/module/testcase/css/browse.css +++ b/module/testcase/css/browse.css @@ -10,4 +10,3 @@ .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} .pl-5px{padding-left:5px;} -#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;} diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index be7d814c9f..b50bdf87ba 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -82,11 +82,11 @@
        createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '#'; echo html::a($link, "" . $lang->testcase->create, '', $misc); ?> -
          From 2af603bac7ebfe6ef147b554e99b027fb90e74b8 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 17:07:13 +0800 Subject: [PATCH 3/4] * adjust task #2681. --- module/task/model.php | 3 +-- module/task/view/view.html.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 60b43542ef..263db42f6d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -813,8 +813,7 @@ class taskModel extends model $task->files = $this->loadModel('file')->getByObject('task', $taskID); /* Get related test cases. */ - $cases = $this->dao->select('id, title')->from(TABLE_CASE)->where('story')->eq($task->story)->andWhere('storyVersion')->eq($task->storyVersion)->fetchPairs(); - if($cases) $task->cases = $cases; + if($task->story) $task->cases = $this->dao->select('id, title')->from(TABLE_CASE)->where('story')->eq($task->story)->andWhere('storyVersion')->eq($task->storyVersion)->fetchPairs(); return $this->processTask($task); } diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 3b2fca49ee..43cd8bfe28 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -88,7 +88,7 @@ - cases)):?> + cases) and $task->cases):?>
          task->case;?>
          From ffa9b017f005d7d99c62d9ca2f7d161e800e2810 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 17:14:04 +0800 Subject: [PATCH 4/4] * adjust task #2780. --- module/productplan/view/linkstory.html.php | 4 ++-- module/productplan/view/view.html.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 601487fd47..3e719d93e1 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -24,8 +24,8 @@ include '../../common/view/tablesorter.html.php';
idAB;?> priAB;?> story->plan;?> story->title;?> story->module;?> story->title;?> openedByAB;?> assignedToAB;?> story->estimateAB;?> story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?> planTitle;?>createLink('story', 'view', "storyID=$story->id"), $story->title);?> module];?>createLink('story', 'view', "storyID=$story->id"), $story->title);?> openedBy);?> assignedTo);?> estimate;?>
idAB);?> priAB);?> story->title);?> story->module);?> story->title);?> openedByAB);?> assignedToAB);?> story->estimateAB);?> story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri);?>module];?> title);?>module];?> openedBy);?> assignedTo);?> estimate;?>