diff options
Diffstat (limited to 'epsdk-app-onap/src/main/webapp/WEB-INF/jsp')
| -rwxr-xr-x | epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp | 11 | ||||
| -rwxr-xr-x | epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp | 34 |
2 files changed, 42 insertions, 3 deletions
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp index 57aa16ef4..fb55c1168 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp @@ -25,6 +25,9 @@ <script src="app/vid/external/bootstrap/js/bootstrap.min.js"></script>
<script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>
<script src="app/vid/external/upload-file/ng-file-upload.min.js"></script>
+<script src="app/vid/external/angular-feature-flags/featureFlags.min.js"></script>
+<script src="app/vid/external/angular-moment/moment.min.js"></script>
+<script src="app/vid/external/angular-moment/angular-moment.min.js"></script>
<script src="app/vid/scripts/angular-ui-tree.js"></script>
@@ -42,6 +45,7 @@ <script src="app/vid/scripts/modals/alert-modal/alert-modal.controller.js"></script>
<script src="app/vid/scripts/controller/aaiSubscriberController.js"></script>
<script src="app/vid/scripts/controller/creationDialogController.js"></script>
+<script src="app/vid/scripts/controller/iframeDialogController.js"></script>
<script src="app/vid/scripts/controller/deleteResumeDialogController.js"></script>
<script src="app/vid/scripts/controller/detailsDialogController.js"></script>
<script src="app/vid/scripts/controller/statusDialogController.js"></script>
@@ -56,6 +60,7 @@ <script src="app/vid/scripts/controller/testEnvironmentsController.js"></script>
<script src="app/vid/scripts/modals/attach-test-env-manifest/attach-test-env-manifest.controller.js"></script>
<script src="app/vid/scripts/controller/ServiceProxyConfigController.js"></script>
+<script src="app/vid/scripts/controller/iframeController.js"></script>
<script src="app/vid/scripts/directives/angularjs-datetime-picker.js"></script>
<script src="app/vid/scripts/controller/msoCommitModalController.js"></script>
@@ -81,6 +86,7 @@ <script src="app/vid/scripts/services/utilityService.js"></script>
<script src="app/vid/scripts/services/vnfService.js"></script>
<script src="app/vid/scripts/services/pnfService.js"></script>
+<script src="app/vid/scripts/services/crService.js"></script>
<script src="app/vid/scripts/services/change-management.service.js"></script>
<script src="app/vid/scripts/modals/cancel-pending-workflow/cancel-pending-workflow.controller.js"></script>
<script src="app/vid/scripts/services/OwningEntityService.js"></script>
@@ -96,9 +102,10 @@ + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}";
%>
-<div ng-controller="ServiceModelController"
+<div class="service-models-page" ng-controller="ServiceModelController"
ng-init="init(<%=properties%>);" ng-cloak>
- <div ng-view></div>
+ <div class="overlay"></div>
+ <div class="service-model-content" ng-view></div>
</div>
<!-- Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->
<div class="temporary-solution">
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 e52484e2a..479459f09 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 @@ -1,5 +1,11 @@ <script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>
<script src="app/vid/external/upload-file/ng-file-upload.min.js"></script>
+<script src="app/vid/external/angular-feature-flags/featureFlags.min.js"></script>
+<script src="app/vid/external/angular-moment/moment.min.js"></script>
+<script src="app/vid/external/angular-moment/angular-moment.min.js"></script>
+<%@ page import="org.onap.vid.properties.Features"%>
+<%@ page import="org.onap.vid.properties.VidProperties" %>
+<%@ page import="org.onap.portalsdk.core.util.SystemProperties" %>
<div>
<h1 class="heading1">ONAP</h1>
<br>
@@ -19,7 +25,33 @@ <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>
-
+ <%
+ if (Features.FLAG_ADD_MSO_TESTAPI_FIELD.isActive()) {
+
+ String displayTestApi = SystemProperties.getProperty(VidProperties.MSO_DISPLAY_TEST_API_ON_SCREEN);
+ String defaultTestApiValue = SystemProperties.getProperty(VidProperties.MSO_DEFAULT_TEST_API);
+
+ String selectionVisibility = Boolean.parseBoolean(displayTestApi) ? "inherit" : "hidden";
+ %>
+ <div style="visibility: <%=selectionVisibility%>" id="selectTestApiSection">
+ <br/><br/><br/>
+ <label>Test API for A-la-carte:</label>
+ <select style="width: 20ch" id="selectTestApi" onchange="sessionStorage.setItem('msoRequestParametersTestApiValue',this.value);">
+ <option value="VNF_API">VNF_API (old)</option>
+ <option value="GR_API">GR_API (new)</option>
+ </select>
+ </div>
+ <script type="text/javascript">
+ var selectedValue = sessionStorage.getItem('msoRequestParametersTestApiValue') || "<%=defaultTestApiValue%>";
+ var element = document.getElementById('selectTestApi');
+ if (element) {
+ element.value = selectedValue;
+ }
+ sessionStorage.setItem('msoRequestParametersTestApiValue', selectedValue);
+ </script>
+ <%
+ }
+ %>
<BR>
</div>
<br>
|