diff --git a/src/bundle/Resources/public/js/scripts/admin.content.edit.js b/src/bundle/Resources/public/js/scripts/admin.content.edit.js index b02ba13322..665ab83a19 100644 --- a/src/bundle/Resources/public/js/scripts/admin.content.edit.js +++ b/src/bundle/Resources/public/js/scripts/admin.content.edit.js @@ -159,7 +159,7 @@ const saveDate = ibexa.helpers.timezone.convertDateToTimezone(new Date(), userPreferredTimezone); const saveTime = moment(saveDate).formatICU('HH:mm'); const saveMessage = Translator.trans( - /*@Desc("Autosave is on, draft created %time%")*/ 'content_edit.autosave.status_saved.message.full', + /*@Desc("Autosave is on, draft saved %time%")*/ 'content_edit.autosave.status_saved.message.full', { time: saveTime }, 'ibexa_content', ); diff --git a/src/bundle/Resources/public/scss/_autosave.scss b/src/bundle/Resources/public/scss/_autosave.scss index 5c43560b54..2094ebf03b 100644 --- a/src/bundle/Resources/public/scss/_autosave.scss +++ b/src/bundle/Resources/public/scss/_autosave.scss @@ -39,14 +39,6 @@ } } - &--saved { - color: $ibexa-color-success; - - .ibexa-autosave__icon-saved { - fill: $ibexa-color-success; - } - } - &--error { color: $ibexa-color-danger; diff --git a/src/bundle/Resources/public/scss/_context-menu.scss b/src/bundle/Resources/public/scss/_context-menu.scss index 2da8333898..d265da20bc 100644 --- a/src/bundle/Resources/public/scss/_context-menu.scss +++ b/src/bundle/Resources/public/scss/_context-menu.scss @@ -1,5 +1,6 @@ .ibexa-context-menu-wrapper { display: flex; + width: 100%; } .ibexa-context-menu { diff --git a/src/bundle/Resources/public/scss/_edit-header.scss b/src/bundle/Resources/public/scss/_edit-header.scss index 47e8d5a20b..80ba342cc2 100644 --- a/src/bundle/Resources/public/scss/_edit-header.scss +++ b/src/bundle/Resources/public/scss/_edit-header.scss @@ -61,6 +61,7 @@ display: flex; flex-direction: column; justify-content: center; + white-space: nowrap; padding-left: 0; margin-top: calculateRem(20px); height: calculateRem(48px); @@ -83,10 +84,8 @@ &__context-actions { display: flex; - position: absolute; - top: calculateRem(36px); - right: calculateRem(64px); - width: 55%; + margin-top: calculateRem(20px); + width: 100%; } &__tooltip { diff --git a/src/bundle/Resources/translations/ibexa_content.en.xliff b/src/bundle/Resources/translations/ibexa_content.en.xliff index 23ce8b9df2..602535d1a6 100644 --- a/src/bundle/Resources/translations/ibexa_content.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content.en.xliff @@ -6,6 +6,11 @@ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. + + You can turn autosave off in your user settings + You can turn autosave off in your user settings + key: content.autosave.turn_off.message + Created a new draft for '%name%'. Created a new draft for '%name%'. @@ -51,11 +56,31 @@ Content item '%name%' revealed. key: content.reveal.success + + Saving error + Saving error + key: content_edit.autosave.status_error.message + + + Autosave is off, draft not created + Autosave is off, draft not created + key: content_edit.autosave.status_off.message + + + Autosave is on, draft created + Autosave is on, draft created + key: content_edit.autosave.status_on.message + - Autosave is on, draft created %time% - Autosave is on, draft created %time% + Autosave is on, draft saved %time% + Autosave is on, draft saved %time% key: content_edit.autosave.status_saved.message.full + + Saving + Saving + key: content_edit.autosave.status_saving.message + Location: %location% Location: %location% diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index ec5660463a..57d5e3c56b 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -121,11 +121,6 @@ words key: character_counter.words - - You can turn autosave off in your user settings - You can turn autosave off in your user settings - key: content.autosave.turn_off.message - Content ID: %contentId% Content ID: %contentId% @@ -181,26 +176,6 @@ In Trash key: content.in_trash - - Saving error - Saving error - key: content_edit.autosave.status_error.message - - - Autosave is off, draft not created - Autosave is off, draft not created - key: content_edit.autosave.status_off.message - - - Autosave is on, draft created %time% - Autosave is on, draft created %time% - key: content_edit.autosave.status_on.message - - - Saving - Saving - key: content_edit.autosave.status_saving.message - Do you want to delete the Content Type? Do you want to delete the Content Type? diff --git a/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig index 701fc2155b..9c277595ea 100644 --- a/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/component/autosave/autosave.html.twig @@ -1,3 +1,5 @@ +{% trans_default_domain 'ibexa_content' %} +
- {% set current_time = 'now'|date('H:i', ibexa_user_settings.timezone) %} - - {{ 'content_edit.autosave.status_on.message'|trans({ '%time%': current_time })|desc('Autosave is on, draft created %time%') }} + {{ 'content_edit.autosave.status_on.message'|trans|desc('Autosave is on, draft created') }}
diff --git a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig index 06e0850bcf..6d714730ed 100644 --- a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig @@ -21,7 +21,7 @@ {% endif %}
-
+
{{ context_actions|default('')|raw }}