diff options
Diffstat (limited to 'juick-spring-www/src/main/webapp/WEB-INF/templates')
3 files changed, 5 insertions, 5 deletions
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 2317369c5..3b2d3bff3 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 @@ -14,7 +14,7 @@ </form> </div> <section id="headdiv"> - <th:block th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}"> + <th:block th:if="${#authorization.expression('isAuthenticated()')}"> <nav id="user"> <ul> <li> @@ -48,7 +48,7 @@ </ul> </nav> </th:block> - <th:block th:if="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}"> + <th:block th:if="${#authorization.expression('isAnonymous()')}"> <p>[(#{message.loginForSending(@{/login})})]</p> </th:block> </section> diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html index 6b6f278d9..2c5aab3bf 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html @@ -3,8 +3,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/mainLayout}"> <head> - <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> + <title th:if="${#authorization.expression('isAuthenticated()')}" th:text="#{title.index.user}">Популярные</title> + <title th:if="${#authorization.expression('isAnonymous()')}" th:text="#{title.index.anonym}">Микроблоги Juick: популярные записи</title> </head> <body> diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html index df2caf7b8..5b85bc5f7 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html @@ -1,4 +1,4 @@ -<div th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> +<div th:if="${#authorization.expression('isAuthenticated()')}" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"> <form action="/post" th:action="@{/post}" method="post" enctype="multipart/form-data"> <section id="newmessage"> <textarea name="body" placeholder="Новое сообщение..." th:placeholder="#{postForm.newMessage}"></textarea> |