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

Undo some of the latest changes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13663 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2012-08-30 14:01:04 +00:00
parent 612ce0ae0e
commit 6b9007e64a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,11 +307,11 @@ DataTable.prototype.add = function(rowCont) {
* @param barId Status bar ID
*/
function createStatusBar(barId) {
var statusBar = $('<div class="ui-corner-all" id="' + barId + '"></div>').css({
// Do not change the background color or color! This is handled by the theme
// the user selects.
var statusBar = $('<div class="ui-state-highlight ui-corner-all" id="' + barId + '"></div>').css({
'margin-bottom': '5px',
'min-height': '30px',
'background-color':'#7BBEDE',
'color': '#FFFFFF',
'max-height': '150px',
'overflow': 'auto'
});
@ -354,10 +354,10 @@ function createStatusBar(barId) {
* @return Info bar
*/
function createInfoBar(msg) {
var infoBar = $('<div class="ui-corner-all"></div>').css({
'margin': '5px 0px',
'background-color':'#7BBEDE',
'color': '#FFFFFF'
// Do not change the background color or color! This is handled by the theme
// the user selects.
var infoBar = $('<div class="ui-state-highlight ui-corner-all"></div>').css({
'margin': '5px 0px',
});
var icon = $('<span class="ui-icon ui-icon-info"></span>').css({
'display': 'inline-block',

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

@ -97,7 +97,7 @@ function submit_request($req, $skipVerify, $opts_array){
// Turn on output buffering
ob_start();
if ($flush){
if ($flush) {
echo str_pad('',1024)."\n";
}

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

@ -234,10 +234,6 @@ sub provzlinux {
# Set nodetype definitions
$out = `chtab node=$node noderes.netboot=zvm nodetype.nodetype=osi nodetype.provmethod=install nodetype.os=$os nodetype.arch=$arch nodetype.profile=$profile nodetype.comments="owner:$owner"`;
# Update hosts table and DNS
`makehosts`;
`makedns`;
# Create user directory entry replacing LXUSR with user ID
# Use /opt/zhcp/conf/default.direct on zHCP as the template
# USER LXUSR PSWD 512M 1G G
@ -316,6 +312,10 @@ sub provzlinux {
$virt_addr = $virt_addr + 1;
}
}
# Update hosts table and DNS
`makehosts`;
`makedns`;
# Update DHCP
`makedhcp -a`;