diff options
5 files changed, 10 insertions, 2 deletions
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()) {
diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java b/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java index 8331886c0..39750246b 100644 --- a/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java +++ b/vid-app-common/src/main/java/org/onap/vid/properties/VidProperties.java @@ -31,6 +31,7 @@ public class VidProperties extends SystemProperties { //VID General Properties public static final String MSO_DISPLAY_TEST_API_ON_SCREEN="mso.displayTestAPIOnScreen"; + public static final String HOMEPAGE_CONTACT_US_URL = "homepage_contact_us_url"; public static final String MSO_DEFAULT_TEST_API="mso.defaultTestAPI"; public static final String MSO_MAX_OPENED_INSTANTIATION_REQUESTS="mso.maxOpenedInstantiationRequests"; public static final String MSO_ASYNC_POLLING_INTERVAL_SECONDS="mso.asyncPollingIntervalSeconds"; diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties index bfd7ef985..829c2cae9 100644 --- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties +++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties @@ -104,6 +104,7 @@ ecomp_shared_context_rest_url= https://www.ecomp.att.com:8080/ecompportal/contex # Link shown in Help menu contact_us_link = https://wiki.web.att.com/display/EcompPortal/ECOMP+Portal+Home +homepage_contact_us_url = mailto:portal@lists.onap.org # Camunda cockpit link camunda_cockpit_link = https://cloopwf.client.research.att.com:8443/camunda/app/cockpit/default/#/dashboard |