2 files changed, 9 insertions, 5 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html
index 4cd32be3..7ee2156d 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/index.html
@@ -3,12 +3,16 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/mainLayout}">
 <head>
-    <title>Главная страница</title>
+    <title th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}" th:text="#{title.index.user}">Популярные</title>
+    <title th:if="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}" th:text="#{title.index.anonym}">Микроблоги Juick: популярные записи</title>
 </head>
 
 <body>
 <section layout:fragment="content">
     <p>Главная страница !</p>
+    <p th:text="${#authorization.expression('hasRole(''ROLE_USER'')')}"></p>
+    <p th:text="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}"></p>
+    <p th:text="${#authentication}"></p>
 </section>
 <aside id="column">
     <p layout:fragment="column"></p>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
index 95714e10..c7cd1c81 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
@@ -20,8 +20,8 @@
                    th:value="${param.search}"/>
         </form>
     </div>
-    <section id="headdiv" th:switch="${visitor.isAnonym()}">
-        <th:block th:case="false">
+    <section id="headdiv">
+        <th:block th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}">
             <nav id="user">
                 <ul>
                     <li><a href="/?show=my" th:href="@{/?show=my}" th:text="#{link.my}">Моя лента</a></li>
@@ -35,13 +35,13 @@
             <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=${#authentication.name})}" th:text="'@'+${#authentication.name}">@ugnich</a></li>
                     <li><a href="/settings" th:href="@{/settings}" th:text="#{link.settings}" rel="nofollow">Настройки</a></li>
                     <li><a href="/logout" th:href="@{/logout}" th:text="#{link.logout}">Выйти</a></li>
                 </ul>
             </nav>
         </th:block>
-        <th:block th:case="true">
+        <th:block th:if="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}">
             <p>[(#{message.loginForSending(@{/login})})]</p>
         </th:block>
     </section>