xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

Changed xCAT-UI theme. Modify Guide page wording.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9524 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt
2011-05-09 18:25:31 +00:00
parent a6f4e35bb3
commit b37b6e7167
6 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

10
xCAT-UI/js/manual/manual.js
View File

@@ -6,10 +6,10 @@ function loadManualPage(){
//add the help content
var helpForm = $('<div class="form"></div>');
helpForm.append('<fieldset><legend>Quick Start</legend><ol>' +
'<li><a href="configure.php">1. Discover hardwares</a><br/>Discover all hardwares in the cluster. Define them into xCAT database. Initialize your cluster fast and easily. It is in the Discover tab.</li>' +
'<li><a href="index.php">2. Verify defined nodes</a><br/>See nodes definition by groups in table style and graphical layout style.</li>' +
'<li><a href="#" onclick="showProvisionHelp()">3. Install compute nodes</a><br/>Copy useful files from DVD into harddisk. Create Linux image. Install compute nodesin stateful, stateless and statelite style. It\'s all here.</li>' +
'<li><a href="monitor.php">4. Monitor Cluster</a><br/>Allows you to plug-in one or more third party monitoring software such as Ganglia, RMC etc. to monitor the xCAT cluster. </li></ol></fieldset>' +
'<fieldset><legend>Advanced</legend><ol><li><a href="configure.php">a. Edit the xCAT database tables directly</a></li><li><a href="configure.php">b. Update the xCAT RPM on Management node automatically</a></li></ol></fieldset>');
'<li><a href="configure.php">1. Discover hardware</a><br/>Discover all hardware in the cluster. Define them in the xCAT database. Initialize your cluster.</li>' +
'<li><a href="index.php">2. Verify defined nodes</a><br/>View nodes definition by groups in a table or graphical style.</li>' +
'<li><a href="#" onclick="showProvisionHelp()">3. Install compute nodes</a><br/>Copy useful files from DVD into harddisk. Create Linux image. Install compute nodes in stateful, stateless and statelite style.</li>' +
'<li><a href="monitor.php">4. Monitor Cluster</a><br/>Monitor your xCAT cluster using one or more third party monitoring software such as Ganglia, RMC, etc. </li></ol></fieldset>' +
'<fieldset><legend>Advanced</legend><ol><li><a href="configure.php">a. Edit the xCAT database tables</a></li><li><a href="configure.php">b. Update the xCAT RPM on the Management Node</a></li></ol></fieldset>');
tab.add('monitorTab', 'Guide', helpForm, false);
}

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

@@ -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 = $('<a>Undo</a>');
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({

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

@@ -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

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

@@ -12,14 +12,14 @@ function loadPage(){
<head>
<title>xCAT Console</title>
<link rel="shortcut icon" href="images/favicon.ico">
<link href="css/jquery-ui-1.8.7.custom.css" rel=stylesheet type="text/css">
<link href="css/jquery-ui-1.8.12.start.css" rel=stylesheet type="text/css">
<link href="css/jquery.dataTables.css" rel=stylesheet type="text/css">
<link href="css/superfish.css" rel=stylesheet type="text/css">
<link href="css/jstree.css" rel=stylesheet type="text/css">
<link href="css/jquery.jqplot.css" rel=stylesheet type="text/css">
<link href="css/style.css" rel=stylesheet type="text/css">
<script type="text/javascript" src="js/jquery/jquery-1.4.4.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery-ui-1.8.7.custom.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery-1.5.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery-ui-1.8.12.start.min.js"></script>
<script type="text/javascript" src="js/ui.js"></script>
</head>';

29
xCAT-UI/xCAT-UI.spec
View File

@@ -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