diff --git a/module/bug/model.php b/module/bug/model.php
index 9d2c90a7d7..6fac1b92cc 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2637,7 +2637,7 @@ class bugModel extends model
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
- common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
+ common::printIcon('bug', 'close', $params, $bug, 'list', 'close', '', 'iframe', true);
common::printIcon('bug', 'edit', $params, $bug, 'list');
common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy');
break;
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 0147853aff..a0be507ce2 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -37,7 +37,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
if($moduleID)
{
$removeLink = $browseType == 'bymodule' ? inlink('browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("bugModule")';
- echo html::a($removeLink, "", '', "class='text-muted'");
+ echo html::a($removeLink, "", '', "class='text-muted'");
}
?>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 3810f677fd..8c306b8036 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -73,7 +73,7 @@
common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'search', '', 'iframe', true);
common::printIcon('bug', 'assignTo', $params, $bug, 'button', '', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'button', 'checked', '', 'iframe showinonlybody', true);
- common::printIcon('bug', 'close', $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true);
+ common::printIcon('bug', 'close', $params, $bug, 'button', 'close', '', 'text-danger iframe showinonlybody', true);
common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true);
if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']);
@@ -82,7 +82,7 @@
echo "";
common::printIcon('bug', 'edit', $params, $bug);
common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
- common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin');
+ common::printIcon('bug', 'delete', $params, $bug, 'button', 'trash', 'hiddenwin');
?>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index dc2aef8a36..663d0c00f0 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -45,7 +45,7 @@ tbody tr td:first-child input{display:none;}
if(common::hasPriv('build', 'linkBug')) echo html::a(inlink('view', "buildID=$build->id&type=bug&link=true"), ' ' . $lang->build->linkBug, '', "class='btn btn-link'");
}
common::printIcon('build', 'edit', "buildID=$build->id", $build);
- common::printIcon('build', 'delete', "buildID=$build->id", $build, 'button', '', 'hiddenwin');
+ common::printIcon('build', 'delete', "buildID=$build->id", $build, 'button', 'trash', 'hiddenwin');
}
?>
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index d3a8a89330..59bbfc2d86 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -105,7 +105,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list');
$deleteClass = (strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) ? 'btn iframe' : 'btn disabled';
- echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='{$deleteClass}'");
+ echo html::a($this->createLink('user', 'delete', "userID=$user->id"), '', '', "title='{$lang->user->delete}' class='{$deleteClass}'");
?>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index faeb47261b..bb2b90141b 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -50,7 +50,7 @@ var browseType = '';
" . $this->lang->doc->create, '', "class='btn btn-primary'");?>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index bb3a3d3565..04d1d93364 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -21,8 +21,8 @@
" . $this->lang->doc->create, '', "class='btn btn-primary'");?>
diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php
index 81dc78d899..75b78a0608 100644
--- a/module/group/view/browse.html.php
+++ b/module/group/view/browse.html.php
@@ -55,7 +55,7 @@
if(common::hasPriv('group', 'delete') and $group->role != 'limited')
{
$deleteURL = $this->createLink('group', 'delete', "groupID=$group->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '', '', "title='{$lang->group->delete}' class='btn'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"groupList\", confirmDelete)", '', '', "title='{$lang->group->delete}' class='btn'");
}
else
{
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 13e5817b86..b47830f627 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -95,7 +95,7 @@
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
- common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
+ common::printIcon('bug', 'close', $params, $bug, 'list', 'close', '', 'iframe', true);
common::printIcon('bug', 'edit', $params, $bug, 'list');
common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy');
?>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index ac9adf91b8..17f5ed9b3d 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -82,7 +82,7 @@
$vars = "story={$story->id}";
common::printIcon('story', 'change', $vars, $story, 'list', 'fork');
common::printIcon('story', 'review', $vars, $story, 'list', 'glasses');
- common::printIcon('story', 'close', $vars, $story, 'list', 'off', '', 'iframe', true);
+ common::printIcon('story', 'close', $vars, $story, 'list', 'close', '', 'iframe', true);
common::printIcon('story', 'edit', $vars, $story, 'list');
if($config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap');
?>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index db1fb90172..2a4636e731 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -96,7 +96,7 @@
{
if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
- common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+ common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', 'close', '', 'iframe', true, '');
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 7d2782b16d..86500cf681 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -63,7 +63,7 @@
if(common::hasPriv('testtask', 'delete', $task))
{
$deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'");
}
?>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 3556890f2f..c24b46d798 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -119,7 +119,7 @@
if(common::hasPriv('todo', 'delete'))
{
$deleteURL = $this->createLink('todo', 'delete', "todoID=$todo->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='btn' title='{$lang->todo->delete}'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"todoList\",confirmDelete)", '', '', "class='btn' title='{$lang->todo->delete}'");
}
?>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index c3d3a3fcce..9d9151e05b 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -87,12 +87,12 @@
echo "";
if($product->status != 'closed')
{
- common::printIcon('product', 'close', $params, $product, 'button', '', '', 'iframe', true);
+ common::printIcon('product', 'close', $params, $product, 'button', 'close', '', 'iframe', true);
echo "";
}
common::printIcon('product', 'edit', $params, $product);
- common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin');
+ common::printIcon('product', 'delete', $params, $product, 'button', 'trash', 'hiddenwin');
}
?>
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index 0f393bf12e..424f1f4440 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -128,7 +128,7 @@
if(common::hasPriv('productplan', 'delete', $plan))
{
$deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplanList\",confirmDelete)", '', '', "class='btn' title='{$lang->productplan->delete}'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"productplanList\",confirmDelete)", '', '', "class='btn' title='{$lang->productplan->delete}'");
}
?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index c42053f5ec..d91ddc669b 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -54,7 +54,7 @@
}
if(common::hasPriv('productplan', 'create') and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), "", '', "class='btn btn-link' title='{$this->lang->productplan->children}'");
common::printIcon('productplan', 'edit', "planID=$plan->id", $plan);
- common::printIcon('productplan', 'delete', "planID=$plan->id", $plan, 'button', '', 'hiddenwin');
+ common::printIcon('productplan', 'delete', "planID=$plan->id", $plan, 'button', 'trash', 'hiddenwin');
}
?>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 543809d370..c2f5642cff 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -101,7 +101,7 @@
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
- common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
+ common::printIcon('bug', 'close', $params, $bug, 'list', 'close', '', 'iframe', true);
common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy');
common::printIcon('bug', 'edit', $params, $bug, 'list');
?>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 6162088535..f3cd8ea063 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -88,7 +88,7 @@
if(common::hasPriv('build', 'delete', $build))
{
$deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='btn' title='{$lang->build->delete}'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '', '', "class='btn' title='{$lang->build->delete}'");
}
?>
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 7e0505fe07..99f595b66b 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -210,7 +210,7 @@
|
project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);?>
id", '', 'list');?>
- project&taskid=$task->id", '', 'list', '', 'hiddenwin');?>
+ project&taskid=$task->id", '', 'list', 'trash', 'hiddenwin');?>
|
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 6d1fbcc580..aa2c0d757c 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -78,7 +78,7 @@
if (common::hasPriv('project', 'unlinkMember', $member))
{
$unlinkURL = $this->createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn' title='{$lang->project->unlinkMember}'");
+ echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn' title='{$lang->project->unlinkMember}'");
}
?>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index abe3869e2b..e9c66cec98 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -157,11 +157,11 @@
common::printIcon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'putoff', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
- common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
+ common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', 'close', '', 'iframe', true);
echo "";
common::printIcon('project', 'edit', $params, $project);
- common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin');
+ common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin');
}
?>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index a53b283365..f2fa3307ce 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -82,7 +82,7 @@
if(common::hasPriv('release', 'delete', $release))
{
$deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='btn' title='{$lang->release->delete}'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"releaseList\",confirmDelete)", '', '', "class='btn' title='{$lang->release->delete}'");
}
?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 1f1a711610..253060f0ac 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -42,7 +42,7 @@
echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn btn-link' title='{$lang->release->changeStatusList[$changedStatus]}'");
}
common::printIcon('release', 'edit', "releaseID=$release->id", $release);
- common::printIcon('release', 'delete', "releaseID=$release->id", $release, 'button', '', 'hiddenwin');
+ common::printIcon('release', 'delete', "releaseID=$release->id", $release, 'button', 'trash', 'hiddenwin');
}
?>
diff --git a/module/story/model.php b/module/story/model.php
index f3fcd46a1b..f7f880095d 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2457,7 +2457,7 @@ class storyModel extends model
$vars = "story={$story->id}";
common::printIcon('story', 'change', $vars, $story, 'list', 'fork');
common::printIcon('story', 'review', $vars, $story, 'list', 'glasses');
- common::printIcon('story', 'close', $vars, $story, 'list', 'off', '', 'iframe', true);
+ common::printIcon('story', 'close', $vars, $story, 'list', 'close', '', 'iframe', true);
common::printIcon('story', 'edit', $vars, $story, 'list');
if($this->config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap');
break;
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 6f2838017e..e79c66666c 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -78,7 +78,7 @@
if(common::hasPriv('story', 'batchCreate')) echo html::a($link, " " . $lang->story->subdivide, '', $misc);
}
- common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
+ common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', 'close', '', 'iframe showinonlybody', true);
common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
if($config->global->flow != 'onlyStory' and !isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate')))
@@ -105,7 +105,7 @@
echo "";
common::printIcon('story', 'edit', "storyID=$story->id", $story);
common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', 'iframe showinonlybody', true, "data-width='1050'");
- common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', '', 'hiddenwin');
+ common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', 'trash', 'hiddenwin');
?>
diff --git a/module/task/model.php b/module/task/model.php
index a47806a148..5487f33fa3 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2619,7 +2619,7 @@ class taskModel extends model
if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
- common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+ common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', 'close', '', 'iframe', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 2c070df144..d257efcc16 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -131,7 +131,7 @@
common::printIcon('task', 'activate', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true);
common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
- common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+ common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', 'close', '', 'iframe', true);
common::printIcon('task', 'edit', "taskID=$child->id", $child, 'list');
?>
@@ -159,14 +159,14 @@
common::printIcon('task', 'pause', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
common::printIcon('task', 'activate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
- common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
+ common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', 'close', '', 'iframe showinonlybody', true);
common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
if(!isonlybody()) echo "";
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','plus','','','','',' ');
common::printIcon('task', 'edit', "taskID=$task->id", $task);
common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
- common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', '', 'hiddenwin');
+ common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', 'trash', 'hiddenwin');
if($task->parent > 0) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "", '', "class='btn btn-link' title='{$lang->task->parent}'");
?>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 09317f79cc..14d5d70274 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -117,7 +117,7 @@
common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'button', 'copy');
if($isLibCase and common::hasPriv('testsuite', 'createCase')) echo html::a($this->createLink('testsuite', 'createCase', "libID=$case->lib&moduleID=$case->module¶m=$case->id", $case), "", '', "class='btn' title='{$lang->testcase->copy}'");
- common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', '', 'hiddenwin');
+ common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin');
?>
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index e28eff0ac5..6dda7d8fc7 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -70,7 +70,7 @@
if(common::hasPriv('testsuite', 'delete', $suite))
{
$deleteURL = $this->createLink('testsuite', 'delete', "suiteID=$suite->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"suiteList\",confirmDelete)", '', '', "title='{$lang->testsuite->delete}' class='btn'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"suiteList\",confirmDelete)", '', '', "title='{$lang->testsuite->delete}' class='btn'");
}
?>
diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php
index 527c2a173c..d5ed803411 100644
--- a/module/testsuite/view/library.html.php
+++ b/module/testsuite/view/library.html.php
@@ -146,7 +146,7 @@ js::set('flow', $config->global->flow);
if(common::hasPriv('testcase', 'delete'))
{
$deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn'");
}
?>
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index a79600d8a4..1709f62c3c 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -33,7 +33,7 @@
{
common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id", $suite, 'button', 'link');
common::printIcon('testsuite', 'edit', "suiteID=$suite->id");
- common::printIcon('testsuite', 'delete', "suiteID=$suite->id", '', 'button', '', 'hiddenwin');
+ common::printIcon('testsuite', 'delete', "suiteID=$suite->id", '', 'button', 'trash', 'hiddenwin');
}
?>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 99f7282c4a..b21f0fac16 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -111,7 +111,7 @@ $status = $this->session->testTaskVersionStatus;
if(common::hasPriv('testtask', 'delete', $task))
{
$deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'");
}
?>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 232c04e2f8..ca67a29fe1 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -49,7 +49,7 @@
id", $task, 'button', '', '', 'iframe showinonlybody', true);
- common::printIcon('testtask', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
+ common::printIcon('testtask', 'close', "taskID=$task->id", $task, 'button', 'close', '', 'iframe showinonlybody', true);
common::printIcon('testtask', 'block', "taskID=$task->id", $task, 'button', 'pause', '', 'iframe showinonlybody', true);
common::printIcon('testtask', 'activate', "taskID=$task->id", $task, 'button', 'magic', '', 'iframe showinonlybody', true);
common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'button', 'sitemap');
@@ -58,7 +58,7 @@
id", $task);
- common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'button', '', 'hiddenwin');
+ common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'button', 'trash', 'hiddenwin');
?>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 6c55be83c7..6cd5977720 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -43,7 +43,7 @@
if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
common::printLink('todo', 'edit', "todoID=$todo->id", "", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
- common::printLink('todo', 'delete', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
+ common::printLink('todo', 'delete', "todoID=$todo->id", "", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
if(common::hasPriv('action', 'comment', $todo)) echo html::a('#commentModal', '', '', "title='{$lang->comment}' data-toggle='modal' class='btn'");
diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php
index d15f6d307d..508378752e 100644
--- a/module/webhook/view/browse.html.php
+++ b/module/webhook/view/browse.html.php
@@ -39,7 +39,7 @@
if(common::hasPriv('webhook', 'delete'))
{
$deleteURL = $this->createLink('webhook', 'delete', "webhookID=$id&confirm=yes");
- echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '', '', "title='{$lang->webhook->delete}' class='btn'");
+ echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '', '', "title='{$lang->webhook->delete}' class='btn'");
}
?>