From 456187a26701866d323c74444b261ef3f43d1778 Mon Sep 17 00:00:00 2001 From: shentao Date: Thu, 27 Apr 2017 18:07:01 +0800 Subject: modified dashboard links Issue-id: CLIENT-175 Change-Id: I207f806fad9a18dfd8bf0f0b720bcf545acab773 Signed-off-by: shentao --- login/src/main/webapp/login/html/menu.html | 42 +++++++++++++++--------------- login/src/main/webapp/login/js/loginApp.js | 1 + login/src/main/webapp/login/js/menuApp.js | 12 ++++----- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html index 53a82a66..713bedee 100644 --- a/login/src/main/webapp/login/html/menu.html +++ b/login/src/main/webapp/login/html/menu.html @@ -41,7 +41,7 @@ - +
  • @@ -62,7 +62,7 @@ Resource
  • @@ -78,9 +78,9 @@ Orchestrator
  • @@ -88,9 +88,9 @@ Manage View
  • @@ -98,8 +98,8 @@ Performance
  • @@ -107,7 +107,7 @@ Monitor
  • @@ -115,7 +115,7 @@ VNF Market
  • @@ -123,7 +123,7 @@ Holmes
    • @@ -159,7 +159,7 @@
    - +
    Service
    @@ -179,7 +179,7 @@
    - +
    Resource
    @@ -199,7 +199,7 @@
    - +
    Orchestrator
    @@ -219,7 +219,7 @@
    - +
    Manage View
    @@ -239,7 +239,7 @@
    - +
    Performance
    @@ -259,7 +259,7 @@
    - +
    Monitor
    diff --git a/login/src/main/webapp/login/js/loginApp.js b/login/src/main/webapp/login/js/loginApp.js index 35434a00..06f3bd74 100644 --- a/login/src/main/webapp/login/js/loginApp.js +++ b/login/src/main/webapp/login/js/loginApp.js @@ -62,6 +62,7 @@ loginApp.controller("loginCtrl", function($scope, $http) { } }).error(function(data, status) { $scope.error = "Incorrect username/password !"; + 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 index aa2d150c..3696eb15 100644 --- a/login/src/main/webapp/login/js/menuApp.js +++ b/login/src/main/webapp/login/js/menuApp.js @@ -63,18 +63,18 @@ function iFrameHeight() { } }; -function clickDashboard() { +function displayIframe() { var dashboard_div = document.getElementById("dashboard_div"); var mainFrame_div = document.getElementById("mainFrame_div"); - dashboard_div.style.display='none'; - mainFrame_div.style.display='block'; + dashboard_div.style.display = "none"; + mainFrame_div.style.display = ""; } -function dashboardInit() { +function displayDashboard() { var dashboard_div = document.getElementById("dashboard_div"); var mainFrame_div = document.getElementById("mainFrame_div"); - mainFrame_div.style.display='none'; - dashboard_div.style.visidisplaybility='block'; + mainFrame_div.style.display = "none"; + dashboard_div.style.display = ""; } function logoutSubmit() { -- cgit 1.2.3-korg