diff --git a/src/bundle/Resources/public/js/scripts/admin.anchor.sections.navigation.js b/src/bundle/Resources/public/js/scripts/admin.anchor.sections.navigation.js deleted file mode 100644 index 7a939ed7d6..0000000000 --- a/src/bundle/Resources/public/js/scripts/admin.anchor.sections.navigation.js +++ /dev/null @@ -1,5 +0,0 @@ -(function () { - // depraacted, will be removed in 5.0 - // code that was in this file was mostly moved and unified with admin.anchor.navigation.js - console.warn('admin.anchor.sections.navigation.js has been depracted in favor for admin.anchor.navigation.js'); -})(); diff --git a/src/bundle/Resources/public/js/scripts/admin.contenttype.relation.default.location.js b/src/bundle/Resources/public/js/scripts/admin.contenttype.relation.default.location.js index 48aad659d1..ab4d5faf7c 100644 --- a/src/bundle/Resources/public/js/scripts/admin.contenttype.relation.default.location.js +++ b/src/bundle/Resources/public/js/scripts/admin.contenttype.relation.default.location.js @@ -1,3 +1,5 @@ +import * as middleEllipsisHelper from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/middle.ellipsis'; + (function (global, doc, ibexa, React, ReactDOM) { const SELECTOR_RESET_STARTING_LOCATION_BTN = '.ibexa-tag__remove-btn'; const defaultLocationContainers = doc.querySelectorAll('.ibexa-default-location'); @@ -11,7 +13,7 @@ const deleteBtn = container.querySelector(SELECTOR_RESET_STARTING_LOCATION_BTN); - ibexa.helpers.ellipsis.middle.parseAll(); + middleEllipsisHelper.parse(); deleteBtn.addEventListener('click', resetStartingLocation, false); }; @@ -99,6 +101,6 @@ defaultLocationContainers.forEach((defaultLocationContainer) => { attachEvents(defaultLocationContainer); toggleDisabledState(defaultLocationContainer); - ibexa.helpers.ellipsis.middle.parseAll(); + middleEllipsisHelper.parse(); }); })(window, window.document, window.ibexa, window.React, window.ReactDOM); diff --git a/src/bundle/Resources/public/js/scripts/admin.middle.ellipsis.js b/src/bundle/Resources/public/js/scripts/admin.middle.ellipsis.js index a47e6bb768..5866c39c54 100644 --- a/src/bundle/Resources/public/js/scripts/admin.middle.ellipsis.js +++ b/src/bundle/Resources/public/js/scripts/admin.middle.ellipsis.js @@ -1,3 +1,5 @@ -(function (global, doc, ibexa) { - ibexa.helpers.ellipsis.middle.parseAll(); -})(window, window.document, window.ibexa); +import * as middleEllipsisHelper from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/middle.ellipsis'; + +(function () { + middleEllipsisHelper.parse(); +})(); diff --git a/src/bundle/Resources/public/js/scripts/core/base.chart.js b/src/bundle/Resources/public/js/scripts/core/base.chart.js index 08858371bc..f56d6e3e23 100644 --- a/src/bundle/Resources/public/js/scripts/core/base.chart.js +++ b/src/bundle/Resources/public/js/scripts/core/base.chart.js @@ -1,3 +1,5 @@ +import { getAdminUiConfig } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/context.helper'; + (function (global, doc, ibexa, Chart) { const IBEXA_WHITE = '#fff'; const IBEXA_COLOR_BASE = '#e0e0e8'; @@ -32,10 +34,12 @@ class BaseChart { constructor(data, options = {}, plugins = []) { + const { backOfficeLanguage } = getAdminUiConfig(); + this.setData(data); this.setOptions(options); this.setPlugins(plugins); - this.lang = document.documentElement.lang.replace('_', '-'); // TODO: Get this config from settings + this.lang = backOfficeLanguage; } setData(data) { diff --git a/src/bundle/Resources/public/js/scripts/core/tag.view.select.js b/src/bundle/Resources/public/js/scripts/core/tag.view.select.js index 75d366f97b..e60eb18caf 100644 --- a/src/bundle/Resources/public/js/scripts/core/tag.view.select.js +++ b/src/bundle/Resources/public/js/scripts/core/tag.view.select.js @@ -1,3 +1,5 @@ +import * as middleEllipsisHelper from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/middle.ellipsis'; + (function (global, doc, ibexa) { class TagViewSelect { constructor(config) { @@ -24,7 +26,7 @@ this.attachDeleteEvents = this.attachDeleteEvents.bind(this); this.adjustButtonLabel = this.adjustButtonLabel.bind(this); - ibexa.helpers.ellipsis.middle.parseAll(); + middleEllipsisHelper.parse(); this.attachDeleteEvents(); this.disabledObserver = new MutationObserver((mutationsList) => { @@ -78,7 +80,7 @@ }); this.inputField.dispatchEvent(new Event('change')); - ibexa.helpers.ellipsis.middle.parseAll(); + middleEllipsisHelper.parse(); this.toggleDeleteButtons(); this.adjustButtonLabel(); } diff --git a/src/bundle/Resources/public/js/scripts/helpers/config.loader.js b/src/bundle/Resources/public/js/scripts/helpers/config.loader.js index 4e27206779..753cd67d8d 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/config.loader.js +++ b/src/bundle/Resources/public/js/scripts/helpers/config.loader.js @@ -1,7 +1,6 @@ import * as browser from './browser.helper'; import * as contentType from './content.type.helper'; import * as cookies from './cookies.helper'; -import * as formError from './form.error.helper'; import * as formValidation from './form.validation.helper'; import * as highlight from './highlight.helper'; import * as icon from './icon.helper'; @@ -23,7 +22,6 @@ import * as user from './user.helper'; ibexa.addConfig('helpers.browser', browser); ibexa.addConfig('helpers.contentType', contentType); ibexa.addConfig('helpers.cookies', cookies); - ibexa.addConfig('helpers.formError', formError); ibexa.addConfig('helpers.formValidation', formValidation); ibexa.addConfig('helpers.highlight', highlight); ibexa.addConfig('helpers.icon', icon); diff --git a/src/bundle/Resources/public/js/scripts/helpers/form.error.helper.js b/src/bundle/Resources/public/js/scripts/helpers/form.error.helper.js deleted file mode 100644 index c5f8c0f52e..0000000000 --- a/src/bundle/Resources/public/js/scripts/helpers/form.error.helper.js +++ /dev/null @@ -1,12 +0,0 @@ -import { formatErrorLine } from './form.validation.helper'; - -// @deprecated, will be removed in 5.0 -const formatLine = (...args) => { - console.warn( - 'helpers.formError.formatLine method is deprecated and will be removed in 5.0, please use helpers.formValidation.formatErrorLine instead.', - ); - - return formatErrorLine(...args); -}; - -export { formatLine }; diff --git a/src/bundle/Resources/public/js/scripts/helpers/middle.ellipsis.js b/src/bundle/Resources/public/js/scripts/helpers/middle.ellipsis.js index 43e53abb4b..0146c43001 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/middle.ellipsis.js +++ b/src/bundle/Resources/public/js/scripts/helpers/middle.ellipsis.js @@ -40,8 +40,6 @@ const parse = (baseElement = doc) => { resizeEllipsisObserver.observe(middleEllipsisContainer); }); }; -// @deprecated, will be removed in 5.0 -const parseAll = () => parse(doc); const update = (baseElement, content) => { const contentElements = [...baseElement.querySelectorAll('.ibexa-middle-ellipsis__name-ellipsized')]; const contentEscaped = escapeHTML(content); @@ -53,4 +51,4 @@ const update = (baseElement, content) => { parse(baseElement); }; -export { parse, parseAll, update }; +export { parse, update }; diff --git a/src/bundle/Resources/public/scss/_alerts.scss b/src/bundle/Resources/public/scss/_alerts.scss index 3e6b231ee6..107906690d 100644 --- a/src/bundle/Resources/public/scss/_alerts.scss +++ b/src/bundle/Resources/public/scss/_alerts.scss @@ -261,15 +261,4 @@ } } } - - //Alert Complementary depracated. Will be removed in 5.0. - &--complementary { - color: $ibexa-color-complementary-700; - background-color: $ibexa-color-complementary-100; - border-color: $ibexa-color-complementary; - - .ibexa-icon { - fill: $ibexa-color-complementary-700; - } - } } diff --git a/src/bundle/Resources/public/scss/_content-type-edit.scss b/src/bundle/Resources/public/scss/_content-type-edit.scss index e702bc826e..5b51c7d8d6 100644 --- a/src/bundle/Resources/public/scss/_content-type-edit.scss +++ b/src/bundle/Resources/public/scss/_content-type-edit.scss @@ -1,5 +1,5 @@ .ibexa-available-field-types { - @include sidebar-drag-items(); + @include toolbox-drag-items; min-height: calculateRem(700px); max-height: calc(100vh - #{calculateRem(200px)}); @@ -7,7 +7,7 @@ } .ibexa-available-field-type { - @include sidebar-drag-item; + @include toolbox-drag-item; } .ibexa-content-type-edit { diff --git a/src/bundle/Resources/public/scss/_footer.scss b/src/bundle/Resources/public/scss/_footer.scss deleted file mode 100644 index c37a6d4b45..0000000000 --- a/src/bundle/Resources/public/scss/_footer.scss +++ /dev/null @@ -1,47 +0,0 @@ -.ibexa-footer { - position: absolute; - bottom: 0; - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - height: calculateRem(50px); - margin-top: calculateRem(24px); - padding: 0 calculateRem(24px); - background-color: $ibexa-color-white; - font-size: calculateRem(14px); - color: $ibexa-color-dark-300; - - &__brand-img { - margin-right: calculateRem(16px); - max-width: calculateRem(32px); - } - - &__link { - display: inline-block; - margin-left: calculateRem(24px); - font-size: calculateRem(14px); - color: $ibexa-color-dark-300; - } -} - -.ibexa-bookmark-list-view, -.ibexa-drafts-list-view { - .ibexa-main-row { - .ibexa-content-container { - .ibexa-footer { - margin: auto 0 0; - } - } - } -} - -.ibexa-main-row { - .ibexa-content-container { - .ibexa-footer { - position: relative; - width: auto; - margin: auto calculateRem(15px) 0; - } - } -} diff --git a/src/bundle/Resources/public/scss/_mixins.scss b/src/bundle/Resources/public/scss/_mixins.scss index 55ae909c89..78bb9fe3b3 100644 --- a/src/bundle/Resources/public/scss/_mixins.scss +++ b/src/bundle/Resources/public/scss/_mixins.scss @@ -8,7 +8,6 @@ @import 'mixins/modals'; @import 'mixins/togglers'; @import 'mixins/pagination'; -@import 'mixins/font'; @import 'mixins/containers'; @import 'mixins/drag-and-drop'; @import 'mixins/spinner'; diff --git a/src/bundle/Resources/public/scss/ibexa.scss b/src/bundle/Resources/public/scss/ibexa.scss index 8af52eea26..b32dc2da36 100644 --- a/src/bundle/Resources/public/scss/ibexa.scss +++ b/src/bundle/Resources/public/scss/ibexa.scss @@ -89,7 +89,6 @@ @import 'trash-search-form'; @import 'inputs'; @import 'links'; -@import 'footer'; @import 'embedded-item-actions'; @import 'popup-menu'; @import 'multilevel-popup-menu'; diff --git a/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss b/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss index b488bc4a95..4d37e0beb2 100644 --- a/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss +++ b/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss @@ -12,211 +12,7 @@ background-size: calculateRem(5px) calculateRem(5px); } -//Sidebar depracated. Will be removed in 5.0. Use Toolbox. -@mixin sidebar-drag-items { - $ibexa-sidebar-width: calculateRem(360px); - - display: flex; - flex-direction: column; - width: $ibexa-sidebar-width; - border: calculateRem(1px) solid $ibexa-color-light; - border-radius: calculateRem(5px); - overflow: hidden; - background: $ibexa-color-white; - box-shadow: $ibexa-edit-header-box-shadow; - transition-property: opacity, transform; - transition-duration: $ibexa-admin-transition-duration; - transition-timing-function: $ibexa-admin-transition; - transform-origin: top center; - - &__action-bar { - display: flex; - justify-content: space-between; - align-items: center; - padding: calculateRem(8px) calculateRem(16px); - background-color: $ibexa-color-light-400; - } - - &__title-bar { - padding: calculateRem(5px) calculateRem(32px); - border-bottom: calculateRem(1px) solid $ibexa-color-dark-200; - } - - &__title { - height: calculateRem(33px); - line-height: calculateRem(33px); - color: $ibexa-color-dark; - font-size: $ibexa-text-font-size-large; - font-weight: 600; - padding: 0; - margin: 0; - } - - &__search-bar { - padding: calculateRem(23px) calculateRem(32px) calculateRem(15px); - } - - &__list { - padding: calculateRem(5px) calculateRem(32px); - margin-bottom: 0; - overflow: auto; - } - - &--draggable { - position: fixed; - z-index: 500; - top: calculateRem(130px); - left: calc(100% - #{$ibexa-sidebar-width} - #{calculateRem(5px)}); - } -} - -@mixin sidebar-drag-items-group { - $self: &; - - height: auto; - - &__title-bar { - display: flex; - justify-content: space-between; - align-items: center; - height: calculateRem(36px); - border-top: calculateRem(1px) solid $ibexa-color-light; - cursor: pointer; - - &:hover { - color: $ibexa-color-primary; - - #{$self}__toggler { - .ibexa-icon { - fill: $ibexa-color-primary; - } - } - } - - .ibexa-icon { - transition: transform $ibexa-admin-transition-duration $ibexa-admin-transition; - } - } - - &__title { - font-size: $ibexa-text-font-size-medium; - font-weight: 600; - } - - &--collapsed { - height: calculateRem(34px); - overflow: hidden; - } -} - -@mixin sidebar-drag-item { - $self: &; - - background: $ibexa-color-light-300; - margin-bottom: calculateRem(8px); - border-radius: $ibexa-border-radius; - display: flex; - width: 100%; - - &:last-of-type { - margin-bottom: calculateRem(24px); - } - - &:hover:not(&--unavailable, &--immovable) { - #{$self}__content { - border-color: $ibexa-color-dark; - transform: scale(1.02) translateX(-10px); - box-shadow: calculateRem(4px) calculateRem(10px) calculateRem(17px) 0 rgba($ibexa-color-info, 0.2); - } - - #{$self}__drag-icon { - fill: $ibexa-color-dark; - } - } - - &__content { - background: $ibexa-color-white; - display: flex; - width: 100%; - padding: calculateRem(13px) calculateRem(10px); - border: calculateRem(1px) solid $ibexa-color-light; - border-radius: $ibexa-border-radius; - box-shadow: calculateRem(4px) calculateRem(2px) calculateRem(17px) 0 rgba($ibexa-color-info, 0.05); - transition: all $ibexa-admin-transition-duration $ibexa-admin-transition; - - &[draggable='true'] { - cursor: grab; - } - } - - &__drag { - display: flex; - align-items: center; - padding: 0 calculateRem(8px) 0 calculateRem(5px); - } - - &__drag-icon { - fill: $ibexa-color-light; - } - - &__type { - display: flex; - align-items: center; - padding: 0 calculateRem(8px); - } - - &__label { - font-size: $ibexa-text-font-size-medium; - font-weight: 600; - } - - &__collapse { - padding: 0 calculateRem(9px); - } - - &--hidden { - display: none; - } - - &--unavailable { - cursor: not-allowed; - - #{$self}__content { - color: $ibexa-color-dark-300; - fill: $ibexa-color-dark-300; - border-color: $ibexa-color-light-300; - background: $ibexa-color-light-300; - box-shadow: none; - } - - #{$self}__drag-icon { - fill: $ibexa-color-dark-300; - } - } - - &--immovable { - cursor: not-allowed; - - #{$self}__content { - color: $ibexa-color-dark-300; - fill: $ibexa-color-dark-300; - border-color: $ibexa-color-light-300; - box-shadow: none; - } - - #{$self}__drag-icon { - fill: $ibexa-color-dark-300; - } - } - - &--is-dragging-out { - #{$self}__content { - opacity: 0; - } - } -} - -@mixin toolbar-drag-items { +@mixin toolbox-drag-items { $ibexa-sidebar-min-width: calculateRem(360px); $ibexa-sidebar-max-width: calculateRem(520px); @@ -333,7 +129,7 @@ margin-bottom: calculateRem(24px); } - &:hover { + &:hover:not(&--unavailable, &--immovable) { #{$self}__content { border-color: var(--ibexa-border-color); transform: scale(1.02) translateX(-10px); @@ -390,6 +186,7 @@ } &--unavailable { + cursor: not-allowed; opacity: 0.5; &:hover { @@ -402,6 +199,21 @@ } } + &--immovable { + cursor: not-allowed; + + #{$self}__content { + color: $ibexa-color-dark-300; + fill: $ibexa-color-dark-300; + border-color: $ibexa-color-light-300; + box-shadow: none; + } + + #{$self}__drag-icon { + fill: $ibexa-color-dark-300; + } + } + &--is-dragging-out { #{$self}__content { opacity: 0; diff --git a/src/bundle/Resources/public/scss/mixins/_font.scss b/src/bundle/Resources/public/scss/mixins/_font.scss deleted file mode 100644 index 64ef4eee7d..0000000000 --- a/src/bundle/Resources/public/scss/mixins/_font.scss +++ /dev/null @@ -1,5 +0,0 @@ -// deprecated - will be removed in 5.0 -@mixin ibexa-font-sans-serif() { - font-family: $font-family-sans-serif; - letter-spacing: calculateRem(0.12px); -} diff --git a/src/bundle/Resources/translations/ibexa_content.en.xliff b/src/bundle/Resources/translations/ibexa_content.en.xliff index 555b99a8fd..f97a02233a 100644 --- a/src/bundle/Resources/translations/ibexa_content.en.xliff +++ b/src/bundle/Resources/translations/ibexa_content.en.xliff @@ -81,11 +81,6 @@ Saving key: content_edit.autosave.status_saving.message - - Location: %location% - Location: %location% - key: editing_details - Edit Edit diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index 9f1dc7c5d5..7407a2b012 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -418,26 +418,6 @@ Show key: fieldview.toggler.show - - - - key: footer.copyright - - - Documentation - Documentation - key: footer.ibexa_documentation - - - Ibexa DXP - Ibexa DXP - key: footer.ibexa_dxp - - - Support - Support - key: footer.ibexa_support - Cancel Cancel diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig index cf01d2ac25..5289ca739e 100644 --- a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig @@ -1,5 +1,3 @@ -{# @todo move to view/user/preferences in the future #} - {% trans_default_domain 'change_user_password' %} {% block form_row -%} diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig index 189f94aaad..cb2faf5e6e 100644 --- a/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig @@ -1,7 +1,7 @@ {% extends '@ibexadesign/ui/edit_base.html.twig' %} {% form_theme form_change_user_password with [ - '@ibexadesign/account/form_fields.html.twig', + '@ibexadesign/ui/form_fields.html.twig', '@ibexadesign/account/change_password/form_fields.html.twig' ] %} diff --git a/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig index 6babee8edc..61cea543a0 100644 --- a/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/forgot_password/index.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/account/base.html.twig' %} -{% form_theme form_forgot_user_password '@ibexadesign/account/form_fields.html.twig' %} +{% form_theme form_forgot_user_password '@ibexadesign/ui/form_fields.html.twig' %} {%- block content -%} diff --git a/src/bundle/Resources/views/themes/admin/account/forgot_password/index_with_login.html.twig b/src/bundle/Resources/views/themes/admin/account/forgot_password/index_with_login.html.twig index 8ad2c102e7..6bad4231c4 100644 --- a/src/bundle/Resources/views/themes/admin/account/forgot_password/index_with_login.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/forgot_password/index_with_login.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/account/base.html.twig' %} -{% form_theme form_forgot_user_password_with_login '@ibexadesign/account/form_fields.html.twig' %} +{% form_theme form_forgot_user_password_with_login '@ibexadesign/ui/form_fields.html.twig' %} {%- block content -%} diff --git a/src/bundle/Resources/views/themes/admin/account/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/account/form_fields.html.twig deleted file mode 100644 index aac88df30b..0000000000 --- a/src/bundle/Resources/views/themes/admin/account/form_fields.html.twig +++ /dev/null @@ -1,2 +0,0 @@ -{# @deprecated, will be removed in 5.0 #} -{% extends '@ibexadesign/ui/form_fields.html.twig' %} diff --git a/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig index f8c0c875b2..b8fcf8c019 100644 --- a/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/reset_password/index.html.twig @@ -1,6 +1,6 @@ {% extends '@ibexadesign/account/base.html.twig' %} -{% form_theme form_reset_user_password '@ibexadesign/account/form_fields.html.twig' %} +{% form_theme form_reset_user_password '@ibexadesign/ui/form_fields.html.twig' %} {%- block content -%} diff --git a/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig deleted file mode 100644 index 0994162b2b..0000000000 --- a/src/bundle/Resources/views/themes/admin/content/edit/content_header.html.twig +++ /dev/null @@ -1,46 +0,0 @@ -{# @deprecated, will be removed in 5.0. #} -{% trans_default_domain 'ibexa_content' %} - -{% set is_autosave_enabled = ibexa_user_settings['autosave'] is same as('enabled') %} -{% set form_has_autosave = form.autosave is defined %} - -
-
-
-
-
- {% if (description is defined and description|length) or content is defined %} -
- - - -
- {% endif %} - - {{ context_actions|default('')|raw }} -
-
-
-
- -
- -
-
-
- -

{{ title }}

-
- {{ 'editing_details'|trans({ '%location%': parent_location.contentInfo.name })|desc('Location: %location%')|raw }} -
-
-
- {% include '@ibexadesign/ui/autosave.html.twig' %} -
-
-
-
diff --git a/src/bundle/Resources/views/themes/admin/content/edit/content_header_tooltip.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/content_header_tooltip.html.twig deleted file mode 100644 index 1fa8d96163..0000000000 --- a/src/bundle/Resources/views/themes/admin/content/edit/content_header_tooltip.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% if content is defined %} - {% if creator is defined and creator is not empty %} -
{{ 'content.details.created_by'|trans({'%name%': ibexa_content_name(creator)})|desc('Created by %name%') }}
- {% endif %} - -
{{ content.versionInfo.contentInfo.publishedDate|ibexa_full_datetime }}
-
- {{ 'content.details.content_id'|trans({'%contentId%': content.id})|desc('Content ID: %contentId%') }} | - - {% if is_published is defined and is_published == false %} - {{ 'content.details.parent_location_id'|trans({'%locationId%': parent_location.id})|desc('Parent Location ID: %locationId%') }} - {% else %} - {{ 'content.details.location_id'|trans({'%locationId%': location.id})|desc('Location ID: %locationId%') }} - {% endif %} -
-{% endif %} - -{% if description is defined %} -
{{ description }}
-{% endif %} diff --git a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig index aeaa7fcc47..46f916b11a 100644 --- a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig @@ -133,7 +133,6 @@
{{ 'footer.ibexa_dxp'|trans|desc('Ibexa DXP') }} - {{ 'footer.ibexa_support'|trans|desc('Support') }} - {{ 'footer.ibexa_documentation'|trans|desc('Documentation') }} -
-
diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig index 25368fe36a..a646ce0de0 100644 --- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig @@ -522,7 +522,7 @@
{% include '@ibexadesign/ui/component/alert/alert.html.twig' with { - type: 'complementary', + type: 'info', title, icon_path: ibexa_icon_path('system-information'), show_close_btn: true diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js b/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js index dacfe6c534..f90f21d1ee 100644 --- a/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js +++ b/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { getTranslator } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/context.helper'; -import { fileSizeToString } from '../../helpers/text.helper'; +import { fileSizeToString } from '../../../common/helpers/text.helper'; import { createCssClassNames } from '../../../common/helpers/css.class.names'; import Icon from '../../../common/icon/icon'; export default class DropAreaComponent extends Component { diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js b/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js index 610d641d9c..c26094ab49 100644 --- a/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js +++ b/src/bundle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js @@ -6,7 +6,7 @@ import { getTranslator, isExternalInstance } from '@ibexa-admin-ui/src/bundle/Re import { createCssClassNames } from '../../../common/helpers/css.class.names'; import Icon from '../../../common/icon/icon'; -import { fileSizeToString } from '../../helpers/text.helper'; +import { fileSizeToString } from '../../../common/helpers/text.helper'; import ProgressBarComponent from '../progress-bar/progress.bar.component'; export default class UploadItemComponent extends Component { diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/helpers/text.helper.js b/src/bundle/ui-dev/src/modules/multi-file-upload/helpers/text.helper.js deleted file mode 100644 index f09830e284..0000000000 --- a/src/bundle/ui-dev/src/modules/multi-file-upload/helpers/text.helper.js +++ /dev/null @@ -1,4 +0,0 @@ -import { fileSizeToString as fileSizeToStringFromCommon } from '../../common/helpers/text.helper'; - -// @deprecated, will be removed in 5.0 -export const fileSizeToString = fileSizeToStringFromCommon;