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-7112: Tabs class extension added #1196

Merged
merged 4 commits into from
Mar 28, 2024
Merged

IBX-7112: Tabs class extension added #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d2d21f
IBX-7112: Tabs class extension added
Gengar-i Mar 1, 2024
c323409
Validation label updated
Gengar-i Mar 1, 2024
7b65d12
Fixed placeholder not showing in filter
Gengar-i Mar 1, 2024
3704bee
Updated translations
Gengar-i Mar 7, 2024
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
4 changes: 2 additions & 2 deletions src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ const checkIsEmpty = (field) => {
if (label) {
const fieldName = label.innerText;

errorMessage = Translator.trans(/*@Desc("%fieldName% cannot be empty")*/ 'error.required.field', { fieldName }, 'forms');
errorMessage = Translator.trans(/*@Desc("%fieldName% cannot be empty.")*/ 'error.required.field', { fieldName }, 'forms');
} else {
errorMessage = Translator.trans(/*@Desc("This value should not be blank")*/ 'error.required.field_not_blank', {}, 'forms');
errorMessage = Translator.trans(/*@Desc("This value should not be blank.")*/ 'error.required.field_not_blank', {}, 'forms');
Gengar-i marked this conversation as resolved.
Show resolved Hide resolved
}

return {
Expand Down
8 changes: 4 additions & 4 deletions src/bundle/Resources/translations/forms.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<note>key: content_types_delete_form.delete</note>
</trans-unit>
<trans-unit id="268c741bdf4f818f950cd022b562c079744cfdca" resname="error.required.field">
<source>%fieldName% cannot be empty</source>
<target state="new">%fieldName% cannot be empty</target>
<source>%fieldName% cannot be empty.</source>
<target state="new">%fieldName% cannot be empty.</target>
<note>key: error.required.field</note>
</trans-unit>
<trans-unit id="6090b5d2c17e00053a576ede5c82afba67f0cc49" resname="error.required.field_not_blank">
<source>This value should not be blank</source>
<target state="new">This value should not be blank</target>
<source>This value should not be blank.</source>
<target state="new">This value should not be blank.</target>
<note>key: error.required.field_not_blank</note>
</trans-unit>
<trans-unit id="0ad9197dcdbe88b1a05f099c564dc2b5634f8aa5" resname="ezplatform.language.create.enabled">
Expand Down
5 changes: 4 additions & 1 deletion src/bundle/Resources/views/themes/admin/ui/component/tab/tabs_header.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
{% set tabs_attr = tabs_attr|default({})|merge({
class: (tabs_attr.class|default('') ~ ' ibexa-tabs')|trim,
}) %}
{% set header_attr = attr|default({})|merge({
class: (attr.class|default('') ~ ' ibexa-header')|trim,
}) %}

<div class="ibexa-header">
<div {{ html.attributes(header_attr) }}>
<div {{ html.attributes(tabs_attr) }}>
<ul class="nav nav-tabs ibexa-tabs__list ibexa-adaptive-items" role="tablist">
{% block tabs_list %}
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/ui-dev/src/modules/common/input/filter.search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { getTranslator } from '@ibexa-admin-ui/src/bundle/Resources/public/js/sc
const Search = ({ onChange, placeholder, extraClasses, value }) => {
const Translator = getTranslator();
const inputPlaceholder =
placeholder ?? Translator.trans(/*@Desc("Search...")*/ 'search.placeholder', {}, 'ibexa_universal_discovery_widget');
placeholder || Translator.trans(/*@Desc("Search...")*/ 'search.placeholder', {}, 'ibexa_universal_discovery_widget');
const searchClassName = createCssClassNames({
'form-control': true,
'ibexa-input': true,
Expand Down
Loading