From 36dd4e0296d384adfbf64f2e92394992410d77bc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 14 Jan 2019 08:43:10 +0100
Subject: [PATCH] TreeRenderer: Use a more homogenous html structure

i.e. no divs, just uls and lis
---
 .../Businessprocess/Renderer/TreeRenderer.php | 22 +++++--------------
 public/css/module.less                        |  8 +++----
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/library/Businessprocess/Renderer/TreeRenderer.php b/library/Businessprocess/Renderer/TreeRenderer.php
index 0182dc0..7c73683 100644
--- a/library/Businessprocess/Renderer/TreeRenderer.php
+++ b/library/Businessprocess/Renderer/TreeRenderer.php
@@ -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);
             }
diff --git a/public/css/module.less b/public/css/module.less
index 070cd63..86786cd 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -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;
         }
     }