Skip to content

Commit a13e940

Browse files
ShkarinShkarin
committed
show field
1 parent cec09fc commit a13e940

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ function initPage(suggestCountryUrl) {
1010
return CatalogUtils.expandNumbers(val);
1111
});
1212
});
13+
14+
$(".js-collapse-toggle-header").show();
1315

1416
$('.collapse').on('show.bs.collapse hide.bs.collapse', function toggleChevron() {
1517
$(this)
1618
.prev('.js-collapse-toggle-header')
1719
.find('.glyphicon')
1820
.toggleClass('glyphicon-chevron-down glyphicon-chevron-right');
1921
});
22+
23+
$('.collapse').not(".has-error, .js-has-data").collapse('hide');
2024

2125
$('.js-with-tooltip').tooltip({
2226
'placement': 'right'

‎src/main/webapp/WEB-INF/static/styles/main.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,6 @@ label {
111111
.link-vcenter {
112112
line-height: 34px;
113113
}
114+
.js-collapse-toggle-header {
115+
display: none;
116+
}

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

Lines changed: 10 additions & 9 deletions
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"></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,12 @@ <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"></span>&nbsp;
375+
<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>
375376
</div>
376377
</div>
377378

378-
<div class="form-group form-group-sm collapse js-catalogs-info" th:classappend="|${michelHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'in' : ''}|">
379+
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${michelHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
379380
<label for="michelNumbers" class="control-label col-sm-3">
380381
<span class="field-label" th:text="#{t_michel}">
381382
Michel
@@ -400,7 +401,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
400401
</div>
401402
</div>
402403

403-
<div class="form-group form-group-sm collapse js-catalogs-info" th:classappend="|${scottHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'in' : ''}|">
404+
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${scottHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
404405
<label for="scottNumbers" class="control-label col-sm-3">
405406
<span class="field-label" th:text="#{t_scott}">
406407
Scott
@@ -425,7 +426,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
425426
</div>
426427
</div>
427428

428-
<div class="form-group form-group-sm collapse js-catalogs-info" th:classappend="|${yvertHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'in' : ''}|">
429+
<div class="form-group form-group-sm js-catalogs-info collapse in" th:classappend="|${yvertHasErrors ? 'has-error' : ''} ${showCatalogsInfo ? 'js-has-data' : ''}|">
429430
<label for="yvertNumbers" class="control-label col-sm-3">
430431
<span class="field-label" th:text="#{t_yvert}">
431432
Yvert
@@ -450,7 +451,7 @@ <h3 th:text="${#strings.capitalize(add_series)}">
450451
</div>
451452
</div>
452453

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

478479
<div class="form-group js-collapse-toggle-header" sec:authorize="hasAuthority('ADD_COMMENTS_TO_SERIES')">
479480
<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>
481+
<span class="glyphicon glyphicon-chevron-down"></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>
481482
</div>
482483
</div>
483484

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')">
485+
<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')">
485486
<label for="comment" class="control-label col-sm-3">
486487
<span class="field-label" th:text="#{t_comment}">
487488
Comment

0 commit comments

Comments
 (0)