From a7d7a0b11f0cb5583a41e47b07c4dc341a1df384 Mon Sep 17 00:00:00 2001 From: mxi1 Date: Fri, 6 Nov 2009 10:18:13 +0000 Subject: [PATCH] after the jquery version is updated, the login dialog has small update here git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4498 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/js/loading.js | 2 +- xCAT-UI/js/xcatauth.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT-UI/js/loading.js b/xCAT-UI/js/loading.js index 54a3fb37a..1b2d74e80 100644 --- a/xCAT-UI/js/loading.js +++ b/xCAT-UI/js/loading.js @@ -79,7 +79,7 @@ LoadBar.prototype.loaded = function(file) { //load the reset button to try one more time! //$(document).ready(function () { injs(); - document.getElementById("wrapper").style.display = "block"; + document.getElementById("wrapper").style.display = "none"; //}); } }; diff --git a/xCAT-UI/js/xcatauth.js b/xCAT-UI/js/xcatauth.js index 1dd92a95a..7c0728a1b 100644 --- a/xCAT-UI/js/xcatauth.js +++ b/xCAT-UI/js/xcatauth.js @@ -12,6 +12,7 @@ function onlogin (data, textstatus) { $("#logstatus").text("Logged in successfully"); //todo: nrtree.refresh(); // Fix tree potentiall broken through attempts to operate without auth $("#logdialog").dialog("close"); + $("#wrapper").show(); //window.location = 'index.php'; // it has remembered what page they were trying to go to } else { $("#logstatus").text("Authentication failure"); @@ -22,6 +23,7 @@ function onlogin (data, textstatus) { function logout() { $.post("security/log.php",{logout:1}) $("#logstatus").html(""); + $("#wrapper").hide(); //hide the current page $("#logdialog").dialog("open"); }