Skip to content

Commit 4630348

Browse files
php-coderphp-coder
committed
Simplify Thymeleaf code.
No functional changes.
1 parent 47292e9 commit 4630348

File tree

6 files changed

+34
-66
lines changed

6 files changed

+34
-66
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ <h3 th:text="#{t_activation_on_site}">
9797
</div>
9898

9999
<div class="form-group" th:classappend="${#fields.hasErrors('name') ? 'has-error' : ''}">
100-
<label for="name" class="control-label col-sm-3">
101-
<span th:remove="tag" th:text="#{t_name}">Name</span>
100+
<label for="name" class="control-label col-sm-3" th:text="#{t_name}">
101+
Name
102102
</label>
103103
<div class="col-sm-5">
104104
<input type="text" id="name" class="form-control" th:field="*{name}" />

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,8 @@ <h3 th:text="${#strings.capitalize(create_category)}">
9292
</div>
9393

9494
<div class="form-group" th:classappend="${#fields.hasErrors('nameRu') ? 'has-error' : ''}">
95-
<label for="nameRu" class="control-label col-sm-4">
96-
<span th:remove="tag" th:text="#{t_name_in_russian}">
97-
Name (in Russian)
98-
</span>
95+
<label for="nameRu" class="control-label col-sm-4" th:text="#{t_name_in_russian}">
96+
Name (in Russian)
9997
</label>
10098
<div class="col-sm-5">
10199
<input id="nameRu" type="text" class="form-control" th:field="*{nameRu}" />

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,8 @@ <h3 th:text="${#strings.capitalize(add_country)}">
9292
</div>
9393

9494
<div class="form-group" th:classappend="${#fields.hasErrors('nameRu') ? 'has-error' : ''}">
95-
<label for="nameRu" class="control-label col-sm-4">
96-
<span th:remove="tag" th:text="#{t_name_in_russian}">
97-
Name (in Russian)
98-
</span>
95+
<label for="nameRu" class="control-label col-sm-4" th:text="#{t_name_in_russian}">
96+
Name (in Russian)
9997
</label>
10098
<div class="col-sm-5">
10199
<input id="nameRu" type="text" class="form-control" th:field="*{nameRu}" />

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,8 @@ <h3 th:text="${#strings.capitalize(header)}">
9292
</div>
9393

9494
<div class="form-group" th:classappend="${#fields.hasErrors('url') ? 'has-error' : ''}">
95-
<label for="url" class="control-label col-sm-4">
96-
<span th:remove="tag" th:text="#{t_url}">
97-
URL
98-
</span>
95+
<label for="url" class="control-label col-sm-4" th:text="#{t_url}">
96+
URL
9997
</label>
10098
<div class="col-sm-5">
10199
<input id="url" type="url" class="form-control" th:field="*{url}" />

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

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
137137
</div>
138138

139139
<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('country') ? 'has-error' : ''}">
140-
<label for="country" class="control-label col-sm-3">
141-
<span th:remove="tag" th:text="#{t_country}">
142-
Country
143-
</span>
140+
<label for="country" class="control-label col-sm-3" th:text="#{t_country}">
141+
Country
144142
</label>
145143
<div class="col-sm-5">
146144
<select id="country" name="country" class="form-control">
@@ -209,10 +207,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
209207
</div>
210208

211209
<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('perforated') ? 'has-error' : ''}">
212-
<label for="perforated" class="control-label col-sm-3">
213-
<span th:remove="tag" th:text="#{t_perforated}">
214-
Perforated
215-
</span>
210+
<label for="perforated" class="control-label col-sm-3" th:text="#{t_perforated}">
211+
Perforated
216212
</label>
217213
<div class="col-sm-1">
218214
<input type="checkbox" id="perforated" checked="checked" th:field="*{perforated}" />
@@ -273,10 +269,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
273269
</div>
274270

275271
<div class="form-group form-group-sm js-issue-date collapse in" th:classappend="|${issueDateHasErrors ? 'has-error' : ''} ${issueDateHasValues ? 'js-has-data' : ''}|">
276-
<label for="year" class="control-label col-sm-3">
277-
<span th:remove="tag" th:text="#{t_issue_date}">
278-
Date of release
279-
</span>
272+
<label for="year" class="control-label col-sm-3" th:text="#{t_issue_date}">
273+
Date of release
280274
</label>
281275

282276
<div class="col-sm-5">
@@ -366,10 +360,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
366360
</div>
367361

368362
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${michelHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
369-
<label for="michelNumbers" class="control-label col-sm-3">
370-
<span th:remove="tag" th:text="#{t_michel}">
371-
Michel
372-
</span>
363+
<label for="michelNumbers" class="control-label col-sm-3" th:text="#{t_michel}">
364+
Michel
373365
</label>
374366
<div class="col-sm-7">
375367
<div class="row">
@@ -391,10 +383,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
391383
</div>
392384

393385
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${scottHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
394-
<label for="scottNumbers" class="control-label col-sm-3">
395-
<span th:remove="tag" th:text="#{t_scott}">
396-
Scott
397-
</span>
386+
<label for="scottNumbers" class="control-label col-sm-3" th:text="#{t_scott}">
387+
Scott
398388
</label>
399389
<div class="col-sm-7">
400390
<div class="row">
@@ -416,10 +406,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
416406
</div>
417407

418408
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${yvertHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
419-
<label for="yvertNumbers" class="control-label col-sm-3">
420-
<span th:remove="tag" th:text="#{t_yvert}">
421-
Yvert
422-
</span>
409+
<label for="yvertNumbers" class="control-label col-sm-3" th:text="#{t_yvert}">
410+
Yvert
423411
</label>
424412
<div class="col-sm-7">
425413
<div class="row">
@@ -441,10 +429,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
441429
</div>
442430

443431
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${gibbonsHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
444-
<label for="gibbonsNumbers" class="control-label col-sm-3">
445-
<span th:remove="tag" th:text="#{t_sg}">
446-
Gibbons
447-
</span>
432+
<label for="gibbonsNumbers" class="control-label col-sm-3" th:text="#{t_sg}">
433+
Gibbons
448434
</label>
449435
<div class="col-sm-7">
450436
<div class="row">
@@ -472,10 +458,8 @@ <h3 th:text="${#strings.capitalize(add_series)}">
472458
</div>
473459

474460
<div class="form-group js-comment collapse in" th:classappend="|${#fields.hasErrors('comment') ? 'has-error' : ''} ${addSeriesForm.comment != null ? 'js-has-data' : ''}|" sec:authorize="hasAuthority('ADD_COMMENTS_TO_SERIES')">
475-
<label for="comment" class="control-label col-sm-3">
476-
<span th:remove="tag" th:text="#{t_comment}">
477-
Comment
478-
</span>
461+
<label for="comment" class="control-label col-sm-3" th:text="#{t_comment}">
462+
Comment
479463
</label>
480464
<div class="col-sm-5">
481465
<textarea id="comment" class="form-control" cols="22" rows="3" th:field="*{comment}"></textarea>

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

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@
9999
th:action="@{${ADD_IMAGE_SERIES_PAGE}(id=${series.id})}"
100100
th:object="${addImageForm}">
101101
<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('image') ? 'has-error' : ''}">
102-
<label for="image" class="control-label col-sm-3">
103-
<span th:remove="tag" th:text="#{t_image}">
104-
Image
105-
</span>
102+
<label for="image" class="control-label col-sm-3" th:text="#{t_image}">
103+
Image
106104
</label>
107105
<div class="col-sm-9">
108106
<input id="image"
@@ -383,10 +381,8 @@ <h5 th:text="|#{t_add_info_who_selling_series}:|">Add info about selling/buying
383381
th:object="${addSeriesSalesForm}">
384382

385383
<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('date') ? 'has-error' : ''}">
386-
<label for="date" class="control-label col-sm-3">
387-
<span th:remove="tag" th:text="#{t_date}">
388-
Date
389-
</span>
384+
<label for="date" class="control-label col-sm-3" th:text="#{t_date}">
385+
Date
390386
</label>
391387
<div class="col-sm-4">
392388
<input type="text" id="date" class="form-control" th:field="*{date}" />
@@ -427,10 +423,8 @@ <h5 th:text="|#{t_add_info_who_selling_series}:|">Add info about selling/buying
427423
</div>
428424

429425
<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('url') ? 'has-error' : ''}">
430-
<label for="url" class="control-label col-sm-3">
431-
<span th:remove="tag" th:text="#{t_url}">
432-
URL
433-
</span>
426+
<label for="url" class="control-label col-sm-3" th:text="#{t_url}">
427+
URL
434428
</label>
435429
<div class="col-sm-6">
436430
<input type="url" id="url" class="form-control" th:field="*{url}" />
@@ -471,10 +465,8 @@ <h5 th:text="|#{t_add_info_who_selling_series}:|">Add info about selling/buying
471465
</div>
472466

473467
<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('altPrice') or #fields.hasErrors('altCurrency') ? 'has-error' : ''}">
474-
<label for="price" class="control-label col-sm-3">
475-
<span th:remove="tag" th:text="#{t_alternative_price}">
476-
Alternative price
477-
</span>
468+
<label for="price" class="control-label col-sm-3" th:text="#{t_alternative_price}">
469+
Alternative price
478470
</label>
479471
<div class="col-sm-6">
480472
<div class="row">
@@ -500,10 +492,8 @@ <h5 th:text="|#{t_add_info_who_selling_series}:|">Add info about selling/buying
500492
</div>
501493

502494
<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('buyerId') ? 'has-error' : ''}">
503-
<label for="buyer" class="control-label col-sm-3">
504-
<span th:remove="tag" th:text="#{t_buyer}">
505-
Buyer
506-
</span>
495+
<label for="buyer" class="control-label col-sm-3" th:text="#{t_buyer}">
496+
Buyer
507497
</label>
508498
<div class="col-sm-6">
509499
<select id="buyer" class="form-control" th:field="*{buyerId}">

0 commit comments

Comments
 (0)