From 3b12c6e9b5d2885244b7b1fb6c016ad8999e3cf2 Mon Sep 17 00:00:00 2001
From: Rina Roi <rina.roi@intl.att.com>
Date: Tue, 30 Jul 2019 12:31:51 +0300
Subject: Take 'contact us' url from configuration

Issue-ID: VID-541
Signed-off-by: Rina Roi <rina.roi@intl.att.com>
Change-Id: Ia7d829c20a8689f7aab737ea83ed420b6c3448a3
---
 epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties      | 1 +
 .../src/main/webapp/WEB-INF/conf/system_template.properties        | 2 ++
 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp             | 7 +++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'epsdk-app-onap/src/main')

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 976ec7504..70b41c6e4 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@ -123,6 +123,7 @@ ecomp_shared_context_rest_url= https://www.openecomp.org:8080/ecompportal/contex
 
 # Link shown in Help menu
 contact_us_link = https://www.openecomp.org/EcompPortal/ECOMP+Portal+Home
+homepage_contact_us_url = mailto:portal@lists.onap.org
 
 # An Unique 128-bit value defined to identify a specific version
 # of an application deployed on a specific virtual machine.
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index cdea4d004..5143b1e6d 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
@@ -54,6 +54,7 @@ mobile_enable = false
 # Cache config file is needed on the classpath
 cache_config_file_path        = /WEB-INF/classes/cache.ccf
 cache_switch                  = 199
+
 cache_load_on_startup         = false
 
 user_name = fullName
@@ -84,6 +85,7 @@ aai.vnf.provstatus=${AAI_VNF_PROVSTATUS}
 ecomp_shared_context_rest_url=${VID_ECOMP_SHARED_CONTEXT_REST_URL}
 # Link shown in Help menu
 contact_us_link=${VID_CONTACT_US_LINK}
+homepage_contact_us_url= mailto:portal@lists.onap.org
 #Cron Schedules
 log_cron                      = 0 0/1 * * * ?;
 mylogins_feed_cron            = 0 0/60 * * * ?;
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp
index 479459f09..8c9c39ed8 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -22,9 +22,12 @@
    The VID user can also search for, and display, existing service instances and direct the instantiation of 
    subsequent instance components.
      <br><br>
+    <%
+        String contactUsUrl = SystemProperties.getProperty(VidProperties.HOMEPAGE_CONTACT_US_URL);
+    %>
   
-    <h1 class="heading1"><a href="mailto:portal@lists.onap.org" target="_top">Contact Us</a></h1>
-    <a href="mailto:portal@lists.onap.org" target="_top">Please click here to contact us.</a>
+    <h1 class="heading1"><a href="<%=contactUsUrl%>" target="_top">Contact Us</a></h1>
+    <a href="<%=contactUsUrl%>" target="_top">Please click here to contact us.</a>
     <%
         if (Features.FLAG_ADD_MSO_TESTAPI_FIELD.isActive()) {
 
-- 
cgit 1.2.3-korg