From 13e173ac773f87d51396c240a6fb5150f041af28 Mon Sep 17 00:00:00 2001 From: seshukm Date: Thu, 20 Apr 2017 15:57:49 +0530 Subject: Issues of the VNF Market place IssueId : VNFSDK-21 Change-Id: I50e0913b7200efa3bb73ffaf9ce371840e1fcd22 Signed-off-by: seshukm --- .../src/main/webapp/vnfmarket/app/app.config.js | 2 +- .../webapp/vnfmarket/app/modules/home/home.html | 4 +- .../webapp/vnfmarket/app/modules/home/homeRoute.js | 2 +- .../vnfmarket/app/modules/home/marketplace.html | 16 +-- .../home/serviceDetails/functionalTest/view.html | 2 +- .../home/serviceDetails/serviceDetails.html | 6 +- .../onboarding/functionalTest/view.html | 2 +- .../vnfmarket/common/config/configuration.js | 2 +- .../vnfmarket/common/services/httpService.js | 4 +- vnfmarket/src/main/webapp/vnfmarket/index.html | 120 ++++++++++----------- 10 files changed, 80 insertions(+), 80 deletions(-) diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js b/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js index 2efd963c..4b9af093 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/app.config.js @@ -85,7 +85,7 @@ $translateProvider.useSanitizeValueStrategy(null); $translateProvider.useStaticFilesLoader({ - prefix: "vnfmarket/common/locale/locale-", + prefix: "/openoui/vnfmarket/common/locale/locale-", suffix: ".json" }); $translateProvider.preferredLanguage('en') diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html index f27486fa..a10cf5fe 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/home.html @@ -17,7 +17,7 @@
- +
@@ -27,7 +27,7 @@
- +

{{ 'module.marketplace.sideNav.marketplaceNav' | translate}}

diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js index ff2d0994..be24302e 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/homeRoute.js @@ -26,7 +26,7 @@ angular.module('vnfmarket') .config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider, vnfConfig) { - var homePath = 'vnfmarket/app/modules/home'; + var homePath = '/openoui/vnfmarket/app/modules/home'; $stateProvider .state('home', { url: '', diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html index e0e9773b..eb4cf6b5 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/marketplace.html @@ -16,7 +16,7 @@
- + @@ -95,14 +95,14 @@ @@ -110,7 +110,7 @@ @@ -184,7 +184,7 @@ {{'common.actions.update' | translate}} - + @@ -192,13 +192,13 @@ {{'common.actions.download' | translate}} - + {{'common.actions.delete' | translate}} - + @@ -215,7 +215,7 @@
- +

{{'module.marketplace.main.emptyList.label' | translate}} {{'module.marketplace.main.emptyList.anchor' | translate}} {{'module.marketplace.main.emptyList.labelContinued' | translate}}

diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html index 61455396..86875311 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/functionalTest/view.html @@ -3,7 +3,7 @@
- +

diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html index 3731bf66..a6221996 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceDetails/serviceDetails.html @@ -42,7 +42,7 @@ @@ -50,14 +50,14 @@ diff --git a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html index 1056ac7b..35fdb528 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html +++ b/vnfmarket/src/main/webapp/vnfmarket/app/modules/home/serviceUpload/onboarding/functionalTest/view.html @@ -12,7 +12,7 @@
- +

diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js b/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js index a98c7523..fb8f85e5 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js +++ b/vnfmarket/src/main/webapp/vnfmarket/common/config/configuration.js @@ -72,7 +72,7 @@ } }, "modulePath": { - "home": "vnfmarket/app/modules/home" + "home": "/openoui/vnfmarket/app/modules/home" } }) })(); \ No newline at end of file diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js b/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js index 1b340061..51b64348 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js +++ b/vnfmarket/src/main/webapp/vnfmarket/common/services/httpService.js @@ -50,7 +50,7 @@ var parentEl = angular.element(document.body); $mdDialog.show({ parent:parentEl, - templateUrl:'vnfmarket/common/templates/serverError.html', + templateUrl:'/openoui/vnfmarket/common/templates/serverError.html', locals:{ error:error }, @@ -92,7 +92,7 @@ var parentEl = angular.element(document.body); $mdDialog.show({ parent:parentEl, - templateUrl:'vnfmarket/common/templates/serverError.html', + templateUrl:'/openoui/vnfmarket/common/templates/serverError.html', locals:{ error:error }, diff --git a/vnfmarket/src/main/webapp/vnfmarket/index.html b/vnfmarket/src/main/webapp/vnfmarket/index.html index f5f8c77c..1293150f 100644 --- a/vnfmarket/src/main/webapp/vnfmarket/index.html +++ b/vnfmarket/src/main/webapp/vnfmarket/index.html @@ -24,21 +24,21 @@ - - - - + + + + - - - - + + + + - - - - - + + + + @@ -46,56 +46,56 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg