diff --git a/src/bundle/Resources/public/img/ibexa-icons.svg b/src/bundle/Resources/public/img/ibexa-icons.svg index c22a7ad350..7ce87c0054 100644 --- a/src/bundle/Resources/public/img/ibexa-icons.svg +++ b/src/bundle/Resources/public/img/ibexa-icons.svg @@ -797,4 +797,7 @@ + + + diff --git a/src/bundle/Resources/public/img/icons/interface-block.svg b/src/bundle/Resources/public/img/icons/interface-block.svg new file mode 100644 index 0000000000..68e9268f39 --- /dev/null +++ b/src/bundle/Resources/public/img/icons/interface-block.svg @@ -0,0 +1,9 @@ + + + +icon/+Streamline/light/interface-block + + + + + + \ No newline at end of file diff --git a/src/bundle/Resources/public/js/scripts/core/dropdown.js b/src/bundle/Resources/public/js/scripts/core/dropdown.js index fadd1a0e9f..7427b7239b 100644 --- a/src/bundle/Resources/public/js/scripts/core/dropdown.js +++ b/src/bundle/Resources/public/js/scripts/core/dropdown.js @@ -110,7 +110,7 @@ const selectedItemsList = this.container.querySelector('.ibexa-dropdown__selection-info'); - if (selected && value) { + if (selected) { const label = element.querySelector('.ibexa-dropdown__item-label').innerHTML; selectedItemsList diff --git a/src/bundle/Resources/public/scss/_add-translation.scss b/src/bundle/Resources/public/scss/_add-translation.scss index be086f7ac1..c8802d1627 100644 --- a/src/bundle/Resources/public/scss/_add-translation.scss +++ b/src/bundle/Resources/public/scss/_add-translation.scss @@ -1,11 +1,23 @@ .ibexa-translation { - .ibexa-dropdown { - &__wrapper { - width: 60%; - } + .modal-dialog { + max-width: calculateRem(790px); + } + + .modal-body { + display: flex; + align-items: flex-end; + padding-bottom: calculateRem(140px); + } + + .form-group { + width: calculateRem(330px); + } - &__items { - width: 100%; - } + &__arrow { + height: calculateRem(48px); + transform: rotate(180deg); + display: flex; + align-items: center; + padding: 0 calculateRem(16px); } } diff --git a/src/bundle/Resources/public/scss/_dropdown.scss b/src/bundle/Resources/public/scss/_dropdown.scss index 00680db138..de36fe66e8 100644 --- a/src/bundle/Resources/public/scss/_dropdown.scss +++ b/src/bundle/Resources/public/scss/_dropdown.scss @@ -186,10 +186,22 @@ display: none; } + &--selected { + position: relative; + + .ibexa-dropdown__item-check { + display: block; + } + } + .ibexa-input { margin-right: calculateRem(16px); } + .ibexa-icon { + margin-right: calculateRem(8px); + } + &:hover { background-color: $ibexa-color-light-300; } @@ -201,6 +213,20 @@ cursor: not-allowed; } } + + &[data-value=""] { + position: relative; + + &:after { + display: block; + content: ''; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + border-bottom: calculateRem(1px) solid $ibexa-color-light; + } + } } &__item-group-label { @@ -211,6 +237,12 @@ padding-left: 0; } + &__item-check { + position: absolute; + right: calculateRem(4px); + display: none; + } + &__separator { background-color: $ibexa-color-light-600; } diff --git a/src/bundle/Resources/public/scss/mixins/_modals.scss b/src/bundle/Resources/public/scss/mixins/_modals.scss index a960ac337d..56a4b58808 100644 --- a/src/bundle/Resources/public/scss/mixins/_modals.scss +++ b/src/bundle/Resources/public/scss/mixins/_modals.scss @@ -18,7 +18,7 @@ @mixin modal-title { margin-right: calculateRem(30px); font-size: $modal-title-font-size; - font-weight: 500; + font-weight: 600; } @mixin modal-subtitle { diff --git a/src/bundle/Resources/translations/content_type.en.xliff b/src/bundle/Resources/translations/content_type.en.xliff index 859e3434ea..b64f224560 100644 --- a/src/bundle/Resources/translations/content_type.en.xliff +++ b/src/bundle/Resources/translations/content_type.en.xliff @@ -36,11 +36,6 @@ Content Field definitions key: content_type.content_field_definitions - - Content Type - Content Type - key: content_type.content_type - Error occoured while copying the '%name%' Content Type. Error occoured while copying the '%name%' Content Type. @@ -71,11 +66,6 @@ Available key: content_type.default_availability.available - - Content of this Content Type will be available in the main language even if there is no translation. - Content of this Content Type will be available in the main language even if there is no translation. - key: content_type.default_availability.help - Not available Not available diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff index e470d82620..2f8c6355a4 100644 --- a/src/bundle/Resources/translations/forms.en.xliff +++ b/src/bundle/Resources/translations/forms.en.xliff @@ -1081,10 +1081,20 @@ Select Content item key: swap_location_form.swap - - Choose a Language - Choose a Language - key: translation.base_language.choose + + Source language + Source language + key: translation.base_language.label + + + No language + No language + key: translation.base_language.no_language + + + Target language + Target language + key: translation.language.label Delete permanently diff --git a/src/bundle/Resources/translations/locationview.en.xliff b/src/bundle/Resources/translations/locationview.en.xliff index 8e2bcb4071..2a0b19464b 100644 --- a/src/bundle/Resources/translations/locationview.en.xliff +++ b/src/bundle/Resources/translations/locationview.en.xliff @@ -341,21 +341,11 @@ Delete Translation key: tab.translations.action.delete - - Base this translation on an existing translation - Base this translation on an existing translation - key: tab.translations.add.base_language - Cancel Cancel key: tab.translations.add.cancel - - Select a language for the new translation - Select a language for the new translation - key: tab.translations.add.language - Create a new translation Create a new translation diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index 4798b28f7e..2311da7a6f 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -643,11 +643,6 @@ From date - to date key: search.date.range - - Delete Section - Delete Section - key: section.action.delete - Assign Content Assign Content diff --git a/src/bundle/Resources/translations/section.en.xliff b/src/bundle/Resources/translations/section.en.xliff index 181f52a857..51def38118 100644 --- a/src/bundle/Resources/translations/section.en.xliff +++ b/src/bundle/Resources/translations/section.en.xliff @@ -11,6 +11,11 @@ No content. Drafts you create will show up here key: dashboard.tab.my_drafts.empty + + Delete Section + Delete Section + key: section.action.delete + Assign content Assign content @@ -81,11 +86,6 @@ Identifier key: section.identifier - - Section information - Section information - key: section.information.header - Sections Sections @@ -121,6 +121,11 @@ Section: %identifier% key: section.view.title.identifier + + Technical details + Technical details + key: tab.details.technical_details + diff --git a/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig index 7b0f574b27..f1ee7e8617 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/add_translation.html.twig @@ -16,13 +16,16 @@
-
{{ 'tab.translations.add.language'|trans|desc('Select a language for the new translation') }}
- {{ form_widget(form.language, {'attr': {'class': 'ibexa-translation__language-wrapper ibexa-translation__language-wrapper--language'}}) }} -
{{ 'tab.translations.add.base_language'|trans|desc('Base this translation on an existing translation') }}
- {{ form_widget(form.base_language, {'attr': {'class': 'ibexa-translation__language-wrapper ibexa-translation__language-wrapper--base-language'}}) }} + {{ form_row(form.base_language, {'attr': {'class': 'ibexa-translation__language-wrapper ibexa-translation__language-wrapper--base-language'}}) }} +
+ + + +
+ {{ form_row(form.language, {'attr': {'class': 'ibexa-translation__language-wrapper ibexa-translation__language-wrapper--language'}}) }}
- {{ form_widget(form.add, {'attr': {'class': 'btn ibexa-btn ibexa-btn--primary ibexa-btn--create-translation', 'disabled': 'disabled'}}) }} + {{ form_widget(form.add, {'attr': {'class': 'btn ibexa-btn ibexa-btn--primary ibexa-btn--create-translation'}}) }} diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig index c5128f1d4b..df3378ee1e 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown.html.twig @@ -105,7 +105,7 @@ value: '', label: _self.get_translated_label(placeholder, translation_domain), } %} - {% include '@ibexadesign/ui/component/dropdown/dropdown_item.html.twig' with { choice: placeholder_choice, custom_form: true } %} + {% include '@ibexadesign/ui/component/dropdown/dropdown_item.html.twig' with { choice: placeholder_choice, custom_form: true, icon: 'interface-block' } %} {% endif %} {% for choice in preferred_choices %} {% include '@ibexadesign/ui/component/dropdown/dropdown_item.html.twig' with { choice, preferred_choice: true, custom_form } %} diff --git a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig index 20ee3981d6..1191c58149 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/dropdown/dropdown_item.html.twig @@ -11,16 +11,25 @@ {% else %} + {% set is_selected = custom_form ? choice.value == value : choice is selectedchoice(value) %}
  • {% if multiple is defined and multiple %} - + + {% endif %} + {% if icon is defined %} + + + {% endif %} {{ item_label }} + + +
    • {% endif %} diff --git a/src/lib/Form/Type/Content/Translation/TranslationAddType.php b/src/lib/Form/Type/Content/Translation/TranslationAddType.php index 37f6f2e601..e4fa58402a 100644 --- a/src/lib/Form/Type/Content/Translation/TranslationAddType.php +++ b/src/lib/Form/Type/Content/Translation/TranslationAddType.php @@ -232,6 +232,7 @@ static function (Language $language) use ($contentLanguages, $limitationLanguage } ); }), + 'label' => /** @Desc("Target language") */ 'translation.language.label', 'choice_value' => 'languageCode', 'choice_label' => 'name', ] @@ -241,7 +242,7 @@ static function (Language $language) use ($contentLanguages, $limitationLanguage ChoiceType::class, [ 'required' => false, - 'placeholder' => /** @Desc("Choose a Language") */ 'translation.base_language.choose', + 'placeholder' => /** @Desc("No language") */ 'translation.base_language.no_language', 'multiple' => false, 'expanded' => false, 'choice_loader' => new CallbackChoiceLoader(function () use ($contentLanguages) { @@ -251,6 +252,7 @@ static function (Language $language) use ($contentLanguages) { } ); }), + 'label' => /** @Desc("Source language") */ 'translation.base_language.label', 'choice_value' => 'languageCode', 'choice_label' => 'name', ] diff --git a/src/lib/Form/Type/ContentType/Translation/TranslationAddType.php b/src/lib/Form/Type/ContentType/Translation/TranslationAddType.php index 95d6165726..d9c725816c 100644 --- a/src/lib/Form/Type/ContentType/Translation/TranslationAddType.php +++ b/src/lib/Form/Type/ContentType/Translation/TranslationAddType.php @@ -183,6 +183,7 @@ public function addLanguageFields(FormInterface $form, array $contentLanguages): 'multiple' => false, 'expanded' => false, 'choice_loader' => new AvailableTranslationLanguageChoiceLoader($this->languageService, $contentLanguages), + 'label' => /** @Desc("Target language") */ 'translation.language.label', 'choice_value' => 'languageCode', 'choice_label' => 'name', ] @@ -192,10 +193,11 @@ public function addLanguageFields(FormInterface $form, array $contentLanguages): ChoiceType::class, [ 'required' => false, - 'placeholder' => /** @Desc("Choose a Language") */ 'translation.base_language.choose', + 'placeholder' => /** @Desc("No language") */ 'translation.base_language.no_language', 'multiple' => false, 'expanded' => false, 'choice_loader' => new BaseTranslationLanguageChoiceLoader($this->languageService, $contentLanguages), + 'label' => /** @Desc("Source language") */ 'translation.base_language.label', 'choice_value' => 'languageCode', 'choice_label' => 'name', ]