Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-154: Allowed to define if the alternative text for image field is required (2.5) #1782

Merged
merged 5 commits into from
Jun 25, 2021
Merged

IBX-154: Allowed to define if the alternative text for image field is required (2.5) #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d09a4f
IBX-154: Allowed to define if the alternative text for image field is…
adamwojs Jun 16, 2021
fbe6173
Fixed HTML markup in ezimage field definition form
adamwojs Jun 22, 2021
8d3b554
fixup! Fixed HTML markup in ezimage field definition form
adamwojs Jun 24, 2021
0a2afc7
Added data-is-required attribute to alt input
adamwojs Jun 24, 2021
7b0d03c
Added validation alternative text in JS
dew326 Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bundle/Controller/AssetController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function uploadImageAction(Request $request): Response
'path' => $file->getRealPath(),
'fileSize' => $file->getSize(),
'fileName' => $file->getClientOriginalName(),
'alternativeText' => null,
'alternativeText' => $file->getClientOriginalName(),
]),
$data->getLanguageCode()
);
Expand Down
7 changes: 5 additions & 2 deletions src/bundle/Resources/public/js/scripts/fieldType/ezimage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,12 @@
* @memberof EzStringValidator
*/
validateAltInput(event) {
const isRequired = event.target.required;
const fileField = this.fieldContainer.querySelector(SELECTOR_INPUT_FILE);
const dataContainer = this.fieldContainer.querySelector('.ez-field-edit__data');
const isFileFieldEmpty = fileField.files && !fileField.files.length && dataContainer && !dataContainer.hasAttribute('hidden');
const isRequired = event.target.dataset.isRequired;
const isEmpty = !event.target.value;
const isError = isEmpty && isRequired;
const isError = isEmpty && isRequired && !isFileFieldEmpty;
const label = event.target.closest(SELECTOR_ALT_WRAPPER).querySelector('.ez-data-source__label').innerHTML;
const result = { isError };

Expand Down
14 changes: 9 additions & 5 deletions src/bundle/Resources/public/scss/fieldType/edit/_ezimage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.ez-field-edit--ezimage {
.ez-field-edit-preview {
padding: 1.25rem 0 .75rem 1.25rem;
padding: 1.25rem 0 0.75rem 1.25rem;

&__media {
max-width: 100%;
Expand All @@ -11,12 +11,12 @@

&__details {
color: $ez-color-base-light;
font-size: .75rem;
padding-top: .5rem;
font-size: 0.75rem;
padding-top: 0.5rem;
}

.ez-field-edit-preview__image-alt {
margin-top: .5rem;
margin-top: 0.5rem;
}
}

Expand All @@ -25,7 +25,7 @@
position: relative;

&:before {
content : '!';
content: '!';
position: absolute;
top: 0;
left: -20px;
Expand All @@ -41,6 +41,10 @@
}

.ez-data-source__field--alternativeText {
.ez-data-source__label {
@include label-required();
}

&.is-invalid {
.ez-data-source__label-wrapper,
.ez-data-source__label-wrapper .ez-field-edit__label {
Expand Down
4 changes: 4 additions & 0 deletions src/bundle/Resources/views/admin/content_type/field_types.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@
<div class="ezimage-validator max-file-size{% if group_class is not empty %} {{ group_class }}{% endif %}">
{{- form_row(form.maxSize, {'label_attr': {'class': 'ez-label'}}) -}}
</div>

<div class="ezimage-validator is-alternative-text-required"{% if group_class is not empty %} {{ group_class }}{% endif %}>
{{ form_row(form.isAlternativeTextRequired, {'attr': {'class': 'ez-input ez-input--checkbox'}, 'label_attr': {'class': 'checkbox-inline ez-label'}}) }}
</div>
{% endblock %}

{% block ezinteger_field_definition_edit %}
Expand Down
6 changes: 5 additions & 1 deletion src/bundle/Resources/views/fieldtypes/edit/ezimage.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
<span class="ez-field-edit-preview__file-size">{{ form.parent.vars.value.value.fileSize|ez_file_size(2) }}</span>
</div>
<div class="ez-field-edit-preview__image-alt">
{{ form_row(form.alternativeText) }}
{% set alternative_text_label_class = form.vars.is_alternative_text_required ? 'required' : '' %}
{{ form_row(form.alternativeText, {
attr: { 'data-is-required': form.vars.is_alternative_text_required },
label_attr: { 'class': alternative_text_label_class }
}) }}
</div>
</div>
<div class="ez-field-edit-preview__actions">
Expand Down