aboutsummaryrefslogtreecommitdiff
path: root/juick-spring-www/src/main/webapp
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-12-12 14:48:20 +0300
committerGravatar Vitaly Takmazov2016-12-12 14:48:20 +0300
commit2ab55ec4cc52f45b5296fd888359d48804045f44 (patch)
tree0e1a86952b1e12953de0b42563f356ded78ca785 /juick-spring-www/src/main/webapp
parent5146e43ab81143a4fab59b43d4a71fd3de0f6ac9 (diff)
juick-spring-www: fix navigation template
Diffstat (limited to 'juick-spring-www/src/main/webapp')
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html2
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html22
2 files changed, 16 insertions, 8 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html
index 06805dc6..e851aefa 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/mainLayout.html
@@ -16,7 +16,7 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
<![endif]-->
</head>
-<body>
+<body id="body">
<div layout:replace="~{views/partial/navigation :: nav}">Navigation block</div>
<section id="content">
<p layout:fragment="content">Main content</p>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html
index 51489194..77c9321a 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/navigation.html
@@ -2,18 +2,22 @@
<html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-<body layout:fragment="nav">
+<body>
+<header layout:fragment="nav">
<div id="logo"><a href="/" th:href="@{/}">Juick</a></div>
<nav id="global">
<ul>
<li><a href="/" th:href="@{/}" th:text="#{link.popular}">Популярные</a></li>
- <li><a href="/?show=all" th:href="@{/?show=all}" rel="nofollow" th:text="#{link.allMessages}">Все сообщения</a></li>
- <li><a href="/?show=photos" th:href="@{/?show=photos}" rel="nofollow" th:text="#{link.withPhotos}">Фотографии</a></li>
+ <li><a href="/?show=all" th:href="@{/?show=all}" rel="nofollow" th:text="#{link.allMessages}">Все
+ сообщения</a></li>
+ <li><a href="/?show=photos" th:href="@{/?show=photos}" rel="nofollow" th:text="#{link.withPhotos}">Фотографии</a>
+ </li>
</ul>
</nav>
<div id="search">
<form action="/">
- <input type="text" name="search" class="text" placeholder="Поиск" th:placeholder="#{label.search}" th:value="${param.search}"/>
+ <input type="text" name="search" class="text" placeholder="Поиск" th:placeholder="#{label.search}"
+ th:value="${param.search}"/>
</form>
</div>
<section id="headdiv" th:switch="${visitor.isAnonym()}">
@@ -22,14 +26,17 @@
<ul>
<li><a href="/?show=my" th:href="@{/?show=my}" th:text="#{link.my}">Моя лента</a></li>
<li><a href="/pm/inbox" th:href="@{/pm/inbox}" th:text="#{link.privateMessages}">Приватные</a></li>
- <li><a href="/?show=discuss" th:href="@{/?show=discuss}" th:text="#{link.discuss}">Обсуждения</a></li>
- <li><a href="/?show=recommended" th:href="@{/?show=recommended}" th:text="#{link.recommended}">Рекомендации</a></li>
+ <li><a href="/?show=discuss" th:href="@{/?show=discuss}" th:text="#{link.discuss}">Обсуждения</a>
+ </li>
+ <li><a href="/?show=recommended" th:href="@{/?show=recommended}" th:text="#{link.recommended}">Рекомендации</a>
+ </li>
</ul>
</nav>
<nav id="actions">
<ul>
<li><a href="/#post" th:href="@{/#post}" th:text="#{link.postMessage}">Написать</a></li>
- <li><a href="/ugnich" th:href="@{/{userName}(userName=${visitor.name})}" th:text="'@'+${visitor.name}">@ugnich</a></li>
+ <li><a href="/ugnich" th:href="@{/{userName}(userName=${visitor.name})}"
+ th:text="'@'+${visitor.name}">@ugnich</a></li>
<li><a href="/logout" th:href="@{/logout}" th:text="#{link.logout}">Выйти</a></li>
</ul>
</nav>
@@ -38,5 +45,6 @@
<p>[(#{message.loginForSending(@{/login})})]</p>
</th:block>
</section>
+</header>
</body>
</html>