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

Renamed Guide page to Help page. Added checks in KVM/ESX provision page. Group fields into fieldsets in z/VM provision page.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11039 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2011-11-23 17:59:48 +00:00
parent f8be2a59d3
commit 8e051620f3
10 changed files with 115 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-UI/css/style.css
View File

@@ -277,7 +277,7 @@ fieldset {
margin-bottom: 5px;
border-width: 1px 0 0 0;
border-style: solid none none none;
border-color: #D8D8D8;
border-color: gray;
}
.tab label {

27
xCAT-UI/js/custom/esx.js
View File

@@ -376,9 +376,30 @@ esxPlugin.prototype.loadProvisionPage = function(tabId) {
$(this).parents('.ui-tabs-panel').find('.ui-state-error').remove();
var ready = true;
var errorMessage = '';
// Get provision tab ID
var thisTabId = 'esxProvisionTab' + inst;
// Get tab ID
var thisTabId = $(this).parents('.ui-tabs-panel').attr('id');
// Check if fields are properly filled in
var inputs = $('#' + thisTabId + ' input:visible');
for ( var i = 0; i < inputs.length; i++) {
if (!inputs.eq(i).val()) {
inputs.eq(i).css('border', 'solid #FF0000 1px');
ready = false;
} else {
inputs.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
var selects = $('#' + thisTabId + ' select:visible');
for ( var i = 0; i < selects.length; i++) {
if (!selects.eq(i).val()) {
selects.eq(i).css('border', 'solid #FF0000 1px');
ready = false;
} else {
selects.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
});
provForm.append(provisionBtn);
};

27
xCAT-UI/js/custom/kvm.js
View File

@@ -376,9 +376,30 @@ kvmPlugin.prototype.loadProvisionPage = function(tabId) {
$(this).parents('.ui-tabs-panel').find('.ui-state-error').remove();
var ready = true;
var errorMessage = '';
// Get provision tab ID
var thisTabId = 'kvmProvisionTab' + inst;
// Get tab ID
var thisTabId = $(this).parents('.ui-tabs-panel').attr('id');
// Check if fields are properly filled in
var inputs = $('#' + thisTabId + ' input:visible');
for ( var i = 0; i < inputs.length; i++) {
if (!inputs.eq(i).val()) {
inputs.eq(i).css('border', 'solid #FF0000 1px');
ready = false;
} else {
inputs.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
var selects = $('#' + thisTabId + ' select:visible');
for ( var i = 0; i < selects.length; i++) {
if (!selects.eq(i).val()) {
selects.eq(i).css('border', 'solid #FF0000 1px');
ready = false;
} else {
selects.eq(i).css('border', 'solid #BDBDBD 1px');
}
}
});
provForm.append(provisionBtn);
};

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

@@ -1294,9 +1294,14 @@ zvmPlugin.prototype.loadProvisionPage = function(tabId) {
// Append to provision tab
$('#' + tabId).append(provForm);
var typeFS = $('<fieldset></fieldset>');
var typeLegend = $('<legend>Type</legend>');
typeFS.append(typeLegend);
provForm.append(typeFS);
// Create provision type drop down
var provType = $('<div></div>');
var typeLabel = $('<label>Provision:</label>');
var typeLabel = $('<label>Type:</label>');
var typeSelect = $('<select></select>');
var provNewNode = $('<option value="new">New node</option>');
var provExistNode = $('<option value="existing">Existing node</option>');
@@ -1304,7 +1309,7 @@ zvmPlugin.prototype.loadProvisionPage = function(tabId) {
typeSelect.append(provExistNode);
provType.append(typeLabel);
provType.append(typeSelect);
provForm.append(provType);
typeFS.append(provType);
/**
* Create provision new node division

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

@@ -1817,7 +1817,7 @@ function loadDiskPoolTable(data) {
var tableID = 'zDiskDataTable';
var table = new DataTable(tableID);
// Resource headers: volume ID, device type, start address, and size
table.init( [ 'Hardware control point', 'Pool', 'Status', 'Volume ID', 'Device type', 'Start address', 'Size' ]);
table.init( [ 'HCP', 'Pool', 'Status', 'Volume ID', 'Device type', 'Start address', 'Size' ]);
// Append datatable to tab
fieldSet.append(table.object());
@@ -1877,7 +1877,7 @@ function loadNetworkTable(data) {
// Create table
var tableId = 'zNetworkDataTable';
var table = new DataTable(tableId);
table.init( [ 'Hardware control point', 'Type', 'Name', 'Details' ]);
table.init( [ 'HCP', 'Type', 'Name', 'Details' ]);
// Append datatable to tab
fieldSet.append(table.object());
@@ -1892,14 +1892,16 @@ function loadNetworkTable(data) {
cols.eq(0).css('width', '20px'); // HCP column
cols.eq(1).css('width', '20px'); // Type column
cols.eq(2).css('width', '20px'); // Name column
cols.eq(3).css('width', '600px'); // Details column
cols.eq(3).css({'width': '600px'}); // Details column
}
// Skip index 0 because it contains nothing
var details = '';
var details = '<pre style="text-align: left;">';
for ( var i = 1; i < tmp.length; i++) {
details += tmp[i] + '<br>';
details += tmp[i];
}
details += '</pre>';
dTable.fnAddData( [ hcp, type, name, details ]);
}
@@ -1981,6 +1983,16 @@ function connect2VSwitch(data) {
function createZProvisionExisting(inst) {
// Create provision existing and hide it
var provExisting = $('<div></div>').hide();
var vmFS = $('<fieldset></fieldset>');
var vmLegend = $('<legend>Virtual Machine</legend>');
vmFS.append(vmLegend);
provExisting.append(vmFS);
var osFS = $('<fieldset></fieldset>');
var osLegend = $('<legend>Operating System</legend>');
osFS.append(osLegend);
provExisting.append(osFS);
// Create group input
var group = $('<div></div>');
@@ -2017,7 +2029,7 @@ function createZProvisionExisting(inst) {
var groupInput = $('<input type="text" name="group"/>');
group.append(groupInput);
}
provExisting.append(group);
vmFS.append(group);
// Create node input
var node = $('<div></div>');
@@ -2025,7 +2037,7 @@ function createZProvisionExisting(inst) {
var nodeDatatable = $('<div class="indent" id="zNodesDatatableDIV' + inst + '"><p>Select a group to view its nodes</p></div>');
node.append(nodeLabel);
node.append(nodeDatatable);
provExisting.append(node);
vmFS.append(node);
// Create operating system image input
var os = $('<div></div>');
@@ -2043,7 +2055,7 @@ function createZProvisionExisting(inst) {
});
os.append(osLabel);
os.append(osInput);
provExisting.append(os);
osFS.append(os);
// Create boot method drop down
var bootMethod = $('<div></div>');
@@ -2057,7 +2069,7 @@ function createZProvisionExisting(inst) {
);
bootMethod.append(methoddLabel);
bootMethod.append(methodSelect);
provExisting.append(bootMethod);
osFS.append(bootMethod);
// Generate tooltips
provExisting.find('div input[title]').tooltip({
@@ -2168,6 +2180,21 @@ function createZProvisionExisting(inst) {
function createZProvisionNew(inst) {
// Create provision new node division
var provNew = $('<div></div>');
var vmFS = $('<fieldset></fieldset>');
var vmLegend = $('<legend>Virtual Machine</legend>');
vmFS.append(vmLegend);
provNew.append(vmFS);
var hwFS = $('<fieldset></fieldset>');
var hwLegend = $('<legend>Hardware</legend>');
hwFS.append(hwLegend);
provNew.append(hwFS);
var osFS = $('<fieldset></fieldset>');
var osLegend = $('<legend>Operating System</legend>');
osFS.append(osLegend);
provNew.append(osFS);
// Create group input
var group = $('<div></div>');
@@ -2185,7 +2212,7 @@ function createZProvisionNew(inst) {
});
group.append(groupLabel);
group.append(groupInput);
provNew.append(group);
vmFS.append(group);
// Create node input
var nodeName = $('<div></div>');
@@ -2193,11 +2220,11 @@ function createZProvisionNew(inst) {
var nodeInput = $('<input type="text" name="nodeName" title="You must give a node or a node range. A node range must be given as: node1-node9 or node[1-9]."/>');
nodeName.append(nodeLabel);
nodeName.append(nodeInput);
provNew.append(nodeName);
vmFS.append(nodeName);
// Create user ID input
var userId = $('<div><label>User ID:</label><input type="text" name="userId" title="You must give a user ID or a user ID range. A user ID range must be given as: user1-user9 or user[1-9]."/></div>');
provNew.append(userId);
vmFS.append(userId);
// Create hardware control point input
var hcpDiv = $('<div></div>');
@@ -2225,7 +2252,7 @@ function createZProvisionNew(inst) {
});
hcpDiv.append(hcpLabel);
hcpDiv.append(hcpInput);
provNew.append(hcpDiv);
vmFS.append(hcpDiv);
// Create operating system image input
var os = $('<div></div>');
@@ -2243,7 +2270,7 @@ function createZProvisionNew(inst) {
});
os.append(osLabel);
os.append(osInput);
provNew.append(os);
osFS.append(os);
// Create user entry input
var defaultChkbox = $('<input type="checkbox" name="userEntry" value="default"/>').click(function() {
@@ -2308,7 +2335,7 @@ function createZProvisionNew(inst) {
});
var userEntry = $('<div><label for="userEntry">Directory entry:</label><textarea/></textarea></div>');
userEntry.append($('<span></span>').append(defaultChkbox, 'Use default'));
provNew.append(userEntry);
hwFS.append(userEntry);
// Create disk table
var diskDiv = $('<div class="provision"></div>');
@@ -2373,7 +2400,7 @@ function createZProvisionNew(inst) {
diskRow.append(diskMode);
// Get list of disk pools
var thisTabId = $(this).parent().parent().parent().parent().parent().parent().attr('id');
var thisTabId = $(this).parents('.tab').attr('id');
var thisHcp = $('#' + thisTabId + ' input[name=hcp]').val();
var definedPools;
if (thisHcp) {
@@ -2420,7 +2447,7 @@ function createZProvisionNew(inst) {
diskDiv.append(diskLabel);
diskDiv.append(diskTable);
provNew.append(diskDiv);
hwFS.append(diskDiv);
// Generate tooltips
provNew.find('div input[title]').tooltip({

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

@@ -647,7 +647,7 @@ function loadNodes(data) {
$('#nodesTab').children().remove();
// Create info bar for nodes tab
var info = createInfoBar('Double-click on a cell to edit. Click outside the table to save changes. Hit the Escape key to ignore changes.');
var info = createInfoBar('Double-click on a cell to edit a node\'s properties. Click outside the table to save changes. Hit the Escape key to ignore changes.');
$('#nodesTab').append(info);
// Create action bar

8
xCAT-UI/js/ui.js
View File

@@ -613,10 +613,10 @@ function initPage() {
includeJs("js/monitor/gangliamon.js");
headers.eq(3).css(style);
loadMonitorPage();
} else if (page == 'guide.php') {
includeJs("js/guide/guide.js");
} else if (page == 'help.php') {
includeJs("js/help/help.js");
headers.eq(4).css(style);
loadGuidePage();
loadHelpPage();
} else {
// Load nodes page by default
includeJs("js/jquery/jquery.topzindex.min.js");
@@ -822,6 +822,8 @@ function openSettings() {
if ($.cookie('xcat_theme')) {
// Select theme
oList.find('input[value="' + $.cookie('xcat_theme') + '"]').attr('checked', true);
} else {
oList.find('input[value="start"]').attr('checked', true);
}
// Open form as a dialog

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

@@ -71,7 +71,7 @@ function onlogin(data, txtStatus) {
// Remembered what page they were trying to go to
window.location = window.location.pathname;
} else {
window.location = 'guide.php';
window.location = 'help.php';
}
// Set the logonflag

2
xCAT-UI/lib/ui.php
View File

@@ -29,7 +29,7 @@ function loadPage() {
<li><a href="configure.php" class="top_link">Configure</a></li>
<li><a href="provision.php" class="top_link">Provision</a></li>
<li><a href="monitor.php" class="top_link">Monitor</a></li>
<li><a href="guide.php" class="top_link">Guide</a></li>
<li><a href="help.php" class="top_link">Help</a></li>
</ul>';
// User name and log out section

8
xCAT-UI/xcat/plugins/web.pm
View File

@@ -2181,7 +2181,13 @@ sub web_getdefaultuserentry {
$group = 'default';
}
my $entry = `ssh $hcp "cat /opt/zhcp/conf/$group.direct"`;
my $entry;
if (!(`ssh $hcp "test -e /opt/zhcp/conf/$group.direct && echo 'File exists'"`)) {
$entry = `ssh $hcp "cat /opt/zhcp/conf/default.direct"`;
} else {
$entry = `ssh $hcp "cat /opt/zhcp/conf/$group.direct"`;
}
$callback->( { data => $entry } );
}
1;