Skip to content

Commit 011e5ad

Browse files
ShkarinShkarin
committed
show field
1 parent cec09fc commit 011e5ad

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

‎src/main/java/ru/mystamps/web/Url.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public final class Url {
8282
public static final String ADD_SERIES_WITH_COUNTRY_PAGE = "/series/add/country/{slug}";
8383

8484
// MUST be updated when any of our resources were modified
85-
public static final String RESOURCES_VERSION = "v0.3.2";
85+
public static final String RESOURCES_VERSION = "v0.3.3";
8686

8787
// CheckStyle: ignore LineLength for next 4 lines
8888
public static final String MAIN_CSS = "/static/" + RESOURCES_VERSION + "/styles/main.min.css";

‎src/main/javascript/series/add.js

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ function initPage(suggestCountryUrl) {
1717
.find('.glyphicon')
1818
.toggleClass('glyphicon-chevron-down glyphicon-chevron-right');
1919
});
20+
21+
$('.collapse').not(".has-error, .js-has-data").collapse('hide');
2022

2123
$('.js-with-tooltip').tooltip({
2224
'placement': 'right'

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,11 @@ <h3 th:text="${#strings.capitalize(add_series)}">
279279

280280
<div class="form-group js-collapse-toggle-header">
281281
<div class="col-sm-offset-3 col-sm-5">
282-
<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>
282+
<span class="glyphicon glyphicon-chevron-down" 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>
283283
</div>
284284
</div>
285285

286-
<div class="form-group form-group-sm collapse js-issue-date" th:classappend="|${issueDateHasErrors ? 'has-error in' : ''} ${issueDateHasValues ? 'in' : ''}|">
286+
<div class="form-group form-group-sm js-issue-date collapse in" th:classappend="|${issueDateHasErrors ? 'has-error' : ''} ${issueDateHasValues ? 'js-has-data' : ''}|">
287287
<label for="year" class="control-label col-sm-3">
288288
<span class="field-label" th:text="#{t_issue_date}">
289289
Date of release
@@ -371,11 +371,11 @@ <h3 th:text="${#strings.capitalize(add_series)}">
371371

372372
<div class="form-group js-collapse-toggle-header">
373373
<div class="col-sm-offset-3 col-sm-7">
374-
<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>
374+
<span class="glyphicon glyphicon-chevron-down" 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>
375375
</div>
376376
</div>
377377

378-
<div class="form-group form-group-sm collapse js-catalogs-info" th:classappend="|${michelHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'in' : ''}|">
378+
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${michelHasErrors ? 'has-error' : ''} ${michelHasValues ? 'js-has-data' : ''}|">
379379
<label for="michelNumbers" class="control-label col-sm-3">
380380
<span class="field-label" th:text="#{t_michel}">
381381
Michel
@@ -400,7 +400,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
400400
</div>
401401
</div>
402402

403-
<div class="form-group form-group-sm collapse js-catalogs-info" th:classappend="|${scottHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'in' : ''}|">
403+
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${scottHasErrors ? 'has-error' : ''} ${scottHasValues ? 'js-has-data' : ''}|">
404404
<label for="scottNumbers" class="control-label col-sm-3">
405405
<span class="field-label" th:text="#{t_scott}">
406406
Scott
@@ -425,7 +425,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
425425
</div>
426426
</div>
427427

428-
<div class="form-group form-group-sm collapse js-catalogs-info" th:classappend="|${yvertHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'in' : ''}|">
428+
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${yvertHasErrors ? 'has-error' : ''} ${yvertHasValues ? 'js-has-data' : ''}|">
429429
<label for="yvertNumbers" class="control-label col-sm-3">
430430
<span class="field-label" th:text="#{t_yvert}">
431431
Yvert
@@ -450,7 +450,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
450450
</div>
451451
</div>
452452

453-
<div class="form-group form-group-sm collapse js-catalogs-info" th:classappend="|${gibbonsHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'in' : ''}|">
453+
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${gibbonsHasErrors ? 'has-error' : ''} ${gibbonsHasValues ? 'js-has-data' : ''}|">
454454
<label for="gibbonsNumbers" class="control-label col-sm-3">
455455
<span class="field-label" th:text="#{t_sg}">
456456
Gibbons
@@ -477,11 +477,11 @@ <h3 th:text="${#strings.capitalize(add_series)}">
477477

478478
<div class="form-group js-collapse-toggle-header" sec:authorize="hasAuthority('ADD_COMMENTS_TO_SERIES')">
479479
<div class="col-sm-offset-3 col-sm-5">
480-
<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>
480+
<span class="glyphicon glyphicon-chevron-down" 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>
481481
</div>
482482
</div>
483483

484-
<div class="form-group collapse js-comment" th:classappend="|${#fields.hasErrors('comment') ? 'has-error in' : ''} ${addSeriesForm.comment != null ? 'in' : ''}|" sec:authorize="hasAuthority('ADD_COMMENTS_TO_SERIES')">
484+
<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')">
485485
<label for="comment" class="control-label col-sm-3">
486486
<span class="field-label" th:text="#{t_comment}">
487487
Comment

0 commit comments

Comments
 (0)