diff options
Diffstat (limited to 'vid-app-common/src/test/resources/WEB-INF/jsp')
4 files changed, 54 insertions, 28 deletions
diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp index 2c7dd9f5f..76fe13e4b 100644 --- a/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp @@ -12,7 +12,7 @@ <script src="app/vid/test/testAaiData.js"></script> <script src="app/vid/scripts/controller/creationDialogController.js"></script> -<script src="app/vid/scripts/controller/deletionDialogController.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> <script src="app/vid/scripts/controller/msoCommitController.js"></script> @@ -21,7 +21,7 @@ <script src="app/vid/scripts/services/asdcService.js"></script> <script src="app/vid/scripts/services/creationService.js"></script> <script src="app/vid/scripts/services/dataService.js"></script> -<script src="app/vid/scripts/services/deletionService.js"></script> +<script src="app/vid/scripts/services/deleteResumeService.js"></script> <script src="app/vid/scripts/services/detailsService.js"></script> <script src="app/vid/scripts/services/statusService.js"></script> <script src="app/vid/scripts/services/componentService.js"></script> @@ -43,7 +43,7 @@ <link rel="stylesheet" type="text/css" href="app/vid/styles/angular-ui-tree.css" /> <link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" /> -<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp index 9fdf75d64..2adaf447d 100644 --- a/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp @@ -1,3 +1,4 @@ +<link rel="stylesheet" type="text/css" href="app/vid/external/bootstrap/css/bootstrap.min.css" /> <link rel="stylesheet" type="text/css" href="app/vid/styles/aaiGetSubs.css" /> <link rel="stylesheet" type="text/css" href="app/vid/styles/aaiSubDetails.css" /> <link rel="stylesheet" type="text/css" href="app/vid/styles/aaiSubViewEdit.css" /> @@ -6,18 +7,20 @@ <link rel="stylesheet" type="text/css" href="app/vid/styles/instantiate.css" /> <link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" /> <link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" /> -<link rel="stylesheet" type="text/css" href="app/vid/external/bootstrap/css/bootstrap.min.css" /> +<link rel="stylesheet" type="text/css" href="app/vid/styles/angularjs-datetime-picker.css"></link> +<link rel="stylesheet" type="text/css" href="app/vid/styles/common.css" /> <script> var appDS2 = app; </script> + <script src="app/vid/scripts/controller/VidApp.js"></script> <!-- Latest compiled and minified JavaScript --> -<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> +<script src="app/vid/external/bootstrap/js/bootstrap.min.js"></script> <script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script> @@ -32,28 +35,45 @@ <script src="app/vid/scripts/filters/date.filter.js"></script> <script src="app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.controller.js"></script> <script src="app/vid/scripts/modals/new-change-management/new-change-management.controller.js"></script> +<script src="app/vid/scripts/modals/alert-modal/alert-modal.controller.js"></script> +<script src="app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js"></script> + +<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/deletionDialogController.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> <script src="app/vid/scripts/controller/InstantiationController.js"></script> <script src="app/vid/scripts/controller/msoCommitController.js"></script> +<script src="app/vid/scripts/controller/pnfSearchAssociationController.js"></script> <script src="app/vid/scripts/controller/ServiceModelController.js"></script> <script src="app/vid/scripts/controller/previousVersionDialogController.js"></script> <script src="app/vid/scripts/controller/previousVersionContoller.js"></script> +<script src="app/vid/scripts/controller/AddNetworkNodeController.js"></script> <script src="app/vid/scripts/controller/change-management.controller.js"></script> +<script src="app/vid/scripts/controller/testEnvironmentsController.js"></script> +<script src="app/vid/scripts/controller/ServiceProxyConfigController.js"></script> + +<script src="app/vid/scripts/directives/angularjs-datetime-picker.js"></script> +<script src="app/vid/scripts/controller/ServiceProxyConfigController.js"></script> + +<script src="app/vid/scripts/directives/angularjs-datetime-picker.js"></script> +<script src="app/vid/scripts/controller/msoCommitModalController.js"></script> + <script src="app/vid/scripts/directives/extensionsDirective.js"></script> <script src="app/vid/scripts/directives/parameterBlockDirective.js"></script> <script src="app/vid/scripts/directives/popupWindowDirective.js"></script> <script src="app/vid/scripts/directives/progressBarDirective.js"></script> +<script src="app/vid/scripts/directives/serviceMetadata.js"></script> <script src="app/vid/scripts/services/aaiService.js"></script> +<script src="app/vid/scripts/services/schedulerService.js"></script> <script src="app/vid/scripts/services/asdcService.js"></script> <script src="app/vid/scripts/services/componentService.js"></script> <script src="app/vid/scripts/services/creationService.js"></script> <script src="app/vid/scripts/services/dataService.js"></script> -<script src="app/vid/scripts/services/deletionService.js"></script> +<script src="app/vid/scripts/services/deleteResumeService.js"></script> <script src="app/vid/scripts/services/detailsService.js"></script> <script src="app/vid/scripts/services/statusService.js"></script> <script src="app/vid/scripts/services/msoService.js"></script> @@ -61,8 +81,12 @@ <script src="app/vid/scripts/services/utilityService.js"></script> <script src="app/vid/scripts/services/vnfService.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> +<script src="app/vid/scripts/services/testEnvironmentsService.js"></script> -<%@ page import="org.openecomp.vid.mso.*"%> + +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) @@ -75,18 +99,20 @@ <div ng-view></div> </div> <!-- Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 --> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> -<br> +<div class="temporary-solution"> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> + <br> +</div> diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp index abcc8e26d..711308996 100644 --- a/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp @@ -31,7 +31,7 @@ Consider / investigate replacing this approach with an alternative REST / Angular mechanism. --> -<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp index 031fedf8c..105ff0b58 100644 --- a/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp @@ -7,7 +7,7 @@ <link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" /> <script src="app/vid/scripts/controller/creationDialogController.js"></script> -<script src="app/vid/scripts/controller/deletionDialogController.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> <script src="app/vid/scripts/controller/msoCommitController.js"></script> @@ -16,7 +16,7 @@ <script src="app/vid/scripts/services/asdcService.js"></script> <script src="app/vid/scripts/services/creationService.js"></script> <script src="app/vid/scripts/services/dataService.js"></script> -<script src="app/vid/scripts/services/deletionService.js"></script> +<script src="app/vid/scripts/services/deleteResumeService.js"></script> <script src="app/vid/scripts/services/detailsService.js"></script> <script src="app/vid/scripts/services/statusService.js"></script> <script src="app/vid/scripts/services/componentService.js"></script> @@ -40,7 +40,7 @@ Consider / investigate replacing this approach with an alternative REST / Angular mechanism. --> -<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) @@ -54,7 +54,7 @@ <div popup-window class="popupContents" ngx-show="{{popup.isVisible}}" ng-cloak> <div ng-include="'app/vid/scripts/view-models/creationDialog.htm'"></div> - <div ng-include="'app/vid/scripts/view-models/deletionDialog.htm'"></div> + <div ng-include="'app/vid/scripts/view-models/deleteResumeDialog.htm'"></div> <div ng-include="'app/vid/scripts/view-models/detailsDialog.htm'" onload="autoStartTest();"></div> </div> |