diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 712f2cc29e..9684b8336c 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -53,6 +53,34 @@ createLink('action', 'comment', "objectType=bug&objectID=$bug->id");?> + id"; + $copyParams = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id"; + $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id"; + ?> +
+
+ + deleted):?> +
+ 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']); + common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap'); + + echo "
"; + common::printIcon('bug', 'edit', $params, $bug); + common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy'); + common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin'); + ?> + +
+
@@ -314,34 +342,8 @@
-id"; -$copyParams = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id"; -$convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id"; -?>
-
- - deleted):?> -
- 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']); - common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap'); - - echo "
"; - common::printIcon('bug', 'edit', $params, $bug); - common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy'); - common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin'); - ?> - -
diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index abc975a995..1c2147d27b 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -1,6 +1,6 @@ getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> -
+
@@ -14,7 +14,7 @@ $('blockquote.textdiff').each(function() { newBoxID = $(this).parent().attr('id'); - if(newBoxID != oldBoxID) + if(newBoxID != oldBoxID) { oldBoxID = newBoxID; if($(this).html() != $(this).next().html()) $(this).closest('.history-changes').before(diffButton); @@ -61,12 +61,12 @@ action->printChanges($action->objectType, $action->history);?>
- comment)):?> + comment)):?> ', "title='{$lang->action->editComment}'", 'btn btn-link btn-icon btn-sm btn-edit-comment');?>
- comment) == $action->comment ? nl2br($action->comment) : $action->comment;?> + comment) == $action->comment ? nl2br($action->comment) : $action->comment;?>
id")?>'> diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 2512525a0b..e8ff822c97 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -100,6 +100,23 @@ createLink('action', 'comment', "objectType=doc&objectID=$doc->id");?>
+
+
+ + deleted) + { + echo "
"; + common::printIcon('doc', 'edit', "docID=$doc->id", $doc); + common::printIcon('doc', 'delete', "docID=$doc->id", $doc, 'button', '', 'hiddenwin'); + } + else + { + common::printRPN($browseLink); + } + ?> +
+
@@ -166,21 +183,6 @@
-
- - deleted) - { - echo "
"; - common::printIcon('doc', 'edit', "docID=$doc->id", $doc); - common::printIcon('doc', 'delete', "docID=$doc->id", $doc, 'button', '', 'hiddenwin'); - } - else - { - common::printRPN($browseLink); - } - ?> -
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 18956e3a02..5a3e4d2064 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -11,7 +11,7 @@ */ ?> -
+
@@ -75,6 +75,27 @@
+
+
+ id"; + $browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id"); + common::printBack($browseLink); + if(!$product->deleted) + { + echo "
"; + if($product->status != 'closed') + { + common::printIcon('product', 'close', $params, $product, 'button', '', '', 'iframe', true); + echo "
"; + } + + common::printIcon('product', 'edit', $params, $product); + common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin'); + } + ?> +
+
@@ -213,24 +234,5 @@
-
- id"; - $browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id"); - common::printBack($browseLink); - if(!$product->deleted) - { - echo "
"; - if($product->status != 'closed') - { - common::printIcon('product', 'close', $params, $product, 'button', '', '', 'iframe', true); - echo "
"; - } - - common::printIcon('product', 'edit', $params, $product); - common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin'); - } - ?> -
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 665f758de0..44652f18c6 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -11,7 +11,7 @@ */ ?> -
+
@@ -144,6 +144,28 @@
+
+
+ id"; + $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$project->id"); + common::printBack($browseLink); + if(!$project->deleted) + { + echo "
"; + common::printIcon('project', 'start', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); + 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); + + echo "
"; + common::printIcon('project', 'edit', $params, $project); + common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin'); + } + ?> +
+
@@ -277,26 +299,6 @@
-
- id"; - $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$project->id"); - common::printBack($browseLink); - if(!$project->deleted) - { - echo "
"; - common::printIcon('project', 'start', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - 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); - - echo "
"; - common::printIcon('project', 'edit', $params, $project); - common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin'); - } - ?> -