From d02a59ddeb7addb4aa05001e72f920b8b5c4ecfa Mon Sep 17 00:00:00 2001 From: IlhemEssaadi Date: Wed, 11 Oct 2023 09:12:46 +0100 Subject: [PATCH 1/3] Add Cloud storage and Documents editors nodes to platform settings navigation - EXO-66546 - Meeds-io/MIPs#88 --- .../portal/administration_en.properties | 23 +++++++ .../portal/portal-configuration.xml | 38 ++++++++++++ .../portal/administration/navigation.xml | 54 ++++++++++++++++ .../portal/portal/administration/pages.xml | 24 ++++++++ .../portal/administration_en.properties | 23 +++++++ .../editors/portal/portal-configuration.xml | 40 +++++++++++- .../portal/administration/navigation.xml | 54 ++++++++++++++++ .../portal/portal/administration/pages.xml | 24 ++++++++ .../portal/administration_en.properties | 22 +++++++ .../portal/portal-configuration.xml | 38 ++++++++++++ .../portal/administration/navigation.xml | 50 +++++++++++++++ .../portal/portal/administration/pages.xml | 26 ++++++++ .../portal/administration_en.properties | 22 +++++++ .../portal/ecms-portal-configuration.xml | 38 ++++++++++++ .../portal/administration/navigation.xml | 54 ++++++++++++++++ .../portal/portal/administration/pages.xml | 61 +++++++++++++++++++ 16 files changed, 590 insertions(+), 1 deletion(-) create mode 100644 apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties create mode 100644 apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml create mode 100644 apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml create mode 100644 apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties create mode 100644 apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml create mode 100644 apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml create mode 100644 apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties create mode 100644 apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml create mode 100644 apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml create mode 100644 ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties create mode 100644 ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml create mode 100644 ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml diff --git a/apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties b/apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties new file mode 100644 index 00000000000..314bff89bc6 --- /dev/null +++ b/apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties @@ -0,0 +1,23 @@ +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# +portal.administration.home=Platform settings +portal.administration.applications=Applications +portal.administration.documents-settings=Documents settings +portal.administration.cloud-storage=Cloud storage + diff --git a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml index 52f47ab9158..87623d3780c 100644 --- a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml +++ b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml @@ -60,5 +60,43 @@ + + new.portal.config.user.listener + initListener + org.exoplatform.portal.config.NewPortalConfigListener + this listener init the portal configuration + + + override + The flag parameter to decide if portal metadata is overriden on restarting server + ${exo.ecms.portalConfig.administration.metadata.override:true} + + + portal.configuration + description + + + + + administration + + + + + portal + + + war:/conf/clouddrive/portal + + + ${exo.ecms.portalConfig.administration.override:true} + + + ${exo.ecms.portalConfig.administration.importmode:insert} + + + + + \ No newline at end of file diff --git a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml new file mode 100644 index 00000000000..9a6ddff083e --- /dev/null +++ b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml @@ -0,0 +1,54 @@ + + + + 3 + + + + home + + fas fa-cog + DISPLAYED + + applications + + fas fa-boxes + DISPLAYED + + documents-settings + + fas fa-file-alt + DISPLAYED + + cloud-storage + + fas fa-cloud-download-alt + portal::administration::cloudStorage + + + + + + diff --git a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml new file mode 100644 index 00000000000..e8c3ac15f03 --- /dev/null +++ b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml @@ -0,0 +1,24 @@ + + + + + + cloudStorage + Cloud Storage + *:/platform/administrators + manager:/platform/administrators + + + clouddrives + cloudStoragePortlet + + cloud Storage + *:/platform/administrators + false + + + + \ No newline at end of file diff --git a/apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties b/apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties new file mode 100644 index 00000000000..e8be418fa90 --- /dev/null +++ b/apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties @@ -0,0 +1,23 @@ +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# +portal.administration.home=Platform settings +portal.administration.applications=Applications +portal.administration.documents-settings=Documents settings +portal.administration.documents-editors=Documents editors + diff --git a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml index c73c3cad1cd..43cacb3dc26 100644 --- a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml +++ b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml @@ -59,5 +59,43 @@ - + + new.portal.config.user.listener + initListener + org.exoplatform.portal.config.NewPortalConfigListener + this listener init the portal configuration + + + override + The flag parameter to decide if portal metadata is overriden on restarting server + ${exo.ecms.portalConfig.administration.metadata.override:true} + + + portal.configuration + description + + + + + administration + + + + + portal + + + war:/conf/editors/portal + + + ${exo.ecms.portalConfig.administration.override:true} + + + ${exo.ecms.portalConfig.administration.importmode:insert} + + + + + + diff --git a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml new file mode 100644 index 00000000000..094046ba078 --- /dev/null +++ b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml @@ -0,0 +1,54 @@ + + + + 3 + + + + home + + fas fa-cog + DISPLAYED + + applications + + fas fa-boxes + DISPLAYED + + documents-settings + + fas fa-file-alt + DISPLAYED + + documents-editors + + fas fa-edit + portal::administration::editors + + + + + + diff --git a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml new file mode 100644 index 00000000000..35f6785684e --- /dev/null +++ b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml @@ -0,0 +1,24 @@ + + + + + + editors + Editors Administration + *:/platform/administrators + manager:/platform/administrators + + + editors + EditorsAdminPortlet + + Document Editors Administration + *:/platform/administrators + false + + + + \ No newline at end of file diff --git a/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties b/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties new file mode 100644 index 00000000000..8ab0dae4dd4 --- /dev/null +++ b/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties @@ -0,0 +1,22 @@ +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# +portal.administration.home=Platform settings +portal.administration.security=Security +portal.administration.transfert-rules=Transfert rules + diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml index 2fd3af1879c..221f1715a2a 100644 --- a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml @@ -60,5 +60,43 @@ + + new.portal.config.user.listener + initListener + org.exoplatform.portal.config.NewPortalConfigListener + this listener init the portal configuration + + + override + The flag parameter to decide if portal metadata is overriden on restarting server + ${exo.ecms.portalConfig.administration.metadata.override:true} + + + portal.configuration + description + + + + + administration + + + + + portal + + + war:/conf/transferRules/portal + + + ${exo.ecms.portalConfig.administration.override:true} + + + ${exo.ecms.portalConfig.administration.importmode:insert} + + + + + diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml new file mode 100644 index 00000000000..f26bce75fac --- /dev/null +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml @@ -0,0 +1,50 @@ + + + + 3 + + + + home + + fas fa-cog + DISPLAYED + + security + + fas fa-shield-alt + DISPLAYED + + transfert-rules + + fas fa-exchange-alt + DISPLAYED + portal::administration::transferRules + + + + + + diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml new file mode 100644 index 00000000000..9338f798216 --- /dev/null +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml @@ -0,0 +1,26 @@ + + + + + + transferRules + Transfer Rules + *:/platform/administrators + manager:/platform/administrators + + + + transfer-rules + transferRulesPortlet + + Transfer Rules Administration + *:/platform/administrators + false + + + + + \ No newline at end of file diff --git a/ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties b/ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties new file mode 100644 index 00000000000..efc9f3970d6 --- /dev/null +++ b/ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties @@ -0,0 +1,22 @@ +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# +portal.administration.home=Platform settings +portal.administration.legacy=Legacy +portal.administration.wcm-backoffice=WCM back-office +portal.administration.wcm-settings=WCM Settings diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml index b2a4e04a2d8..43f935f9cf5 100644 --- a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml @@ -123,7 +123,45 @@ + + new.portal.config.user.listener + initListener + org.exoplatform.portal.config.NewPortalConfigListener + this listener init the portal configuration + + + override + The flag parameter to decide if portal metadata is overriden on restarting server + ${exo.ecms.portalConfig.administration.metadata.override:true} + + + portal.configuration + description + + + + + administration + + + + + portal + + + war:/conf/wcm-extension/portal + + + ${exo.ecms.portalConfig.administration.override:true} + + + ${exo.ecms.portalConfig.administration.importmode:insert} + + + + + new.portal.config.user.listener initListener diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml new file mode 100644 index 00000000000..80ba6a3dd5c --- /dev/null +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml @@ -0,0 +1,54 @@ + + + + 3 + + + + home + + fas fa-cog + DISPLAYED + + legacy + + fas fa-archive + DISPLAYED + + wcm-backoffice + + fas fa-archive + portal::administration::SiteExplorer + + + wcm-settings + + fas fa-archive + portal::administration::WcmAdmin + + + + + diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml new file mode 100644 index 00000000000..e553cb0cb8f --- /dev/null +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml @@ -0,0 +1,61 @@ + + + + + + SiteExplorer + Site Explorer + *:/platform/web-contributors + manager:/platform/web-contributors + + + ecmexplorer + FileExplorerPortlet + + + driveName + Managed Sites + false + + + + Site Explorer + *:/platform/web-contributors + false + false + false + + + + authoring-apps + AuthoringDashboard + + Authoring Dashboard + *:/platform/web-contributors + false + false + false + + + + WcmAdmin + WCM Administration + manager:/platform/web-contributors + manager:/platform/web-contributors + + + ecmadmin + ECMAdminPortlet + + + WCM Administration + *:/platform/web-contributors + false + false + false + + + \ No newline at end of file From dd89f9928faba85692efe61e14c53a9dcae46c29 Mon Sep 17 00:00:00 2001 From: Mohamed Amine Krout Date: Wed, 30 Nov 2022 12:09:11 +0100 Subject: [PATCH 2/3] fix review --- .../portal/administration_en.properties | 4 +- .../portal/portal-configuration.xml | 8 +- .../portal/administration/navigation.xml | 36 +++--- .../portal/portal/administration/pages.xml | 41 +++++-- .../portal/administration_en.properties | 4 +- .../editors/portal/portal-configuration.xml | 8 +- .../portal/administration/navigation.xml | 36 +++--- .../portal/portal/administration/pages.xml | 41 +++++-- .../portal/administration_en.properties | 4 +- .../portal/portal-configuration.xml | 8 +- .../portal/administration/navigation.xml | 36 +++--- .../portal/portal/administration/pages.xml | 20 +++- .../portal/administration_en.properties | 4 +- .../portal/ecms-portal-configuration.xml | 8 +- .../portal/administration/navigation.xml | 35 +++--- .../portal/portal/administration/pages.xml | 108 +++++++++++------- translations.properties | 4 + 17 files changed, 215 insertions(+), 190 deletions(-) diff --git a/apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties b/apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties index 314bff89bc6..c82d8a5f736 100644 --- a/apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties +++ b/apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties @@ -1,9 +1,9 @@ # -# Copyright (C) 2009 eXo Platform SAS. +# Copyright (C) 2023 eXo Platform SAS. # # This is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of +# published by the Free Software Foundation; either version 3 of # the License, or (at your option) any later version. # # This software is distributed in the hope that it will be useful, diff --git a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml index 87623d3780c..2bf0acb60bf 100644 --- a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml +++ b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal-configuration.xml @@ -66,14 +66,8 @@ org.exoplatform.portal.config.NewPortalConfigListener this listener init the portal configuration - - override - The flag parameter to decide if portal metadata is overriden on restarting server - ${exo.ecms.portalConfig.administration.metadata.override:true} - portal.configuration - description @@ -92,7 +86,7 @@ ${exo.ecms.portalConfig.administration.override:true} - ${exo.ecms.portalConfig.administration.importmode:insert} + ${exo.ecms.portalConfig.administration.importmode:merge} diff --git a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml index 9a6ddff083e..54a1e33e04f 100644 --- a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml +++ b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/navigation.xml @@ -1,23 +1,20 @@ home fas fa-cog - DISPLAYED applications fas fa-boxes - DISPLAYED documents-settings fas fa-file-alt - DISPLAYED cloud-storage diff --git a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml index e8c3ac15f03..fe27aeb69ba 100644 --- a/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml +++ b/apps/portlet-clouddrives/src/main/webapp/WEB-INF/conf/clouddrive/portal/portal/administration/pages.xml @@ -1,7 +1,21 @@ - - + @@ -10,15 +24,18 @@ Cloud Storage *:/platform/administrators manager:/platform/administrators - - - clouddrives - cloudStoragePortlet - - cloud Storage - *:/platform/administrators - false - + + *:/platform/users + + + clouddrives + cloudStoragePortlet + + cloud Storage + *:/platform/administrators + false + + \ No newline at end of file diff --git a/apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties b/apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties index e8be418fa90..e092b897d8b 100644 --- a/apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties +++ b/apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties @@ -1,9 +1,9 @@ # -# Copyright (C) 2009 eXo Platform SAS. +# Copyright (C) 2023 eXo Platform SAS. # # This is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of +# published by the Free Software Foundation; either version 3 of # the License, or (at your option) any later version. # # This software is distributed in the hope that it will be useful, diff --git a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml index 43cacb3dc26..d4fcbd426f7 100644 --- a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml +++ b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal-configuration.xml @@ -65,14 +65,8 @@ org.exoplatform.portal.config.NewPortalConfigListener this listener init the portal configuration - - override - The flag parameter to decide if portal metadata is overriden on restarting server - ${exo.ecms.portalConfig.administration.metadata.override:true} - portal.configuration - description @@ -91,7 +85,7 @@ ${exo.ecms.portalConfig.administration.override:true} - ${exo.ecms.portalConfig.administration.importmode:insert} + ${exo.ecms.portalConfig.administration.importmode:merge} diff --git a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml index 094046ba078..41634723ba5 100644 --- a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml +++ b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/navigation.xml @@ -1,23 +1,20 @@ home fas fa-cog - DISPLAYED applications fas fa-boxes - DISPLAYED documents-settings fas fa-file-alt - DISPLAYED documents-editors diff --git a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml index 35f6785684e..11a9544d75a 100644 --- a/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml +++ b/apps/portlet-editors/src/main/webapp/WEB-INF/conf/editors/portal/portal/administration/pages.xml @@ -1,7 +1,21 @@ - - + @@ -10,15 +24,18 @@ Editors Administration *:/platform/administrators manager:/platform/administrators - - - editors - EditorsAdminPortlet - - Document Editors Administration - *:/platform/administrators - false - + + *:/platform/users + + + editors + EditorsAdminPortlet + + Document Editors Administration + *:/platform/administrators + false + + \ No newline at end of file diff --git a/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties b/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties index 8ab0dae4dd4..69a4fef6b10 100644 --- a/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties +++ b/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties @@ -1,9 +1,9 @@ # -# Copyright (C) 2009 eXo Platform SAS. +# Copyright (C) 2023 eXo Platform SAS. # # This is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of +# published by the Free Software Foundation; either version 3 of # the License, or (at your option) any later version. # # This software is distributed in the hope that it will be useful, diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml index 221f1715a2a..e71230b79d0 100644 --- a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal-configuration.xml @@ -66,14 +66,8 @@ org.exoplatform.portal.config.NewPortalConfigListener this listener init the portal configuration - - override - The flag parameter to decide if portal metadata is overriden on restarting server - ${exo.ecms.portalConfig.administration.metadata.override:true} - portal.configuration - description @@ -92,7 +86,7 @@ ${exo.ecms.portalConfig.administration.override:true} - ${exo.ecms.portalConfig.administration.importmode:insert} + ${exo.ecms.portalConfig.administration.importmode:merge} diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml index f26bce75fac..5c8b9351fe3 100644 --- a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml @@ -1,23 +1,20 @@ home fas fa-cog - DISPLAYED security fas fa-shield-alt - DISPLAYED transfert-rules fas fa-exchange-alt - DISPLAYED portal::administration::transferRules diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml index 9338f798216..9dd5c0f15f3 100644 --- a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml @@ -1,7 +1,21 @@ - - + diff --git a/ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties b/ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties index efc9f3970d6..1e66116ab4b 100644 --- a/ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties +++ b/ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties @@ -1,9 +1,9 @@ # -# Copyright (C) 2009 eXo Platform SAS. +# Copyright (C) 2023 eXo Platform SAS. # # This is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of +# published by the Free Software Foundation; either version 3 of # the License, or (at your option) any later version. # # This software is distributed in the hope that it will be useful, diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml index 43f935f9cf5..b065f2ce45d 100644 --- a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml @@ -129,14 +129,8 @@ org.exoplatform.portal.config.NewPortalConfigListener this listener init the portal configuration - - override - The flag parameter to decide if portal metadata is overriden on restarting server - ${exo.ecms.portalConfig.administration.metadata.override:true} - portal.configuration - description @@ -155,7 +149,7 @@ ${exo.ecms.portalConfig.administration.override:true} - ${exo.ecms.portalConfig.administration.importmode:insert} + ${exo.ecms.portalConfig.administration.importmode:merge} diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml index 80ba6a3dd5c..d85104d58ad 100644 --- a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/navigation.xml @@ -1,23 +1,20 @@ home fas fa-cog - DISPLAYED legacy fas fa-archive - DISPLAYED wcm-backoffice diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml index e553cb0cb8f..f50fe03eb2d 100644 --- a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml @@ -1,7 +1,21 @@ - - + @@ -10,52 +24,58 @@ Site Explorer *:/platform/web-contributors manager:/platform/web-contributors - - - ecmexplorer - FileExplorerPortlet - - - driveName - Managed Sites - false - - - - Site Explorer - *:/platform/web-contributors - false - false - false - - - - authoring-apps - AuthoringDashboard - - Authoring Dashboard - *:/platform/web-contributors - false - false - false - + + *:/platform/users + + + ecmexplorer + FileExplorerPortlet + + + driveName + Managed Sites + false + + + + Site Explorer + *:/platform/web-contributors + false + false + false + + + + authoring-apps + AuthoringDashboard + + Authoring Dashboard + *:/platform/web-contributors + false + false + false + + WcmAdmin WCM Administration manager:/platform/web-contributors manager:/platform/web-contributors - - - ecmadmin - ECMAdminPortlet - - - WCM Administration - *:/platform/web-contributors - false - false - false - + + *:/platform/users + + + ecmadmin + ECMAdminPortlet + + + WCM Administration + *:/platform/web-contributors + false + false + false + + \ No newline at end of file diff --git a/translations.properties b/translations.properties index 66beaaf56b6..fade5083204 100644 --- a/translations.properties +++ b/translations.properties @@ -43,6 +43,7 @@ apps/JCRExplorerPortlet.properties=apps/portlet-explorer/src/main/resources/loca apps/CloudDrive-navigation.properties=apps/portlet-clouddrives/src/main/resources/locale/navigation/group/platform/administrators_en.properties apps/attachments.properties=apps/portlet-documents/src/main/resources/locale/portlet/attachments_en.properties apps/webui.properties=apps/portlet-documents/src/main/resources/locale/portal/webui_en.properties +apps/administration.properties=apps/portlet-clouddrives/src/main/resources/locale/navigation/portal/administration_en.properties # ext ext/AuthoringPublication.properties=ext/authoring/services/src/main/resources/locale/services/publication/lifecycle/authoring/AuthoringPublication_en.xml @@ -59,6 +60,7 @@ ext/UIDocumentComposer.properties=ecms-social-integration/src/main/resources/loc ecm-wcm-extension/views.properties=ecm-wcm-extension/src/main/resources/locale/ecm/views_en.xml ecm-wcm-extension/dialogs.properties=ecm-wcm-extension/src/main/resources/locale/ecm/dialogs_en.xml ecm-wcm-extension/webui.properties=ecm-wcm-extension/src/main/resources/locale/ecm/webui_en.xml +ecm-wcm-extension/administration.properties=ecm-wcm-extension/src/main/resources/locale/navigation/portal/administration_en.properties # portal portal/global.properties=ecm-wcm-extension/src/main/resources/locale/navigation/portal/global_en.properties @@ -67,10 +69,12 @@ portal/web-contributors.properties=ecm-wcm-extension/src/main/resources/locale/n # Editors portlet portlet-editors/navigation.properties=apps/portlet-editors/src/main/resources/locale/navigation/group/platform/administrators_en.properties portlet-editors/portlets.properties=apps/portlet-editors/src/main/resources/locale/portlet/EditorsAdmin_en.xml +portlet-editors/administration.properties=apps/portlet-editors/src/main/resources/locale/navigation/portal/administration_en.properties # Transfer Rules portlet portlet-transfer-rules/navigation.properties=/apps/portlet-transferrules/src/main/resources/locale/navigation/group/platform/administrators_en.properties portlet-transfer-rules/portlets.properties=/apps/portlet-transferrules/src/main/resources/locale/portlet/transferRules_en.properties +portlet-transfer-rules/administration.properties=/apps/portlet-transferrules/src/main/resources/locale/navigation/portal/administration_en.properties # Analytics Analytics.properties=apps/portlet-documents/src/main/resources/locale/portlet/Analytics_en.properties \ No newline at end of file From 3224334c94b43e635c65c615c0c8c9c3c0da6aa7 Mon Sep 17 00:00:00 2001 From: IlhemEssaadi Date: Thu, 12 Oct 2023 16:43:51 +0100 Subject: [PATCH 3/3] fix review1 --- .../portal/portal/administration/navigation.xml | 1 - .../transferRules/portal/portal/administration/pages.xml | 2 +- .../wcm-extension/portal/ecms-portal-configuration.xml | 9 +++++---- .../wcm-extension/portal/portal/administration/pages.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml index 5c8b9351fe3..2692de73bac 100644 --- a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/navigation.xml @@ -36,7 +36,6 @@ fas fa-exchange-alt portal::administration::transferRules - diff --git a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml index 9dd5c0f15f3..334fda1afa1 100644 --- a/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml +++ b/apps/portlet-transferrules/src/main/webapp/WEB-INF/conf/transferRules/portal/portal/administration/pages.xml @@ -24,7 +24,7 @@ Transfer Rules *:/platform/administrators manager:/platform/administrators - + transfer-rules diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml index b065f2ce45d..cf7ae583591 100644 --- a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/ecms-portal-configuration.xml @@ -25,8 +25,8 @@ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - - org.exoplatform.portal.config.UserPortalConfigService + + org.exoplatform.portal.config.UserPortalConfigService @@ -123,7 +123,8 @@ - + + new.portal.config.user.listener initListener org.exoplatform.portal.config.NewPortalConfigListener @@ -189,5 +190,5 @@ - + diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml index f50fe03eb2d..26cfc97a45e 100644 --- a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml +++ b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/wcm-extension/portal/portal/administration/pages.xml @@ -24,7 +24,7 @@ Site Explorer *:/platform/web-contributors manager:/platform/web-contributors - + *:/platform/users @@ -62,7 +62,7 @@ WCM Administration manager:/platform/web-contributors manager:/platform/web-contributors - + *:/platform/users