fix review

exoplatform · Oct 12, 2023 · 8935ed3 · 8935ed3
1 parent 3ae91b4
commit 8935ed3
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 56 deletions.
diff --git a/services/src/main/resources/locale/navigation/portal/administration_en.properties b/services/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/translations.properties b/translations.properties
@@ -29,3 +29,4 @@ webrtc/administrators.properties=services/src/main/resources/locale/navigation/g
 webrtc/global.properties=services/src/main/resources/locale/navigation/portal/global_en.properties
 Analytics.properties=webapp/src/main/resources/locale/portlet/Analytics_en.properties
 notifcations.properties=webapp/src/main/resources/locale/portlet/notification/webconferencingNotification_en.properties
+administration.properties=services/src/main/resources/locale/navigation/portal/administration_en.properties
diff --git a/webapp/src/main/webapp/WEB-INF/conf/webconferencing/portal/portal-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/webconferencing/portal/portal-configuration.xml
@@ -44,14 +44,8 @@
       <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
       <description>this listener init the portal configuration</description>
       <init-params>
-        <value-param>
-          <name>override</name>
-          <description>The flag parameter to decide if portal metadata is overriden on restarting server</description>
-          <value> ${exo.agenda.portalConfig.administration.metadata.override:true} </value>
-        </value-param>
         <object-param>
           <name>portal.configuration</name>
-          <description>description</description>
           <object type="org.exoplatform.portal.config.NewPortalConfig">
             <field name="predefinedOwner">
               <collection type="java.util.HashSet">
@@ -70,7 +64,7 @@
               <boolean>${exo.webconferencing.portalConfig.administration.override:true}</boolean>
             </field>
             <field name="importMode">
-              <string>${exo.webconferencing.portalConfig.administration.importmode:insert}</string>
+              <string>${exo.webconferencing.portalConfig.administration.importmode:merge}</string>
             </field>
           </object>
         </object-param>

diff --git a/.../src/main/webapp/WEB-INF/conf/webconferencing/portal/portal/administration/navigation.xml b/.../src/main/webapp/WEB-INF/conf/webconferencing/portal/portal/administration/navigation.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-
-    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.
-
+ * Copyright (C) 2023 eXo Platform SAS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
 -->
 <node-navigation
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -30,12 +27,10 @@
       <name>home</name>
       <label>#{portal.administration.home}</label>
       <icon>fas fa-cog</icon>
-      <visibility>DISPLAYED</visibility>
       <node>
         <name>applications</name>
         <label>#{portal.administration.applications}</label>
         <icon>fas fa-boxes</icon>
-        <visibility>DISPLAYED</visibility>
         <node>
           <name>visio</name>
           <label>#{portal.administration.visio}</label>

diff --git a/webapp/src/main/webapp/WEB-INF/conf/webconferencing/portal/portal/administration/pages.xml b/webapp/src/main/webapp/WEB-INF/conf/webconferencing/portal/portal/administration/pages.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-    Copyright (C) 2017 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.
-
+ * Copyright (C) 2023 eXo Platform SAS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
 -->
 <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_objects_1_8 http://www.exoplatform.org/xml/ns/gatein_objects_1_8"
@@ -27,14 +24,17 @@
     <title>Web Conferencing Administration</title>
     <access-permissions>*:/platform/administrators</access-permissions>
     <edit-permission>manager:/platform/administrators</edit-permission>
-    <portlet-application>
-      <portlet>
-        <application-ref>webconferencing</application-ref>
-        <portlet-ref>WebConferencingAdminPortlet</portlet-ref>
-      </portlet>
-      <title>Web Conferencing Administration</title>
-      <access-permissions>*:/platform/administrators</access-permissions>
-      <show-info-bar>false</show-info-bar>
-    </portlet-application>
+    <container id="singlePageApplicationContainer" template="system:/groovy/portal/webui/container/UIContainer.gtmpl" cssClass="singlePageApplication">
+      <access-permissions>*:/platform/users</access-permissions>
+      <portlet-application>
+        <portlet>
+          <application-ref>webconferencing</application-ref>
+          <portlet-ref>WebConferencingAdminPortlet</portlet-ref>
+        </portlet>
+        <title>Web Conferencing Administration</title>
+        <access-permissions>*:/platform/administrators</access-permissions>
+        <show-info-bar>false</show-info-bar>
+      </portlet-application>
+    </container>
   </page>
 </page-set>