From 3c32fd1eaac19c245842cdad7928c532044db7a5 Mon Sep 17 00:00:00 2001 From: phamt Date: Thu, 22 Sep 2011 18:29:44 +0000 Subject: [PATCH] Update service portal with new theme git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10609 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/js/service/service.js | 38 +++++++++++++++++++++++++++++++++++ xCAT-UI/js/srv_xcatauth.js | 38 +++++++++++++++++------------------ xCAT-UI/service.php | 27 +++++++++---------------- 3 files changed, 67 insertions(+), 36 deletions(-) diff --git a/xCAT-UI/js/service/service.js b/xCAT-UI/js/service/service.js index 8faffbe40..c96badf6a 100644 --- a/xCAT-UI/js/service/service.js +++ b/xCAT-UI/js/service/service.js @@ -11,6 +11,44 @@ var gangliaTimer; * Initialize service page */ function initServicePage() { + // Load theme + var theme = $.cookie('xcat_theme'); + if (theme) { + switch (theme) { + case 'cupertino': + includeCss("css/themes/jquery-ui-cupertino.css"); + break; + case 'dark_hive': + includeCss("css/themes/jquery-ui-dark_hive.css"); + break; + case 'redmond': + includeCss("css/themes/jquery-ui-redmond.css"); + break; + case 'start': + includeCss("css/themes/jquery-ui-start.css"); + break; + case 'sunny': + includeCss("css/themes/jquery-ui-sunny.css"); + break; + case 'ui_dark': + includeCss("css/themes/jquery-ui-ui_darkness.css"); + break; + default: + includeCss("css/themes/jquery-ui-start.css"); + } + } else { + includeCss("css/themes/jquery-ui-start.css"); + } + + // Load jQuery stylesheets + includeCss("css/query.dataTables.css"); + includeCss("css/superfish.css"); + includeCss("css/jstree.css"); + includeCss("css/jquery.jqplot.css"); + + // Load custom stylesheet + includeCss("css/service.css"); + // Reuqired JQuery plugins includeJs("js/jquery/jquery.dataTables.min.js"); includeJs("js/jquery/jquery.cookie.min.js"); diff --git a/xCAT-UI/js/srv_xcatauth.js b/xCAT-UI/js/srv_xcatauth.js index d0ea19c74..3ec07eede 100644 --- a/xCAT-UI/js/srv_xcatauth.js +++ b/xCAT-UI/js/srv_xcatauth.js @@ -6,7 +6,7 @@ $(document).ready(function() { $('#content').remove(); var winHeight = document.body.clientHeight; - var diagHeight = $('#logdialog').css('height'); + var diagHeight = $('#login').css('height'); diagHeight = diagHeight.substr(0, diagHeight.length - 2); diagHeight = Number(diagHeight); @@ -18,31 +18,31 @@ $(document).ready(function() { tmpHeight = parseInt((winHeight - diagHeight - 50) / 2); } - $('#logdialog').css('margin', tmpHeight + 'px auto'); + $('#login').css('margin', tmpHeight + 'px auto'); $('button').bind('click', function(){ authenticate(); }).button(); if (document.location.protocol == 'http:') { - $('#logstatus').html('You are using an unencrypted session!'); - $('#logstatus').css('color', 'red'); + $('#login_status').html('You are using an unencrypted session!'); + $('#login_status').css('color', 'red'); } - if (!$('#username').val()) { - $('#username').focus(); + if (!$("#login input[name='username']").val()) { + $("#login input[name='username']").focus(); } else { - $('#password').focus(); + $("#login input[name='password']").focus(); } // When enter is hit while in username, advance to password - $('#username').keydown(function(event) { + $("#login input[name='username']").keydown(function(event) { if (event.keyCode == 13) { - $('#password').focus(); + $("#login input[name='password']").focus(); } }); // Submit authentication if enter is pressed in password field - $('#password').keydown(function(event) { + $("#login input[name='password']").keydown(function(event) { if (event.keyCode == 13) { authenticate(); } @@ -59,10 +59,10 @@ $(document).ready(function() { */ function onlogin(data, txtStatus) { // Clear password field regardless of what happens - var usrName = $('#username').val(); - $('#password').val(''); + var usrName = $("#login input[name='username']").val(); + $("#login input[name='password']").val(''); if (data.authenticated == 'yes') { - $('#logstatus').text('Login successful'); + $('#login_status').text('Login successful'); window.location = 'service.php'; // Set user name cookie @@ -70,8 +70,8 @@ function onlogin(data, txtStatus) { exDate.setTime(exDate.getTime() + (240 * 60 * 1000)); $.cookie('srv_usrname', usrName, { expires: exDate }); } else { - $('#logstatus').text('Authentication failure'); - $('#logstatus').css('color', '#FF0000'); + $('#login_status').text('Authentication failure'); + $('#login_status').css('color', '#FF0000'); } } @@ -79,12 +79,12 @@ function onlogin(data, txtStatus) { * Authenticate user for new session */ function authenticate() { - $('#logstatus').css('color', '#000000'); - $('#logstatus').html('Authenticating...'); + $('#login_status').css('color', '#000000'); + $('#login_status').html('Authenticating...'); - var passwd = $('#password').val(); + var passwd = $("#login input[name='password']").val(); $.post('lib/srv_log.php', { - username : $('#username').val(), + username : $("#login input[name='username']").val(), password : passwd }, onlogin, 'json'); } diff --git a/xCAT-UI/service.php b/xCAT-UI/service.php index 7c4e5e8d1..ab7e594f9 100644 --- a/xCAT-UI/service.php +++ b/xCAT-UI/service.php @@ -10,21 +10,15 @@ require_once "lib/jsonwrapper.php"; * Load service page */ // Include CSS and Javascripts - -// TODO Rebuild xCAT-UI-deps where version numbers are removed from: -// jquery-ui-default.css, jquery.min.js, jquery-ui.min.js echo ' xCAT Service Portal - - - - - + + '; @@ -59,18 +53,17 @@ echo if (!isAuthenticated()) { // xcatauth.js will open a dialog box asking for the user name and password echo - ' - -
-
+ ' +
+
- + - - - - + + + +

eXtreme Cloud Administration Toolkit

eXtreme Cloud Administration Toolkit
Open Source. EPL License.