From 439f658078e7d4a7e36897ccf8f72b5a0933aa45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E2=80=9Cshentao=E2=80=9D?= Date: Tue, 21 Mar 2017 14:32:47 +0800 Subject: [PATCH] link menu to function pages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Issue-id: CLIENT-175 Change-Id: I6ebb2112a96ec470da69ca532d94217b95a94e2c Signed-off-by: “shentao” --- .../main/resources/portalConfig/msb_register.xml | 18 ++++++------- login/src/main/webapp/login/html/menu.html | 17 ++++++++---- .../{resourceNfvo.html => resourceManagement.html} | 2 +- .../main/webapp/login/html/temp/resourceSdno.html | 18 ------------- login/src/main/webapp/login/js/app.js | 30 +++++++++++----------- 5 files changed, 37 insertions(+), 48 deletions(-) rename login/src/main/webapp/login/html/temp/{resourceNfvo.html => resourceManagement.html} (93%) delete mode 100644 login/src/main/webapp/login/html/temp/resourceSdno.html diff --git a/integration/src/main/resources/portalConfig/msb_register.xml b/integration/src/main/resources/portalConfig/msb_register.xml index 6a56f89a..9e3861eb 100644 --- a/integration/src/main/resources/portalConfig/msb_register.xml +++ b/integration/src/main/resources/portalConfig/msb_register.xml @@ -23,7 +23,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/login login UI @@ -33,7 +33,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/catalog catalog UI @@ -43,7 +43,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/extsys extsys UI @@ -53,7 +53,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/performance performance UI @@ -63,7 +63,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/monitor monitor UI @@ -73,7 +73,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/lifecyclemgr lifecyclemgr UI @@ -83,7 +83,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/resmgr-nfv resmgr-nfv UI @@ -93,7 +93,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/resmgr-sdn resmgr-sdn UI @@ -103,7 +103,7 @@ 127.0.0.1 - 8300 + 9150 /openoui/user user UI diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html index 59bc30a7..db3f4067 100644 --- a/login/src/main/webapp/login/html/menu.html +++ b/login/src/main/webapp/login/html/menu.html @@ -23,7 +23,7 @@
  • - Service + Service
    • Service Management
      • @@ -31,11 +31,18 @@
    • - Resource Mgr + Resource
      +
      • +
    • +
      + Province +
      +
    • @@ -84,7 +91,7 @@
      - + User Name diff --git a/login/src/main/webapp/login/html/temp/resourceNfvo.html b/login/src/main/webapp/login/html/temp/resourceManagement.html similarity index 93% rename from login/src/main/webapp/login/html/temp/resourceNfvo.html rename to login/src/main/webapp/login/html/temp/resourceManagement.html index 52e583bd..3614ff55 100644 --- a/login/src/main/webapp/login/html/temp/resourceNfvo.html +++ b/login/src/main/webapp/login/html/temp/resourceManagement.html @@ -14,5 +14,5 @@ limitations under the License. -->
      -

      resourceNfvo test page

      +

      resourceManagement test page

      diff --git a/login/src/main/webapp/login/html/temp/resourceSdno.html b/login/src/main/webapp/login/html/temp/resourceSdno.html deleted file mode 100644 index 76ff13e1..00000000 --- a/login/src/main/webapp/login/html/temp/resourceSdno.html +++ /dev/null @@ -1,18 +0,0 @@ - -
      -

      resourceSdno test page

      -
      diff --git a/login/src/main/webapp/login/js/app.js b/login/src/main/webapp/login/js/app.js index cf267f15..6d3ac224 100644 --- a/login/src/main/webapp/login/js/app.js +++ b/login/src/main/webapp/login/js/app.js @@ -33,20 +33,20 @@ var app = angular.module("POCApp", ["ui.router", "ngTable"]) }) .state("menu.serviceManagement", { url: "/serviceManagement", - templateUrl : "/openoui/login/html/temp/serviceManagement.html", + templateUrl : "/openoui/lifecyclemgr/index.html", controller : "serviceManagementCtrl", authenticate: true }) - .state("menu.resourceSdno", { - url: "/resourceSdno", - templateUrl : "/openoui/login/html/temp/resourceSdno.html", - controller : "resourceSdnoCtrl", + .state("menu.resourceManagement", { + url: "/resourceManagement", + templateUrl : "/openoui/resmgr/index.html", + controller : "resourceManagementCtrl", authenticate: true }) - .state("menu.resourceNfvo", { - url: "/resourceNfvo", - templateUrl : "/openoui/login/html/temp/resourceNfvo.html", - controller : "resourceNfvoCtrl", + .state("menu.provinceManagement", { + url: "/provinceManagement", + templateUrl : "/openoui/provincemgr/index.html", + controller : "provinceManagementCtrl", authenticate: true }) .state("menu.modelDesign", { @@ -159,14 +159,14 @@ var app = angular.module("POCApp", ["ui.router", "ngTable"]) $scope.message = "Service Management"; }) - /*Resource Sdno Controller*/ - .controller("resourceSdnoCtrl", function($scope, DataService, $log){ - $scope.message = "Resource Sdno"; + /*Resource Management Controller*/ + .controller("resourceManagementCtrl", function($scope, DataService, $log){ + $scope.message = "Resource Management"; }) - /*Resource Nfvo Controller*/ - .controller("resourceNfvoCtrl", function($scope, DataService, $log){ - $scope.message = "Resource Nfvo"; + /*Province Management Controller*/ + .controller("provinceManagementCtrl", function($scope, DataService, $log){ + $scope.message = "Province Management"; }) /*Model Design Controller*/ -- 2.16.6