From 74aaed0949a95749f941f0249940c27f7745257b Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 14:49:35 +0800 Subject: [PATCH 01/11] * adjust task #2713. --- module/project/view/taskdata.html.php | 2 +- module/task/lang/en.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/model.php | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/project/view/taskdata.html.php b/module/project/view/taskdata.html.php index e3e2dbd746..a15cc3ae24 100644 --- a/module/project/view/taskdata.html.php +++ b/module/project/view/taskdata.html.php @@ -37,7 +37,7 @@ task->estimateAB);?> task->consumedAB);?> task->leftAB);?> - task->progess;?> + task->progess;?> type == 'sprint'): ?> task->story); ?> diff --git a/module/task/lang/en.php b/module/task/lang/en.php index f1c3fcc932..92475017a8 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -34,6 +34,7 @@ $lang->task->fromBug = 'From Bug'; $lang->task->case = 'Related Case'; $lang->task->confirmStoryChange = "Confirm Story Change"; $lang->task->progess = 'Progess'; +$lang->task->progessTips = 'Consumed/(Consumed+Left)'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index bbdabf7813..25df0afc2d 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -34,6 +34,7 @@ $lang->task->fromBug = '来源Bug'; $lang->task->case = '相关用例'; $lang->task->confirmStoryChange = "确认需求变动"; $lang->task->progess = '进度'; +$lang->task->progessTips = '已消耗/(已消耗+剩余)'; $lang->task->common = '任务'; $lang->task->id = '编号'; diff --git a/module/task/model.php b/module/task/model.php index 71f60cbdeb..60b43542ef 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1205,7 +1205,7 @@ class taskModel extends model } else { - $task->progess = round($task->consumed / ($task->consumed + $task->left), 3) * 100; + $task->progess = round($task->consumed / ($task->consumed + $task->left), 2) * 100; } return $task; From 11f494ae0723ed48917ae56adb5f76b59b42f280 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 15:00:53 +0800 Subject: [PATCH 02/11] * adjuct task #2722. --- module/release/model.php | 2 +- module/release/view/view.html.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/release/model.php b/module/release/model.php index aefe92f392..d47133a334 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -23,7 +23,7 @@ class releaseModel extends model */ public function getByID($releaseID, $setImgSize = false) { - $release = $this->dao->select('t1.*, t2.id as buildID, t2.filePath, t2.scmPath, t2.name as buildName, t3.name as productName, t3.type as productType') + $release = $this->dao->select('t1.*, t2.id as buildID, t2.filePath, t2.scmPath, t2.name as buildName, t2.project, t3.name as productName, t3.type as productType') ->from(TABLE_RELEASE)->alias('t1') ->leftJoin(TABLE_BUILD)->alias('t2')->on('t1.build = t2.id') ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product = t3.id') diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 7bbd4d3510..1f645e4b58 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -278,7 +278,9 @@ release->build;?> - createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank');?> + + project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?> + release->status;?> From dd29125b5846da2e7bf82f553058a313f5356e63 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 15:24:11 +0800 Subject: [PATCH 03/11] * adjust task #2725. --- module/project/css/create.css | 2 ++ module/project/js/create.js | 13 +++++++++++++ module/project/view/create.html.php | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/module/project/css/create.css b/module/project/css/create.css index d57c2a5536..fa0cdf6e0d 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -15,3 +15,5 @@ .modal-dialog {margin-top: 10%!important;} .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;} + +.type-tips {display: none; margin: 5px 0; color: #545454;} diff --git a/module/project/js/create.js b/module/project/js/create.js index cb29ecc71b..20a3c65cd4 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -9,3 +9,16 @@ $(function() $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')}); $('#productsBox .col-sm-3').width($('#type').closest('td').width()); }); + +function showTypeTips() +{ + var type = $('#type').val(); + if(type == 'ops') + { + $('.type-tips').show(); + } + else + { + $('.type-tips').hide(); + } +} diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 75c46ca657..e02eaad36e 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -81,10 +81,10 @@ project->type;?> - project->typeList, '', "class='form-control'");?> + project->typeList, '', "class='form-control' onchange='showTypeTips()'");?> -
project->typeDesc;?>
+
project->typeDesc;?>
From e9e77687069dd1eef49467564c33c39a3a40096f Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 16:18:59 +0800 Subject: [PATCH 04/11] * adjust task #2727. --- module/install/lang/zh-cn.php | 14 +++++++------- module/install/view/index.html.php | 8 ++++---- www/theme/default/images/main/zdoo.png | Bin 0 -> 5441 bytes 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100755 www/theme/default/images/main/zdoo.png diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 1309fdc36f..268eca4d9d 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -157,13 +157,13 @@ $lang->install->ranzhi->desc = <<论坛博客，动态消息 EOD; -$lang->install->yidou = new stdclass(); -$lang->install->yidou->name = '亿斗进销存管理运营系统'; -$lang->install->yidou->desc = <<install->zdoo = new stdclass(); +$lang->install->zdoo->name = '可深度定制的云端一体化协作平台'; +$lang->install->zdoo->desc = << -
  • 销售订单处理，信息及时反馈
    • -
  • 采销业务状况，时时查询跟进
    • -
  • 仓储配货送货，轻松便利快捷
    • -
  • 财务收款付款，简单实用准确
    • +
  • 安全、稳定、高效
    • +
  • 以容器为交付单位
    • +
  • 租户隔离，可深度定制
    • +
  • 提供一体化管理平台
    • EOD; diff --git a/module/install/view/index.html.php b/module/install/view/index.html.php index 11a94598ea..ffe61be8be 100644 --- a/module/install/view/index.html.php +++ b/module/install/view/index.html.php @@ -59,11 +59,11 @@
    - -
    +     +
    -
    install->yidou->name?>
    -
    install->yidou->desc?>
    +
    install->zdoo->name?>
    +
    install->zdoo->desc?>
    diff --git a/www/theme/default/images/main/zdoo.png b/www/theme/default/images/main/zdoo.png new file mode 100755 index 0000000000000000000000000000000000000000..cce643c6a08c738153afedac44e8789f27c0b9d0 GIT binary patch literal 5441 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 OfVPI7`X^QE(EkD-a9+*; literal 0 HcmV?d00001 From 75589d210df2cad6a63f104d4b4da71b6b390560 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 16:43:15 +0800 Subject: [PATCH 05/11] * 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));?> + - From dc8d9d40024a5f89b0e6c9f9669f626b6b80038a Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 1 Dec 2016 17:27:48 +0800 Subject: [PATCH 09/11] * code for task #2745. --- module/task/css/create.css | 7 ++- module/task/js/create.js | 18 ++++--- module/task/view/create.html.php | 81 +++++++++++++++++--------------- 3 files changed, 60 insertions(+), 46 deletions(-) diff --git a/module/task/css/create.css b/module/task/css/create.css index c723963b03..02a3660e8f 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -6,6 +6,9 @@ .chosen-container {max-width: 980px} -.minw-80px {min-width: 120px;} -.minw-60px {min-width: 50px;} +#priRowCol, #estRowCol {width: 110px;} +.col-table .input-group {width: 100%} +#taskPlanCol, #mailCol {width: 50%} +#planAndMailCell.has-mail-col #taskPlanCol {padding-right: 5px;} +#planAndMailCell.has-mail-col #taskPlanCol + #mailCol {padding-left: 5px;} diff --git a/module/task/js/create.js b/module/task/js/create.js index d5e0308eda..a92ebf7610 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -152,14 +152,20 @@ $(document).ready(function() $('[data-toggle=tooltip]').tooltip(); - /* Code for kanban following codes. */ - // ajust style for file box - var ajustFilebox = function() + // adjust form controls layout + var ajustFormControls = function() { - applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#dataPlanGroup').width() - 2) + 'px}', 'filebox') + // adjust style for file box + applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#dataPlanGroup').width() - 1) + 'px}', 'filebox'); + + // adjust #priRowCol and #estRowCol size + var $priRowCol = $('#priRowCol'), + $estRowCol = $('#estRowCol'); + $priRowCol.css('width', 55 + $priRowCol.find('.input-group-addon').outerWidth()); + $estRowCol.css('width', 55 + $estRowCol.find('.input-group-addon').outerWidth()); }; - ajustFilebox(); - $(window).resize(ajustFilebox); + ajustFormControls(); + $(window).resize(ajustFormControls); /* First unbind ajaxForm for form.*/ $("form[data-type='ajax']").unbind('submit'); diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index f6c9c6d3e1..6b90a40690 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -72,11 +72,9 @@ $hiddenPri = strpos(",$showFields,", ',pri,') === false; $hiddenEst = strpos(",$showFields,", ',estimate,') === false; ?> - - -
    -
    - + +
    +
    task->pri;?> - task->priList, '', "class='form-control minw-80px'");?> + task->priList, '', "class='form-control'");?>
    - - - task->estimateAB;?> - task->hour}'");?> -
    - + + + +
    +
    + task->estimateAB;?> + task->hour}'");?> +
    +
    +
    @@ -123,33 +125,36 @@ - - - - - - - From ea0e116b46b7b939c5238c3367c6ae1efb9bedec Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 1 Dec 2016 17:31:36 +0800 Subject: [PATCH 10/11] * adjust task/create view style. --- module/task/js/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index a92ebf7610..4deb7e5628 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -161,7 +161,7 @@ $(document).ready(function() // adjust #priRowCol and #estRowCol size var $priRowCol = $('#priRowCol'), $estRowCol = $('#estRowCol'); - $priRowCol.css('width', 55 + $priRowCol.find('.input-group-addon').outerWidth()); + $priRowCol.css('width', 54 + $priRowCol.find('.input-group-addon').outerWidth()); $estRowCol.css('width', 55 + $estRowCol.find('.input-group-addon').outerWidth()); }; ajustFormControls(); From cb39cc9f08f61f3b1eb3428a3dccde2d8053e547 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Thu, 1 Dec 2016 17:33:45 +0800 Subject: [PATCH 11/11] * adjust task #2784. --- module/project/control.php | 6 ++---- module/project/css/importtask.css | 2 +- module/project/js/importtask.js | 2 +- module/project/lang/en.php | 1 - module/project/lang/zh-cn.php | 1 - module/project/model.php | 11 ++--------- module/project/view/importtask.html.php | 8 -------- 7 files changed, 6 insertions(+), 25 deletions(-) diff --git a/module/project/control.php b/module/project/control.php index 40ba301867..bac73aeb53 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -320,11 +320,10 @@ class project extends control * * @param int $projectID * @param int $fromProject - * @param bool $containDoing * @access public * @return void */ - public function importTask($toProject, $fromProject = 0, $containDoing = false) + public function importTask($toProject, $fromProject = 0) { if(!empty($_POST)) { @@ -335,7 +334,7 @@ class project extends control $project = $this->commonAction($toProject); $branches = $this->project->getProjectBranches($toProject); $tasks = $this->project->getTasks2Imported($toProject, $branches); - $projects = $this->project->getProjectsToImport(array_keys($tasks), $containDoing); + $projects = $this->project->getProjectsToImport(array_keys($tasks)); unset($projects[$toProject]); unset($tasks[$toProject]); @@ -362,7 +361,6 @@ class project extends control $this->view->tasks2Imported = $tasks2Imported; $this->view->projects = $projects; $this->view->projectID = $project->id; - $this->view->containDoing = $containDoing; $this->view->fromProject = $fromProject; $this->display(); } diff --git a/module/project/css/importtask.css b/module/project/css/importtask.css index 9c2bcbe15e..9c7db148a6 100644 --- a/module/project/css/importtask.css +++ b/module/project/css/importtask.css @@ -1,2 +1,2 @@ -#titlebar .input-group {position: relative; top: -6px; margin-left: 10px; width: 500px;} +#titlebar .input-group {position: relative; top: -6px; margin-left: 10px; width: 300px;} #titlebar .input-group-addon, #titlebar .form-control {font-size: 12px; padding: 5px 10px; line-height: 18px; height: 30px} diff --git a/module/project/js/importtask.js b/module/project/js/importtask.js index 56e68cb51b..65cf6f7dbd 100644 --- a/module/project/js/importtask.js +++ b/module/project/js/importtask.js @@ -1,6 +1,6 @@ function reload(toProject, fromProject) { - link = createLink('project','importtask','toProject='+toProject + '&fromProject='+fromProject + '&containDoing=' + containDoing); + link = createLink('project','importtask','toProject='+toProject + '&fromProject='+fromProject); location.href = link; } $(function() diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 87de0512cc..60ab174de3 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -51,7 +51,6 @@ $lang->project->mine = 'My Responsibility: '; $lang->project->other = 'Other:'; $lang->project->deleted = 'Deleted'; $lang->project->delayed = 'Delayed'; -$lang->project->containDoing = 'including doing project'; $lang->project->start = 'Start'; $lang->project->activate = 'Activate'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 5601164db4..d107bc9ae9 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -51,7 +51,6 @@ $lang->project->mine = '我负责：'; $lang->project->other = '其他：'; $lang->project->deleted = '已删除'; $lang->project->delayed = '已延期'; -$lang->project->containDoing = '包含进行中的项目'; $lang->project->start = '开始'; $lang->project->activate = '激活'; diff --git a/module/project/model.php b/module/project/model.php index 679b9cb43e..ca1101d038 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1042,7 +1042,7 @@ class projectModel extends model * @access public * @return array */ - public function getProjectsToImport($projectIds, $containDoing = 'false') + public function getProjectsToImport($projectIds) { $projects = $this->dao->select('*')->from(TABLE_PROJECT) ->where('id')->in($projectIds) @@ -1054,14 +1054,7 @@ class projectModel extends model $now = date('Y-m-d'); foreach($projects as $id => $project) { - if($containDoing) - { - if($this->checkPriv($project) and ($project->status == 'done' or $project->status == 'doing' or $project->end < $now)) $pairs[$id] = ucfirst(substr($project->code, 0, 1)) . ':' . $project->name; - } - else - { - if($this->checkPriv($project) and ($project->status == 'done' or $project->end < $now)) $pairs[$id] = ucfirst(substr($project->code, 0, 1)) . ':' . $project->name; - } + if($this->checkPriv($project)) $pairs[$id] = ucfirst(substr($project->code, 0, 1)) . ':' . $project->name; } return $pairs; } diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php index 66cf2346a8..8957d6d75e 100644 --- a/module/project/view/importtask.html.php +++ b/module/project/view/importtask.html.php @@ -12,7 +12,6 @@ ?> -
    icons['task']);?> @@ -21,13 +20,6 @@ $lang->project->allProjects) + $projects;?> project->selectProject;?> - - createLink('project', 'importTask', $params), " " . $lang->project->containDoing, '', "class='btn'"); - ?> -
    %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 06/11] * 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 07/11] * 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 08/11] * 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;?>
    task->mailto : $lang->task->datePlan;?> -
    - - estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?> - - - ~ - - - deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?> - -
    +     		'> +
    + +
    +
    + + estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?> + + + ~ + + + deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?> + +
    +
    + + +
    +
    + + task->mailto;?> + + acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?> + fetch('my', 'buildContactLists');?> +
    +
    + +
    		-
    - - task->mailto;?> - - acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?> - fetch('my', 'buildContactLists');?> -
    -