Durchgängig gleicher Abstand zwischen Pfad-Menü und dem aktiven Menü

diff --git a/dist/less/screen/menu.less b/dist/less/screen/menu.less
index 1dc142e..d35c541 100644 (file)
--- a/dist/less/screen/menu.less
+++ b/dist/less/screen/menu.less
@@ -44,10 +44,15 @@
 }
 #submenu ul.s
 {
 }
 #submenu ul.s
 {

-  margin: 1.5em 0 0 0; /** 24px 0 0 0 */
+  margin: 1em 0 0 0; /** 16px 0 0 0 */

   padding: 0;
   list-style-type: none;
 }
   padding: 0;
   list-style-type: none;
 }

+#submenu.selected,
+#submenu ul.s.selected
+{
+  margin-top: 2em; /** 32px */
+}

 #submenu li.s
 {
   margin: 0 0 .5em 0; /** 0 0 10px 0 */
 #submenu li.s
 {
   margin: 0 0 .5em 0; /** 0 0 10px 0 */

diff --git a/dist/templates/layout.html b/dist/templates/layout.html
index c464d69..acb20bc 100644 (file)
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -130,6 +130,7 @@
                   pos=1"
                 id="submenu"
                 class="s"
                   pos=1"
                 id="submenu"
                 class="s"

+                th:class="'s' + (${crumbs.size() == 1 or (crumbs.size() == 2 and page['childs'] == null)} ? ' selected' : '')"

                 >
               <li th:fragment="submenu(submenu, parent, pos)"
                   th:each="entry : ${submenu}"
                 >
               <li th:fragment="submenu(submenu, parent, pos)"
                   th:each="entry : ${submenu}"


@@ -150,7 +151,7 @@
                     >fix-swf</a>
                 <ul th:if="${selected and childs != null}"
                     class="s active"
                     >fix-swf</a>
                 <ul th:if="${selected and childs != null}"
                     class="s active"

-                    th:class="${selected} ? 's active' : 's'"
+                    th:class="'s' + (${selected} ? ' active' : '') + (${entry.key == uri or (crumbs.size() &gt; 1 and entry.key == crumbs.get(crumbs.size()-2).uri and page['childs'] == null)} ? ' selected' : '')"

                     >
                   <li th:replace="templates/layout :: submenu(submenu=${childs}, parent=${entry.key}, pos=${pos + 1})"
                       class="s"
                     >
                   <li th:replace="templates/layout :: submenu(submenu=${childs}, parent=${entry.key}, pos=${pos + 1})"
                       class="s"