Skip to content

Commit 297ac61

Browse files
php-coderphp-coder
committed
Fix markup in prototype to look the same as real page.
No functional changes.
1 parent d039219 commit 297ac61

File tree

6 files changed

+47
-9
lines changed

6 files changed

+47
-9
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ <h3 th:text="#{t_activation_on_site}">
116116
</label>
117117
<div class="col-sm-5">
118118
<input type="text" id="login" class="form-control" required="required" th:field="*{login}" />
119+
<!--/*/
119120
<span id="login.errors" class="help-block" th:if="${#fields.hasErrors('login')}" th:each="error : ${#fields.errors('login')}" th:text="${error}"></span>
121+
/*/-->
120122
</div>
121123
</div>
122124

@@ -126,7 +128,9 @@ <h3 th:text="#{t_activation_on_site}">
126128
</label>
127129
<div class="col-sm-5">
128130
<input type="text" id="name" class="form-control" th:field="*{name}" />
131+
<!--/*/
129132
<span id="name.errors" class="help-block" th:if="${#fields.hasErrors('name')}" th:each="error : ${#fields.errors('name')}" th:text="${error}"></span>
133+
/*/-->
130134
</div>
131135
</div>
132136

@@ -137,7 +141,9 @@ <h3 th:text="#{t_activation_on_site}">
137141
</label>
138142
<div class="col-sm-5">
139143
<input type="password" id="password" class="form-control" required="required" th:field="*{password}" />
144+
<!--/*/
140145
<span id="password.errors" class="help-block" th:if="${#fields.hasErrors('password')}" th:each="error : ${#fields.errors('password')}" th:text="${error}"></span>
146+
/*/-->
141147
</div>
142148
</div>
143149

@@ -148,7 +154,9 @@ <h3 th:text="#{t_activation_on_site}">
148154
</label>
149155
<div class="col-sm-5">
150156
<input type="password" id="passwordConfirmation" class="form-control" required="required" th:field="*{passwordConfirmation}" />
157+
<!--/*/
151158
<span id="passwordConfirmation.errors" class="help-block" th:if="${#fields.hasErrors('passwordConfirmation')}" th:each="error : ${#fields.errors('passwordConfirmation')}" th:text="${error}"></span>
159+
/*/-->
152160
</div>
153161
</div>
154162

@@ -159,7 +167,9 @@ <h3 th:text="#{t_activation_on_site}">
159167
</label>
160168
<div class="col-sm-5">
161169
<input type="text" id="activationKey" class="form-control" required="required" th:field="*{activationKey}" />
170+
<!--/*/
162171
<span id="activationKey.errors" class="help-block" th:if="${#fields.hasErrors('activationKey')}" th:each="error : ${#fields.errors('activationKey')}" th:text="${error}"></span>
172+
/*/-->
163173
</div>
164174
</div>
165175

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ <h3 th:text="#{t_registration_on_site}">
119119
To this address we will send activation code
120120
</span>
121121
</small>
122+
<!--/*/
122123
<span id="email.errors" class="help-block" th:if="${#fields.hasErrors('email')}" th:each="error : ${#fields.errors('email')}" th:text="${error}"></span>
124+
/*/-->
123125
</div>
124126
</div>
125127

‎src/main/webapp/WEB-INF/views/category/add.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ <h3 th:text="${#strings.capitalize(create_category)} ">
110110
</label>
111111
<div class="col-sm-5">
112112
<input id="name" type="text" class="form-control" required="required" th:field="*{name}" />
113+
<!--/*/
113114
<span id="name.errors" class="help-block" th:if="${#fields.hasErrors('name')}" th:each="error : ${#fields.errors('name')}" th:text="${error}"></span>
115+
/*/-->
114116
</div>
115117
</div>
116118

@@ -123,7 +125,9 @@ <h3 th:text="${#strings.capitalize(create_category)} ">
123125
</label>
124126
<div class="col-sm-5">
125127
<input id="nameRu" type="text" class="form-control" required="required" th:field="*{nameRu}" />
128+
<!--/*/
126129
<span id="nameRu.errors" class="help-block" th:if="${#fields.hasErrors('nameRu')}" th:each="error : ${#fields.errors('nameRu')}" th:text="${error}"></span>
130+
/*/-->
127131
</div>
128132
</div>
129133

‎src/main/webapp/WEB-INF/views/country/add.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ <h3 th:text="${#strings.capitalize(add_country)}">
110110
</label>
111111
<div class="col-sm-5">
112112
<input id="name" type="text" class="form-control" required="required" th:field="*{name}" />
113+
<!--/*/
113114
<span id="name.errors" class="help-block" th:if="${#fields.hasErrors('name')}" th:each="error : ${#fields.errors('name')}" th:text="${error}"></span>
115+
/*/-->
114116
</div>
115117
</div>
116118

@@ -123,7 +125,9 @@ <h3 th:text="${#strings.capitalize(add_country)}">
123125
</label>
124126
<div class="col-sm-5">
125127
<input id="nameRu" type="text" class="form-control" required="required" th:field="*{nameRu}" />
128+
<!--/*/
126129
<span id="nameRu.errors" class="help-block" th:if="${#fields.hasErrors('nameRu')}" th:each="error : ${#fields.errors('nameRu')}" th:text="${error}"></span>
130+
/*/-->
127131
</div>
128132
</div>
129133

‎src/main/webapp/WEB-INF/views/series/add.html

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ <h3 th:text="${#strings.capitalize(add_series)}">
143143
You can also <a href="../category/add.html">add a new category</a>
144144
</span>
145145
</small>
146+
<!--/*/
146147
<span id="category.errors" class="help-block" th:if="${#fields.hasErrors('category')}" th:each="error : ${#fields.errors('category')}" th:text="${error}"></span>
148+
/*/-->
147149
</div>
148150
</div>
149151

@@ -174,7 +176,9 @@ <h3 th:text="${#strings.capitalize(add_series)}">
174176
You can also <a href="../country/add.html">add a new country</a>
175177
</span>
176178
</small>
179+
<!--/*/
177180
<span id="country.errors" class="help-block" th:if="${#fields.hasErrors('country')}" th:each="error : ${#fields.errors('country')}" th:text="${error}"></span>
181+
/*/-->
178182
</div>
179183
</div>
180184

@@ -195,7 +199,9 @@ <h3 th:text="${#strings.capitalize(add_series)}">
195199
min="1"
196200
max="50"
197201
th:field="*{quantity}" />
202+
<!--/*/
198203
<span id="quantity.errors" class="help-block" th:if="${#fields.hasErrors('quantity')}" th:each="error : ${#fields.errors('quantity')}" th:text="${error}"></span>
204+
/*/-->
199205
</div>
200206
</div>
201207

@@ -207,7 +213,9 @@ <h3 th:text="${#strings.capitalize(add_series)}">
207213
</label>
208214
<div class="col-sm-1">
209215
<input type="checkbox" id="perforated" checked="checked" th:field="*{perforated}" />
216+
<!--/*/
210217
<span id="perforated.errors" class="help-block" th:if="${#fields.hasErrors('perforated')}" th:each="error : ${#fields.errors('perforated')}" th:text="${error}"></span>
218+
/*/-->
211219
</div>
212220
</div>
213221

@@ -225,15 +233,15 @@ <h3 th:text="${#strings.capitalize(add_series)}">
225233
You will be able to add additional images on the series page
226234
</span>
227235
</small>
236+
<!--/*/
228237
<span id="image.errors" class="help-block" th:if="${#fields.hasErrors('image')}" th:each="error : ${#fields.errors('image')}" th:text="${error}"></span>
238+
/*/-->
229239
</div>
230240
</div>
231241

232242
<div class="form-group js-collapse-toggle-header">
233243
<div class="col-sm-offset-3 col-sm-5">
234-
<span class="glyphicon glyphicon-chevron-right" th:class="${issueDateHasErrors or issueDateHasValues ? 'glyphicon glyphicon-chevron-down' : 'glyphicon glyphicon-chevron-right'}"></span>&nbsp;<a href="javascript:void(0)" id="specify-issue-date-link" data-toggle="collapse" data-target=".js-issue-date" th:text="#{t_specify_issue_date}">
235-
Specify date of release
236-
</a>
244+
<span class="glyphicon glyphicon-chevron-right" th:class="${issueDateHasErrors or issueDateHasValues ? 'glyphicon glyphicon-chevron-down' : 'glyphicon glyphicon-chevron-right'}"></span>&nbsp;<a href="javascript:void(0)" id="specify-issue-date-link" data-toggle="collapse" data-target=".js-issue-date" th:text="#{t_specify_issue_date}">Specify date of release</a>
237245
</div>
238246
</div>
239247

@@ -315,17 +323,17 @@ <h3 th:text="${#strings.capitalize(add_series)}">
315323
</select>
316324
</div>
317325
</div>
326+
<!--/*/
318327
<span id="day.errors" class="help-block" th:if="${#fields.hasErrors('day')}" th:each="error : ${#fields.errors('day')}" th:text="${error}"></span>
319328
<span id="year.errors" class="help-block" th:if="${#fields.hasErrors('year')}" th:each="error : ${#fields.errors('year')}" th:text="${error}"></span>
320329
<span id="month.errors" class="help-block" th:if="${#fields.hasErrors('month')}" th:each="error : ${#fields.errors('month')}" th:text="${error}"></span>
330+
/*/-->
321331
</div>
322332
</div>
323333

324334
<div class="form-group js-collapse-toggle-header">
325335
<div class="col-sm-offset-3 col-sm-7">
326-
<span class="glyphicon glyphicon-chevron-right" th:class="${showCatalogsInfo ? 'glyphicon glyphicon-chevron-down' : 'glyphicon glyphicon-chevron-right'}"></span>&nbsp;<a href="javascript:void(0)" id="add-catalog-numbers-link" data-toggle="collapse" data-target=".js-catalogs-info" th:text="#{t_add_catalogs_info}">
327-
Add information from stamps catalogues
328-
</a>
336+
<span class="glyphicon glyphicon-chevron-right" th:class="${showCatalogsInfo ? 'glyphicon glyphicon-chevron-down' : 'glyphicon glyphicon-chevron-right'}"></span>&nbsp;<a href="javascript:void(0)" id="add-catalog-numbers-link" data-toggle="collapse" data-target=".js-catalogs-info" th:text="#{t_add_catalogs_info}">Add information from stamps catalogues</a>
329337
</div>
330338
</div>
331339

@@ -347,8 +355,10 @@ <h3 th:text="${#strings.capitalize(add_series)}">
347355
</div>
348356
</div>
349357
</div>
358+
<!--/*/
350359
<span id="michelNumbers.errors" class="help-block" th:if="${#fields.hasErrors('michelNumbers')}" th:each="error : ${#fields.errors('michelNumbers')}" th:text="${error}"></span>
351360
<span id="michelPrice.errors" class="help-block" th:if="${#fields.hasErrors('michelPrice')}" th:each="error : ${#fields.errors('michelPrice')}" th:text="${error}"></span>
361+
/*/-->
352362
</div>
353363
</div>
354364

@@ -370,8 +380,10 @@ <h3 th:text="${#strings.capitalize(add_series)}">
370380
</div>
371381
</div>
372382
</div>
383+
<!--/*/
373384
<span id="scottNumbers.errors" class="help-block" th:if="${#fields.hasErrors('scottNumbers')}" th:each="error : ${#fields.errors('scottNumbers')}" th:text="${error}"></span>
374385
<span id="scottPrice.errors" class="help-block" th:if="${#fields.hasErrors('scottPrice')}" th:each="error : ${#fields.errors('scottPrice')}" th:text="${error}"></span>
386+
/*/-->
375387
</div>
376388
</div>
377389

@@ -393,8 +405,10 @@ <h3 th:text="${#strings.capitalize(add_series)}">
393405
</div>
394406
</div>
395407
</div>
408+
<!--/*/
396409
<span id="yvertNumbers.errors" class="help-block" th:if="${#fields.hasErrors('yvertNumbers')}" th:each="error : ${#fields.errors('yvertNumbers')}" th:text="${error}"></span>
397410
<span id="yvertPrice.errors" class="help-block" th:if="${#fields.hasErrors('yvertPrice')}" th:each="error : ${#fields.errors('yvertPrice')}" th:text="${error}"></span>
411+
/*/-->
398412
</div>
399413
</div>
400414

@@ -416,16 +430,16 @@ <h3 th:text="${#strings.capitalize(add_series)}">
416430
</div>
417431
</div>
418432
</div>
433+
<!--/*/
419434
<span id="gibbonsNumbers.errors" class="help-block" th:if="${#fields.hasErrors('gibbonsNumbers')}" th:each="error : ${#fields.errors('gibbonsNumbers')}" th:text="${error}"></span>
420435
<span id="gibbonsPrice.errors" class="help-block" th:if="${#fields.hasErrors('gibbonsPrice')}" th:each="error : ${#fields.errors('gibbonsPrice')}" th:text="${error}"></span>
436+
/*/-->
421437
</div>
422438
</div>
423439

424440
<div class="form-group js-collapse-toggle-header" sec:authorize="hasAuthority('ADD_COMMENTS_TO_SERIES')">
425441
<div class="col-sm-offset-3 col-sm-5">
426-
<span class="glyphicon glyphicon-chevron-right" th:class="${#fields.hasErrors('comment') or addSeriesForm.comment != null ? 'glyphicon glyphicon-chevron-down' : 'glyphicon glyphicon-chevron-right'}"></span>&nbsp;<a href="javascript:void(0)" id="add-comment-link" data-toggle="collapse" data-target=".js-comment" th:text="#{t_add_comment}">
427-
Add comment
428-
</a>
442+
<span class="glyphicon glyphicon-chevron-right" th:class="${#fields.hasErrors('comment') or addSeriesForm.comment != null ? 'glyphicon glyphicon-chevron-down' : 'glyphicon glyphicon-chevron-right'}"></span>&nbsp;<a href="javascript:void(0)" id="add-comment-link" data-toggle="collapse" data-target=".js-comment" th:text="#{t_add_comment}">Add comment</a>
429443
</div>
430444
</div>
431445

@@ -437,7 +451,9 @@ <h3 th:text="${#strings.capitalize(add_series)}">
437451
</label>
438452
<div class="col-sm-5">
439453
<textarea id="comment" class="form-control" cols="22" rows="3" th:field="*{comment}"></textarea>
454+
<!--/*/
440455
<span id="comment.errors" class="help-block" th:if="${#fields.hasErrors('comment')}" th:each="error : ${#fields.errors('comment')}" th:text="${error}"></span>
456+
/*/-->
441457
</div>
442458
</div>
443459

‎src/main/webapp/WEB-INF/views/series/info.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@
111111
<form method="post" class="form-horizontal" enctype="multipart/form-data" th:action="@{${ADD_IMAGE_SERIES_PAGE}(id=${series.id})}" th:object="${addImageForm}">
112112
<div class="form-group" th:classappend="${#fields.hasErrors('image') ? 'has-error' : ''}">
113113
<input type="file" id="image" style="box-shadow: none; border: 0px;" required="required" accept="image/png,image/jpeg" th:field="*{image}" />
114+
<!--/*/
114115
<span id="image.errors" class="help-block" th:if="${#fields.hasErrors('image')}" th:each="error : ${#fields.errors('image')}" th:text="${error}"></span>
116+
/*/-->
115117
</div>
116118
<div class="from-group-sm">
117119
<input type="submit" class="btn btn-primary" value="Add image" th:value="#{t_add_image}" />

0 commit comments

Comments
 (0)