diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css index 8a5dab26f..c2531c63b 100644 --- a/xCAT-UI/css/style.css +++ b/xCAT-UI/css/style.css @@ -205,6 +205,7 @@ span.ui-icon-info { .tab a { cursor: pointer; + color: #0000FF; } .tab .ui-icon-close { @@ -305,11 +306,15 @@ legend { } .actionBar a { - color: #2E6E9E; + color: #FFFFFF; font-weight: bold; cursor: pointer; } +.actionBar a:hover { + color: #026890; +} + .actionBar li { list-style: none; padding: 5px; diff --git a/xCAT-UI/js/manual/manual.js b/xCAT-UI/js/manual/manual.js index 22a0710a8..7e966d98a 100644 --- a/xCAT-UI/js/manual/manual.js +++ b/xCAT-UI/js/manual/manual.js @@ -6,10 +6,10 @@ function loadManualPage(){ //add the help content var helpForm = $('
'); helpForm.append('
Quick Start
    ' + - '
  1. 1. Discover hardwares
    Discover all hardwares in the cluster. Define them into xCAT database. Initialize your cluster fast and easily. It is in the Discover tab.
    2. ' + - '
  2. 2. Verify defined nodes
    See nodes definition by groups in table style and graphical layout style.
    3. ' + - '
  3. 3. Install compute nodes
    Copy useful files from DVD into harddisk. Create Linux image. Install compute nodesin stateful, stateless and statelite style. It\'s all here.
    4. ' + - '
  4. 4. Monitor Cluster
    Allows you to plug-in one or more third party monitoring software such as Ganglia, RMC etc. to monitor the xCAT cluster.
' + - '
Advanced
  1. a. Edit the xCAT database tables directly
  2. b. Update the xCAT RPM on Management node automatically
'); + '
  • 1. Discover hardware
    Discover all hardware in the cluster. Define them in the xCAT database. Initialize your cluster.
    • ' + + '
  • 2. Verify defined nodes
    View nodes definition by groups in a table or graphical style.
    • ' + + '
  • 3. Install compute nodes
    Copy useful files from DVD into harddisk. Create Linux image. Install compute nodes in stateful, stateless and statelite style.
    • ' + + '
  • 4. Monitor Cluster
    Monitor your xCAT cluster using one or more third party monitoring software such as Ganglia, RMC, etc.
    • ' + + '
    Advanced
    1. a. Edit the xCAT database tables
    2. b. Update the xCAT RPM on the Management Node
    '); tab.add('monitorTab', 'Guide', helpForm, false); } \ No newline at end of file diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js index 73d0aaa6e..69b3f2429 100644 --- a/xCAT-UI/js/nodes/nodes.js +++ b/xCAT-UI/js/nodes/nodes.js @@ -737,6 +737,7 @@ function loadNodes(data) { var actions = [ [ powerLnk, powerActionMenu ], [ monitorLnk, monitorActionMenu ], cloneLnk, deleteLnk, unlockLnk, [ advancedLnk, advancedActionMenu ] ]; var actionsMenu = createMenu(actions); actionsMenu.superfish(); + actionsMenu.css('display', 'inline-block'); actionsDiv.append(actionsMenu); actionBar.append(actionsDiv); @@ -758,13 +759,16 @@ function loadNodes(data) { var undoLnk = $('Undo'); undoLnk.bind('click', function(event){ restoreNodeAttrs(); + + // Hide table menu actions + tableActionsMenu.hide(); }); // It will be hidden until a change is made - var tableActionsMenu = createMenu([saveLnk, undoLnk]).hide(); - tableActionsMenu.css('margin-left', '90px'); + var tableActionsMenu = createMenu([saveLnk, undoLnk]); + tableActionsMenu.css('display', 'inline-block'); tableActionsMenu.attr('id', 'tableActionMenu'); - actionsDiv.append(tableActionsMenu); + actionsDiv.append(tableActionsMenu.hide()); // Turn table into a datatable var nodesDatatable = $('#' + nodesTableId).dataTable({ diff --git a/xCAT-UI/js/xcatauth.js b/xCAT-UI/js/xcatauth.js index 3c3150e0d..882609ed9 100644 --- a/xCAT-UI/js/xcatauth.js +++ b/xCAT-UI/js/xcatauth.js @@ -56,16 +56,15 @@ function onlogin(data, txtStatus) { $("#logstatus").text("Login successful"); $("#logdialog").dialog("close"); - //not the first time to log + // Not the first time to log if ($.cookie('logonflag')){ - // Remembered what page they were trying to go to + // Remembered what page they were trying to go to window.location = window.location.pathname; - } - else{ + } else { window.location = 'manual.php'; } - //set the logonflag + // Set the logonflag $.cookie('logonflag', 'yes', { path : '/xcat', expires : 100 diff --git a/xCAT-UI/lib/ui.php b/xCAT-UI/lib/ui.php index e43280bb0..3d6177ad3 100644 --- a/xCAT-UI/lib/ui.php +++ b/xCAT-UI/lib/ui.php @@ -12,14 +12,14 @@ function loadPage(){ xCAT Console - + - - + + '; diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec index 00de81eae..4b1876dec 100644 --- a/xCAT-UI/xCAT-UI.spec +++ b/xCAT-UI/xCAT-UI.spec @@ -126,6 +126,18 @@ set -x fi if [ "$1" = 1 ] # Install + then + # Update apache conf + /bin/rm -f /etc/$apachedaemon/conf.d/xcat-ui.conf + /bin/ln -s %{prefix}/ui/etc/apache2/conf.d/xcat-ui.conf /etc/$apachedaemon/conf.d/xcat-ui.conf + + # Automatically put encrypted password into the xCAT passwd database + %{prefix}/sbin/chtab key=xcat,username=root passwd.password=`grep root /etc/shadow|cut -d : -f 2` + + echo "To use xCAT-UI, point your browser to http://"`hostname -f`"/xcat" + fi + + if [ "$1" = 1 ] || [ "$1" = 2 ] # Install or upgrade then # Copy php.ini file into /opt/xcat/ui and turn off output_buffering if [ -e "/etc/redhat-release" ]; then @@ -134,21 +146,8 @@ set -x /bin/sed /etc/php5/apache2/php.ini -e 's/output_buffering = 4096/output_buffering = Off/g' > %{prefix}/ui/php.ini fi - # Update apache conf - /bin/rm -f /etc/$apachedaemon/conf.d/xcat-ui.conf - /bin/ln -s %{prefix}/ui/etc/apache2/conf.d/xcat-ui.conf /etc/$apachedaemon/conf.d/xcat-ui.conf - /etc/init.d/$apachedaemon reload - - # Automatically put encrypted password into the xCAT passwd database - %{prefix}/sbin/chtab key=xcat,username=root passwd.password=`grep root /etc/shadow|cut -d : -f 2` - - echo "To use xCAT-UI, point your browser to http://"`hostname -f`"/xcat" - fi - - if [ "$1" = 1 ] || [ "$1" = 2 ] # Install or upgrade - then - # Uncomment this if we change xcat-ui.conf again - # /etc/init.d/$apachedaemon reload + # Restart Apache Web Server + /etc/init.d/$apachedaemon reload true fi %else # AIX