Section-Handling überarbeitet: URI ist generell der Key für Map-Zugriffe!

diff --git a/dist/thymeleaf/templates/layout.html b/dist/thymeleaf/templates/layout.html
index 2ff0255..2351163 100644 (file)
--- a/dist/thymeleaf/templates/layout.html
+++ b/dist/thymeleaf/templates/layout.html
@@ -111,8 +111,8 @@
             <h1 class="nav">Navigation</h1>
             <h2 class="nav menu">Section-Menu</h2>
             <ul id="menu" class="cf">
             <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.html" th:href="@{${entry.value.uri}}" class="m" th:class="${entry.value.uri == section.uri} ? 'm selected' : 'm'" th:text="${entry.value.name}">Blog</a>
+              <li class="m blog" th:each="entry : ${sections}" th:class="'m ' + ${entry.value.key}">
+                <a href="../blog.html" th:href="@{${entry.key}}" class="m" th:class="${entry.key == section.uri} ? 'm selected' : 'm'" th:text="${entry.value.name}">Blog</a>

               </li>
               <!--/*-->
               <li class="m projects"><a href="../projects" class="m selected">Projects</a></li>
               </li>
               <!--/*-->
               <li class="m projects"><a href="../projects" class="m selected">Projects</a></li>

diff --git a/dist/thymeleaf/templates/variables.json b/dist/thymeleaf/templates/variables.json
index 8b192f5..612be66 100644 (file)
--- a/dist/thymeleaf/templates/variables.json
+++ b/dist/thymeleaf/templates/variables.json
@@ -137,9 +137,9 @@
     ]
   },
   "sections": {
     ]
   },
   "sections": {

-    "blog": { "name": "Blog", "uri": "/blog.html" },
-    "projects": { "name": "Projects", "uri": "/projects.html" },
-    "about": { "name": "About", "uri": "/about.html" }
+    "/blog.html": { "name": "Blog", "key": "blog" },
+    "/projects.html": { "name": "Projects", "key": "projects" },
+    "/about.html": { "name": "About", "key": "about" }

   },
   "submenu": {
     "#": { "name": "hibernate4-maven-plugin" },
   },
   "submenu": {
     "#": { "name": "hibernate4-maven-plugin" },