+ class="d-flex flex-grow-1 flex-shrink-1 align-center justify-center overflow-hidden"
+ :class="title && 'py-4'">
![]()
@@ -82,46 +82,46 @@
+ class="flex-grow-0 flex-shrink-0 subtitle-1 text-truncate-2 text-color"
+ :title="name">
{{ name }}
+ class="flex-grow-0 flex-shrink-0 text-truncate-2 pt-0 text-subtitle"
+ :title="$utils.htmlToText(description)">
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/ApplicationMenu.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/ApplicationMenu.vue
index dff1e63c3..72449ce34 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/ApplicationMenu.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/ApplicationMenu.vue
@@ -27,21 +27,21 @@
-
+
- fa-arrows-alt
+ fa-arrows-alt
{{ $t('layout.moveCell') }}
@@ -49,15 +49,15 @@
- fa-edit
+ fa-edit
{{ $t('layout.editApplication') }}
@@ -65,15 +65,15 @@
- fa-trash
+ fa-trash
{{ $t('layout.deleteApplication') }}
@@ -84,87 +84,87 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellResizeButton.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellResizeButton.vue
index 140da6d37..dc97f961e 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellResizeButton.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellResizeButton.vue
@@ -20,15 +20,15 @@
-->
+ @mouseover="hoverSeparator = true">
+ class="icon-default-color"
+ :size="iconSize">
{{ dynamicSection && 'fa-arrows-alt-h' || 'fa-expand-alt' }}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsDropBox.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsDropBox.vue
index eb9ccf4b0..ccdf86f87 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsDropBox.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsDropBox.vue
@@ -21,275 +21,275 @@
+ class="layout-selecting-container border-box-sizing d-flex position-absolute elevation-2 z-index-modal"
+ :style="boxStyle">
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsSelectionBox.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsSelectionBox.vue
index 2ea7ff6c4..241a4d3d9 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsSelectionBox.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/CellsSelectionBox.vue
@@ -21,215 +21,215 @@
+ class="layout-selecting-container border-box-sizing grey opacity-5 elevation-2 position-absolute z-index-modal"
+ :style="boxStyle">
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionMenu.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionMenu.vue
index ed184436a..269bd3cf2 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionMenu.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionMenu.vue
@@ -21,30 +21,30 @@
+ class="absolute-full-size layout-no-multi-select border-radius"
+ :class="moving && 'layout-section-moving' || 'layout-section-hover'">
+ @mouseout="hoverArea = false"
+ @mouseover="hoverArea = true">
-
+
+ v-bind="attrs"
+ v-on="on">
fa-plus
@@ -58,24 +58,24 @@
v-if="displayMoveButton"
v-model="hoverButton2">
+ class="position-absolute t-10 z-index-one full-height"
+ :style="leftButtonStyle">
-
+
+ v-bind="attrs"
+ v-on="on">
+ @mouseup="$emit('move-end')">
fa-arrows-alt
@@ -87,19 +87,19 @@
+ class="position-absolute t-10 z-index-one full-height"
+ :style="rightButtonStyle">
+ v-bind="attrs"
+ v-on="on">
fa-edit
@@ -110,14 +110,14 @@
+ v-bind="attrs"
+ v-on="on">
fa-copy
@@ -128,14 +128,14 @@
+ v-bind="attrs"
+ v-on="on">
fa-columns
@@ -151,14 +151,14 @@
+ v-bind="attrs"
+ v-on="on">
fa-plus
@@ -173,107 +173,107 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionSelectionGrid.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionSelectionGrid.vue
index 8c8dcf565..c9989ac6f 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionSelectionGrid.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/common/SectionSelectionGrid.vue
@@ -19,69 +19,69 @@
-->
-
+
{{ $vuetify.rtl && 'fa-caret-left' || 'fa-caret-right' }}
+ {{ $vuetify.rtl && 'fa-caret-left' || 'fa-caret-right' }}
- fab fa-readme
+ :height="isFlexSection && 'calc(100% - 20px)' || '100%'">
+ fab fa-readme
{{ $t('layout.readonlyPortletContent') }}
@@ -75,189 +75,189 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Cell.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Cell.vue
index b300d66a5..9df38c6a5 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Cell.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Cell.vue
@@ -21,15 +21,15 @@
@@ -37,15 +37,15 @@
+ }">
+ }">
{{ applicationTitle }}
-
+ }">
- far fa-hourglass
+ far fa-hourglass
{{ $t('layout.inSearchOfData') }}
{{ applicationTitle }}
({{ applicationCategoryTitle }})
@@ -54,227 +54,229 @@
-
+
-
+
+
+
+
-
-
-
+
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Container.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Container.vue
index b97170c8b..c825e13b1 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Container.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/content/container/Container.vue
@@ -21,30 +21,30 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/dialog/EditPortletDialog.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/dialog/EditPortletDialog.vue
index e6bd0a51e..0162cc667 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/dialog/EditPortletDialog.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/dialog/EditPortletDialog.vue
@@ -21,10 +21,10 @@
+ :width="width">
@@ -33,8 +33,8 @@
+ icon
+ :title="$t('label.close')">
mdi-close
@@ -44,72 +44,72 @@
+ data-mode="EDIT"
+ flat
+ max-width="100%">
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/AddApplicationDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/AddApplicationDrawer.vue
index fb9bef9b9..b74fdfe1a 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/AddApplicationDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/AddApplicationDrawer.vue
@@ -20,77 +20,77 @@
-->
-
+ @closed="$root.$emit('layout-application-drawer-closed')"
+ @expand-updated="expanded = $event">
+
{{ $t('layout.addApplicationFromCategoryTitle', {0: categoryName}) }}
+ :class="expanded && 'flex-wrap' || 'flex-column'"
+ flat
+ max-width="100%">
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditApplicationDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditApplicationDrawer.vue
index 494e63910..f50243d7a 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditApplicationDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditApplicationDrawer.vue
@@ -20,14 +20,14 @@
-->
-
+
{{ drawerTitle }}
@@ -40,9 +40,9 @@
+ flat
+ max-width="100%">
+ class="mx-0"
+ value="150px">
{{ $t('layout.fixedHeight150') }}
+ class="mx-0"
+ value="300px">
{{ $t('layout.fixedHeight300') }}
+ class="mx-0"
+ value="500px">
{{ $t('layout.fixedHeight500') }}
+ class="mx-0"
+ :value="customHeight">
+ disable-pull-to-refresh
+ right>
{{ $root.isSiteLayout && $t('layout.editSitePagesProperties') || $t('layout.editPageProperties') }}
@@ -34,19 +34,19 @@
class="pa-4"
flat>
+ width="380px">
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateDrawer.vue
index da0ac55ed..bc90f759c 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateDrawer.vue
@@ -21,12 +21,12 @@
-->
{{ isNew && $t('layout.sectionTemplate.drawerTitie.add') || $t('layout.sectionTemplate.drawerTitie.edit') }}
@@ -34,18 +34,18 @@
{{ $t('layout.sectionTemplate.drawerTitie.add') }}
@@ -33,17 +33,17 @@
- fa-plus
- {{ $t('layout.addApp') }}
-
+ flat
+ :title="!isDynamicSection && $t('layout.cellHoverTooltip')"
+ v-on="!multiSelectEnabled && {
+ click: () => $root.$emit('layout-add-application-category-drawer', parentId, container)
+ }">
+
+ fa-plus
+ {{ $t('layout.addApp') }}
+
+
+
+ fa-vector-square
+
+
+
+
-
- fa-vector-square
-
-
-
+ }">
{{ $t('layout.applicationStyling') }}
@@ -70,8 +70,8 @@
v-if="initialized"
ref="backgroundInput"
v-model="backgroundProperties"
- immediate-save
class="mt-4"
+ immediate-save
@refresh="refresh++" />
{{ $t('layout.fixedHeightCustom') }}
@@ -148,197 +148,197 @@
{{ $t('layout.siteDesign') }}
@@ -55,8 +55,8 @@
v-if="$root.isSiteLayout && parentContainer"
ref="siteBackgroundInput"
v-model="parentContainer"
- :default-background-color="defaultBackgroundColor"
- class="mt-2">
+ class="mt-2"
+ :default-background-color="defaultBackgroundColor">
+ top>
+ flat
+ max-width="80%">
+ :min="1"
+ thumb-label="always"
+ :thumb-size="24">
fa-minus
@@ -87,8 +87,8 @@
{{ $t('layout.siteBackground') }}
@@ -78,26 +78,26 @@
class="ms-0 mt-0 me-auto full-width text-no-wrap"
mandatory>
+ class="mx-0"
+ :value="customWidth">
+ class="mx-0"
+ value="100%">
{{ $t('layout.fullWindow') }}
@@ -106,12 +106,12 @@
{{ $t('layout.fixedWidthCustom') }}
{{ $t('layout.pageMargins') }}
@@ -122,8 +122,8 @@
v-if="pageContainer"
ref="backgroundInput"
v-model="pageContainer"
- :default-background-color="defaultBackgroundColor"
- class="mt-2">
+ class="mt-2"
+ :default-background-color="defaultBackgroundColor">
+ flat
+ max-width="80%">
+ :min="1"
+ thumb-label="always"
+ :thumb-size="24">
fa-minus
@@ -48,10 +48,10 @@
fa-plus
@@ -66,20 +66,20 @@
{{ $t('layout.globalPageBackground') }}
@@ -147,8 +147,8 @@
class="mt-4"
page-style />
{{ $t('layout.apply') }}
@@ -178,129 +178,129 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditSectionDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditSectionDrawer.vue
index c750d98b3..e65f6f85b 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditSectionDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/EditSectionDrawer.vue
@@ -20,11 +20,11 @@
-->
+ disable-pull-to-refresh
+ right>
{{ $t('layout.editSectionTitle', {0: index + 1}) }}
@@ -32,14 +32,14 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusInput.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusInput.vue
index 7b194dc47..0fe4e05cc 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusInput.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusInput.vue
@@ -31,17 +31,17 @@
+ v-bind="attrs"
+ v-on="on">
fa-copy
@@ -50,15 +50,15 @@
+ class="mx-0"
+ value="color">
{{ $t('layout.color') }}
+ class="mx-0"
+ value="gradient">
{{ $t('layout.gradient') }}
@@ -58,8 +58,8 @@
+ class="me-0 ms-auto"
+ :class="choice === 'color' && !scrollColor && 'mb-auto' || 'my-auto'">
+ v-bind="attrs"
+ v-on="on">
fa-columns
@@ -71,15 +71,15 @@
+ class="mx-0"
+ :value="false">
{{ $t('layout.listAppsInRows') }}
+ class="mx-0"
+ :value="true">
{{ $t('layout.listAppsInColumns') }}
@@ -130,15 +130,15 @@
class="my-auto text-no-wrap ms-n1 mt-2"
mandatory>
+ class="mx-0"
+ :value="false">
{{ $t('layout.scrollNoSticky') }}
+ class="mx-0"
+ :value="true">
{{ $t('layout.scrollStickyLastApp') }}
@@ -152,10 +152,10 @@
{{ $t('layout.delete') }}
@@ -166,8 +166,8 @@
{{ $t('layout.cancel') }}
{{ $t('layout.apply') }}
@@ -176,126 +176,126 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/SelectApplicationCategoryDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/SelectApplicationCategoryDrawer.vue
index 19daaf9ab..e5e5c8ecf 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/SelectApplicationCategoryDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/drawer/SelectApplicationCategoryDrawer.vue
@@ -20,11 +20,11 @@
-->
@@ -32,54 +32,54 @@
+ flat
+ max-width="100%">
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundImageAttachment.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundImageAttachment.vue
index 373390d8b..f270e9e70 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundImageAttachment.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundImageAttachment.vue
@@ -25,32 +25,32 @@
+
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundInput.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundInput.vue
index c15041e57..1607ec38d 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundInput.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BackgroundInput.vue
@@ -24,8 +24,8 @@
+ v-bind="attrs"
+ v-on="on">
fa-trash
@@ -60,109 +60,109 @@
+ class="me-auto"
+ :class="textBold && 'font-weight-bold' || 'text-header'">
{{ $t('layout.background') }}
@@ -109,29 +109,29 @@
class="my-auto text-no-wrap flex-grow-1 flex-shrink-0"
mandatory>
+ class="mx-0"
+ value="cover">
{{ $t('layout.imageSizeCover') }}
+ class="mx-0"
+ value="contain">
{{ $t('layout.imageSizeContain') }}
+ class="mx-0"
+ value="repeat">
{{ $t('layout.imageRepeat') }}
+ class="mx-0"
+ value="no-repeat">
{{ $t('layout.imageNoRepeat') }}
@@ -142,29 +142,29 @@
class="my-auto text-no-wrap flex-grow-1 flex-shrink-0"
mandatory>
+ class="mx-0"
+ value="top left">
{{ $t('layout.imagePositionTopLeft') }}
+ class="mx-0"
+ value="top right">
{{ $t('layout.imagePositionTopRight') }}
+ class="mx-0"
+ value="bottom left">
{{ $t('layout.imagePositionBottomLeft') }}
+ class="mx-0"
+ value="bottom right">
{{ $t('layout.imagePositionBottomRight') }}
@@ -174,192 +174,192 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderInput.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderInput.vue
index c3d4fee13..2cc32edc7 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderInput.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderInput.vue
@@ -52,10 +52,10 @@
+ class="d-flex"
+ :class="choice === 'same' && 'flex-row' || 'flex-column'">
@@ -49,8 +49,8 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusSelector.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusSelector.vue
index 9c1844b5b..86c809ca5 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusSelector.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/BorderRadiusSelector.vue
@@ -21,50 +21,50 @@
{{ $t('layout.square') }}
{{ $t('layout.rounded') }}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/ColorPicker.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/ColorPicker.vue
index 51cd1babe..5818b1dda 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/ColorPicker.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/ColorPicker.vue
@@ -38,16 +38,16 @@
+ flat
+ :min-width="minTextWidth">
+ flat
+ :min-width="minTextWidth">
{{ value }}
@@ -55,22 +55,22 @@
{{ $t('layout.cancel') }}
{{ $t('layout.ok') }}
@@ -79,55 +79,55 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/MarginInput.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/MarginInput.vue
index 9335d47e3..c3203dd8d 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/MarginInput.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/MarginInput.vue
@@ -22,8 +22,8 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionMarginInput.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionMarginInput.vue
index 1b0d5cb8a..65f664707 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionMarginInput.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionMarginInput.vue
@@ -23,8 +23,8 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionTemplate.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionTemplate.vue
index 81a0279b1..18b10e7d0 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionTemplate.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/SectionTemplate.vue
@@ -24,16 +24,16 @@
{{ $t('layout.use') }}
{{ $t('layout.preview') }}
@@ -81,43 +81,43 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/TextInput.vue b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/TextInput.vue
index 3b92cf9c4..c8f8d5df5 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/TextInput.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/components/form/TextInput.vue
@@ -22,8 +22,8 @@
-
+
fa-bold
-
+
fa-italic
@@ -54,16 +54,16 @@
-
+
fa-bold
-
+
fa-italic
@@ -89,16 +89,16 @@
-
+
fa-bold
-
+
fa-italic
@@ -124,16 +124,16 @@
-
+
fa-bold
-
+
fa-italic
@@ -159,227 +159,227 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/js/LayoutUtils.js b/layout-webapp/src/main/webapp/vue-app/common-layout/js/LayoutUtils.js
index 6735650e4..c5186f6d1 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/js/LayoutUtils.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/js/LayoutUtils.js
@@ -181,17 +181,17 @@ export const pageJSContextIds = [
'sitesHeadScripts',
];
-export function getQueryParam(paramName) {
+export function getQueryParam (paramName) {
const uri = window.location.search.substring(1);
const params = new URLSearchParams(uri);
return params.get(paramName);
}
-export function initPageContext(navUri) {
+export function initPageContext (navUri) {
return fetch(`/portal${navUri}?showMaxWindow=true&hideSharedLayout=true`, {
credentials: 'include',
method: 'GET',
- redirect: 'manual'
+ redirect: 'manual',
})
.then(resp => {
if (resp?.status === 200) {
@@ -207,7 +207,7 @@ export function initPageContext(navUri) {
.catch(e => console.error('Error navigating to ', navUri, '.', e));
}
-export function getParentContainer(layout) {
+export function getParentContainer (layout) {
if (!layout) {
return null;
}
@@ -221,11 +221,11 @@ export function getParentContainer(layout) {
}
}
-export function newParentContainer(layout) {
+export function newParentContainer (layout) {
return newContainer(sectionsParentTemplate, '', layout, 0);
}
-export function getApplications(container, applications) {
+export function getApplications (container, applications) {
if (!container) {
return;
}
@@ -240,7 +240,7 @@ export function getApplications(container, applications) {
return applications;
}
-export function applyMobileStyle(container) {
+export function applyMobileStyle (container) {
if (container.template === gridTemplate || container.template === flexTemplate) {
container.children?.forEach(applyMobileStyle);
cleanBreakpointClasses(container, container.template === gridTemplate && 'grid-rows' || null, 'grid-cols');
@@ -251,11 +251,11 @@ export function applyMobileStyle(container) {
}
}
-export function applyDesktopStyle(container) {
+export function applyDesktopStyle (container) {
applyGridStyle(container);
}
-export function applyGridStyle(container) {
+export function applyGridStyle (container) {
if (container.template === gridTemplate || container.template === flexTemplate) {
container.children?.forEach(c => applyGridStyle(c, container.template));
applyBreakpointClasses(container, container.template === gridTemplate && 'grid-rows' || null, 'grid-cols');
@@ -266,7 +266,7 @@ export function applyGridStyle(container) {
}
}
-export function applyContainerStyle(container, containerStyle) {
+export function applyContainerStyle (container, containerStyle) {
if (!container.cssClass) {
container.cssClass = '';
}
@@ -365,7 +365,7 @@ export function applyContainerStyle(container, containerStyle) {
Vue.set(container, 'textSubtitleFontStyle', containerStyle.textSubtitleFontStyle || null);
}
-export function parseSite(layout) {
+export function parseSite (layout) {
const compatible = isSiteLayoutCompatible(layout);
if (compatible) {
parseContainer(layout);
@@ -388,7 +388,7 @@ export function parseSite(layout) {
}
}
-export function newSite(layout) {
+export function newSite (layout) {
if (!layout) {
layout = {};
}
@@ -400,8 +400,8 @@ export function newSite(layout) {
children: [{
...newContainer(sidebarCellTemplate),
children: applications || [],
- width: 310
- }]
+ width: 310,
+ }],
},
{ // Middle
...newContainer(siteBodyMiddleTemplate),
@@ -412,7 +412,7 @@ export function newSite(layout) {
newContainer(bannerCellTemplate),
newContainer(bannerCellTemplate),
newContainer(bannerCellTemplate),
- ]
+ ],
},
{ // Middle - Center
...newContainer(siteBodyMiddleCenterTemplate),
@@ -421,8 +421,8 @@ export function newSite(layout) {
...newContainer(sidebarTemplate),
children: [{
...newContainer(sidebarCellTemplate),
- width: 310
- }]
+ width: 310,
+ }],
},
// Page Body
newContainer(pageBodyTemplate),
@@ -430,31 +430,31 @@ export function newSite(layout) {
...newContainer(sidebarTemplate),
children: [{
...newContainer(sidebarCellTemplate),
- width: 310
- }]
+ width: 310,
+ }],
},
- ]
+ ],
},
{ // Bottom Banner
...newContainer(bannerTemplate),
children: [
newContainer(bannerCellTemplate),
- ]
- }
- ]
+ ],
+ },
+ ],
},
{ // Right
...newContainer(sidebarTemplate),
children: [{
...newContainer(sidebarCellTemplate),
- width: 310
- }]
- }
+ width: 310,
+ }],
+ },
];
return !applications?.length;
}
-export function isSiteLayoutCompatible(layout) {
+export function isSiteLayoutCompatible (layout) {
return layout.template === siteTemplate
&& layout.children?.length
&& layout.children.length > 0
@@ -467,7 +467,7 @@ export function isSiteLayoutCompatible(layout) {
&& layout.children.find(c => c.template === siteBodyMiddleTemplate).children.find(c => c.template === siteBodyMiddleCenterTemplate).children.length <= 3;
}
-export function parseSections(layout) {
+export function parseSections (layout) {
const parentContainer = getParentContainer(layout);
if (parentContainer) {
if (!parentContainer.children) {
@@ -475,7 +475,7 @@ export function parseSections(layout) {
}
const compatible = parentContainer.children.every(c => c.template === gridTemplate || c.template === flexTemplate);
if (compatible) {
- Object.assign(parentContainer, Object.assign({...containerModel}, parentContainer));
+ Object.assign(parentContainer, Object.assign({ ...containerModel }, parentContainer));
try {
parentContainer.children.forEach(parseSection);
} catch (e) {
@@ -489,12 +489,12 @@ export function parseSections(layout) {
}
}
-export function getSection(layout, id) {
+export function getSection (layout, id) {
const parentContainer = getParentContainer(layout);
return parentContainer?.children?.find?.(c => c?.storageId === id);
}
-export function getSectionByContainer(layout, id, isSiteLayout) {
+export function getSectionByContainer (layout, id, isSiteLayout) {
if (isSiteLayout) {
return getContainerById(layout, id);
} else {
@@ -503,7 +503,7 @@ export function getSectionByContainer(layout, id, isSiteLayout) {
}
}
-export function getContainerById(container, id) {
+export function getContainerById (container, id) {
if (container?.storageId === id) {
return container;
} else if (container?.children?.length) {
@@ -513,7 +513,7 @@ export function getContainerById(container, id) {
}
}
-export function hasChild(container, id) {
+export function hasChild (container, id) {
if (container?.storageId === id) {
return true;
} else {
@@ -521,7 +521,7 @@ export function hasChild(container, id) {
}
}
-export function getCell(container, storageId) {
+export function getCell (container, storageId) {
if (container.storageId === storageId) {
return container;
} else {
@@ -529,7 +529,7 @@ export function getCell(container, storageId) {
}
}
-export function newSection(parentContainer, index, rows, cols, sectionType) {
+export function newSection (parentContainer, index, rows, cols, sectionType) {
const defaultSectionStyle = sectionType === flexTemplate ? 'd-flex flex-column d-md-grid layout-sticky-application' : 'd-flex flex-column d-md-grid';
const section = newContainer(
sectionType,
@@ -560,7 +560,7 @@ export function newSection(parentContainer, index, rows, cols, sectionType) {
return section;
}
-export function editGridSection(section, rows, cols) {
+export function editGridSection (section, rows, cols) {
const diffRows = rows - section.rowsCount;
const diffCols = cols - section.colsCount;
if (diffCols > 0) {
@@ -575,7 +575,7 @@ export function editGridSection(section, rows, cols) {
}
}
-export function editDynamicSection(section, cols) {
+export function editDynamicSection (section, cols) {
const colSpan = parseInt(section.colsCount / cols);
section.children.forEach(c => applyBreakpointValues(c, 1, colSpan));
@@ -592,7 +592,7 @@ export function editDynamicSection(section, cols) {
applyGridStyle(section);
}
-export function newApplication(parentContainer, appFromRegistry, append) {
+export function newApplication (parentContainer, appFromRegistry, append) {
const application = JSON.parse(JSON.stringify(applicationModel));
application.contentId = appFromRegistry.contentId;
application.title = appFromRegistry.displayName;
@@ -605,7 +605,7 @@ export function newApplication(parentContainer, appFromRegistry, append) {
}
}
-export function addRows(section, diffRows) {
+export function addRows (section, diffRows) {
if (!diffRows) {
return;
}
@@ -618,7 +618,7 @@ export function addRows(section, diffRows) {
applyGridStyle(section);
}
-export function addColumns(section, diffCols) {
+export function addColumns (section, diffCols) {
if (!diffCols) {
return;
}
@@ -632,7 +632,7 @@ export function addColumns(section, diffCols) {
applyGridStyle(section);
}
-export function removeRows(section, diffRows) {
+export function removeRows (section, diffRows) {
if (!diffRows) {
return;
}
@@ -645,7 +645,7 @@ export function removeRows(section, diffRows) {
applyGridStyle(section);
}
-export function removeColumns(section, diffCols) {
+export function removeColumns (section, diffCols) {
diffCols = Math.abs(diffCols);
if (!diffCols) {
return;
@@ -661,13 +661,13 @@ export function removeColumns(section, diffCols) {
applyGridStyle(section);
}
-export function refreshCellIndexes(section) {
+export function refreshCellIndexes (section) {
parseSectionMatrix(section, parseMatrix(section));
applyBreakpointValues(section, section.rowsCount, section.colsCount);
applyGridStyle(section);
}
-export function moveCell(section, sourceCell, targetRowIndex, targetColIndex) {
+export function moveCell (section, sourceCell, targetRowIndex, targetColIndex) {
const sourceRowIndex = sourceCell.rowIndex;
const sourceColIndex = sourceCell.colIndex;
if ((sourceRowIndex === targetRowIndex && sourceColIndex === targetColIndex)
@@ -717,7 +717,7 @@ export function moveCell(section, sourceCell, targetRowIndex, targetColIndex) {
applyGridStyle(section);
}
-export function deleteCell(section, application) {
+export function deleteCell (section, application) {
const cell = section?.children?.find?.(c => hasChild(c, application.storageId));
if (section.template === flexTemplate) {
const index = cell.children.findIndex(c => hasChild(c, application.storageId));
@@ -737,7 +737,7 @@ export function deleteCell(section, application) {
applyGridStyle(section);
}
-export function resizeCell(section, cell, rowIndex, colIndex) {
+export function resizeCell (section, cell, rowIndex, colIndex) {
if (section.template === flexTemplate) {
cell = section.children.find(c => c?.storageId === cell.storageId);
const cellIndex = section.children.findIndex(c => c?.storageId === cell.storageId);
@@ -765,7 +765,7 @@ export function resizeCell(section, cell, rowIndex, colIndex) {
applyGridStyle(section);
}
-export function isValidTargetMovingCell(section, movingCell, targetRowIndex, targetColIndex) {
+export function isValidTargetMovingCell (section, movingCell, targetRowIndex, targetColIndex) {
if (!section || !movingCell || targetRowIndex < 0 || targetColIndex < 0) {
return false;
}
@@ -789,11 +789,11 @@ export function isValidTargetMovingCell(section, movingCell, targetRowIndex, tar
));
}
-export function isBetween(value, b0, b1) {
+export function isBetween (value, b0, b1) {
return value >= b0 && value <= b1;
}
-export function cleanAttributes(container, cleanStorage, cleanStyle) {
+export function cleanAttributes (container, cleanStorage, cleanStyle) {
container = JSON.parse(JSON.stringify(container));
if (cleanStyle) {
applyDesktopStyle(container);
@@ -816,7 +816,7 @@ export function cleanAttributes(container, cleanStorage, cleanStyle) {
return container;
}
-export function parseContainer(container) {
+export function parseContainer (container) {
if (container.template) {
containerModelAttributes.forEach(key => {
if (!Object.hasOwn(container, key)) {
@@ -834,7 +834,7 @@ export function parseContainer(container) {
return container;
}
-export function newCell(section, index, rows, cols) {
+export function newCell (section, index, rows, cols) {
const container = newContainer(cellTemplate,
section.template === flexTemplate ? 'flex-cell' : 'grid-cell',
(index === 0 || index) && section || null,
@@ -844,7 +844,7 @@ export function newCell(section, index, rows, cols) {
return container;
}
-export function newContainer(template, cssClass, parentContainer, index) {
+export function newContainer (template, cssClass, parentContainer, index) {
const container = JSON.parse(JSON.stringify(containerModel));
container.template = template;
container.cssClass = cssClass || '';
@@ -862,12 +862,12 @@ export function newContainer(template, cssClass, parentContainer, index) {
return container;
}
-function parseSection(section) {
+function parseSection (section) {
if ((section.template !== gridTemplate && section.template !== flexTemplate)
|| !section.children.length) {
return;
}
- Object.assign(section, Object.assign({...containerModel}, section));
+ Object.assign(section, Object.assign({ ...containerModel }, section));
if (section.children) {
section.children.forEach(parseCell);
} else {
@@ -885,7 +885,7 @@ function parseSection(section) {
}
}
-export function parseContainerStyle(container) {
+export function parseContainerStyle (container) {
if (container.template !== siteTemplate
&& container.template !== flexTemplate
&& container.template !== gridTemplate
@@ -916,7 +916,7 @@ export function parseContainerStyle(container) {
}
}
-function parseCell(colContainer) {
+function parseCell (colContainer) {
if (colContainer.template !== cellTemplate) {
throw Error(`Container template '${colContainer.template}' not compatible. Fallback to old editor.`);
}
@@ -928,7 +928,7 @@ function parseCell(colContainer) {
parseContainerStyle(colContainer);
}
-function applyBreakpointClasses(container, rowClassPrefix, colClassPrefix) {
+function applyBreakpointClasses (container, rowClassPrefix, colClassPrefix) {
if (!container.cssClass) {
container.cssClass = '';
}
@@ -951,7 +951,7 @@ function applyBreakpointClasses(container, rowClassPrefix, colClassPrefix) {
container.cssClass = cssClasses;
}
-function cleanBreakpointClasses(container, rowClassPrefix, colClassPrefix) {
+function cleanBreakpointClasses (container, rowClassPrefix, colClassPrefix) {
let cssClasses = container.cssClass || '';
const colClasses = cssClasses.match(new RegExp(`(^| )${colClassPrefix}-((md|lg|xl)-)?[0-9]{1,2}`, 'g'));
@@ -972,7 +972,7 @@ function cleanBreakpointClasses(container, rowClassPrefix, colClassPrefix) {
container.cssClass = cssClasses.replace(/ +/g, ' ');
}
-function parseBreakpointClasses(container, classPrefix) {
+function parseBreakpointClasses (container, classPrefix) {
const classes = !container.cssClass && [] || container.cssClass.match(new RegExp(`(^| )${classPrefix}-((md|lg|xl)-)?[0-9]{1,2}`, 'g'));
const bp = {
md: 0,
@@ -1000,7 +1000,7 @@ function parseBreakpointClasses(container, classPrefix) {
}
}
-function parseGapClasses() {
+function parseGapClasses () {
return {
h: 20,
v: 20,
@@ -1011,7 +1011,7 @@ function parseGapClasses() {
};
}
-export function applyBreakpointValues(container, rows, cols) {
+export function applyBreakpointValues (container, rows, cols) {
if (!container.colBreakpoints) {
container.colBreakpoints = {};
}
@@ -1026,7 +1026,7 @@ export function applyBreakpointValues(container, rows, cols) {
container.rowsCount = container.rowBreakpoints[currentBreakpoint];
}
-function moveCol(matrix, sourceCell, targetColIndex) {
+function moveCol (matrix, sourceCell, targetColIndex) {
for (let i = 0; i < sourceCell.rowsCount; i++) {
let colIndex = 0;
for (let j = 0; j < sourceCell.colsCount; j++) {
@@ -1048,7 +1048,7 @@ function moveCol(matrix, sourceCell, targetColIndex) {
}
}
-function moveRow(matrix, sourceCell, targetRowIndex) {
+function moveRow (matrix, sourceCell, targetRowIndex) {
for (let j = 0; j < sourceCell.colsCount; j++) {
let rowIndex = 0;
for (let i = 0; i < sourceCell.rowsCount; i++) {
@@ -1070,7 +1070,7 @@ function moveRow(matrix, sourceCell, targetRowIndex) {
}
}
-function filterChildren(section) {
+function filterChildren (section) {
section.children = section.children.filter(c => {
const colSpan = breakpoints.reduce((sum, b) => sum += c.colBreakpoints[b], 0);
const rowSpan = breakpoints.reduce((sum, b) => sum += c.rowBreakpoints[b], 0);
@@ -1078,7 +1078,7 @@ function filterChildren(section) {
});
}
-function parseMatrix(section) {
+function parseMatrix (section) {
const matrix = {};
for (let i = 0; i < section.rowsCount; i++) {
matrix[i] = {};
@@ -1119,7 +1119,7 @@ function parseMatrix(section) {
return matrix;
}
-function parseSectionMatrix(section, matrix) {
+function parseSectionMatrix (section, matrix) {
const children = [];
for (let row = 0; row < section.rowsCount; row++) {
if (!matrix[row]) {
@@ -1168,10 +1168,10 @@ function parseSectionMatrix(section, matrix) {
cell.colBreakpoints[b] = cell.colsCount;
});
});
- Object.assign(section, {children});
+ Object.assign(section, { children });
}
-function installPageContext(pageHeadContent) {
+function installPageContext (pageHeadContent) {
const replacableScriptsIterator = pageHeadContent.matchAll(/]*id="[^>]*"[^>]*>/g);
let scriptIteratorElement = replacableScriptsIterator.next().value;
while (scriptIteratorElement) {
@@ -1191,7 +1191,7 @@ function installPageContext(pageHeadContent) {
}
}
-function replaceScriptElements(node) {
+function replaceScriptElements (node) {
if (node.tagName === 'SCRIPT') {
node.parentNode.replaceChild(cloneScriptElement(node), node);
} else {
@@ -1202,7 +1202,7 @@ function replaceScriptElements(node) {
return node;
}
-function cloneScriptElement(node) {
+function cloneScriptElement (node) {
const scriptElement = document.createElement('script');
scriptElement.innerText = node.innerHTML;
const scriptAttrs = node.attributes;
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout/services.js b/layout-webapp/src/main/webapp/vue-app/common-layout/services.js
index 7b9d2e68e..8e0f22db3 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout/services.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout/services.js
@@ -19,8 +19,8 @@
import * as layoutUtils from './js/LayoutUtils.js';
-if (!Vue.prototype.$layoutUtils) {
- window.Object.defineProperty(Vue.prototype, '$layoutUtils', {
+if (!eXo.$layoutUtils) {
+ window.Object.defineProperty(eXo, '$layoutUtils', {
value: layoutUtils,
});
}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-page-layout/components/SectionMobileColumnMenu.vue b/layout-webapp/src/main/webapp/vue-app/common-page-layout/components/SectionMobileColumnMenu.vue
index c0d7a3057..9f223ff40 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-page-layout/components/SectionMobileColumnMenu.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-page-layout/components/SectionMobileColumnMenu.vue
@@ -25,19 +25,19 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplateDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplateDrawer.vue
index 012200b20..0a8c4696a 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplateDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplateDrawer.vue
@@ -20,12 +20,12 @@
-->
+ right>
{{ duplicate && $t('layout.duplicateTemplateTitle') || templateId && $t('layout.editTemplateTitle') || $t('layout.saveAsTemplateTitle') }}
@@ -33,20 +33,20 @@
+ :placeholder="$t('layout.templateTitlePlaceholder')"
+ required
+ :rules="rules.title">
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceCategoryService.js b/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceCategoryService.js
index 4f4a6cba4..8e63d4c07 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceCategoryService.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceCategoryService.js
@@ -17,7 +17,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-export function getPortletInstanceCategories() {
+export function getPortletInstanceCategories () {
return fetch('/layout/rest/portlet/instance/categories', {
method: 'GET',
credentials: 'include',
@@ -30,7 +30,7 @@ export function getPortletInstanceCategories() {
});
}
-export function getPortletInstanceCategory(id) {
+export function getPortletInstanceCategory (id) {
return fetch(`/layout/rest/portlet/instance/categories/${id}`, {
method: 'GET',
credentials: 'include',
@@ -43,7 +43,7 @@ export function getPortletInstanceCategory(id) {
});
}
-export function createPortletInstanceCategory(category) {
+export function createPortletInstanceCategory (category) {
return fetch('/layout/rest/portlet/instance/categories', {
credentials: 'include',
method: 'POST',
@@ -51,7 +51,7 @@ export function createPortletInstanceCategory(category) {
'Content-Type': 'application/json',
},
body: JSON.stringify(category),
- }).then((resp) => {
+ }).then(resp => {
if (resp?.ok) {
return resp.json();
} else {
@@ -60,7 +60,7 @@ export function createPortletInstanceCategory(category) {
});
}
-export function updatePortletInstanceCategory(category) {
+export function updatePortletInstanceCategory (category) {
return fetch(`/layout/rest/portlet/instance/categories/${category.id}`, {
credentials: 'include',
method: 'PUT',
@@ -68,18 +68,18 @@ export function updatePortletInstanceCategory(category) {
'Content-Type': 'application/json',
},
body: JSON.stringify(category),
- }).then((resp) => {
+ }).then(resp => {
if (!resp?.ok) {
throw new Error('Error when updating portlet instance categories');
}
});
}
-export function deletePortletInstanceCategory(id) {
+export function deletePortletInstanceCategory (id) {
return fetch(`/layout/rest/portlet/instance/categories/${id}`, {
credentials: 'include',
method: 'DELETE',
- }).then((resp) => {
+ }).then(resp => {
if (!resp?.ok) {
throw new Error('Error when deleting portlet instance categories');
}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceService.js b/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceService.js
index 65afb0eb8..56d487767 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceService.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletInstanceService.js
@@ -17,7 +17,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-export function getPortletInstances(categoryId) {
+export function getPortletInstances (categoryId) {
return fetch(`/layout/rest/portlet/instances${categoryId && `?categoryId=${categoryId}` || ''}`, {
method: 'GET',
credentials: 'include',
@@ -30,7 +30,7 @@ export function getPortletInstances(categoryId) {
});
}
-export function getPortletInstance(id) {
+export function getPortletInstance (id) {
return fetch(`/layout/rest/portlet/instances/${id}`, {
method: 'GET',
credentials: 'include',
@@ -43,7 +43,7 @@ export function getPortletInstance(id) {
});
}
-export function getPortletInstancePreferences(id) {
+export function getPortletInstancePreferences (id) {
return fetch(`/layout/rest/portlet/instances/${id}/preferences`, {
method: 'GET',
credentials: 'include',
@@ -56,7 +56,7 @@ export function getPortletInstancePreferences(id) {
});
}
-export function createPortletInstance(portletInstance) {
+export function createPortletInstance (portletInstance) {
return fetch('/layout/rest/portlet/instances', {
credentials: 'include',
method: 'POST',
@@ -64,7 +64,7 @@ export function createPortletInstance(portletInstance) {
'Content-Type': 'application/json',
},
body: JSON.stringify(portletInstance),
- }).then((resp) => {
+ }).then(resp => {
if (resp?.ok) {
return resp.json();
} else {
@@ -73,7 +73,7 @@ export function createPortletInstance(portletInstance) {
});
}
-export function updatePortletInstance(portletInstance) {
+export function updatePortletInstance (portletInstance) {
return fetch(`/layout/rest/portlet/instances/${portletInstance.id}`, {
credentials: 'include',
method: 'PUT',
@@ -81,18 +81,18 @@ export function updatePortletInstance(portletInstance) {
'Content-Type': 'application/json',
},
body: JSON.stringify(portletInstance),
- }).then((resp) => {
+ }).then(resp => {
if (!resp?.ok) {
throw new Error('Error when updating portlet instance');
}
});
}
-export function deletePortletInstance(id) {
+export function deletePortletInstance (id) {
return fetch(`/layout/rest/portlet/instances/${id}`, {
credentials: 'include',
method: 'DELETE',
- }).then((resp) => {
+ }).then(resp => {
if (!resp?.ok) {
throw new Error('Error when deleting portlet instance');
}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletService.js b/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletService.js
index 23599cd56..caf499660 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletService.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-portlets/js/PortletService.js
@@ -17,7 +17,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-export function getPortlets() {
+export function getPortlets () {
return fetch('/layout/rest/portlets', {
method: 'GET',
credentials: 'include',
diff --git a/layout-webapp/src/main/webapp/vue-app/common-portlets/services.js b/layout-webapp/src/main/webapp/vue-app/common-portlets/services.js
index bdbcc3c25..eadb48a6e 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-portlets/services.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-portlets/services.js
@@ -21,18 +21,18 @@ import * as portletInstanceCategoryService from './js/PortletInstanceCategorySer
import * as portletInstanceService from './js/PortletInstanceService.js';
import * as portletService from './js/PortletService.js';
-if (!Vue.prototype.$portletInstanceCategoryService) {
- window.Object.defineProperty(Vue.prototype, '$portletInstanceCategoryService', {
+if (!eXo.$portletInstanceCategoryService) {
+ window.Object.defineProperty(eXo, '$portletInstanceCategoryService', {
value: portletInstanceCategoryService,
});
}
-if (!Vue.prototype.$portletInstanceService) {
- window.Object.defineProperty(Vue.prototype, '$portletInstanceService', {
+if (!eXo.$portletInstanceService) {
+ window.Object.defineProperty(eXo, '$portletInstanceService', {
value: portletInstanceService,
});
}
-if (!Vue.prototype.$portletService) {
- window.Object.defineProperty(Vue.prototype, '$portletService', {
+if (!eXo.$portletService) {
+ window.Object.defineProperty(eXo, '$portletService', {
value: portletService,
});
}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionFlexEditor.vue b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionFlexEditor.vue
index 7aaf4f9bb..53171e70c 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionFlexEditor.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionFlexEditor.vue
@@ -27,20 +27,20 @@
+ flat
+ max-width="80%">
+ :min="1"
+ thumb-label="always"
+ :thumb-size="24">
fa-minus
@@ -48,8 +48,8 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionGridEditor.vue b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionGridEditor.vue
index e616c2320..60faeb31a 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionGridEditor.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionGridEditor.vue
@@ -27,20 +27,20 @@
{{ label }}
{{ value }}
+ class="me-auto"
+ :class="textBold && 'font-weight-bold' || 'text-header'">
{{ $t('layout.margins') }}
+ class="d-flex"
+ :class="marginChoice === 'same' && 'flex-row' || 'flex-column'">
+ class="me-auto"
+ :class="textBold && 'font-weight-bold' || 'text-header'">
{{ $t('layout.margins') }}
+ class="me-auto"
+ :class="textBold && 'font-weight-bold' || 'text-header'">
{{ $t('layout.textStyle') }}
{{ $t('layout.templateTitle') }}
@@ -58,16 +58,16 @@
+ rich-editor
+ :rules="rules.description">
{{ $t('layout.save') }}
@@ -111,151 +111,151 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplatePreview.vue b/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplatePreview.vue
index 68893430a..fd46b289f 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplatePreview.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-page-template/components/PageTemplatePreview.vue
@@ -28,17 +28,17 @@
{{ $t('layout.templateDescription') }}
@@ -77,11 +77,11 @@
id="pageTemplateDescription"
ref="pageTemplateDescriptionEditor"
v-model="description"
- :placeholder="$t('layout.templateDescriptionPlaceholder')"
- :max-length="maxDescriptionLength"
- :tag-enabled="false"
ck-editor-type="pageTemplateDescription"
- disable-suggester />
+ disable-suggester
+ :max-length="maxDescriptionLength"
+ :placeholder="$t('layout.templateDescriptionPlaceholder')"
+ :tag-enabled="false" />
+ v-bind="attrs"
+ v-on="on">
@@ -46,118 +46,118 @@
+ class="border-color-thin-grey-opacity2 border-radius mt-2 mb-4 pa-2"
+ :style="cssStyle">
+ class="grid-gap-1"
+ :class="gridClass">
+ class="border-color-thin-grey-opacity2 border-radius mt-2 mb-4 pa-2"
+ :style="cssStyle">
+ class="grid-gap-1"
+ :class="gridClass">
@@ -56,14 +56,14 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateSaveAsDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateSaveAsDrawer.vue
index 6ba68f43d..e661fa164 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateSaveAsDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplateSaveAsDrawer.vue
@@ -21,11 +21,11 @@
-->
@@ -74,11 +74,11 @@
id="sectionTemplateDescription"
ref="sectionTemplateDescriptionEditor"
v-model="descriptionTranslations[lang]"
- :placeholder="$t('layout.sectionTemplate.descriptionTranslationDrawerTitle')"
- :max-length="maxDescriptionLength"
- :tag-enabled="false"
ck-editor-type="sectionTemplateDescription"
disable-suggester
+ :max-length="maxDescriptionLength"
+ :placeholder="$t('layout.sectionTemplate.descriptionTranslationDrawerTitle')"
+ :tag-enabled="false"
@ready="checkCKEdtiorDisplay" />
{{ $t('layout.save') }}
@@ -108,124 +108,124 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplatePreview.vue b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplatePreview.vue
index 155cc22b3..fd4c20315 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplatePreview.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-section-template/components/SectionTemplatePreview.vue
@@ -29,17 +29,17 @@
+ v-bind="attrs"
+ v-on="on">
@@ -47,104 +47,104 @@
@@ -54,13 +54,13 @@
{{ $t('layout.siteTemplate.drawerTitie.add') }}
@@ -33,17 +33,17 @@
+ disabled
+ off-icon="far fa-square"
+ on-icon="fa-check-square">
@@ -71,11 +71,11 @@
id="sectionTemplateDescription"
ref="sectionTemplateDescriptionEditor"
v-model="descriptionTranslations[lang]"
- :placeholder="$t('layout.sectionTemplate.descriptionTranslationDrawerTitle')"
- :max-length="maxDescriptionLength"
- :tag-enabled="false"
ck-editor-type="sectionTemplateDescription"
disable-suggester
+ :max-length="maxDescriptionLength"
+ :placeholder="$t('layout.sectionTemplate.descriptionTranslationDrawerTitle')"
+ :tag-enabled="false"
@ready="checkCKEdtiorDisplay" />
{{ $t('layout.save') }}
@@ -104,109 +104,109 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-section-template/js/SectionTemplateService.js b/layout-webapp/src/main/webapp/vue-app/common-section-template/js/SectionTemplateService.js
index 967997acc..e9336e43d 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-section-template/js/SectionTemplateService.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-section-template/js/SectionTemplateService.js
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-export function getSectionTemplates() {
+export function getSectionTemplates () {
return fetch('/layout/rest/sections', {
method: 'GET',
credentials: 'include',
@@ -31,7 +31,7 @@ export function getSectionTemplates() {
});
}
-export function getSectionTemplate(id) {
+export function getSectionTemplate (id) {
return fetch(`/layout/rest/sections/${id}`, {
method: 'GET',
credentials: 'include',
@@ -44,7 +44,7 @@ export function getSectionTemplate(id) {
});
}
-export function generateSectionTemplateNodeId(id) {
+export function generateSectionTemplateNodeId (id) {
return fetch(`/layout/rest/sections/${id}/nodeId`, {
method: 'GET',
credentials: 'include',
@@ -57,7 +57,7 @@ export function generateSectionTemplateNodeId(id) {
});
}
-export function generateSectionTemplateContent(id) {
+export function generateSectionTemplateContent (id) {
return fetch(`/layout/rest/sections/${id}/content`, {
method: 'GET',
credentials: 'include',
@@ -70,7 +70,7 @@ export function generateSectionTemplateContent(id) {
});
}
-export function saveAsSectionTemplate(pageRef, containerId) {
+export function saveAsSectionTemplate (pageRef, containerId) {
return fetch(`/layout/rest/sections/container/${containerId}`, {
credentials: 'include',
method: 'POST',
@@ -78,7 +78,7 @@ export function saveAsSectionTemplate(pageRef, containerId) {
'Content-Type': 'application/x-www-form-urlencoded',
},
body: `pageRef=${pageRef}`,
- }).then((resp) => {
+ }).then(resp => {
if (resp?.ok) {
return resp.json();
} else {
@@ -87,7 +87,7 @@ export function saveAsSectionTemplate(pageRef, containerId) {
});
}
-export function createSectionTemplate(sectionTemplate) {
+export function createSectionTemplate (sectionTemplate) {
return fetch('/layout/rest/sections', {
credentials: 'include',
method: 'POST',
@@ -95,7 +95,7 @@ export function createSectionTemplate(sectionTemplate) {
'Content-Type': 'application/json',
},
body: JSON.stringify(sectionTemplate),
- }).then((resp) => {
+ }).then(resp => {
if (resp?.ok) {
return resp.json();
} else {
@@ -104,7 +104,7 @@ export function createSectionTemplate(sectionTemplate) {
});
}
-export function updateSectionTemplate(sectionTemplate) {
+export function updateSectionTemplate (sectionTemplate) {
return fetch(`/layout/rest/sections/${sectionTemplate.id}`, {
credentials: 'include',
method: 'PUT',
@@ -112,18 +112,18 @@ export function updateSectionTemplate(sectionTemplate) {
'Content-Type': 'application/json',
},
body: JSON.stringify(sectionTemplate),
- }).then((resp) => {
+ }).then(resp => {
if (!resp?.ok) {
throw new Error('Error when updating section template');
}
});
}
-export function deleteSectionTemplate(id) {
+export function deleteSectionTemplate (id) {
return fetch(`/layout/rest/sections/${id}`, {
credentials: 'include',
method: 'DELETE',
- }).then((resp) => {
+ }).then(resp => {
if (!resp?.ok) {
throw new Error('Error when deleting section template');
}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-section-template/services.js b/layout-webapp/src/main/webapp/vue-app/common-section-template/services.js
index 5e58ac7e4..c0a6e0609 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-section-template/services.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-section-template/services.js
@@ -19,8 +19,8 @@
import * as sectionTemplateService from './js/SectionTemplateService.js';
-if (!Vue.prototype.$sectionTemplateService) {
- window.Object.defineProperty(Vue.prototype, '$sectionTemplateService', {
+if (!eXo.$sectionTemplateService) {
+ window.Object.defineProperty(eXo, '$sectionTemplateService', {
value: sectionTemplateService,
});
}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateDrawer.vue
index fee0ea56c..ecdde31e0 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateDrawer.vue
@@ -21,11 +21,11 @@
-->
{{ isNew && $t('layout.siteTemplate.drawerTitie.add') || $t('layout.siteTemplate.drawerTitie.edit') }}
@@ -33,18 +33,18 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateSaveAsDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateSaveAsDrawer.vue
index fbb51ce37..7c97974a5 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateSaveAsDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateSaveAsDrawer.vue
@@ -21,11 +21,11 @@
-->
@@ -55,14 +55,14 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplatePreview.vue b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplatePreview.vue
index 6a9ecad5f..c71b7f66c 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplatePreview.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplatePreview.vue
@@ -29,17 +29,17 @@
@@ -73,11 +73,11 @@
id="siteTemplateDescription"
ref="siteTemplateDescriptionEditor"
v-model="descriptionTranslations[lang]"
- :placeholder="$t('layout.siteTemplate.descriptionTranslationDrawerTitle')"
- :max-length="maxDescriptionLength"
- :tag-enabled="false"
ck-editor-type="siteTemplateDescription"
disable-suggester
+ :max-length="maxDescriptionLength"
+ :placeholder="$t('layout.siteTemplate.descriptionTranslationDrawerTitle')"
+ :tag-enabled="false"
@ready="checkCKEdtiorDisplay" />
{{ $t(isNew && 'layout.create' || 'layout.update') }}
@@ -116,112 +116,112 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateLayout.vue b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateLayout.vue
index e5eccffc1..71513a4a8 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateLayout.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateLayout.vue
@@ -27,37 +27,37 @@
+ width="100%">
+ style="zoom: 30%"
+ width="100%">
@@ -66,30 +66,30 @@
ref="previewTitle"
class="d-flex align-center justify-center text-title d-flex position-absolute z-index-one t-0 fa-rotate-315 ms-n12 mt-12"
color="primary"
- min-height="30"
- min-width="220"
dark
- flat>
+ flat
+ min-height="30"
+ min-width="220">
{{ $t('layout.editSite.portalPage') }}
@@ -101,26 +101,26 @@
class="ma-0 me-auto full-width text-no-wrap"
mandatory>
+ class="mx-0"
+ :value="customWidth">
+ class="mx-0"
+ value="100%">
{{ $t('layout.fullWindow') }}
@@ -204,99 +204,99 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateNavigationHandler.vue b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateNavigationHandler.vue
index 83f838cb5..8e3c8b56a 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateNavigationHandler.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-site-template/components/SiteTemplateNavigationHandler.vue
@@ -27,43 +27,43 @@
{{ $t('layout.fixedWidthCustom') }}
+ v-bind="attrs"
+ v-on="on">
@@ -47,106 +47,106 @@
@@ -54,13 +54,13 @@
+ offset-y
+ transition="slide-x-reverse-transition">
-
+ :key="index"
+ class="custom-list-item-min-height">
+
{{ getMembershipTypeLabel(membershipTypeItem.name) }}
@@ -56,52 +56,52 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteAccessPermissions.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteAccessPermissions.vue
index a493ed00b..99546b41b 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteAccessPermissions.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteAccessPermissions.vue
@@ -28,10 +28,10 @@
@@ -71,11 +71,11 @@
id="siteTemplateDescription"
ref="siteTemplateDescriptionEditor"
v-model="descriptionTranslations[lang]"
- :placeholder="$t('layout.siteTemplate.descriptionTranslationDrawerTitle')"
- :max-length="maxDescriptionLength"
- :tag-enabled="false"
ck-editor-type="siteTemplateDescription"
disable-suggester
+ :max-length="maxDescriptionLength"
+ :placeholder="$t('layout.siteTemplate.descriptionTranslationDrawerTitle')"
+ :tag-enabled="false"
@ready="checkCKEdtiorDisplay" />
{{ $t('layout.save') }}
@@ -104,109 +104,109 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-site-template/js/SiteTemplateService.js b/layout-webapp/src/main/webapp/vue-app/common-site-template/js/SiteTemplateService.js
index 703edd3d7..1f648b84e 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-site-template/js/SiteTemplateService.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-site-template/js/SiteTemplateService.js
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-export function getSiteTemplates() {
+export function getSiteTemplates () {
return fetch('/layout/rest/site/templates', {
method: 'GET',
credentials: 'include',
@@ -31,7 +31,7 @@ export function getSiteTemplates() {
});
}
-export function getSiteTemplate(id) {
+export function getSiteTemplate (id) {
return fetch(`/layout/rest/site/templates/${id}`, {
method: 'GET',
credentials: 'include',
@@ -44,7 +44,7 @@ export function getSiteTemplate(id) {
});
}
-export function createSiteTemplate(siteTemplate) {
+export function createSiteTemplate (siteTemplate) {
return fetch('/layout/rest/site/templates', {
credentials: 'include',
method: 'POST',
@@ -52,7 +52,7 @@ export function createSiteTemplate(siteTemplate) {
'Content-Type': 'application/json',
},
body: JSON.stringify(siteTemplate),
- }).then((resp) => {
+ }).then(resp => {
if (resp?.ok) {
return resp.json();
} else {
@@ -61,7 +61,7 @@ export function createSiteTemplate(siteTemplate) {
});
}
-export function updateSiteTemplate(siteTemplate) {
+export function updateSiteTemplate (siteTemplate) {
return fetch(`/layout/rest/site/templates/${siteTemplate.id}`, {
credentials: 'include',
method: 'PUT',
@@ -69,7 +69,7 @@ export function updateSiteTemplate(siteTemplate) {
'Content-Type': 'application/json',
},
body: JSON.stringify(siteTemplate),
- }).then((resp) => {
+ }).then(resp => {
if (resp?.ok) {
return resp.json();
} else {
@@ -78,18 +78,18 @@ export function updateSiteTemplate(siteTemplate) {
});
}
-export function deleteSiteTemplate(id) {
+export function deleteSiteTemplate (id) {
return fetch(`/layout/rest/site/templates/${id}`, {
credentials: 'include',
method: 'DELETE',
- }).then((resp) => {
+ }).then(resp => {
if (!resp?.ok) {
throw new Error('Error when deleting site template');
}
});
}
-export function saveAsSiteTemplate(siteTemplate, siteId) {
+export function saveAsSiteTemplate (siteTemplate, siteId) {
return fetch(`/layout/rest/site/templates/${siteId}`, {
credentials: 'include',
method: 'POST',
@@ -97,7 +97,7 @@ export function saveAsSiteTemplate(siteTemplate, siteId) {
'Content-Type': 'application/json',
},
body: JSON.stringify(siteTemplate),
- }).then((resp) => {
+ }).then(resp => {
if (resp?.ok) {
return resp.json();
} else {
diff --git a/layout-webapp/src/main/webapp/vue-app/common-site-template/services.js b/layout-webapp/src/main/webapp/vue-app/common-site-template/services.js
index 2c632e3a0..9b45dd5c1 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-site-template/services.js
+++ b/layout-webapp/src/main/webapp/vue-app/common-site-template/services.js
@@ -19,8 +19,8 @@
import * as siteTemplateService from './js/SiteTemplateService.js';
-if (!Vue.prototype.$siteTemplateService) {
- window.Object.defineProperty(Vue.prototype, '$siteTemplateService', {
+if (!eXo.$siteTemplateService) {
+ window.Object.defineProperty(eXo, '$siteTemplateService', {
value: siteTemplateService,
});
}
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/ManagePermissionsDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/ManagePermissionsDrawer.vue
index efbb07663..3eece0539 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/ManagePermissionsDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/ManagePermissionsDrawer.vue
@@ -18,14 +18,14 @@
-->
{{ drawerTitle }}
@@ -49,10 +49,10 @@
{{ $t('siteNavigation.label.btn.cancel') }}
+ :loading="loading"
+ @click="save">
{{ $t('siteNavigation.label.btn.save') }}
@@ -60,85 +60,85 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/PermissionTypeSelector.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/PermissionTypeSelector.vue
index a09ef7ca5..71e3c38d1 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/PermissionTypeSelector.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/PermissionTypeSelector.vue
@@ -21,11 +21,11 @@
{{ getMembershipTypeLabel(membershipType) }}
{{ $t('sites.permission.administrators') }}
@@ -40,10 +40,10 @@
+ on-icon="fa-check-square">
{{ $t('sites.permission.users') }}
@@ -52,10 +52,10 @@
+ on-icon="fa-check-square">
{{ $t('sites.permission.guests') }}
@@ -64,9 +64,9 @@
+ on-icon="fa-check-square">
+ class="mt-0 ms-n1"
+ :value="true">
-
+
{{ $t('siteNavigation.label.btn.save') }}
@@ -122,91 +122,91 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeItem.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeItem.vue
index 1c7d7adf2..5778ac123 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeItem.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeItem.vue
@@ -21,65 +21,66 @@
-
-
-
- {{ icon }}
-
-
-
-
-
-
-
-
-
- {{ navigationNode.label }}
-
-
- {{ navigationNode.label }}
-
-
-
-
- {{ navigationNodeUri }}
-
-
- {{ navigationNodeUri }}
-
-
-
-
-
-
-
+
+
+
+
+ {{ icon }}
+
+
+
+
+
+
+
+
+
+ {{ navigationNode.label }}
+
+
+ {{ navigationNode.label }}
+
+
+
+
+ {{ navigationNodeUri }}
+
+
+ {{ navigationNodeUri }}
+
+
+
+
+
+
+
+
@@ -96,12 +97,12 @@
+ v-on="on">
{{ visibilityIcon.icon }}
@@ -112,12 +113,12 @@
+ v-on="on">
{{ accessIcon.icon }}
@@ -129,192 +130,192 @@
+ offset-y
+ :right="!$vuetify.rtl"
+ transition="slide-x-reverse-transition">
- fas fa-ellipsis-v
+ fas fa-ellipsis-v
@@ -39,8 +39,8 @@
@click="$root.$emit('open-site-navigation-add-node-drawer', navigationNode)">
+ class="pe-1"
+ size="16">
fas fa-plus
@@ -53,8 +53,8 @@
+ class="pe-1"
+ size="16">
fas fa-link
@@ -68,8 +68,8 @@
@click="editLayout">
+ class="pe-1"
+ size="16">
fas fa-table
@@ -81,8 +81,8 @@
@click="$root.$emit('open-site-navigation-edit-node-drawer', navigationNode)">
+ class="pe-1"
+ size="16">
fas fa-edit
@@ -95,8 +95,8 @@
@click="cutNode">
+ class="pe-1"
+ size="16">
fas fa-cut
@@ -108,8 +108,8 @@
@click="copyNode">
+ class="pe-1"
+ size="16">
fas fa-copy
@@ -122,8 +122,8 @@
@click="pasteNode">
+ class="pe-1"
+ size="16">
fas fa-paste
@@ -136,8 +136,8 @@
@click="moveUpNode()">
+ class="pe-1"
+ size="21">
mdi-mouse-move-up
@@ -150,8 +150,8 @@
@click="moveDownNode()">
+ class="pe-1"
+ size="21">
mdi-mouse-move-down
@@ -164,8 +164,8 @@
@click="openManagePermissionsDrawer">
+ class="pe-1"
+ size="16">
fas fa-shield-alt
@@ -186,10 +186,10 @@
}">
+ width="50">
fas fa-trash
@@ -207,207 +207,207 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodesList.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodesList.vue
index 454a0c3a5..c13079f04 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodesList.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodesList.vue
@@ -20,18 +20,18 @@
-
+ :loading="loading">
+
@@ -40,111 +40,111 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationDrawer.vue
index 8339a9487..dd67560e3 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationDrawer.vue
@@ -21,9 +21,9 @@
id="siteNavigationDrawer"
ref="drawer"
v-model="drawer"
- :right="!$vuetify.rtl"
- eager
allow-expand
+ eager
+ :right="!$vuetify.rtl"
@closed="close">
{{ $t('siteNavigation.drawer.title') }}
@@ -33,8 +33,8 @@
+ outlined
+ type="info">
@@ -47,8 +47,8 @@
+ icon
+ target="_blank">
fa-edit
@@ -58,25 +58,25 @@
+ dense
+ flat>
+ class="font-weight-bold text-truncate"
+ :title="siteName">
{{ label }}
+ class="btn btn-primary ms-2"
+ @click="createNode">
{{ $t('siteNavigation.label.btn.createNode') }}
fas fa-arrow-left
@@ -47,18 +47,18 @@
-
+
{{ $t('siteNavigation.label.btn.cancel') }}
{{ $t('siteNavigation.label.btn.save') }}
@@ -67,101 +67,101 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationExistingPageElement.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationExistingPageElement.vue
index a41628226..abd0940c5 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationExistingPageElement.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationExistingPageElement.vue
@@ -33,39 +33,39 @@
:all-sites="allSites"
:class="!allSites && 'mb-8'" />
+ class="icon-default-color"
+ size="32">
{{ icon }}
{{ $t('siteNavigation.label.icon.upload') }}
@@ -194,8 +194,8 @@
class="mt-0 me-0" />
+
-
+
{{ $t('siteNavigation.label.btn.next') }}
+ @click="saveNode">
{{ $t('siteNavigation.label.btn.save') }}
@@ -251,358 +255,358 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageElement.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageElement.vue
index c510f3b07..91aaef19d 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageElement.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageElement.vue
@@ -24,41 +24,41 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageSuggester.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageSuggester.vue
index ca452bd50..2d99e1799 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageSuggester.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationPageSuggester.vue
@@ -21,28 +21,28 @@
-
+ return-object
+ width="100%"
+ @blur="$refs.selectPage.isFocused = false"
+ @update:search-input="searchTerm = $event">
+
@@ -50,21 +50,21 @@
-
+
{{ item.displayName }}
-
-
+ {{ data.item.displayName }}
+
@@ -73,120 +73,120 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationScheduleDatePickers.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationScheduleDatePickers.vue
index 25314b275..5f4154bbd 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationScheduleDatePickers.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationScheduleDatePickers.vue
@@ -19,109 +19,141 @@
+ width="100%">
far fa-clock
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationSiteSuggester.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationSiteSuggester.vue
index 29be9f1e4..cf21daa8c 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationSiteSuggester.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationSiteSuggester.vue
@@ -20,29 +20,29 @@
-
+ return-object
+ width="100%"
+ @blur="$refs.selectSiteNavigation.isFocused = false"
+ @update:search-input="searchTerm = $event">
+
@@ -50,21 +50,21 @@
-
+
{{ item.displayName }}
-
-
+ {{ data.item.displayName }}
+
@@ -74,57 +74,65 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common/components/LayoutAnalytics.vue b/layout-webapp/src/main/webapp/vue-app/common/components/LayoutAnalytics.vue
index d7c5312b0..1d5fe221f 100644
--- a/layout-webapp/src/main/webapp/vue-app/common/components/LayoutAnalytics.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common/components/LayoutAnalytics.vue
@@ -1,109 +1,109 @@
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common/js/ApplicationUtils.js b/layout-webapp/src/main/webapp/vue-app/common/js/ApplicationUtils.js
index ff0df2ad9..57f458b7a 100644
--- a/layout-webapp/src/main/webapp/vue-app/common/js/ApplicationUtils.js
+++ b/layout-webapp/src/main/webapp/vue-app/common/js/ApplicationUtils.js
@@ -17,12 +17,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-export function installApplication(navUri, applicationStorageId, applicationElement, applicationMode, showSite, fullRender) {
+export function installApplication (navUri, applicationStorageId, applicationElement, applicationMode, showSite, fullRender) {
return getApplicationContent(navUri, applicationStorageId, applicationMode, showSite, fullRender)
.then(applicationContent => handleApplicationContent(applicationContent, applicationElement, applicationMode));
}
-export function getStyle(container, options) {
+export function getStyle (container, options) {
const style = {};
if (container.marginTop === 0
|| container.marginTop
@@ -338,13 +338,13 @@ export function getStyle(container, options) {
return style;
}
-export function getApplicationContent(navUri, applicationStorageId, applicationMode, showSite, fullRender) {
+export function getApplicationContent (navUri, applicationStorageId, applicationMode, showSite, fullRender) {
const spaceOption = eXo.env.portal.previewSpaceId && `&previewSpaceId=${eXo.env.portal.previewSpaceId}` || '';
const fullRenderOption = fullRender && '&fullRender=true' || '';
return fetch(`/portal${navUri}?maximizedPortletId=${applicationStorageId}&showMaxWindow=${!showSite}&hideSharedLayout=true&maximizedPortletMode=${applicationMode || 'VIEW'}${spaceOption}${fullRenderOption}`, {
credentials: 'include',
method: 'GET',
- redirect: 'manual'
+ redirect: 'manual',
})
.then(resp => {
if (resp?.status === 200) {
@@ -355,7 +355,7 @@ export function getApplicationContent(navUri, applicationStorageId, applicationM
});
}
-export function handleApplicationContent(applicationContent, applicationElement) {
+export function handleApplicationContent (applicationContent, applicationElement) {
const newHeadContent = applicationContent.search(' -1 && applicationContent.substring(applicationContent.search('/g)[0].length, applicationContent.search('')) || '';
let newBodyContent = applicationContent.substring(applicationContent.search('/g)[0].length, applicationContent.lastIndexOf('
{{ $t('sites.permission.everyone') }}
@@ -75,10 +75,10 @@
@@ -90,147 +90,147 @@
v-if="isCustomPermissions"
ref="targetPermissions"
v-model="specificGroupEntries"
- :labels="suggesterLabels"
- :search-options="{filterType: 'all'}"
- name="specificGroupPermissions"
+ all-groups-for-admin
class="mb-n3"
- include-spaces
include-groups
- all-groups-for-admin
+ include-spaces
+ :labels="suggesterLabels"
multiple
- required />
+ name="specificGroupPermissions"
+ required
+ :search-options="{filterType: 'all'}" />
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteEditPermission.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteEditPermission.vue
index 3c54f3853..b9e838ebe 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteEditPermission.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/manage-permissions/SiteEditPermission.vue
@@ -28,8 +28,8 @@
{{ $t('sites.permission.administrators') }}
@@ -37,8 +37,8 @@
+ class="mt-0 ms-n1"
+ :value="false">
{{ $t('siteNavigation.nodeIconPickerDrawer.title') }}
@@ -33,9 +33,9 @@
+ color="primary"
+ size="18">
mdi-close
@@ -57,8 +57,8 @@
+ class="pa-0 pa-1"
+ cols="3">
+ size="18">
fas fa-check-square
+ color="black"
+ size="32">
{{ icon.iconValue }}
{{ $t('sites.permission.groupMembers') }}
@@ -50,111 +50,111 @@
v-if="!isAdministrationPermissions"
ref="targetPermissions"
v-model="specificGroupEntry"
- :labels="suggesterLabels"
- :search-options="{filterType: 'all'}"
- name="specificGroupPermission"
+ all-groups-for-admin
class="mb-n3 mt-n3"
- include-spaces
include-groups
- all-groups-for-admin
- required />
+ include-spaces
+ :labels="suggesterLabels"
+ name="specificGroupPermission"
+ required
+ :search-options="{filterType: 'all'}" />
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeIconPickerDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeIconPickerDrawer.vue
index cf06fe84b..9a0274449 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeIconPickerDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/NodeIconPickerDrawer.vue
@@ -18,13 +18,13 @@
-->
+ class="align-center text-truncate text-caption text--primary font-weight-medium pb-2 mx-1" + v-on="on"> {{ icon.iconName }}
@@ -103,7 +103,7 @@
+ :style="containerStyle">
{{ $t('siteNavigation.label.use') }}
{{ $t('siteNavigation.label.templatePreview') }}
@@ -73,74 +73,74 @@
diff --git a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationNewPageElementItemsList.vue b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationNewPageElementItemsList.vue
index fab598c18..1cdfa61b4 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationNewPageElementItemsList.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-sites/components/site-navigation/SiteNavigationNewPageElementItemsList.vue
@@ -24,8 +24,8 @@
v-if="seeMore"
:aria-label="$t('siteNavigation.label.seeMore')"
color="primary"
- text
plain
+ text
@click="displayItems(maxItemsToDisplay+8)">
{{ $t('siteNavigation.label.seeMore') }}
@@ -34,93 +34,93 @@
@@ -113,9 +113,9 @@
+ class="overflow-hidden"
+ :style="imageContainerStyle">
![]()
+ class="align-center mx-auto object-fit-cover"
+ :src="illustrationSrc"
+ :style="imageStyle">
{{ $t('siteNavigation.label.openSameTab') }}
+ v-if="visible"
+ class="d-flex align-center justify-space-between flex-row">
{{ $t('siteNavigation.label.visibility.scheduleVisibility') }}
@@ -204,17 +204,21 @@
class="mt-0 me-0" />
-