Skip to content

Commit 5a4949e

Browse files
committed
fix: an alert message for already authenticated user is shown on the top again on register, activation and authentication pages
Correction for 27b8d25 commit (#1204). Fix #1486
1 parent 6054605 commit 5a4949e

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

src/main/webapp/WEB-INF/views/account/activate.html

+7-6
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,15 @@ <h3 th:text="#{t_activation_on_site}">
161161
</form>
162162
<!--/*/ </th:block> /*/-->
163163
</div>
164-
</div>
165-
<!--/*/
166-
<div class="row" sec:authorize="isAuthenticated()">
167-
<div class="alert alert-info text-center col-sm-4 col-sm-offset-4" th:text="#{t_already_activated}">
168-
You have already activated account.
164+
165+
<!--/*/
166+
<div class="col-sm-12" sec:authorize="isAuthenticated()">
167+
<div class="alert alert-info text-center col-sm-4 col-sm-offset-4" th:text="#{t_already_activated}">
168+
You have already activated account.
169+
</div>
169170
</div>
171+
/*/-->
170172
</div>
171-
/*/-->
172173
<div class="row">
173174
<footer class="col-sm-12 text-right">
174175
<i class="glyphicon glyphicon-envelope"></i>

src/main/webapp/WEB-INF/views/account/auth.html

+7-6
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,15 @@ <h3 th:text="#{t_authentication_on_site}">
122122
</form>
123123
<!--/*/ </th:block> /*/-->
124124
</div>
125-
</div>
126-
<!--/*/
127-
<div class="row" sec:authorize="isAuthenticated()">
128-
<div class="alert alert-info text-center col-sm-4 col-sm-offset-4" th:text="#{t_already_authenticated}">
129-
You have already authenticated.
125+
126+
<!--/*/
127+
<div class="col-sm-12" sec:authorize="isAuthenticated()">
128+
<div class="alert alert-info text-center col-sm-4 col-sm-offset-4" th:text="#{t_already_authenticated}">
129+
You have already authenticated.
130+
</div>
130131
</div>
132+
/*/-->
131133
</div>
132-
/*/-->
133134
<div class="row">
134135
<footer class="col-sm-12 text-right">
135136
<i class="glyphicon glyphicon-envelope"></i>

src/main/webapp/WEB-INF/views/account/register.html

+7-6
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,15 @@ <h3 th:text="#{t_registration_on_site}">
113113
</form>
114114
<!--/*/ </th:block> /*/-->
115115
</div>
116-
</div>
117-
<!--/*/
118-
<div class="row" sec:authorize="isAuthenticated()">
119-
<div class="alert alert-info text-center col-sm-4 col-sm-offset-4" th:text="#{t_already_registered}">
120-
You have already registered.
116+
117+
<!--/*/
118+
<div class="col-sm-12" sec:authorize="isAuthenticated()">
119+
<div class="alert alert-info text-center col-sm-4 col-sm-offset-4" th:text="#{t_already_registered}">
120+
You have already registered.
121+
</div>
121122
</div>
123+
/*/-->
122124
</div>
123-
/*/-->
124125
<div class="row">
125126
<footer class="col-sm-12 text-right">
126127
<i class="glyphicon glyphicon-envelope"></i>

0 commit comments

Comments
 (0)