From 2808c41b6c878b7925e9c04f45489617c29f0666 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Fri, 17 Oct 2008 12:51:51 +0000 Subject: [PATCH] Improvements to the html and css for the discovery wizard. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2355 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-web/lib/style.css | 3 + xCAT-web/machines/discover.css | 32 ++++++++- xCAT-web/machines/discover.php | 125 +++++++++++++++++---------------- 3 files changed, 98 insertions(+), 62 deletions(-) diff --git a/xCAT-web/lib/style.css b/xCAT-web/lib/style.css index 898dc571f..911246217 100644 --- a/xCAT-web/lib/style.css +++ b/xCAT-web/lib/style.css @@ -194,6 +194,9 @@ TEXTAREA {vertical-align : middle; font-size : 8pt; font-family : sans-serif; fo .Middle {vertical-align : middle;} .Center {text-align : center;} +.Left {text-align : left;} +.Right {text-align : right;} +.NoBullet { list-style-type: none; } .YellowBackground {background-color : yellow;} .SmallText {font-size : small;} .XSmallText {font-size : x-small;} diff --git a/xCAT-web/machines/discover.css b/xCAT-web/machines/discover.css index 6310c98fc..b5524fc22 100644 --- a/xCAT-web/machines/discover.css +++ b/xCAT-web/machines/discover.css @@ -8,4 +8,34 @@ P#wizardDone {font-weight : bold; } -.wizardProgressTable { margin: 10px 0px; } +.WizardProgressTable { + margin: 10px 0px; + text-align: left; +} + +.WizardProgressTable UL { list-style-type: none; } + +.WizardProgressTable LI { + /* list-style-image: url('../images/checked-box.gif'); */ + margin-top: 1em; + margin-bottom: 1em; +} + +.WizardProgressTable IMG { margin-right: 1em; } + +.WizardListTable { + margin: 10px 0px; + text-align: left; +} + +.WizardListTable LI { + margin-top: 1em; + margin-bottom: 1em; +} + +/* this did not work in IE... +.DivTable { + display: table; + text-align: left; +} +*/ \ No newline at end of file diff --git a/xCAT-web/machines/discover.php b/xCAT-web/machines/discover.php index c48849674..60db5f834 100644 --- a/xCAT-web/machines/discover.php +++ b/xCAT-web/machines/discover.php @@ -36,52 +36,53 @@ insertFooter(); function intro() { echo "

This wizard will guide you through the process of defining the naming conventions within your cluster, discovering the hardware on your network, and automatically defining it in the xCAT database."; echo " Choose which type of hardware you want to discover, and then click Next.

\n"; -echo "\n"; -echo "\n"; -echo "\n"; -echo "
\n"; +// The least hacky way to get this list left justified, but have the block in the center, is to use a table. CSS snobs, just deal with it. +echo "
    \n"; +echo "
    • \n"; +echo "
    • \n"; +echo "
\n"; } //----------------------------------------------------------------------------- function patterns() { echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; echo "

Switch Patterns

Switch Patterns

HMCs

HMCs

Frame (BPA) Patterns

Frame (BPA) Patterns

Drawer (FSP/CEC) Patterns

Drawer (FSP/CEC) Patterns

\n"; -//todo: get HCP userids/pws +//todo: get HCP userids/pws from the user } //----------------------------------------------------------------------------- function patterns2() { echo "\n"; -echo "\n"; -echo "\n"; -echo ""; -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; +echo ""; +echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; echo "

Building Blocks

(Subnet address in each Building Block)

Building Blocks

(Subnet address in each Building Block)

LPAR Information

LPAR Information

\n"; // do we need to get any info about the resources that should be in each lpar, or do we just divide them evenly? } @@ -90,20 +91,22 @@ echo "\n"; //----------------------------------------------------------------------------- function preparemn() { global $TOPDIR; -echo "\n"; -echo "\n"; -echo "\n"; // run makenetworks and update the dynamic range for the service LAN -echo "\n"; // run makedhcp and show progress -echo "
Write Cluster Topology Configuration File.
Define networks.
Configure DHCP.
\n"; +echo "
\n"; } //----------------------------------------------------------------------------- function prediscover() { -//todo: there's a better way to get this list left justified, but have the block in the center, but don't feel like figuring it out right now. -echo "
\n"; -echo "
  1. Power on all of the HMCs.
  2. Then power on all of frames.
  3. Then click Next to discover the hardware on the service network.
\n"; -echo "
\n"; +echo "
\n"; +echo "

Do the following manual steps now:

\n"; +echo "
  1. Power on all of the HMCs.
    2. \n"; +echo "
  2. Then power on all of frames.
    3. \n"; +echo "
  3. Then click Next to discover the hardware on the service network.
    4. \n"; +echo "
\n"; } @@ -111,9 +114,9 @@ echo "\n"; function discover() { global $TOPDIR; //todo: run lsslp and show progress -echo "\n"; -echo "\n"; -echo "
Discovering HMCs, BPAs, and FSPs...
\n"; +echo "
\n"; echo "

(This will show the list of hw discovered & located, including nodenames and IP addresses assigned, and then save all info to the DB.)

\n"; } @@ -121,23 +124,23 @@ echo "

(This will show the list of hw discovered & located, including nodename //----------------------------------------------------------------------------- function updatedefs() { global $TOPDIR; -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; // run makedhosts and makedns -echo "
Determine which CECs each HMC should manage.
Assign frame numbers, supernode numbers, and building block numbers.
Assign building block subnets.
Update name resolution.
\n"; +echo "
\n"; } //----------------------------------------------------------------------------- function configurehcps() { global $TOPDIR; -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; -echo "
Assign CECs to their HMC.
Set frame numbers in BPAs.
Power on CECs to Standby.
\n"; +echo "
\n"; //todo: set HCP userids/pws } @@ -146,21 +149,21 @@ echo "\n"; //----------------------------------------------------------------------------- function createnodes() { global $TOPDIR; -echo "\n"; -echo "\n"; -echo "\n"; -echo "
Create LPARs in each CEC.
Save node definitions in xCAT database.
\n"; +echo "
\n"; } //----------------------------------------------------------------------------- function testhcps() { global $TOPDIR; -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; -echo "
(Output for rpower stat for sample nodes)
(Output for rinv for sample nodes)
(Output for rvitals for sample nodes)
\n"; +echo "
\n"; } @@ -168,6 +171,6 @@ echo "\n"; function done() { global $TOPDIR; echo "

Cluster set up successfully completed!

\n"; -echo "

You can now start to deploy nodes.

\n"; +echo "

You can now view your node definitions and start to deploy nodes.

\n"; } ?> \ No newline at end of file