X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=dist%2Ftemplates%2Flayout.html;h=46f8c3ffb7d345dad88b8f3d3e5d82a8a64deb4d;hb=510b648c03a385a08ae2ce739174327a87f6c711;hp=52196c6b43268c7125d2a8fa46938c3a0a75b702;hpb=2328a349bef01826ac56f240e14ae757f02dda9b;p=website

diff --git a/dist/templates/layout.html b/dist/templates/layout.html
index 52196c6b..46f8c3ff 100644
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -18,11 +18,11 @@
       thymeproxy:variables="${json}"
       th:with="crumbs=${_crumbs.get(uri)}"
       >
-    <nav class="column is-8-desktop is-offset-2-desktop">
-      <div class="navbar" role="navigation" aria-label="main navigation">
+    <nav class="section column is-8-desktop is-offset-2-desktop">
+      <div class="navbar is-size-2-tablet has-text-weight-bold" role="navigation" aria-label="main navigation">
         <div class="navbar-brand">
           <a class="navbar-item" href="../index.html" th:href="@{/}" title="Home">
-            <img src="/img/logo.svg" alt="juplo">
+            <img src="/img/logo.svg" alt="juplo" class="logo">
           </a>
       
           <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">
@@ -66,7 +66,78 @@
     <section class="section" id="top">
       <div class="container">
         <div class="columns">
-          <div class="column is-8-desktop is-offset-2-desktop content" th:include="${maincontent}">
+          <nav id="nav" class="column is-3-tablet is-3-desktop content" th:include="~{::#navigation}?:_" th:with="section=${crumbs != null ? crumbs[0] : null}">
+            <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
+            <h1 class="nav">Navigation</h1>
+            <h2 class="nav menu">Section-Menu</h2>
+            <ul id="menu" class="cf">
+              <li class="m blog" th:each="entry : ${_sections}" th:class="'m ' + ${entry.key}">
+                <a href="../blog/" th:href="@{${entry.value}}" class="m" th:class="${entry.value == section} ? 'm selected' : 'm'" th:text="${_titles.get(entry.value)}">Blog</a>
+              </li>
+              <!--/*-->
+              <li class="m projects"><a href="../projects.html" class="m selected">Projects</a></li>
+              <li class="m about"><a href="../about.html" class="m">About</a></li>
+              <!--*/-->
+            </ul>
+            <h2 class="nav submenu">
+              <span class="s">Submenu for section</span>
+              <a class="s selected" href="../projects.html" th:href="@{${section}}" th:text="${_titles.get(section)}">Projects</a>
+            </h2>
+            <ul th:include="${submenu}?:_"
+                th:with="
+                  len=${crumbs.size()},
+                  submenu=${_childs.get(section)},
+                  parent=${crumbs[0]},
+                  pos=1"
+                id="submenu"
+                class="s"
+                th:class="'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},
+                      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'"
+                    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>
+            <hr class="n"/>
+          </nav>
+          <div class="column is-9-tablet is-8-desktop content" th:include="${maincontent}">
             <h1 class="title" th:include="${title}">Title</h1>
             <div class="content" th:fragment="maincontent">
               <p>
@@ -263,104 +334,29 @@
             </div>
             <!--*/-->
           </div>
+          <aside class="column is-hidden-touch is-2-desktop content" th:insert="${marginalcontent}?:~{}">
+          <!--/* the following  is only visible during natural templating -->
+            <h1>Other nasty but marginal stuff</h1>
+            <p>
+              Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+              ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+              aliquip ex ea commodo consequat. Duis aute irure dolor in
+              reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+              pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+              culpa qui officia deserunt mollit anim id est laborum.
+            </p>
+          </aside>
+          <aside class="m">
+            <h1>More nasty stuff</h1>
+            <p>
+              This one is really short!
+            </p>
+          <!--*/-->
+          </aside>
         </div>
       </div>
     </section>
-    <nav id="nav"
-        th:include="~{::#navigation}?:_"
-        th:with="section=${crumbs != null ? crumbs[0] : null}"
-        >
-      <hr class="n"/>
-      <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
-      <h1 class="nav">Navigation</h1>
-      <h2 class="nav menu">Section-Menu</h2>
-      <ul id="menu" class="cf">
-        <li class="m blog" th:each="entry : ${_sections}" th:class="'m ' + ${entry.key}">
-          <a href="../blog/" th:href="@{${entry.value}}" class="m" th:class="${entry.value == section} ? 'm selected' : 'm'" th:text="${_titles.get(entry.value)}">Blog</a>
-        </li>
-        <!--/*-->
-        <li class="m projects"><a href="../projects.html" class="m selected">Projects</a></li>
-        <li class="m about"><a href="../about.html" class="m">About</a></li>
-        <!--*/-->
-      </ul>
-      <h2 class="nav submenu">
-        <span class="s">Submenu for section</span>
-        <a class="s selected" href="../projects.html" th:href="@{${section}}" th:text="${_titles.get(section)}">Projects</a>
-      </h2>
-      <ul th:include="${submenu}?:_"
-          th:with="
-            len=${crumbs.size()},
-            submenu=${_childs.get(section)},
-            parent=${crumbs[0]},
-            pos=1"
-          id="submenu"
-          class="s"
-          th:class="'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},
-                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'"
-              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>
-      <hr class="n"/>
-    </nav>
-    <aside class="m" th:insert="${marginalcontent}?:~{}">
-    <!--/* the following  is only visible during natural templating -->
-      <h1>Other nasty but marginal stuff</h1>
-      <p>
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-        ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-        aliquip ex ea commodo consequat. Duis aute irure dolor in
-        reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-        pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-        culpa qui officia deserunt mollit anim id est laborum.
-      </p>
-    </aside>
-    <aside class="m">
-      <h1>More nasty stuff</h1>
-      <p>
-        This one is really short!
-      </p>
-    <!--*/-->
-    </aside>
     <footer class="footer">
       <div class="container">
         <div class="columns">