Merge remote-tracking branch 'origin/4.6'

Author: OstafinL

src/bundle/Resources/public/scss/fieldType/edit/_ezgmaplocation.scss

@@ -33,11 +33,18 @@
         }
 
         &__coordinates {
-            display: flex;
-            justify-content: space-between;
+            .ibexa-input-text-wrapper {
+                &--type-number {
+                    max-width: calculateRem(230px);
+                }
+            }
 
             .ibexa-data-source__field {
-                width: 45%;
+                margin-bottom: calculateRem(8px);
+
+                &:first-of-type {
+                    margin-top: calculateRem(16px);
+                }
             }
 
             .ibexa-data-source__input {

src/bundle/Resources/translations/ibexa_content_create.en.xliff

@@ -27,13 +27,13 @@
         <note>key: new_content_item</note>
       </trans-unit>
       <trans-unit id="39b4081643351e2a41c1b3b811b6dc78fb528520" resname="on_the_fly.cancel">
-        <source>Cancel</source>
-        <target state="new">Cancel</target>
+        <source>Discard</source>
+        <target state="new">Discard</target>
         <note>key: on_the_fly.cancel</note>
       </trans-unit>
       <trans-unit id="d466f97702d045f02d8b55379a9c6ea5270ecfef" resname="on_the_fly.confirm">
-        <source>Confirm</source>
-        <target state="new">Confirm</target>
+        <source>Save and close</source>
+        <target state="new">Save and close</target>
         <note>key: on_the_fly.confirm</note>
       </trans-unit>
     </body>

src/bundle/Resources/translations/ibexa_content_edit.en.xliff

@@ -37,13 +37,13 @@
         <note>key: fieldtype.translation_is_disabled</note>
       </trans-unit>
       <trans-unit id="39b4081643351e2a41c1b3b811b6dc78fb528520" resname="on_the_fly.cancel">
-        <source>Cancel</source>
-        <target state="new">Cancel</target>
+        <source>Discard</source>
+        <target state="new">Discard</target>
         <note>key: on_the_fly.cancel</note>
       </trans-unit>
       <trans-unit id="d466f97702d045f02d8b55379a9c6ea5270ecfef" resname="on_the_fly.confirm">
-        <source>Confirm</source>
-        <target state="new">Confirm</target>
+        <source>Save and close</source>
+        <target state="new">Save and close</target>
         <note>key: on_the_fly.confirm</note>
       </trans-unit>
     </body>

src/bundle/Resources/views/themes/admin/ui/on_the_fly/create_on_the_fly.html.twig

@@ -12,12 +12,12 @@
     {% set menu_items %}
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">
             <button class="btn ibexa-btn ibexa-btn--primary ibexa-btn--confirm">
-                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Confirm') }}</span>
+                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Save and close') }}</span>
             </button>
         </li>
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">
             <button class="btn ibexa-btn ibexa-btn--secondary ibexa-btn--cancel">
-                <span class="ibexa-btn__label">{{'on_the_fly.cancel'|trans()|desc('Cancel') }}</span>
+                <span class="ibexa-btn__label">{{'on_the_fly.cancel'|trans()|desc('Discard') }}</span>
             </button>
         </li>
     {% endset %}

src/bundle/Resources/views/themes/admin/ui/on_the_fly/edit_on_the_fly.html.twig

@@ -12,12 +12,12 @@
     {% set menu_items %}
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">
             <button class="btn ibexa-btn ibexa-btn--primary ibexa-btn--confirm">
-                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Confirm') }}</span>
+                <span class="ibexa-btn__label">{{ 'on_the_fly.confirm'|trans()|desc('Save and close') }}</span>
             </button>
         </li>
         <li class="ibexa-context-menu__item ibexa-adaptive-items__item">
             <button class="btn ibexa-btn ibexa-btn--secondary ibexa-btn--cancel">
-                <span class="ibexa-btn__label">{{'on_the_fly.cancel'|trans()|desc('Cancel') }}</span>
+                <span class="ibexa-btn__label">{{'on_the_fly.cancel'|trans()|desc('Discard') }}</span>
             </button>
         </li>
     {% endset %}