From: “shentao” Date: Wed, 29 Mar 2017 12:37:22 +0000 (+0800) Subject: add holmes modules into menu X-Git-Tag: release/mercury~66 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8d5667415f9e6656fa7e22279bedd53a52dd6c27;p=vnfsdk%2Frefrepo.git add holmes modules into menu Issue-id: CLIENT-175 Change-Id: Ic1616a80b9ded4ec6690ae24919b35f04acc238f Signed-off-by: “shentao” --- diff --git a/integration/src/main/resources/portalConfig/msb_register.xml b/integration/src/main/resources/portalConfig/msb_register.xml index 2f9c60ad..0f3777de 100644 --- a/integration/src/main/resources/portalConfig/msb_register.xml +++ b/integration/src/main/resources/portalConfig/msb_register.xml @@ -141,5 +141,15 @@ hash 0 + + 127.0.0.1 + 9150 + /openoui/holmes + holmes + UI + 1 + hash + 0 + diff --git a/login/src/main/webapp/login/html/login.html b/login/src/main/webapp/login/html/login.html index ee20f5ec..70c77684 100644 --- a/login/src/main/webapp/login/html/login.html +++ b/login/src/main/webapp/login/html/login.html @@ -14,36 +14,65 @@ limitations under the License. --> -

-
-
-
-
- -

{{error}}

-

- - -

-

- - -

-

- - -

- -
+ + + + + + + OPEN-O + + + + + + + + + + + + + + + + + + + + +

+
+
+
+
+ +

{{error}}

+

+ + +

+

+ + +

+

+ + +

+ +
+
+
+

+
+
+
+
+
-
-

-
-
-
-
-
-
+ + diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html index 2cdfd6f0..6908d056 100644 --- a/login/src/main/webapp/login/html/menu.html +++ b/login/src/main/webapp/login/html/menu.html @@ -14,117 +14,151 @@ limitations under the License. --> -
-
- - -
+ + + + + + + OPEN-O + -
-
-
-
- - - User Name - - -
\ No newline at end of file + + diff --git a/login/src/main/webapp/login/index.html b/login/src/main/webapp/login/index.html index 57cc88dc..7350057c 100644 --- a/login/src/main/webapp/login/index.html +++ b/login/src/main/webapp/login/index.html @@ -16,40 +16,106 @@ - + - + OPEN-O - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + +
+
+ + + + + + + + +
+
diff --git a/login/src/main/webapp/login/js/app.js b/login/src/main/webapp/login/js/app.js deleted file mode 100644 index cf647974..00000000 --- a/login/src/main/webapp/login/js/app.js +++ /dev/null @@ -1,281 +0,0 @@ -/* - Copyright 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. -*/ - -var app = angular.module("POCApp", ["ui.router", "ngTable"]) - .config(function($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvider){ - $urlMatcherFactoryProvider.caseInsensitive(true); - $urlRouterProvider.otherwise('/login'); - $stateProvider - .state('login', { - url : '/login', - templateUrl : '/openoui/login/html/login.html', - controller : 'loginCtrl', - authenticate: false - }) - .state("menu", { - url: "/menu", - templateUrl : "/openoui/login/html/menu.html", - controller : "menuCtrl", - authenticate: true - }) - .state("menu.serviceManagement", { - url: "/serviceManagement", - templateUrl : "/openoui/lifecyclemgr/index.html", - controller : "serviceManagementCtrl", - authenticate: true - }) - .state("menu.resourceManagement", { - url: "/resourceManagement", - // templateUrl : "/openoui/resmgr/index.html", - template : "", - controller : "resourceManagementCtrl", - authenticate: true - }) - .state("menu.provinceManagement", { - url: "/provinceManagement", - templateUrl : "/openoui/provincemgr/index.html", - controller : "provinceManagementCtrl", - authenticate: true - }) - .state("menu.modelDesign", { - url: "/modelDesign", - templateUrl : "/openoui/login/html/temp/modelDesign.html", - controller : "modelDesignCtrl", - authenticate: true - }) - .state("menu.package", { - url: "/package", - templateUrl : "/openoui/catalog/csarPackage.html", - controller : "packageCtrl", - authenticate: true - }) - .state("menu.serviceTemplate", { - url: "/serviceTemplate", - templateUrl : "/openoui/catalog/template.html", - controller : "serviceTemplateCtrl", - authenticate: true - }) - .state("menu.vimManage", { - url: "/vimManage", - templateUrl : "/openoui/extsys/vim/vimView.html", - controller : "vimManageCtrl", - authenticate: true - }) - .state("menu.vnfm", { - url: "/vnfm", - templateUrl : "/openoui/extsys/vnfm/vnfmView.html", - controller : "vnfmCtrl", - authenticate: true - }) - .state("menu.sdbController", { - url: "/sdbController", - templateUrl : "/openoui/login/html/temp/sdbController.html", - controller : "sdbControllerCtrl", - authenticate: true - }) - .state("menu.performanceQuery", { - url: "/performanceQuery", - templateUrl : "/openoui/login/html/temp/performanceQuery.html", - controller : "performanceQueryCtrl", - authenticate: true - }) - .state("menu.alarmQuery", { - url: "/alarmQuery", - templateUrl : "/openoui/login/html/temp/alarmQuery.html", - controller : "alarmQueryCtrl", - authenticate: true - }) - .state("menu.parameterSetting", { - url: "/parameterSetting", - templateUrl : "/openoui/login/html/temp/parameterSetting.html", - controller : "parameterSettingCtrl", - authenticate: true - }) - .state("menu.vnfMarket", { - url: "/vnfMarket", - templateUrl : "/openoui/vnfmarket/index.html", - controller : "vnfMarketCtrl", - authenticate: true - }) - }) - - /*Login Controller*/ - .controller('loginCtrl', function($scope, $rootScope, $stateParams, $state, LoginService) { - $scope.loginFormInit = function() { - $scope.error = ""; - if ($.cookie("loginkeeping") == "true") { - $scope.user = { - 'username': $.cookie("username"), - 'password': $.cookie("password"), - 'loginkeeping': true, - }; - } else { - $scope.user = { - 'username': $.cookie("username"), - 'password': $.cookie("password"), - 'loginkeeping': false, - }; - } - }; - $scope.loginFormSubmit = function() { - LoginService.login($scope.user) - .then(function (response){ - if ($scope.user.loginkeeping) { - $.cookie("loginkeeping", "true", {expires: 7}); - $.cookie("username", $scope.user.username, {expires: 7}); - $.cookie("password", $scope.user.password, {expires: 7}); - } else { - $.cookie("loginkeeping", "false", {expire: -1}); - $.cookie("username", "", {expires: -1}); - $.cookie("password", "", {expires: -1}); - } - - $scope.error = ""; - $state.transitionTo('menu'); - //if (response.status == -1) { - // $scope.error = "Incorrect username/password !"; - //} else { - // $scope.error = ""; - // $state.transitionTo('menu'); - //} - }); - }; - }) - - /*Menu Controller*/ - .controller("menuCtrl", function($scope, $state, DataService){ - $scope.message = "Menu"; - init_menu(); - }) - - /*Service Management Controller*/ - .controller("serviceManagementCtrl", function($scope, DataService, $log){ - $scope.message = "Service Management"; - }) - - /*Resource Management Controller*/ - .controller("resourceManagementCtrl", function($scope, DataService, $log){ - $scope.message = "Resource Management"; - }) - - /*Province Management Controller*/ - .controller("provinceManagementCtrl", function($scope, DataService, $log){ - $scope.message = "Province Management"; - }) - - /*Model Design Controller*/ - .controller("modelDesignCtrl", function($scope, DataService, $log){ - $scope.message = "Model Design"; - }) - - /*Package Controller*/ - .controller("packageCtrl", function($scope, DataService, $log){ - $scope.message = "Package"; - }) - - /*Service Template Controller*/ - .controller("serviceTemplateCtrl", function($scope, DataService, $log){ - $scope.message = "Service Template"; - }) - - /*Vim Manage Controller*/ - .controller("vimManageCtrl", function($scope, DataService, $log){ - $scope.message = "Vim Manage"; - }) - - /*VNFM Controller*/ - .controller("vnfmCtrl", function($scope, DataService, $log){ - $scope.message = "VNFM"; - }) - - /*Sdn Controller Controller*/ - .controller("sdnControllerCtrl", function($scope, DataService, $log){ - $scope.message = "Sdn Controller"; - }) - - /*Performance Query Controller*/ - .controller("performanceQueryCtrl", function($scope, DataService, $log){ - $scope.message = "Performance Query"; - }) - - /*Alarm Query Controller*/ - .controller("alarmQueryCtrl", function($scope, DataService, $log){ - $scope.message = "Alarm Query"; - }) - - /*Parameter Setting Controller*/ - .controller("parameterSettingCtrl", function($scope, DataService, $log){ - $scope.message = "Parameter Setting"; - }) - - /*VNF Market Controller*/ - .controller("vnfMarketCtrl", function($scope, DataService, $log){ - $scope.message = "VNF Market Place"; - }) - - -var modelTemplate = ""; -function loadTemplate() { - $.get('/openoui/framework/template.html', function (template) { - modelTemplate += template; - }); - $.get('/openoui/framework/templateContainer.html', function (template) { - modelTemplate += template; - }); - $.get('/openoui/framework/templateWidget.html', function (template) { - //console.log("Template is : "+template); - modelTemplate += template; - }); - $.get('/openoui/framework/templateNotification.html', function (template) { - modelTemplate += template; - }); - $.get('/openoui/framework/templateFunctional.html', function (template) { - modelTemplate += template; - }); -} - -function init_menu() { - var windowH = $(window).height(); - var headerH = $('#header-logo').height(); - var menuHeight = windowH - headerH; - $('#page-sidebar').height(windowH); - $("#sidebar-menu").height(menuHeight); - - var Accordion = function(el, multiple) { - this.el = el || {}; - this.multiple = multiple || false; - - // Variables privadas - var links = this.el.find('.link'); - // Evento - links.on('click', {el: this.el, multiple: this.multiple}, this.dropdown) - } - - Accordion.prototype.dropdown = function(e) { - var $el = e.data.el; - $this = $(this), - $next = $this.next(); - - $next.slideToggle(); - $this.parent().toggleClass('open'); - - if (!e.data.multiple) { - $el.find('.submenu').not($next).slideUp().parent().removeClass('open'); - }; - } - - var accordion = new Accordion($('#accordion'), false); -} diff --git a/login/src/main/webapp/login/js/loginApp.js b/login/src/main/webapp/login/js/loginApp.js new file mode 100644 index 00000000..f3f4690e --- /dev/null +++ b/login/src/main/webapp/login/js/loginApp.js @@ -0,0 +1,53 @@ +/* + Copyright 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. +*/ + +var loginApp = angular.module("loginApp", []); +loginApp.controller("loginCtrl", function($scope) { + $scope.loginFormInit = function() { + $scope.error = ""; + if ($.cookie("loginkeeping") == "true") { + $scope.user = { + 'username': $.cookie("username"), + 'password': $.cookie("password"), + 'loginkeeping': true, + }; + } else { + $scope.user = { + 'username': $.cookie("username"), + 'password': $.cookie("password"), + 'loginkeeping': false, + }; + } + }; + $scope.loginFormSubmit = function() { + if ($scope.user.loginkeeping) { + $.cookie("loginkeeping", "true", {expires: 7}); + $.cookie("username", $scope.user.username, {expires: 7}); + $.cookie("password", $scope.user.password, {expires: 7}); + } else { + $.cookie("loginkeeping", "false", {expire: -1}); + $.cookie("username", "", {expires: -1}); + $.cookie("password", "", {expires: -1}); + } + + //if (response.status == -1) { + // $scope.error = "Incorrect username/password !"; + //} else { + // $scope.error = ""; + top.window.document.location.href = "/openoui/login/html/menu.html"; + //} + }; +}); diff --git a/login/src/main/webapp/login/js/menuApp.js b/login/src/main/webapp/login/js/menuApp.js new file mode 100644 index 00000000..148c9f03 --- /dev/null +++ b/login/src/main/webapp/login/js/menuApp.js @@ -0,0 +1,55 @@ +/* + Copyright 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. +*/ + +function init_menu() { + var windowH = $(window).height(); + var headerH = $('#header-logo').height(); + var menuHeight = windowH - headerH; + $('#page-sidebar').height(windowH); + $("#sidebar-menu").height(menuHeight); + + var Accordion = function(el, multiple) { + this.el = el || {}; + this.multiple = multiple || false; + + // Variables privadas + var links = this.el.find('.link'); + // Evento + links.on('click', {el: this.el, multiple: this.multiple}, this.dropdown) + } + + Accordion.prototype.dropdown = function(e) { + var $el = e.data.el; + $this = $(this), + $next = $this.next(); + + $next.slideToggle(); + $this.parent().toggleClass('open'); + + if (!e.data.multiple) { + $el.find('.submenu').not($next).slideUp().parent().removeClass('open'); + }; + } + var accordion = new Accordion($('#accordion'), false); +}; + +function iFrameHeight() { + var ifm= document.getElementById("mainFrame"); + var subWeb = document.frames ? document.frames["mainFrame"].document : ifm.contentDocument; + if (ifm != null && subWeb != null) { + ifm.height = subWeb.body.scrollHeight; + } +}; diff --git a/login/src/main/webapp/login/js/rest.js b/login/src/main/webapp/login/js/rest.js deleted file mode 100644 index 020c6899..00000000 --- a/login/src/main/webapp/login/js/rest.js +++ /dev/null @@ -1,58 +0,0 @@ -/* - Copyright 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. -*/ - -app.factory("DataService", function($http, $log){ - return { - /*getAllData: function (value) { - //var value = $scope.param; - return $http({ - url: 'http://localhost:8080/POC_NodeToServletPorting_Server/?widgetType=' + value, - headers: {'Content-Type': 'application/json'}, - method: 'GET' - }).then(function (response) { - $log.info(response.data); - return response.data; - }) - },*/ - } -}); - -app.factory('LoginService', function($http, $log) { - return { - login: function(user) { - return $http({ - // TODO - url: 'http://localhost:8080/api/signin', - method: 'POST', - data: {'name':user.username, 'pswd':user.password}, - headers: {'Content-Type': 'application/json'} - }).then(function(response){ - if(response.status == 200) { - // TODO - // login succeeded - } else { - // TODO - // login failed - } - // TODO - return response; - }, function(error){ - // TODO - return error; - }); - } - }; -});