diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index c2d374932b..0dfacad369 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -125,7 +125,7 @@ common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true, '', '', $task->PRJ); common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', '', '', 'data-group="project"', '', $task->PRJ); - common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'treemap-alt', '', '', '', 'data-group="project"', $this->lang->task->children, $task->PRJ); + common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', '', '', 'data-group="project"', $this->lang->task->children, $task->PRJ); } } ?> @@ -187,7 +187,7 @@ common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true, '', '', $child->PRJ); common::printIcon('task', 'edit', "taskID=$child->id", $child, 'list', '', '', '', '', 'data-group="project"', '', $child->PRJ); - common::printIcon('task', 'batchCreate', "project=$child->project&storyID=$child->story&moduleID=$child->module&taskID=$child->id&ifame=0", $child, 'list', 'treemap-alt', '', '', '', 'data-group="project"', $this->lang->task->children, $child->PRJ); + common::printIcon('task', 'batchCreate', "project=$child->project&storyID=$child->story&moduleID=$child->module&taskID=$child->id&ifame=0", $child, 'list', 'split', '', '', '', 'data-group="project"', $this->lang->task->children, $child->PRJ); } } ?> diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index c9aa54b754..1ece62bdbf 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -134,8 +134,8 @@ common::printIcon('productplan', 'edit', "planID=$plan->id", $plan, 'list'); if(common::hasPriv('productplan', 'create', $plan)) { - if($plan->parent > '0') echo " "; - if($plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product=$productID&branch=$branch&parent={$plan->id}"), "", '', "class='btn' title='{$this->lang->productplan->children}'"); + if($plan->parent > '0') echo " "; + if($plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product=$productID&branch=$branch&parent={$plan->id}"), "", '', "class='btn' title='{$this->lang->productplan->children}'"); } if(common::hasPriv('productplan', 'delete', $plan)) diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 2d127448d3..ea8616e1f6 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -42,7 +42,7 @@ { echo $this->buildOperateMenu($plan, 'view'); - if(common::hasPriv('productplan', 'create', $plan) and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), " " . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'"); + if(common::hasPriv('productplan', 'create', $plan) and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), " " . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'"); if(common::hasPriv('productplan', 'edit', $plan)) echo html::a($this->createLink('productplan', 'edit', "planID=$plan->id"), " " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'"); if(common::hasPriv('productplan', 'delete', $plan) and $plan->parent >= 0) echo html::a($this->createLink('productplan', 'delete', "planID=$plan->id"), " " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'"); } diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php index fea3eb6936..ee4ad8478f 100644 --- a/module/program/view/pgmbrowsebylist.html.php +++ b/module/program/view/pgmbrowsebylist.html.php @@ -74,7 +74,7 @@ id", '', 'list', 'edit');?> - id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->PGMChildren);?> + id", '', 'list', 'split', '', '', '', '', $this->lang->program->PGMChildren);?> createLink("program", "PGMDelete", "programID=$program->id"), "", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?> diff --git a/module/story/model.php b/module/story/model.php index 61d504b784..5cedc0711f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3486,7 +3486,7 @@ class storyModel extends model common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); common::printIcon('story', 'edit', $vars, $story, 'list'); common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); - common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'treemap-alt', '', '', '', '', $this->lang->story->subdivide); + common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide); if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->PRJ}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin'); } else diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 765a9927f5..16f9a1f559 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -195,7 +195,7 @@ $divideLang = $lang->story->subdivide; $misc = "class='btn divideStory' data-toggle='modal' data-type='iframe' data-width='95%'"; $link = $this->createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", '', true); - if(common::hasPriv('story', 'batchCreate', $story)) echo html::a($link, " " . $divideLang, '', $misc); + if(common::hasPriv('story', 'batchCreate', $story)) echo html::a($link, " " . $divideLang, '', $misc); } common::printIcon('story', 'assignTo', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true); diff --git a/module/subject/view/browse.html.php b/module/subject/view/browse.html.php index 1e95bd56c9..8555d4d318 100644 --- a/module/subject/view/browse.html.php +++ b/module/subject/view/browse.html.php @@ -144,7 +144,7 @@ $(function() { linkTemplate: '', title: '', - template: '';?>', + template: '';?>', } }, action: function(event) diff --git a/module/task/model.php b/module/task/model.php index dfe1a055bd..ea93fd4fdc 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3063,7 +3063,7 @@ class taskModel extends model common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true); common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list'); - common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'treemap-alt', '', '', '', '', $this->lang->task->children); + common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', '', '', '', $this->lang->task->children); break; } echo ''; diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 504d2db593..b621fbbbd3 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -157,7 +157,7 @@ ";?> deleted):?> team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button', 'treemap-alt', '', '', '', "title='{$lang->task->children}'", $lang->task->children); + if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button', 'split', '', '', '', "title='{$lang->task->children}'", $lang->task->children); common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer); common::printIcon('task', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('task', 'restart', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 0bea1afa20..14b4875633 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -224,7 +224,7 @@ $(function() { linkTemplate: '', title: '', - template: '';?>', + template: '';?>', } }, action: function(event) diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php index 339e4bb891..b85b420d33 100644 --- a/module/tree/view/browsetask.html.php +++ b/module/tree/view/browsetask.html.php @@ -173,7 +173,7 @@ $(function() { linkTemplate: '', title: 'tree->child ?>', - template: '' + template: '' } }, action: function(event)