X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=dist%2Ftemplates%2Flayout.html;h=0f3d1f00f0370c0685a8197de1ec2bb3b7271d86;hb=065e1152e880038e7404532260598595b04ec028;hp=a7743c23512eb6d56145e3f9dc0f197a9b33e7b4;hpb=752f7e8787c4f6a1e9266caeac3f437884adcdb7;p=website

diff --git a/dist/templates/layout.html b/dist/templates/layout.html
index a7743c23..0f3d1f00 100644
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -17,70 +17,62 @@
       th:fragment="body(uri, maincontent, marginalcontent)"
       thymeproxy:variables="${json}"
       th:with="crumbs=${_crumbs.get(uri)}">
-    <nav>
-      <div class="section breadcrumb" aria-label="breadcrumbs">
-        <ul>
-          <li th:each="crumb: ${crumbs}" class="${uri == crumb}?'is_active':_">
-            <a href="../index.html" th:href="@{${crumb}}" th:text="${_titles.get(crumb)}">Home</a></li>
+    <div class="columns">
+      <main class="column content" th:fragment="maincontent">
+      </main>
+      <nav class="column is-3 has-text-right">
+        <a href="../index.html" th:href="@{/}" title="Home">
+          <img src="/img/logo.svg" alt="juplo" class="logo">
+        </a>
+        <ul th:with="
+              len=${crumbs == null} ? 0 : ${crumbs.size()},
+              parent=${crumbs == null} ? '' : ${crumbs[0]},
+              submenu=${_childs.get(parent)},
+              pos=1"
+            id="navigation"
+            class="s mr-4"
+            th:class="'mr-4 s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')">
+          <li th:fragment="submenu(submenu, parent, pos)"
+              th:each="entry : ${submenu}"
+              th:with="
+                  child=${pos == len},
+                  selected=${!child and crumbs.get(pos) == entry},
+                  leaf=${pos >= (len - 1) and not selected},
+                  active=${entry == uri},
+                  sibling=${pos + 1 == len and (_childs.get(uri) == null or uri == parent)},
+                  childs=${entry == parent ? null : _childs.get(entry)}
+                  "
+              class="s sub"
+              th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')">
+            <a  href="../potemkin/fix-swf/overview.html"
+                th:if="${entry != parent}"
+                th:href="@{${entry}}"
+                class="s selected"
+                th:class="(${selected} ? 's selected' : 's') + ' len_' + ${len} + ' pos_' + ${pos} + (${leaf}?' leaf':'') + (${active} ? ' active' : '')"
+                th:text="${_titles.get(entry)}">fix-swf</a>
+            <ul th:if="${selected and childs != null}"
+                class="s active"
+                th:class="'s' + (${selected &amp;&amp; pos == crumbs.size()-1} ? ' active' : '') + (${entry == uri or (len &gt; 1 and entry == crumbs.get(len-2) and _childs.get(uri) == null)} ? ' selected' : '')">
+              <li th:replace="this :: submenu(submenu=${childs}, parent=${entry}, pos=${pos + 1})"
+                  class="s">
+                <strong class="s">Overview</strong>
+              </li>
+              <!--/*-->
+              <li class="s"><a href="../potemkin/fix-swf/getting-started.html" class="s">Getting Started</a></li>
+              <li class="s"><a href="#" class="s">FAQ</a></li>
+              <li class="s"><a href="#" class="s">Documentation</a></li>
+              <!--*/-->
+            </ul>
+          </li>
           <!--/*-->
-          <li class="is-active"><a href="#">Fix SWF</a></li>
+          <li class="s sub off"><a href="#" class="s">hibernate4-maven-plugin</a></li>
+          <li class="s off"><a href="#" class="s">jquery.openx</a></li>
+          <li class="s sub off"><a href="../potemkin/html-experimente.html" th:href="@{/potemkin/html-experimente.html}" class="s">HTML-Experimente</a></li>
+          <li class="s sub off"><a href="#" class="s">accelerator</a></li>
+          <li class="s off"><a href="../potemkin/typo.html" th:href="@{/potemkin/typo.html}" class="s">Typography</a></li>
           <!--*/-->
         </ul>
-      </div>
-      <div class="section columns">
-        <div class="column is-3 has-text-right">
-          <a href="../index.html" th:href="@{/}" title="Home">
-            <img src="/img/logo.svg" alt="juplo" class="logo">
-          </a>
-          <ul th:with="
-                len=${crumbs == null} ? 0 : ${crumbs.size()},
-                parent=${crumbs == null} ? '' : ${crumbs[0]},
-                submenu=${_childs.get(parent)},
-                pos=1"
-              id="navigation"
-              class="s mr-4"
-              th:class="'mr-4 s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')">
-            <li th:fragment="submenu(submenu, parent, pos)"
-                th:each="entry : ${submenu}"
-                th:with="
-                    leaf=${pos >= len - 1},
-                    selected=${!leaf and crumbs.get(pos) == entry},
-                    active=${entry == uri},
-                    sibling=${pos + 1 == len and (_childs.get(uri) == null or uri == parent)},
-                    childs=${entry == parent ? null : _childs.get(entry)}
-                    "
-                class="s sub"
-                th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or leaf} ? '' : ' off')">
-              <a  href="../potemkin/fix-swf/overview.html"
-                  th:if="${entry != parent}"
-                  th:href="@{${entry}}"
-                  class="s selected"
-                  th:class="(${selected} ? 's selected' : 's') + ' len_' + ${len} + ' pos_' + ${pos} + (${leaf}?' leaf':'') + (${active} ? ' active' : '')"
-                  th:text="${_titles.get(entry)}">fix-swf</a>
-              <ul th:if="${selected and childs != null}"
-                  class="s active"
-                  th:class="'s' + (${selected &amp;&amp; pos == crumbs.size()-1} ? ' active' : '') + (${entry == uri or (len &gt; 1 and entry == crumbs.get(len-2) and _childs.get(uri) == null)} ? ' selected' : '')">
-                <li th:replace="this :: submenu(submenu=${childs}, parent=${entry}, pos=${pos + 1})"
-                    class="s">
-                  <strong class="s">Overview</strong>
-                </li>
-                <!--/*-->
-                <li class="s"><a href="../potemkin/fix-swf/getting-started.html" class="s">Getting Started</a></li>
-                <li class="s"><a href="#" class="s">FAQ</a></li>
-                <li class="s"><a href="#" class="s">Documentation</a></li>
-                <!--*/-->
-              </ul>
-            </li>
-            <!--/*-->
-            <li class="s sub off"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-            <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-            <li class="s sub off"><a href="../potemkin/html-experimente.html" th:href="@{/potemkin/html-experimente.html}" class="s">HTML-Experimente</a></li>
-            <li class="s sub off"><a href="#" class="s">accelerator</a></li>
-            <li class="s off"><a href="../potemkin/typo.html" th:href="@{/potemkin/typo.html}" class="s">Typography</a></li>
-            <!--*/-->
-          </ul>
-        </div>
-      </div>
-    </nav>
+      </nav>
+    </div>
   </body>
 </html>