IBX-625: Redesigned ezcountry (#1858)

ezsystems · Aug 16, 2021 · 16c1b21 · 16c1b21
1 parent c4c1a0d
commit 16c1b21
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezcountry.js b/src/bundle/Resources/public/js/scripts/fieldType/ezcountry.js
@@ -2,7 +2,7 @@
     const SELECTOR_FIELD = '.ez-field-edit--ezcountry';
     const SELECTOR_SELECTED = '.ibexa-dropdown__selection-info';
     const EVENT_VALUE_CHANGED = 'valueChanged';
-    const SELECTOR_ERROR_NODE = '.ez-data-source';
+    const SELECTOR_ERROR_NODE = '.ibexa-form-error';
 
     class EzCountryValidator extends eZ.BaseFieldValidator {
         /**

diff --git a/src/bundle/Resources/public/scss/_dropdown.scss b/src/bundle/Resources/public/scss/_dropdown.scss
@@ -51,6 +51,22 @@
             border-width: calculateRem(8.33px) calculateRem(8px) 0 calculateRem(8px);
             border-color: $ibexa-color-white transparent transparent transparent;
         }
+
+        &.is-invalid {
+            @include input-invalid;
+
+            .ibexa-dropdown__selected-item {
+                color: $ibexa-color-danger;
+            }
+
+            &:before {
+                border-color: $ibexa-color-danger transparent transparent transparent;
+            }
+
+            &:after {
+                border-color: $ibexa-color-danger-100 transparent transparent transparent;
+            }
+        }
     }
 
     &__remove-selection {
@@ -222,7 +238,7 @@
     &:not(&--is-disabled) {
         .ibexa-dropdown {
             &__selection-info {
-                &:hover {
+                &:not(.is-invalid):hover {
                     border-color: $ibexa-color-primary;
 
                     &:before {

diff --git a/src/bundle/Resources/views/themes/admin/ui/component/table/table.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/table/table.html.twig
@@ -5,6 +5,7 @@
         {% include '@ezdesign/ui/component/table/table_header.html.twig' with {
             headline,
             actions: actions|default(null),
+            headline_title: headline_title|default(headline|default('')),
         } only %}
     {% endif %}
 {% endblock %}

diff --git a/src/bundle/Resources/views/themes/admin/ui/component/table/table_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/table/table_header.html.twig
@@ -4,7 +4,7 @@
         title="{{ headline_title|default(headline|default('')) }}"
     >
         {% block headline %}
-            {{ headline }}
+            {{ headline|default('') }}
         {% endblock %}
     </div>
     <div class="ibexa-table-header__actions">