From 48ba2a7bba511f589bcf9da678bc7e2c9a9580e1 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 14 Jan 2019 08:46:32 +0100 Subject: [PATCH] TreeRenderer: Render add button as action link in the top right --- .../Businessprocess/Renderer/TreeRenderer.php | 26 +++++-------------- public/css/module.less | 4 +++ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/library/Businessprocess/Renderer/TreeRenderer.php b/library/Businessprocess/Renderer/TreeRenderer.php index 7c73683..32dd4e8 100644 --- a/library/Businessprocess/Renderer/TreeRenderer.php +++ b/library/Businessprocess/Renderer/TreeRenderer.php @@ -181,14 +181,6 @@ class TreeRenderer extends Renderer } } - if (! $this->isLocked() && $node instanceof BpNode && $bp->getMetadata()->canModify()) { - $tbody->add(Html::tag( - 'li', - null, - $this->renderAddNewNode($node) - )); - } - return $table; } @@ -231,7 +223,7 @@ class TreeRenderer extends Renderer { if ($node instanceof BpNode) { if ($bp->getMetadata()->canModify()) { - return $this->createEditAction($bp, $node); + return [$this->createEditAction($bp, $node), $this->renderAddNewNode($node)]; } else { return ''; } @@ -290,16 +282,12 @@ class TreeRenderer extends Renderer protected function renderAddNewNode($parent) { - return Html::tag( - 'a', - [ - 'href' => $this->getUrl() - ->with('action', 'add') - ->with('node', $parent->getName()), - 'title' => mt('businessprocess', 'Add a new business process node'), - 'class' => 'addnew icon-plus' - ], - mt('businessprocess', 'Add') + return $this->actionIcon( + 'plus', + $this->getUrl() + ->with('action', 'add') + ->with('node', $parent->getName()), + mt('businessprocess', 'Add a new business process node') ); } } diff --git a/public/css/module.less b/public/css/module.less index 86786cd..0b4f5c0 100644 --- a/public/css/module.less +++ b/public/css/module.less @@ -54,6 +54,10 @@ ul.tree { border: .2em dashed @gray-light; border-left-width: 0; } + + a > div { + display: inline-block; + } } ul {