From 89347648e11ba635dfe3683fe688c341c0bd7bc3 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 4 Dec 2017 11:31:12 +0100 Subject: [PATCH 1/4] Show the info URL also in the tile view --- .../Renderer/TileRenderer/NodeTile.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php index 96390f9..b44dc6f 100644 --- a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php +++ b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php @@ -97,6 +97,22 @@ class NodeTile extends BaseElement $this->addActionLinks(); } + if ($node instanceof BpNode) { + $url = $node->getInfoUrl(); + + if ($url !== null) { + $this->actions()->add(Link::create( + Icon::create('help'), + $url, + null, + array( + 'title' => sprintf('%s: %s', $this->translate('More information'), $url), + 'style' => 'float: right' + ) + )); + } + } + return parent::render(); } From a544f255510fa77e2fc0f1efb0a294816b0daa2f Mon Sep 17 00:00:00 2001 From: Jennifer Mourek Date: Mon, 25 Jun 2018 15:31:34 +0200 Subject: [PATCH 2/4] Remove help from node detail view --- .../Renderer/TileRenderer/NodeTile.php | 30 +++++++++---------- public/css/module.less | 5 ++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php index b44dc6f..5d02e7e 100644 --- a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php +++ b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php @@ -97,22 +97,6 @@ class NodeTile extends BaseElement $this->addActionLinks(); } - if ($node instanceof BpNode) { - $url = $node->getInfoUrl(); - - if ($url !== null) { - $this->actions()->add(Link::create( - Icon::create('help'), - $url, - null, - array( - 'title' => sprintf('%s: %s', $this->translate('More information'), $url), - 'style' => 'float: right' - ) - )); - } - } - return parent::render(); } @@ -237,6 +221,20 @@ class NodeTile extends BaseElement 'data-base-target' => '_next' ) )); + + $url = $node->getInfoUrl(); + + if ($url !== null) { + $this->actions()->add(Link::create( + Icon::create('help'), + $url, + null, + array( + 'title' => sprintf('%s: %s', $this->translate('More information'), $url), + 'class' => 'node-help' + ) + )); + } } else { // $url = $this->makeMonitoredNodeUrl($node); if ($node instanceof ServiceNode) { diff --git a/public/css/module.less b/public/css/module.less index d7ff82e..4dea905 100644 --- a/public/css/module.less +++ b/public/css/module.less @@ -466,6 +466,11 @@ div.bp .badges { color: @text-color; } } + + .node-help { + margin-right: 0.3em; + float: right; + } } From bf6aef68b731a242231041083d96ce2200358fef Mon Sep 17 00:00:00 2001 From: Jennifer Mourek Date: Mon, 25 Jun 2018 15:37:04 +0200 Subject: [PATCH 3/4] Move style --- public/css/module.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/css/module.less b/public/css/module.less index 4dea905..b842dcf 100644 --- a/public/css/module.less +++ b/public/css/module.less @@ -465,11 +465,11 @@ div.bp .badges { background-color: white; color: @text-color; } - } - .node-help { - margin-right: 0.3em; - float: right; + > .node-help { + margin-right: 0.3em; + float: right; + } } } From 5391dff635734463b8bf3558132f5691309ce537 Mon Sep 17 00:00:00 2001 From: Jennifer Mourek Date: Tue, 26 Jun 2018 16:11:29 +0200 Subject: [PATCH 4/4] Change info URL icon --- library/Businessprocess/Renderer/TileRenderer/NodeTile.php | 4 ++-- public/css/module.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php index 5d02e7e..cc4a7be 100644 --- a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php +++ b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php @@ -226,12 +226,12 @@ class NodeTile extends BaseElement if ($url !== null) { $this->actions()->add(Link::create( - Icon::create('help'), + Icon::create('info-circled'), $url, null, array( 'title' => sprintf('%s: %s', $this->translate('More information'), $url), - 'class' => 'node-help' + 'class' => 'node-info' ) )); } diff --git a/public/css/module.less b/public/css/module.less index b842dcf..e607532 100644 --- a/public/css/module.less +++ b/public/css/module.less @@ -466,7 +466,7 @@ div.bp .badges { color: @text-color; } - > .node-help { + > .node-info { margin-right: 0.3em; float: right; }