wait #4134 @0.5

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 32380a6888d6c4a2b7188fe850699e478e1e6bca..6389d6f205633b36317254255662595aef2f3c17 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1638,7 +1638,6 @@ class wsHTML5Compiler
         $linkPages = [];
         $allLinksData = [];
 
-        $depths = [10 => 'ctpages', 20 => 'ctpages', 30 => 'cpages', 40 => 'cpages', 50 => 'pages', 60 => 'pages', 70 => 'pages', 80 => 'pages',];
 
         usort($links, array($this, '_sortLinks'));
 
@@ -1671,8 +1670,15 @@ class wsHTML5Compiler
                     $ctpages[$lta->page] = '';
                 }
 
+                $d = $lta->getDepth();
+                if ($d < 30) {
+                    $v = 'ctpages';
+                } else if ($d < 50) {
+                    $v = 'cpages';
+                } else {
+                    $v = 'pages';
+                }
 
-                $v = $depths[$lta->getDepth()];
                 $$v[$lta->page] .= $c;
             }
             // Make old "aftersearch" link compatible with new "extra" menu option by extracting link URL

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 6e19c67668f4e782b970a7ca6a328d29494b3be4..f892a18102339a21268c4ca618d3571ad5c02e0e 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -256,9 +256,6 @@ class wsHTML5Link
             if ($normalizeKey) {
                 $k = mb_strtolower($k);
             }
-            if ($k === 'z-index' || $k==='zindex') {
-                continue;
-            }
             $res[$k] = $v;
         }
 
@@ -375,6 +372,9 @@ class wsHTML5Link
         if ($this->zindex == -1 || null === $this->zindex || !$this->zindex) {
             return $this->defaultZIndex;
         }
+        if ($this->zindex < 10) {
+            return $this->zindex + $this->defaultZIndex;
+        }
         return $this->zindex;
     }