projects
/
website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wiederholende Längenabfrage des Pfades in Variable umgewandelt
[website]
/
dist
/
templates
/
layout.html
diff --git
a/dist/templates/layout.html
b/dist/templates/layout.html
index
caaca4a
..
d7d592d
100644
(file)
--- a/
dist/templates/layout.html
+++ b/
dist/templates/layout.html
@@
-26,7
+26,8
@@
<script src="../js/less-1.7.0.min.js" th:remove="all"></script>
</head>
<body
<script src="../js/less-1.7.0.min.js" th:remove="all"></script>
</head>
<body
- th:with="crumbs=${crumbs.get(uri)}"
+ juplo:variables="${json}"
+ th:with="page=${pages.get(uri)},crumbs=${page['crumbs']}"
id="top"
class="menu"
th:class="${contentclass}?:'menu'"
id="top"
class="menu"
th:class="${contentclass}?:'menu'"
@@
-110,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.
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 class="m blog" th:each="entry : ${sections}" th:class="'m ' + ${entry.key}">
+ <a href="../blog.html" th:href="@{${entry.
value}}" class="m" th:class="${entry.value == section.uri} ? 'm selected' : 'm'" th:text="${pages.get(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>
@@
-124,32
+125,34
@@
</h2>
<ul layout:fragment="submenu"
th:with="
</h2>
<ul layout:fragment="submenu"
th:with="
- submenu=${menu[section.uri]},
- parent=${(crumbs.size() == 2 and submenu.get(uri)['childs'] == null) ? crumbs[0].uri : null},
+ len=${crumbs.size()},
+ submenu=${pages[section.uri]['childs']},
+ parent=${crumbs[0].uri},
pos=1"
id="submenu"
class="s"
pos=1"
id="submenu"
class="s"
+ th:class="'s' + (${len == 1 or (len == 2 and page['childs'] == null)} ? ' selected' : '')"
>
<li th:fragment="submenu(submenu, parent, pos)"
th:each="entry : ${submenu}"
th:with="
>
<li th:fragment="submenu(submenu, parent, pos)"
th:each="entry : ${submenu}"
th:with="
- child=${pos ==
crumbs.size()
},
+ child=${pos ==
len
},
selected=${!child and crumbs.get(pos).uri == entry.key},
selected=${!child and crumbs.get(pos).uri == entry.key},
-
last=${crumbs.get(pos-1).uri == parent and crumbs.size() > pos
},
- childs=${entry.
value
['childs']}
+
sibling=${pos + 1 == len and (page['childs'] == null or uri == parent)
},
+ childs=${entry.
key == parent ? null : pages[entry.key]
['childs']}
"
class="s sub"
"
class="s sub"
- th:class="'s' + (${childs} ? ' sub' : '') + (${selected or
last
or child} ? '' : ' off')"
+ th:class="'s' + (${childs} ? ' sub' : '') + (${selected or
sibling
or child} ? '' : ' off')"
>
<a href="../projects/fix-swf.html"
th:href="@{${entry.key}}"
class="s selected"
th:class="${selected} ? 's selected' : 's'"
>
<a href="../projects/fix-swf.html"
th:href="@{${entry.key}}"
class="s selected"
th:class="${selected} ? 's selected' : 's'"
- th:text="${entry.value
.name
}"
+ th:text="${entry.value}"
>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 (len > 1 and entry.key == crumbs.get(len-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"