summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--integration/src/main/resources/portalConfig/msb_register.xml18
-rw-r--r--login/src/main/webapp/login/html/menu.html17
-rw-r--r--login/src/main/webapp/login/html/temp/resourceManagement.html (renamed from login/src/main/webapp/login/html/temp/resourceNfvo.html)2
-rw-r--r--login/src/main/webapp/login/html/temp/resourceSdno.html18
-rw-r--r--login/src/main/webapp/login/js/app.js30
5 files changed, 37 insertions, 48 deletions
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 @@
<registerList>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/login</url>
<serviceName>login</serviceName>
<protocol>UI</protocol>
@@ -33,7 +33,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/catalog</url>
<serviceName>catalog</serviceName>
<protocol>UI</protocol>
@@ -43,7 +43,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/extsys</url>
<serviceName>extsys</serviceName>
<protocol>UI</protocol>
@@ -53,7 +53,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/performance</url>
<serviceName>performance</serviceName>
<protocol>UI</protocol>
@@ -63,7 +63,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/monitor</url>
<serviceName>monitor</serviceName>
<protocol>UI</protocol>
@@ -73,7 +73,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/lifecyclemgr</url>
<serviceName>lifecyclemgr</serviceName>
<protocol>UI</protocol>
@@ -83,7 +83,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/resmgr-nfv</url>
<serviceName>resmgr-nfv</serviceName>
<protocol>UI</protocol>
@@ -93,7 +93,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/resmgr-sdn</url>
<serviceName>resmgr-sdn</serviceName>
<protocol>UI</protocol>
@@ -103,7 +103,7 @@
</registerInfo>
<registerInfo>
<ip>127.0.0.1</ip>
- <port>8300</port>
+ <port>9150</port>
<url>/openoui/user</url>
<serviceName>user</serviceName>
<protocol>UI</protocol>
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 @@
<ul id="accordion" class="accordion">
<li>
<div class="link">
- <i class="fa fa-globe"></i>Service<i class="fa fa-chevron-down"></i>
+ <i class="fa fa-cloud"></i>Service<i class="fa fa-chevron-down"></i>
</div>
<ul class="submenu">
<li><a ui-sref=".serviceManagement" ui-sref-active="submenu_active">Service Management</a></li>
@@ -31,11 +31,18 @@
</li>
<li>
<div class="link">
- <i class="fa fa-search-minus"></i>Resource Mgr<i class="fa fa-chevron-down"></i>
+ <i class="fa fa-search-minus"></i>Resource<i class="fa fa-chevron-down"></i>
</div>
<ul class="submenu">
- <li><a ui-sref=".resourceSdno" ui-sref-active="submenu_active">Resource Mgr sdno</a></li>
- <li><a ui-sref=".resourceNfvo" ui-sref-active="submenu_active">Resource Mgr Nfvo</a></li>
+ <li><a ui-sref=".resourceManagement" ui-sref-active="submenu_active">Resource Management</a></li>
+ </ul>
+ </li>
+ <li>
+ <div class="link">
+ <i class="fa fa-map-marker"></i>Province<i class="fa fa-chevron-down"></i>
+ </div>
+ <ul class="submenu">
+ <li><a ui-sref=".provinceManagement" ui-sref-active="submenu_active">Province Management</a></li>
</ul>
</li>
<li>
@@ -84,7 +91,7 @@
<div id="page-header-wrapper" class="clearfix">
<div class="top-icon-bar dropdown">
<a href="javascript:;" title="" class="user-ico clearfix" data-toggle="dropdown">
- <img width="36" src="/openoui/login/image/user.png" alt="">
+ <img width="36" src="/openoui/login/image/user.png" alt="" style="border-radius: 15px;"/>
<span>User Name</span>
<i class="fa fa-chevron-down"></i>
</a>
diff --git a/login/src/main/webapp/login/html/temp/resourceNfvo.html b/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.
-->
<div>
- <h4>resourceNfvo test page</h4>
+ <h4>resourceManagement test page</h4>
</div>
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 @@
-<!--
- Copyright 2016-2017, China Mobile Co., Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<div>
- <h4>resourceSdno test page</h4>
-</div>
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*/