arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up code.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7787 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2010-10-08 03:03:42 +00:00
parent 2228c247e0
commit 06d0c7b447
15 changed files with 270 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
xCAT-UI/css/ajaxterm.css
View File

@@ -8,21 +8,25 @@ pre.stat {
border-top: 1px solid black;
color: white;
}
pre.stat span {
padding: 0px;
}
pre.stat .on {
background-color: #080;
font-weight: bold;
color: white;
cursor: pointer;
}
pre.stat .off {
background-color: #888;
font-weight: bold;
color: white;
cursor: pointer;
}
pre.term {
margin: 0px;
padding: 4px;
@@ -33,32 +37,107 @@ pre.term {
border-top: 1px solid white;
color: #eee;
}
pre.term span.f0 { color: #000; }
pre.term span.f1 { color: #b00; }
pre.term span.f2 { color: #0b0; }
pre.term span.f3 { color: #bb0; }
pre.term span.f4 { color: #00b; }
pre.term span.f5 { color: #b0b; }
pre.term span.f6 { color: #0bb; }
pre.term span.f7 { color: #bbb; }
pre.term span.f8 { color: #666; }
pre.term span.f9 { color: #f00; }
pre.term span.f10 { color: #0f0; }
pre.term span.f11 { color: #ff0; }
pre.term span.f12 { color: #00f; }
pre.term span.f13 { color: #f0f; }
pre.term span.f14 { color: #0ff; }
pre.term span.f15 { color: #fff; }
pre.term span.b0 { background-color: #000; }
pre.term span.b1 { background-color: #b00; }
pre.term span.b2 { background-color: #0b0; }
pre.term span.b3 { background-color: #bb0; }
pre.term span.b4 { background-color: #00b; }
pre.term span.b5 { background-color: #b0b; }
pre.term span.b6 { background-color: #0bb; }
pre.term span.b7 { background-color: #bbb; }
body { background-color: #888; }
pre.term span.f0 {
color: #000;
}
pre.term span.f1 {
color: #b00;
}
pre.term span.f2 {
color: #0b0;
}
pre.term span.f3 {
color: #bb0;
}
pre.term span.f4 {
color: #00b;
}
pre.term span.f5 {
color: #b0b;
}
pre.term span.f6 {
color: #0bb;
}
pre.term span.f7 {
color: #bbb;
}
pre.term span.f8 {
color: #666;
}
pre.term span.f9 {
color: #f00;
}
pre.term span.f10 {
color: #0f0;
}
pre.term span.f11 {
color: #ff0;
}
pre.term span.f12 {
color: #00f;
}
pre.term span.f13 {
color: #f0f;
}
pre.term span.f14 {
color: #0ff;
}
pre.term span.f15 {
color: #fff;
}
pre.term span.b0 {
background-color: #000;
}
pre.term span.b1 {
background-color: #b00;
}
pre.term span.b2 {
background-color: #0b0;
}
pre.term span.b3 {
background-color: #bb0;
}
pre.term span.b4 {
background-color: #00b;
}
pre.term span.b5 {
background-color: #b0b;
}
pre.term span.b6 {
background-color: #0bb;
}
pre.term span.b7 {
background-color: #bbb;
}
body {
background-color: #888;
}
#term {
float: left;
}
}

111
xCAT-UI/css/jquery-ui-1.8.custom.css vendored
View File

@@ -6,7 +6,9 @@
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Theming/API
*/ /* Layout helpers
*/
/* Layout helpers
----------------------------------*/
.ui-helper-hidden {
display: none;
@@ -57,7 +59,7 @@
left: 0;
position: absolute;
opacity: 0;
filter: Alpha(Opacity = 0);
filter: Alpha(Opacity = 0);
}
/* Interaction Cues
@@ -67,7 +69,8 @@
}
/* Icons
----------------------------------*/ /* states and images */
----------------------------------*/
/* states and images */
.ui-icon {
display: block;
text-indent: -99999px;
@@ -76,7 +79,8 @@
}
/* Misc visuals
----------------------------------*/ /* Overlays */
----------------------------------*/
/* Overlays */
.ui-widget-overlay {
position: absolute;
top: 0;
@@ -95,7 +99,8 @@
* http://docs.jquery.com/UI/Theming/API
*
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=eb8724&iconColorActive=f9bd01&bgColorHighlight=fbf9ee&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
*/ /* Component containers
*/
/* Component containers
----------------------------------*/
.ui-widget {
font-family: Verdana, Arial, sans-serif;
@@ -114,8 +119,9 @@
.ui-widget-content {
border: 1px solid #a6c9e2;
background: #fcfdfd url(../images/jquery/ui-bg_inset-hard_100_fcfdfd_1x100.png)
50% bottom repeat-x;
background: #fcfdfd
url(../images/jquery/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom
repeat-x;
color: #222222;
}
@@ -125,8 +131,9 @@
.ui-widget-header {
border: 1px solid #4297d7;
background: #5c9ccc url(../images/jquery/ui-bg_gloss-wave_55_5c9ccc_500x100.png)
50% 50% repeat-x;
background: #5c9ccc
url(../images/jquery/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50%
repeat-x;
color: #ffffff;
font-weight: bold;
}
@@ -140,8 +147,9 @@
.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default
{
border: 1px solid #c5dbec;
background: #dfeffc url(../images/jquery/ui-bg_glass_85_dfeffc_1x400.png) 50% 50%
repeat-x;
background: #dfeffc
url(../images/jquery/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x
;
font-weight: bold;
color: #2e6e9e;
}
@@ -155,8 +163,9 @@
.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus
{
border: 1px solid #79b7e7;
background: #d0e5f5 url(../images/jquery/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50%
repeat-x;
background: #d0e5f5
url(../images/jquery/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x
;
font-weight: bold;
color: #1d5987;
}
@@ -169,8 +178,9 @@
.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active
{
border: 1px solid #79b7e7;
background: #f5f8f9 url(../images/jquery/ui-bg_inset-hard_100_f5f8f9_1x100.png)
50% 50% repeat-x;
background: #f5f8f9
url(../images/jquery/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50%
repeat-x;
font-weight: bold;
color: #eb8724;
}
@@ -189,8 +199,9 @@
.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight
{
border: 1px solid #fcefa1;
background: #fbf9ee url(../images/jquery/ui-bg_flat_55_fbf9ee_40x100.png) 50% 50%
repeat-x;
background: #fbf9ee
url(../images/jquery/ui-bg_flat_55_fbf9ee_40x100.png) 50% 50% repeat-x
;
color: #363636;
}
@@ -202,8 +213,9 @@
.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error
{
border: 1px solid #cd0a0a;
background: #fef1ec url(../images/jquery/ui-bg_glass_95_fef1ec_1x400.png) 50% 50%
repeat-x;
background: #fef1ec
url(../images/jquery/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x
;
color: #cd0a0a;
}
@@ -225,19 +237,20 @@
.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary
{
opacity: .7;
filter: Alpha(Opacity = 70);
filter: Alpha(Opacity = 70);
font-weight: normal;
}
.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled
{
opacity: .35;
filter: Alpha(Opacity = 35);
filter: Alpha(Opacity = 35);
background-image: none;
}
/* Icons
----------------------------------*/ /* states and images */
----------------------------------*/
/* states and images */
.ui-icon {
width: 16px;
height: 16px;
@@ -971,7 +984,8 @@
}
/* Misc visuals
----------------------------------*/ /* Corner radius */
----------------------------------*/
/* Corner radius */
.ui-corner-tl {
-moz-border-radius-topleft: 5px;
-webkit-border-top-left-radius: 5px;
@@ -1040,23 +1054,25 @@
/* Overlays */
.ui-widget-overlay {
background: #aaaaaa url(../images/jquery/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50%
repeat-x;
background: #aaaaaa url(../images/jquery/ui-bg_flat_0_aaaaaa_40x100.png)
50% 50% repeat-x;
opacity: .30;
filter: Alpha(Opacity = 30);
filter: Alpha(Opacity = 30);
}
.ui-widget-shadow {
margin: -8px 0 0 -8px;
padding: 8px;
background: #aaaaaa url(../images/jquery/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50%
repeat-x;
background: #aaaaaa url(../images/jquery/ui-bg_flat_0_aaaaaa_40x100.png)
50% 50% repeat-x;
opacity: .30;
filter: Alpha(Opacity = 30);
filter: Alpha(Opacity = 30);
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 8px;
} /*
}
/*
* jQuery UI Resizable @VERSION
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
@@ -1143,7 +1159,9 @@
height: 9px;
right: -5px;
top: -5px;
} /*
}
/*
* jQuery UI Selectable @VERSION
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
@@ -1166,7 +1184,8 @@
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Accordion#theming
*/ /* IE/Win - Fix animation bug - #4615 */
*/
/* IE/Win - Fix animation bug - #4615 */
.ui-accordion {
width: 100%;
}
@@ -1217,7 +1236,9 @@
.ui-accordion .ui-accordion-content-active {
display: block;
} /*
}
/*
* jQuery UI Autocomplete @VERSION
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
@@ -1234,7 +1255,9 @@
/* workarounds */
* html .ui-autocomplete {
width: 1px;
} /* without this, the menu expands to 100% in IE6 */ /*
} /* without this, the menu expands to 100% in IE6 */
/*
* jQuery UI Menu @VERSION
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
@@ -1390,7 +1413,9 @@ input.ui-button {
button.ui-button::-moz-focus-inner {
border: 0;
padding: 0;
} /* reset extra padding in Firefox */ /*
} /* reset extra padding in Firefox */
/*
* jQuery UI Dialog @VERSION
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
@@ -1548,7 +1573,9 @@ button.ui-button::-moz-focus-inner {
.ui-slider-vertical .ui-slider-range-max {
top: 0;
} /*
}
/*
* jQuery UI Tabs @VERSION
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
@@ -1562,8 +1589,8 @@ button.ui-button::-moz-focus-inner {
padding: .2em;
zoom: 1;
}
/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
.ui-tabs .ui-tabs-nav {
margin: 0;
padding: .2em .2em 0;
@@ -1600,8 +1627,8 @@ button.ui-button::-moz-focus-inner {
{
cursor: pointer;
}
/* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
/* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs .ui-tabs-panel {
display: block;
border-width: 0;
@@ -1844,7 +1871,9 @@ button.ui-button::-moz-focus-inner {
left: -4px; /*must have*/
width: 200px; /*must have*/
height: 200px; /*must have*/
} /*
}
/*
* jQuery UI Progressbar @VERSION
*
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)

115
xCAT-UI/js/configure/update.js
View File

@@ -4,7 +4,6 @@
* @return Nothing
*/
function loadUpdatePage() {
var repositoryDiv = $('<div id="repository"></div>');
var rpmDiv = $('<div id="rpm"></div>');
var statusDiv = createStatusBar("update");
@@ -14,15 +13,13 @@
$('#updateTab').append('<br>');
$('#updateTab').append(repositoryDiv);
$('#updateTab').append(rpmDiv);
var infoBar = createInfoBar('Select the Rpm and Repository, then press Update');
var infoBar = createInfoBar('Select the RPM and repository, then press Update');
repositoryDiv.append(infoBar);
repositoryDiv.append("<fieldset><legend>Repository</legend></fieldset>");
$.ajax( {
$.ajax({
url : 'lib/systemcmd.php',
dataType : 'json',
data : {
@@ -43,10 +40,10 @@
success : showRpmInfo
});
}
}
/**
* Show the Rpm Repository, it can use user's last choice and input
* Show the RPM Repository, it can use user's last choice and input
*
* @return Nothing
*/
@@ -55,14 +52,11 @@ function showRepository(data) {
var StableRepository = "";
var Show = "";
//get the corresponding repository by OS Type
if ("aix" == data.rsp)
{
// get the corresponding repository by OS Type
if ("aix" == data.rsp) {
DevelRepository = "http://xcat.sourceforge.net/aix/devel/xcat-core/";
StableRepository = "http://xcat.sourceforge.net/aix/xcat-core/";
}
else
{
} else {
DevelRepository = "http://xcat.sourceforge.net/yum/devel/xcat-core/";
StableRepository = "http://xcat.sourceforge.net/yum/xcat-core/";
}
@@ -71,8 +65,7 @@ function showRepository(data) {
//display the Devel Repository, remember user's last selection
Show = Show + "<li><input type='radio' ";
if(1 == $.cookie('xcatrepository'))
{
if (1 == $.cookie('xcatrepository')) {
Show = Show + "checked='true'";
}
@@ -83,8 +76,7 @@ function showRepository(data) {
//display the Stable Repository, remember user's last selection
Show = "<li><input type='radio' ";
if(2 == $.cookie('xcatrepository'))
{
if (2 == $.cookie('xcatrepository')) {
Show = Show + "checked='true'";
}
@@ -96,13 +88,10 @@ function showRepository(data) {
//display the Input Repository, remember user's last selection
if (($.cookie('xcatrepository'))
&& (1 != $.cookie('xcatrepository'))
&& (2 != $.cookie('xcatrepository')))
{
&& (2 != $.cookie('xcatrepository'))) {
Show = "<li><input type='radio' checked='true' name='reporadio' value=''>Other: ";
Show += "<input style='width: 500px' id='repositoryaddr' value='" + $.cookie('xcatrepository') + "'</li>";
}
else
{
} else {
Show = "<li><input type='radio' name='reporadio' value=''>Other: ";
Show += "<input style='width: 500px' id='repositoryaddr' value=''</li>";
}
@@ -111,27 +100,24 @@ function showRepository(data) {
$('#repository fieldset').append(repoList);
}
function showRpmInfo(data)
{
function showRpmInfo(data) {
var Rpms = null;
var Show = "";
var RpmNames = new Array("xCAT-client","perl-xCAT","xCAT-server","xCAT","xCAT-rmc","xCAT-UI");
var temp = 0;
if(null == data.rsp)
{
if(null == data.rsp) {
$('#rpm fieldset').append("Get Rpm Info Error!");
return;
}
Rpms = data.rsp.split(/\n/);
//no rpm installed, return
if (1 > Rpms.length)
{
// no rpm installed, return
if (1 > Rpms.length) {
$('#rpm fieldset').append("No Rpm installed!");
return;
}
//clear the old data
// clear the old data
$('#rpm fieldset').children().remove();
$('#rpm fieldset').append("<legend>xCAT Rpm Info</legend>");
@@ -141,21 +127,18 @@ function showRpmInfo(data)
Show += "<th><b>Package Name</b></th><th><b>Version</b></th>";
Show += "</tr></thead>";
for (temp = 0; temp < Rpms.length; temp++)
{
//empty line continue
if ("" == Rpms[temp])
{
for (temp = 0; temp < Rpms.length; temp++) {
// empty line continue
if ("" == Rpms[temp]) {
continue;
}
//the rpm is not installed, continue
if (-1 != Rpms[temp].indexOf("not"))
{
// the rpm is not installed, continue
if (-1 != Rpms[temp].indexOf("not")) {
continue;
}
//show the version in table
// show the version in table
Show += "<tr>";
Show += "<td><input type='checkbox' value='" + RpmNames[temp] + "'></td>";
Show += "<td>" + RpmNames[temp] + "</td><td>" + Rpms[temp].substr(RpmNames[temp].length + 1) + "</td>";
@@ -165,22 +148,20 @@ function showRpmInfo(data)
Show += "<br\>";
$('#rpm fieldset').append(Show);
//add the update button
// add the update button
var updateButton = createButton('Update');
$('#rpm fieldset').append(updateButton);
updateButton.bind('click', function(){
updateRpm();
});
});
}
function updateSelectAll()
{
function updateSelectAll() {
var check_status = $('#selectall').attr('checked');
$('input:checkbox').attr('checked', check_status);
}
function updateRpm()
{
function updateRpm() {
// Remove any warning messages
$('#updateTab').find('.ui-state-error').remove();
@@ -189,47 +170,38 @@ function updateRpm()
var rpms = "";
var temp = "";
if(undefined == rpmPath)
{
if (undefined == rpmPath) {
rpmPath = "";
}
//select other and we should use the value in the input
if ("" == rpmPath)
{
// select other and we should use the value in the input
if ("" == rpmPath) {
//user input the repo, and we must stroe it in the cookie
rpmPath = $('#repositoryaddr').val();
rpmPathType = rpmPath;
}
else
{
if(-1 == rpmPath.toLowerCase().indexOf("devel"))
{
} else {
if(-1 == rpmPath.toLowerCase().indexOf("devel")) {
rpmPathType = "2";
}
else
{
} else {
rpmPathType = "1";;
}
}
$("input[type=checkbox]:checked").each(function(){
temp = $(this).val();
if("" == temp)
{
if("" == temp) {
//continue;
return true;
}
var pattern = new RegExp("^" + temp + ",|," + temp + ",");;
if (pattern.test(rpms))
{
if (pattern.test(rpms)) {
return true;
}
rpms = rpms + temp + ",";
});
if(0 < rpms.length)
{
if (0 < rpms.length) {
rpms = rpms.slice(0, -1);
}
@@ -250,7 +222,7 @@ function updateRpm()
return;
}
//remember users' choice and input
// remember users' choice and input
$.cookie('xcatrepository', rpmPathType, { path: '/xcat', expires: 10 });
$('#update').show();
@@ -274,18 +246,17 @@ function updateRpm()
});
}
function ShowUpdateResult(data)
{
function ShowUpdateResult(data) {
var temp = 0;
$('#loadingpic').remove();
var resArray = data.rsp[0].split(/\n/);
if (0 < resArray.length){
if (0 < resArray.length) {
// Show last lines
if (('' == resArray[resArray.length - 1]) && (resArray.length > 1)){
$('#update').append(resArray[resArray.length - 2]);
}
else{
else {
$('#update').append(resArray[resArray.length - 1]);
}
@@ -305,8 +276,7 @@ function ShowUpdateResult(data)
resDetail.hide();
$('#update').append(resDetail);
for (temp = 0; temp < resArray.length; temp++)
{
for (temp = 0; temp < resArray.length; temp++) {
resDetail.append(resArray[temp] + "<br>");
}
}
@@ -323,5 +293,4 @@ function ShowUpdateResult(data)
});
$('#rpm button').attr('disabled', '');
}

17
xCAT-UI/js/custom/blade.js
View File

@@ -61,8 +61,7 @@ bladePlugin.prototype.loadClonePage = function(node) {
if (!$('#' + newTabId).length) {
// Create status bar and hide it
var statBarId = node + 'CloneStatusBar';
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>')
.hide();
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>').hide();
// Create info bar
var infoBar = createInfoBar('Under construction');
@@ -154,14 +153,14 @@ bladePlugin.prototype.loadProvisionPage = function(tabId) {
/**
* Create provision new node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provNew = createProvisionNew('blade', inst);
provForm.append(provNew);
/**
* Create provision existing node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provExisting = createProvisionExisting('blade', inst);
provForm.append(provExisting);
@@ -183,11 +182,13 @@ bladePlugin.prototype.loadProvisionPage = function(tabId) {
*
* @return Nothing
*/
bladePlugin.prototype.loadResources = function() {
var tabID = 'bladeResourceTab'; // Resource tab ID
var loaderID = 'bladeResourceLoader'; // Loader ID
bladePlugin.prototype.loadResources = function() {
// Get resource tab ID
var tabID = 'bladeResourceTab';
// Get loader ID
var loaderID = 'bladeResourceLoader';
if ($('#' + loaderID).length) {
$('#' + loaderID).remove(); // Remove loader
$('#' + loaderID).remove();
}
// Create info bar

4
xCAT-UI/js/custom/customUtils.js
View File

@@ -30,9 +30,9 @@ function createNodesDatatable(group, outId) {
// Data returned
var rsp = data.rsp;
// Output ID
// Get output ID
var outId = data.msg;
// Datatable ID
// Get datatable ID
var dTableId = outId.replace('DIV', '');
// Node attributes hash

15
xCAT-UI/js/custom/fsp.js
View File

@@ -61,8 +61,7 @@ fspPlugin.prototype.loadClonePage = function(node) {
if (!$('#' + newTabId).length) {
// Create status bar and hide it
var statBarId = node + 'CloneStatusBar';
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>')
.hide();
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>').hide();
// Create info bar
var infoBar = createInfoBar('Under construction');
@@ -154,14 +153,14 @@ fspPlugin.prototype.loadProvisionPage = function(tabId) {
/**
* Create provision new node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provNew = createProvisionNew('fsp', inst);
provForm.append(provNew);
/**
* Create provision existing node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provExisting = createProvisionExisting('fsp', inst);
provForm.append(provExisting);
@@ -184,10 +183,12 @@ fspPlugin.prototype.loadProvisionPage = function(tabId) {
* @return Nothing
*/
fspPlugin.prototype.loadResources = function() {
var tabID = 'fspResourceTab'; // Resource tab ID
var loaderID = 'fspResourceLoader'; // Loader ID
// Get resource tab ID
var tabID = 'fspResourceTab';
// Get loader ID
var loaderID = 'fspResourceLoader';
if ($('#' + loaderID).length) {
$('#' + loaderID).remove(); // Remove loader
$('#' + loaderID).remove();
}
// Create info bar

15
xCAT-UI/js/custom/hmc.js
View File

@@ -94,8 +94,7 @@ hmcPlugin.prototype.loadClonePage = function(node) {
if (!$('#' + newTabId).length) {
// Create status bar and hide it
var statBarId = node + 'CloneStatusBar';
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>')
.hide();
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>').hide();
// Create info bar
var infoBar = createInfoBar('Under construction');
@@ -187,14 +186,14 @@ hmcPlugin.prototype.loadProvisionPage = function(tabId) {
/**
* Create provision new node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provNew = createProvisionNew('hmc', inst);
provForm.append(provNew);
/**
* Create provision existing node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provExisting = createProvisionExisting('hmc', inst);
provForm.append(provExisting);
@@ -217,10 +216,12 @@ hmcPlugin.prototype.loadProvisionPage = function(tabId) {
* @return Nothing
*/
hmcPlugin.prototype.loadResources = function() {
var tabID = 'hmcResourceTab'; // Resource tab ID
var loaderID = 'hmcResourceLoader'; // Loader ID
// Get resource tab ID
var tabID = 'hmcResourceTab';
// Get loader ID
var loaderID = 'hmcResourceLoader';
if ($('#' + loaderID).length) {
$('#' + loaderID).remove(); // Remove loader
$('#' + loaderID).remove();
}
// Create info bar

15
xCAT-UI/js/custom/ipmi.js
View File

@@ -61,8 +61,7 @@ ipmiPlugin.prototype.loadClonePage = function(node) {
if (!$('#' + newTabId).length) {
// Create status bar and hide it
var statBarId = node + 'CloneStatusBar';
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>')
.hide();
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>').hide();
// Create info bar
var infoBar = createInfoBar('Under construction');
@@ -154,14 +153,14 @@ ipmiPlugin.prototype.loadProvisionPage = function(tabId) {
/**
* Create provision new node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provNew = createProvisionNew('ipmi', inst);
provForm.append(provNew);
/**
* Create provision existing node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provExisting = createProvisionExisting('ipmi', inst);
provForm.append(provExisting);
@@ -184,10 +183,12 @@ ipmiPlugin.prototype.loadProvisionPage = function(tabId) {
* @return Nothing
*/
ipmiPlugin.prototype.loadResources = function() {
var tabID = 'ipmiResourceTab'; // Resource tab ID
var loaderID = 'ipmiResourceLoader'; // Loader ID
// Get resource tab ID
var tabID = 'ipmiResourceTab';
// Get loader ID
var loaderID = 'ipmiResourceLoader';
if ($('#' + loaderID).length) {
$('#' + loaderID).remove(); // Remove loader
$('#' + loaderID).remove();
}
// Create info bar

15
xCAT-UI/js/custom/ivm.js
View File

@@ -61,8 +61,7 @@ ivmPlugin.prototype.loadClonePage = function(node) {
if (!$('#' + newTabId).length) {
// Create status bar and hide it
var statBarId = node + 'CloneStatusBar';
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>')
.hide();
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>').hide();
// Create info bar
var infoBar = createInfoBar('Under construction');
@@ -154,14 +153,14 @@ ivmPlugin.prototype.loadProvisionPage = function(tabId) {
/**
* Create provision new node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provNew = createProvisionNew('ivm', inst);
provForm.append(provNew);
/**
* Create provision existing node division
*/
// You should copy whatever is in this function here and customize it
// You should copy whatever is in this function, put it here, and customize it
var provExisting = createProvisionExisting('ivm', inst);
provForm.append(provExisting);
@@ -184,10 +183,12 @@ ivmPlugin.prototype.loadProvisionPage = function(tabId) {
* @return Nothing
*/
ivmPlugin.prototype.loadResources = function() {
var tabID = 'ivmResourceTab'; // Resource tab ID
var loaderID = 'ivmResourceLoader'; // Loader ID
// Get resource tab ID
var tabID = 'ivmResourceTab';
// Get loader ID
var loaderID = 'ivmResourceLoader';
if ($('#' + loaderID).length) {
$('#' + loaderID).remove(); // Remove loader
$('#' + loaderID).remove();
}
// Create info bar

6
xCAT-UI/js/custom/zvm.js
View File

@@ -50,8 +50,7 @@ zvmPlugin.prototype.loadClonePage = function(node) {
// Create status bar and hide it
var statBarId = node + 'CloneStatusBar';
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>')
.hide();
var statBar = $('<div class="statusBar" id="' + statBarId + '"></div>').hide();
// Create info bar
var infoBar = createInfoBar('Clone a node');
@@ -640,8 +639,7 @@ zvmPlugin.prototype.loadInventory = function(data) {
dasdType = $('<td>' + args[2] + '</td>');
dasdVolId = $('<td>' + args[3] + '</td>');
dasdAccess = $('<td>' + args[4] + '</td>');
dasdSize = $('<td>' + args[args.length - 9] + ' '
+ args[args.length - 8] + '</td>');
dasdSize = $('<td>' + args[args.length - 9] + ' ' + args[args.length - 8] + '</td>');
// Create a new row for each DASD
dasdTabRow = $('<tr></tr>');

12
xCAT-UI/js/custom/zvmUtils.js
View File

@@ -518,8 +518,7 @@ function updateZProvisionNewStatus(data) {
* (7) Update DHCP
*/
else if (cmd == 'noderes') {
// If there was an error
// Do not continue
// If there was an error, do not continue
if (rsp.length) {
$('#' + loaderId).hide();
$('#' + statBarId).append('<p>(Error) Failed to set operating system</p>');
@@ -662,8 +661,7 @@ function updateZProvisionExistingStatus(data) {
var prg = writeRsp(rsp, '');
$('#' + statBarId).append(prg);
// If there was an error
// Do not continue
// If there was an error, do not continue
if (prg.html().indexOf('Error') > -1) {
var loaderId = 'zProvisionLoader' + inst;
$('#' + loaderId).remove();
@@ -756,8 +754,7 @@ function updateZCloneStatus(data) {
if (cmd == 'nodeadd') {
var node = args[3].replace('node=', '');
// If there was an error
// Do not continue
// If there was an error, do not continue
if (rsp.length) {
$('#' + out2Id).find('img').hide();
$('#' + out2Id).append('<p>(Error) Failed to create node definition</p>');
@@ -787,8 +784,7 @@ function updateZCloneStatus(data) {
* (3) Update DNS
*/
else if (cmd == 'makehosts') {
// If there was an error
// Do not continue
// If there was an error, do not continue
if (rsp.length) {
$('#' + out2Id).find('img').hide();
$('#' + out2Id).append('<p>(Error) Failed to update /etc/hosts</p>');

2
xCAT-UI/js/monitor/monitor.js
View File

@@ -156,7 +156,7 @@ function loadMonitorPage() {
}
function loadMonitorTab(monitorName){
//the tab is exist then we only need to select it
// If the tab exist, then we only need to select it
var tab = getMonitorTab();
if (0 != $("#" + monitorName).length){
tab.select(monitorName);

2
xCAT-UI/js/nodes/nodes.js
View File

@@ -743,7 +743,7 @@ function loadNode(e) {
}
// Get tab area where a new tab will be inserted
// The node name may contain special char(such as '.','#'), so we can not use the node name as a id.
// The node name may contain special characters (e.g. '.','#'), so we can not use the node name as an ID.
var myTab = getNodesTab();
var inst = 0;
var newTabId = 'nodeTab' + inst;

3
xCAT-UI/js/nodes/nodeset.js
View File

@@ -32,8 +32,7 @@ function loadNodesetPage(tgtNodes) {
tabId = 'nodesetTab' + inst;
}
// Open new tab
// Create nodeset form
// Open new tab & create nodeset form
var nodesetForm = $('<div class="form"></div>');
// Create status bar

3
xCAT-UI/lib/systemcmd.php
View File

@@ -6,8 +6,7 @@ require_once "$TOPDIR/lib/jsonwrapper.php";
/**
* Issue a xCAT command, e.g. rpm -qa xCAT
* This will handle system commands. If not, you can create your
* own .php. Look at zCmd.php for an example.
* This will handle system commands.
*
* @param $cmd The system command
* @return The system response. Replies are in the form of JSON