From f995d1f766194110b6dd4d559c70f6340fe0c00d Mon Sep 17 00:00:00 2001
From: GouadriaHanen <hgouadria@exoplatform.com>
Date: Thu, 24 Aug 2023 13:53:34 +0100
Subject: [PATCH] clean up code

---
 .../navigation/portal/mycraft_en.properties   | 18 ++++++++
 .../portal-configuration.xml                  |  2 +-
 .../portal/mycraft/navigation.xml             | 45 ++++++++++---------
 .../portal/mycraft/portal.xml                 | 17 +++++++
 4 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/digital-workplace-webapps/src/main/resources/locale/navigation/portal/mycraft_en.properties b/digital-workplace-webapps/src/main/resources/locale/navigation/portal/mycraft_en.properties
index f5da00855..5d6fbbd94 100644
--- a/digital-workplace-webapps/src/main/resources/locale/navigation/portal/mycraft_en.properties
+++ b/digital-workplace-webapps/src/main/resources/locale/navigation/portal/mycraft_en.properties
@@ -1,3 +1,21 @@
+#
+# 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 3 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.mycraft.drives=Personal drive
 portal.mycraft.tasks=Tasks
 portal.mycraft.agenda=Agenda
diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml
index da15c0ccd..5b3d2de89 100644
--- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml
+++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal-configuration.xml
@@ -54,7 +54,7 @@
         <value-param>
           <name>override</name>
           <description>The flag parameter to decide if portal metadata is overriden on restarting server</description>
-          <value>true</value>
+          <value>${exo.mycraft.portalConfig.metadata.override:true}</value>
         </value-param>
         <object-param>
           <name>group.configuration</name>
diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml
index cbf77f442..bdeb154f4 100644
--- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml
+++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/navigation.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  This file is part of the Meeds project (https://meeds.io/).
-  Copyright (C) 2023 Meeds Association
-  contact@meeds.io
-  This program 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 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
-  Lesser General Public License for more details.
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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"
@@ -25,28 +26,28 @@
       <node>
         <name>dashboard</name>
         <label>#{portal.mycraft.drives}</label>
-        <icon>fas fa-briefcase</icon>
-        <visibility>SYSTEM</visibility>
+        <icon>fa-briefcase</icon>
+        <visibility>DISPLAYED</visibility>
         <page-reference>portal::global::drives</page-reference>
         <node>
           <name>tasks</name>
           <label>#{portal.mycraft.tasks}</label>
-          <icon>fas fa-tasks</icon>
-          <visibility>SYSTEM</visibility>
+          <icon>fa-tasks</icon>
+          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::tasks</page-reference>
         </node>
         <node>
           <name>agenda</name>
           <label>#{portal.mycraft.agenda}</label>
-          <icon>fas fa-calendar-alt</icon>
-          <visibility>SYSTEM</visibility>
+          <icon>fa-calendar-alt</icon>
+          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::agenda</page-reference>
           </node>
         <node>
           <name>processes</name>
           <label>#{portal.mycraft.processes}</label>
-          <icon>fas fa-file-invoice</icon>
-          <visibility>SYSTEM</visibility>
+          <icon>fa-file-invoice</icon>
+          <visibility>DISPLAYED</visibility>
           <page-reference>portal::global::processes</page-reference>
         </node>
       </node>
diff --git a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml
index 710aa828e..e88c90025 100644
--- a/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml
+++ b/digital-workplace-webapps/src/main/webapp/WEB-INF/conf/digital-workplace/portal/mycraft/portal.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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/>.
+ *
+-->
 <portal-config>
     <portal-name>mycraft</portal-name>
     <label>My Craft</label>