upstream/icingaweb2-module-businessprocess
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-businessprocess.git synced 2026-05-28 04:34:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

TreeRenderer: Use a more homogenous html structure

Browse source 
i.e. no divs, just uls and lis
This commit is contained in:
Johannes Meyer 2019-01-14 08:43:10 +01:00
parent d2c858ddf8
commit 36dd4e0296
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
library/Businessprocess/Renderer/TreeRenderer.php
View file

@ -18,7 +18,7 @@ class TreeRenderer extends Renderer
{
$bp = $this->config;
$this->add(Html::tag(
'div',
'ul',
[
'id' => $bp->getHtmlId(),
'class' => ['tree', 'sortable'],
@ -48,7 +48,7 @@ class TreeRenderer extends Renderer
$nodes = $this->parent->getChildren();
}
$html[] = Html::tag('div', ['class' => 'placeholder']);
$html[] = Html::tag('li', ['class' => 'placeholder']);
foreach ($nodes as $name => $node) {
$html[] = $this->renderNode($bp, $node);
}
@ -109,7 +109,7 @@ class TreeRenderer extends Renderer
public function renderNode(BpConfig $bp, Node $node, $path = array())
{
$table = Html::tag(
'div',
'li',
[
'id' => $this->getId($node, $path),
'class' => ['bp', 'movable', $node->getObjectClassName()],
@ -128,11 +128,7 @@ class TreeRenderer extends Renderer
}
if ($node instanceof BpNode) {
$table->add(Html::tag(
'div',
null,
Html::tag('span', ['class' => 'op'], $node->operatorHtml())
));
$table->add(Html::tag('span', ['class' => 'op'], $node->operatorHtml()));
}
$td = Html::tag('div');
@ -179,15 +175,7 @@ class TreeRenderer extends Renderer
$path[] = (string) $node;
foreach ($node->getChildren() as $name => $child) {
if ($child->hasChildren()) {
$tbody->add(Html::tag(
'li',
[
'class' => 'movable',
'id' => $this->getId($child, $path),
'data-node-name' => $name
],
$this->renderNode($bp, $child, $this->getCurrentPath())
));
$tbody->add($this->renderNode($bp, $child, $this->getCurrentPath()));
} else {
$this->renderChild($bp, $tbody, $child, $path);
}

8
public/css/module.less
View file

@ -37,22 +37,22 @@ div.bp.sortable > .sortable-ghost {
/* New tree stuff START */
div.tree {
ul.tree {
padding: 1em;
div.placeholder {
li.placeholder {
// Helps to assist Sortable.js/the browser to properly place items at the top
height: 1em;
}
> div.process,
> li.process,
ul.sortable li {
border: .2em solid @gray;
margin-bottom: .2em;
padding-left: .2em;
&.sortable-ghost {
border: .2em dashed @gray-light;
border-left-width: 0;
}
}