Skip to content

Commit 285f931

Browse files
committed
refactor: make add year form more compact.
Co-authored-by: Bakhodyr Kadyrov <[email protected]> Supersede and close #1457 Fix #1454
1 parent b20b7e6 commit 285f931

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

Diff for: src/main/frontend/src/components/AddReleaseYearForm.js

+38-38
Original file line numberDiff line numberDiff line change
@@ -104,47 +104,47 @@ class AddReleaseYearFormView extends React.PureComponent {
104104
const rangeOfYears = this.generateRange(sinceYear, tillYear);
105105

106106
return (
107-
<div className="col-sm-12 form-group">
108-
<form id="add-release-year-form" className={ `form-horizontal ${hasValidationErrors ? 'has-error' : ''}` }
109-
onSubmit={ handleSubmit }>
110-
<div
111-
id="add-release-year-failed-msg"
112-
className={ `alert alert-danger text-center col-sm-8 col-sm-offset-2 ${hasServerError ? '' : 'hidden' }` }>
107+
<React.Fragment>
108+
<div className="row">
109+
<div id="add-release-year-failed-msg"
110+
className={ `alert alert-danger text-center col-sm-6 col-sm-offset-3 ${hasServerError ? '' : 'hidden'}` }>
113111
{ l10n['t_server_error'] || 'Server error' }
114112
</div>
115-
<div className="form-group form-group-sm">
116-
<label htmlFor="release-year" className="control-label col-sm-3">
117-
{ l10n['t_year'] || 'Year' }
118-
</label>
119-
<div className="col-sm-6">
120-
<select
121-
id="release-year"
122-
name="release-year"
123-
className="form-control"
124-
required="required"
125-
onChange={ handleChange }>
126-
<option value=""></option>
127-
{rangeOfYears.map(year => (
128-
<option key={year.toString()} value={year}>{ year }</option>
129-
))}
130-
</select>
131-
</div>
113+
</div>
114+
<div className="row">
115+
<div className="col-sm-9 col-sm-offset-3 form-group">
116+
<form id="add-release-year-form"
117+
className={ `form-inline ${hasValidationErrors ? 'has-error' : ''}` }
118+
onSubmit={ handleSubmit }>
119+
<div className="form-group form-group-sm">
120+
<select
121+
id="release-year"
122+
name="release-year"
123+
className="form-control"
124+
required="required"
125+
onChange={ handleChange }>
126+
<option value="">{ l10n['t_year'] || 'Year' }</option>
127+
{rangeOfYears.map(year => (
128+
<option key={year.toString()} value={year}>{ year }</option>
129+
))}
130+
</select>
131+
</div>
132+
<div className="form-group form-group-sm">
133+
<button type="submit"
134+
className="btn btn-primary btn-sm"
135+
disabled={ isDisabled }>
136+
{ l10n['t_add'] || 'Add' }
137+
</button>
138+
</div>
139+
<span
140+
id="release-year.errors"
141+
className={ `help-block ${hasValidationErrors ? '' : 'hidden'}` }>
142+
{ validationErrors.join(', ') }
143+
</span>
144+
</form>
132145
</div>
133-
<div className="col-sm-offset-3 col-sm-4">
134-
<span
135-
id="release-year.errors"
136-
className={ `help-block ${hasValidationErrors ? '' : 'hidden'}` }>
137-
{ validationErrors.join(', ') }
138-
</span>
139-
<button
140-
type="submit"
141-
className="btn btn-primary btn-sm"
142-
disabled={ isDisabled }>
143-
{ l10n['t_add'] || 'Add' }
144-
</button>
145-
</div>
146-
</form>
147-
</div>
146+
</div>
147+
</React.Fragment>
148148
);
149149
}
150150
}

Diff for: src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public final class ResourceUrl {
3232
public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
3333

3434
// MUST be updated when any of our resources were modified
35-
public static final String RESOURCES_VERSION = "v0.4.4.3";
35+
public static final String RESOURCES_VERSION = "v0.4.4.4";
3636

3737
// CheckStyle: ignore LineLength for next 16 lines
3838
private static final String CATALOG_UTILS_JS = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";

0 commit comments

Comments
 (0)