diff --git a/xCAT-client/share/doc/index.html b/xCAT-client/share/doc/index.html index 4eca5a318..abf2c7177 100644 --- a/xCAT-client/share/doc/index.html +++ b/xCAT-client/share/doc/index.html @@ -10,20 +10,20 @@

xCAT 2 on the Internet

diff --git a/xCAT-web/config/db.php b/xCAT-web/config/db.php index 8534b0274..e219096d6 100644 --- a/xCAT-web/config/db.php +++ b/xCAT-web/config/db.php @@ -6,7 +6,7 @@ $TOPDIR = '..'; require_once "$TOPDIR/lib/functions.php"; insertHeader('xCAT Database', array('db.css'), - array('db.js',"$TOPDIR/jq/jquery.min.js","$TOPDIR/jq/jquery.jeditable.mini.js"), + array('db.js',"$TOPDIR/jq/jquery.jeditable.mini.js"), array('config','db')); echo "
\n"; diff --git a/xCAT-web/config/prefs.php b/xCAT-web/config/prefs.php index 162335617..ae4f6da00 100644 --- a/xCAT-web/config/prefs.php +++ b/xCAT-web/config/prefs.php @@ -8,7 +8,7 @@ require_once "$TOPDIR/lib/functions.php"; insertHeader('Preferences', NULL, NULL, array('config','prefs')); -echo "
\n"; +echo "
\n"; //foreach ($_COOKIE as $key => $value) { echo "

$key: {$_COOKIE[$key]}

\n"; } diff --git a/xCAT-web/images/throbber.gif b/xCAT-web/images/throbber.gif new file mode 100644 index 000000000..95ff649d4 Binary files /dev/null and b/xCAT-web/images/throbber.gif differ diff --git a/xCAT-web/jq/jquery-ui-personalized.min.js b/xCAT-web/jq/jquery-ui-all.min.js similarity index 100% rename from xCAT-web/jq/jquery-ui-personalized.min.js rename to xCAT-web/jq/jquery-ui-all.min.js diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_arrows_leftright.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_arrows_leftright.gif new file mode 100644 index 000000000..b26780a3b Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_arrows_leftright.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_arrows_updown.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_arrows_updown.gif new file mode 100644 index 000000000..69eb0770a Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_arrows_updown.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_close.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_close.gif new file mode 100644 index 000000000..70d0c82bc Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_close.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_doc.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_doc.gif new file mode 100644 index 000000000..26db4340c Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_doc.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_folder_closed.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_folder_closed.gif new file mode 100644 index 000000000..4efed6832 Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_folder_closed.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_folder_open.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_folder_open.gif new file mode 100644 index 000000000..0032ff62d Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_folder_open.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_minus.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_minus.gif new file mode 100644 index 000000000..6851f3981 Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_minus.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_plus.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_plus.gif new file mode 100644 index 000000000..74ac5cb91 Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_plus.gif differ diff --git a/xCAT-web/jq/theme/images/222222_11x11_icon_resize_se.gif b/xCAT-web/jq/theme/images/222222_11x11_icon_resize_se.gif new file mode 100644 index 000000000..251dc1628 Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_11x11_icon_resize_se.gif differ diff --git a/xCAT-web/jq/theme/images/222222_7x7_arrow_down.gif b/xCAT-web/jq/theme/images/222222_7x7_arrow_down.gif new file mode 100644 index 000000000..29c6c706d Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_7x7_arrow_down.gif differ diff --git a/xCAT-web/jq/theme/images/222222_7x7_arrow_left.gif b/xCAT-web/jq/theme/images/222222_7x7_arrow_left.gif new file mode 100644 index 000000000..9f95efae6 Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_7x7_arrow_left.gif differ diff --git a/xCAT-web/jq/theme/images/222222_7x7_arrow_right.gif b/xCAT-web/jq/theme/images/222222_7x7_arrow_right.gif new file mode 100644 index 000000000..bc0205073 Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_7x7_arrow_right.gif differ diff --git a/xCAT-web/jq/theme/images/222222_7x7_arrow_up.gif b/xCAT-web/jq/theme/images/222222_7x7_arrow_up.gif new file mode 100644 index 000000000..28169eb91 Binary files /dev/null and b/xCAT-web/jq/theme/images/222222_7x7_arrow_up.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_arrows_leftright.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_arrows_leftright.gif new file mode 100644 index 000000000..19f9d6b21 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_arrows_leftright.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_arrows_updown.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_arrows_updown.gif new file mode 100644 index 000000000..c10451f64 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_arrows_updown.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_close.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_close.gif new file mode 100644 index 000000000..326d01533 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_close.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_doc.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_doc.gif new file mode 100644 index 000000000..7d1b5cb57 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_doc.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_folder_closed.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_folder_closed.gif new file mode 100644 index 000000000..71bff0583 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_folder_closed.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_folder_open.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_folder_open.gif new file mode 100644 index 000000000..33a20b851 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_folder_open.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_minus.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_minus.gif new file mode 100644 index 000000000..777c3288f Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_minus.gif differ diff --git a/xCAT-web/jq/theme/images/888888_11x11_icon_plus.gif b/xCAT-web/jq/theme/images/888888_11x11_icon_plus.gif new file mode 100644 index 000000000..43531fff3 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_11x11_icon_plus.gif differ diff --git a/xCAT-web/jq/theme/images/888888_7x7_arrow_down.gif b/xCAT-web/jq/theme/images/888888_7x7_arrow_down.gif new file mode 100644 index 000000000..c91731de5 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_7x7_arrow_down.gif differ diff --git a/xCAT-web/jq/theme/images/888888_7x7_arrow_left.gif b/xCAT-web/jq/theme/images/888888_7x7_arrow_left.gif new file mode 100644 index 000000000..d6c523b2b Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_7x7_arrow_left.gif differ diff --git a/xCAT-web/jq/theme/images/888888_7x7_arrow_right.gif b/xCAT-web/jq/theme/images/888888_7x7_arrow_right.gif new file mode 100644 index 000000000..d65b2ed1a Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_7x7_arrow_right.gif differ diff --git a/xCAT-web/jq/theme/images/888888_7x7_arrow_up.gif b/xCAT-web/jq/theme/images/888888_7x7_arrow_up.gif new file mode 100644 index 000000000..165666af0 Binary files /dev/null and b/xCAT-web/jq/theme/images/888888_7x7_arrow_up.gif differ diff --git a/xCAT-web/jq/theme/images/8ab9ff_40x100_textures_02_glass_50.png b/xCAT-web/jq/theme/images/8ab9ff_40x100_textures_02_glass_50.png new file mode 100644 index 000000000..ea92c4c51 Binary files /dev/null and b/xCAT-web/jq/theme/images/8ab9ff_40x100_textures_02_glass_50.png differ diff --git a/xCAT-web/jq/theme/images/d8d8d8_40x100_textures_02_glass_90.png b/xCAT-web/jq/theme/images/d8d8d8_40x100_textures_02_glass_90.png new file mode 100644 index 000000000..7730bae7e Binary files /dev/null and b/xCAT-web/jq/theme/images/d8d8d8_40x100_textures_02_glass_90.png differ diff --git a/xCAT-web/jq/theme/images/e0e0e0_40x100_textures_02_glass_80.png b/xCAT-web/jq/theme/images/e0e0e0_40x100_textures_02_glass_80.png new file mode 100644 index 000000000..7952d2323 Binary files /dev/null and b/xCAT-web/jq/theme/images/e0e0e0_40x100_textures_02_glass_80.png differ diff --git a/xCAT-web/jq/theme/images/f3f3f3_40x100_textures_01_flat_0.png b/xCAT-web/jq/theme/images/f3f3f3_40x100_textures_01_flat_0.png new file mode 100644 index 000000000..ed434be5a Binary files /dev/null and b/xCAT-web/jq/theme/images/f3f3f3_40x100_textures_01_flat_0.png differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_arrows_leftright.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_arrows_leftright.gif new file mode 100644 index 000000000..b23fdec37 Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_arrows_leftright.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_arrows_updown.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_arrows_updown.gif new file mode 100644 index 000000000..71733b7af Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_arrows_updown.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_close.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_close.gif new file mode 100644 index 000000000..b897068df Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_close.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_doc.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_doc.gif new file mode 100644 index 000000000..586b716bc Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_doc.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_folder_closed.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_folder_closed.gif new file mode 100644 index 000000000..8e4108e81 Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_folder_closed.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_folder_open.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_folder_open.gif new file mode 100644 index 000000000..5f849a24c Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_folder_open.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_minus.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_minus.gif new file mode 100644 index 000000000..900461fb4 Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_minus.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_11x11_icon_plus.gif b/xCAT-web/jq/theme/images/ffffff_11x11_icon_plus.gif new file mode 100644 index 000000000..5047f3dbf Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_11x11_icon_plus.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_7x7_arrow_down.gif b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_down.gif new file mode 100644 index 000000000..43b59a1eb Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_down.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_7x7_arrow_left.gif b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_left.gif new file mode 100644 index 000000000..c501d76da Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_left.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_7x7_arrow_right.gif b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_right.gif new file mode 100644 index 000000000..ab1417861 Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_right.gif differ diff --git a/xCAT-web/jq/theme/images/ffffff_7x7_arrow_up.gif b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_up.gif new file mode 100644 index 000000000..957d10888 Binary files /dev/null and b/xCAT-web/jq/theme/images/ffffff_7x7_arrow_up.gif differ diff --git a/xCAT-web/jq/theme/jquery-ui-theme.css b/xCAT-web/jq/theme/jquery-ui-theme.css new file mode 100644 index 000000000..80db87561 --- /dev/null +++ b/xCAT-web/jq/theme/jquery-ui-theme.css @@ -0,0 +1,832 @@ +/* + * jQuery UI screen structure and presentation + * This CSS file was generated by ThemeRoller, a Filament Group Project for jQuery UI + * Author: Scott Jehl, scott@filamentgroup.com, http://www.filamentgroup.com + * Visit ThemeRoller.com +*/ + +/* + * Note: If your ThemeRoller settings have a font size set in ems, your components will scale according to their parent element's font size. + * As a rule of thumb, set your body's font size to 62.5% to make 1em = 10px. + * body {font-size: 62.5%;} +*/ + + + +/*UI accordion*/ +.ui-accordion { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; + border-bottom: 1px solid #cccccc; +} +.ui-accordion-group { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + border: 1px solid #cccccc; + border-bottom: none; +} +.ui-accordion-header { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + cursor: pointer; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; +} +.ui-accordion-header a { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + display: block; + font-size: 1em; + font-weight: normal; + text-decoration: none; + padding: .5em .5em .5em 1.7em; + color: #444444; + background: url(images/888888_7x7_arrow_right.gif) .5em 50% no-repeat; +} +.ui-accordion-header a:hover { + background: url(images/222222_7x7_arrow_right.gif) .5em 50% no-repeat; + color: #111111; +} +.ui-accordion-header:hover { + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; + color: #111111; +} +.selected .ui-accordion-header, .selected .ui-accordion-header:hover { + background: #8ab9ff url(images/8ab9ff_40x100_textures_02_glass_50.png) 0 50% repeat-x; +} +.selected .ui-accordion-header a, .selected .ui-accordion-header a:hover { + color: #000000; + background: url(images/ffffff_7x7_arrow_down.gif) .5em 50% no-repeat; +} +.ui-accordion-content { + padding: 1.5em 1.7em; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + color: #362b36; + font-size: 1em; +} + + + + + +/*UI tabs*/ +.ui-tabs-nav { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; + float: left; + position: relative; + z-index: 1; + border-right: 1px solid #cccccc; + bottom: -1px; +} +.ui-tabs-nav-item { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + float: left; + border: 1px solid #cccccc; + border-right: none; +} +.ui-tabs-nav-item a { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + float: left; + font-size: 1em; + font-weight: normal; + text-decoration: none; + padding: .5em 1.7em; + color: #444444; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; +} +.ui-tabs-nav-item a:hover { + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; + color: #111111; +} +.ui-tabs-selected { + border-bottom-color: #8ab9ff; +} +.ui-tabs-selected a, .ui-tabs-selected a:hover { + background: #8ab9ff url(images/8ab9ff_40x100_textures_02_glass_50.png) 0 50% repeat-x; + color: #000000; +} +.ui-tabs-panel { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + clear:left; + border: 1px solid #cccccc; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + color: #362b36; + padding: 1.5em 1.7em; + font-size: 1.2em; +} +.ui-tabs-hide { + display: none;/* for accessible hiding: position: absolute; left: -99999999px*/; +} + + + + + +/*slider*/ +.ui-slider { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + border: 1px solid #dddddd; + height: .8em; + position: relative; +} +.ui-slider-handle { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + position: absolute; + z-index: 2; + top: -3px; + width: 1.2em; + height: 1.2em; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; + border: 1px solid #cccccc; +} +.ui-slider-handle:hover { + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; + border: 1px solid #888888; +} +.ui-slider-handle-active, .ui-slider-handle-active:hover { + background: #8ab9ff url(images/8ab9ff_40x100_textures_02_glass_50.png) 0 50% repeat-x; + border: 1px solid #2694e8; +} +.ui-slider-range { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + height: .8em; + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; + position: absolute; + border: 1px solid #cccccc; + border-left: 0; + border-right: 0; + top: -1px; + z-index: 1; + opacity:.7; + filter:Alpha(Opacity=70); +} + + + + + + +/*dialog*/ +.ui-dialog { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + color: #362b36; + border: 4px solid #dddddd; + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + z-index: 99999; +} +.ui-resizable .ui-resizable-handle { + display: block; +} +body .ui-resizable-disabled .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */ +body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */ +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0px; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0px; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0px; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0px; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 13px; + height: 13px; + right: 0px; + bottom: 0px; + background: url(images/222222_11x11_icon_resize_se.gif) no-repeat 0 0; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: 0px; + bottom: 0px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: 0px; + top: 0px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: 0px; + top: 0px; +} +.ui-dialog-titlebar { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + padding: .5em 1.5em .5em 1em; + color: #444444; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; + border-bottom: 1px solid #cccccc; + font-size: 1em; + font-weight: normal; + position: relative; +} +.ui-dialog-title {} +.ui-dialog-titlebar-close { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + background: url(images/888888_11x11_icon_close.gif) 0 0 no-repeat; + position: absolute; + right: 8px; + top: .7em; + width: 11px; + height: 11px; + z-index: 100; +} +.ui-dialog-titlebar-close-hover, .ui-dialog-titlebar-close:hover { + background: url(images/222222_11x11_icon_close.gif) 0 0 no-repeat; +} +.ui-dialog-titlebar-close:active { + background: url(images/ffffff_11x11_icon_close.gif) 0 0 no-repeat; +} +.ui-dialog-titlebar-close span { + display: none; +} +.ui-dialog-content { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + color: #362b36; + padding: 1.5em 1.7em; +} +.ui-dialog-buttonpane { + position: absolute; + bottom: 0; + width: 100%; + text-align: left; + border-top: 1px solid #dddddd; + background: #f3f3f3; +} +.ui-dialog-buttonpane button { + margin: .5em 0 .5em 8px; + color: #444444; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; + font-size: 1em; + border: 1px solid #cccccc; + cursor: pointer; + padding: .2em .6em .3em .6em; + line-height: 1.4em; +} +.ui-dialog-buttonpane button:hover { + color: #111111; + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; + border: 1px solid #888888; +} +.ui-dialog-buttonpane button:active { + color: #000000; + background: #8ab9ff url(images/8ab9ff_40x100_textures_02_glass_50.png) 0 50% repeat-x; + border: 1px solid #2694e8; +} +/* This file skins dialog */ +.ui-dialog.ui-draggable .ui-dialog-titlebar, +.ui-dialog.ui-draggable .ui-dialog-titlebar { + cursor: move; +} + + + + + + + +/*datepicker*/ +/* Main Style Sheet for jQuery UI date picker */ +.ui-datepicker-div, .ui-datepicker-inline, #ui-datepicker-div { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + font-size: 1.2em; + border: 4px solid #dddddd; + width: 15.5em; + padding: 2.5em .5em .5em .5em; + position: relative; +} +.ui-datepicker-div, #ui-datepicker-div { + z-index: 9999; /*must have*/ + display: none; +} +.ui-datepicker-inline { + float: left; + display: block; +} +.ui-datepicker-control { + display: none; +} +.ui-datepicker-current { + display: none; +} +.ui-datepicker-next, .ui-datepicker-prev { + position: absolute; + left: .5em; + top: .5em; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; +} +.ui-datepicker-next { + left: 14.6em; +} +.ui-datepicker-next:hover, .ui-datepicker-prev:hover { + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; +} +.ui-datepicker-next a, .ui-datepicker-prev a { + text-indent: -999999px; + width: 1.3em; + height: 1.4em; + display: block; + font-size: 1em; + background: url(images/888888_7x7_arrow_left.gif) 50% 50% no-repeat; + border: 1px solid #cccccc; + cursor: pointer; +} +.ui-datepicker-next a { + background: url(images/888888_7x7_arrow_right.gif) 50% 50% no-repeat; +} +.ui-datepicker-prev a:hover { + background: url(images/222222_7x7_arrow_left.gif) 50% 50% no-repeat; +} +.ui-datepicker-next a:hover { + background: url(images/222222_7x7_arrow_right.gif) 50% 50% no-repeat; +} +.ui-datepicker-prev a:active { + background: url(images/ffffff_7x7_arrow_left.gif) 50% 50% no-repeat; +} +.ui-datepicker-next a:active { + background: url(images/ffffff_7x7_arrow_right.gif) 50% 50% no-repeat; +} +.ui-datepicker-header select { + border: 1px solid #cccccc; + color: #444444; + background: #e0e0e0; + font-size: 1em; + line-height: 1.4em; + position: absolute; + top: .5em; + margin: 0 !important; +} +.ui-datepicker-header option:focus, .ui-datepicker-header option:hover { + background: #d8d8d8; +} +.ui-datepicker-header select.ui-datepicker-new-month { + width: 7em; + left: 2.2em; +} +.ui-datepicker-header select.ui-datepicker-new-year { + width: 5em; + left: 9.4em; +} +table.ui-datepicker { + width: 15.5em; + text-align: right; +} +table.ui-datepicker td a { + padding: .1em .3em .1em 0; + display: block; + color: #444444; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; + cursor: pointer; + border: 1px solid #f3f3f3; +} +table.ui-datepicker td a:hover { + border: 1px solid #888888; + color: #111111; + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; +} +table.ui-datepicker td a:active { + border: 1px solid #2694e8; + color: #000000; + background: #8ab9ff url(images/8ab9ff_40x100_textures_02_glass_50.png) 0 50% repeat-x; +} +table.ui-datepicker .ui-datepicker-title-row td { + padding: .3em 0; + text-align: center; + font-size: .9em; + color: #362b36; + text-transform: uppercase; +} +table.ui-datepicker .ui-datepicker-title-row td a { + color: #362b36; +} +.ui-datepicker-cover { + display: none; + display/**/: block; + position: absolute; + z-index: -1; + filter: mask(); + top: -4px; + left: -4px; + width: 193px; + height: 200px; +} + + + + + + +/* ui-autocomplete */ +.ui-autocomplete-results { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; + z-index: 9999; +} +.ui-autocomplete-results ul, .ui-autocomplete-results li { + margin: 0; + padding: 0; + list-style: none; +} +.ui-autocomplete-results ul { + border: 1px solid #cccccc; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + color: #362b36; + margin-bottom: -1px; +} +.ui-autocomplete-results li { + padding: .4em .5em; + color: #444444; + font-size: 1em; + font-weight: normal; + position: relative; + border-left: 0; + border-right: 0; + margin: 1px 0; +} +.ui-autocomplete-results li.ui-hover-state, .ui-autocomplete-results li.ui-active-state { + margin: 0; +} +/*Paul - you could add classes for these first last states instead for ie6... */ +.ui-autocomplete-results li:first-child { + border-top: 0; +} +.ui-autocomplete-results li:last-child { + border-bottom: 0; +} +.ui-autocomplete-results li.ui-autocomplete-over { + border: 1px solid #888888; + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; + color: #111111 !important; +} +.ui-autocomplete-results li.ui-autocomplete-active { + border: 1px solid #2694e8; + background: #8ab9ff url(images/8ab9ff_40x100_textures_02_glass_50.png) 0 50% repeat-x; + color: #000000 !important; + outline: none; +} + + + + + + + +/*UI ProgressBar */ +.ui-progressbar { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + border: 1px solid #dddddd; + position: relative; +} +.ui-progressbar-bar { + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; + overflow: visible; + position: relative; + border: 1px solid #cccccc; + margin-top: -1px; + margin-left: -1px; + margin-bottom: -1px; +} +.ui-progressbar-text { + color: #444444; + padding: .2em .5em; + font-weight: normal; +} +.ui-progressbar-text-back { + display: none; +/* position: absolute; + top: 1px; + left: 0px; + font-weight: normal; + color:#000; + padding-top: 1px; + padding-bottom: 1px; + padding-right: 1px; +*/ +} +.ui-progressbar-disabled { + opacity:.5; + filter:Alpha(Opacity=50); +} + + + + + + +/*UI Colorpicker */ +.ui-colorpicker { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + border: 4px solid #dddddd; + padding: 5px; + width: 360px; + position: relative; +} +.ui-colorpicker-color { + float: left; + width: 150px; + height: 150px; + margin-right: 15px; +} +.ui-colorpicker-color div { /* is this extra div needed? why not just .ui-colorpicker-color ? */ + border: 1px solid #cccccc; + height: 150px; + background: url(images/_x_.); + position: relative; +} +.ui-colorpicker-color div div {/* shouldn't this have a class like ui-colorpicker-selector ? */ + width: 11px; + height: 11px; + background: url(images/_x_.); + position: absolute; + border: 0; + margin: -5px 0 0 -5px; + float: none; +} +.ui-colorpicker-hue { + border: 1px solid #cccccc; + float: left; + width: 17px; + height: 150px; + background: url(images/_x_.); + position: relative; + margin-right: 15px; +} +.ui-colorpicker-hue div { + background:transparent url(images/_x_.); /*this image should be themerollable*/ + height:9px; + left:-9px; + margin:-4px 0 0; + position:absolute; + width:35px; + cursor: ns-resize; +} +.ui-colorpicker-new-color, .ui-colorpicker-current-color { + float: left; + width: 6.5em; + height: 30px; + border: 1px solid #cccccc; + margin-right: 5px; +} +.ui-colorpicker-current-color { + margin-right: 0; +} + +.ui-colorpicker-field, .ui-colorpicker-hex { + position: absolute; + width: 6em; +} +.ui-colorpicker-field label, .ui-colorpicker-field input, +.ui-colorpicker-hex label, .ui-colorpicker-hex input { + font-size: 1em; + color: #ffffff; +} +.ui-colorpicker-field label, .ui-colorpicker-hex label { + width: 1em; + margin-right: .3em; +} +.ui-colorpicker-field input, .ui-colorpicker-hex input { + border: 1px solid #cccccc; + width: 4.6em; +} +.ui-colorpicker-hex { + left: 205px; + top: 134px; +} +.ui-colorpicker-rgb-r { + top: 52px; + left: 205px; +} +.ui-colorpicker-rgb-g { + top: 78px; + left: 205px; +} +.ui-colorpicker-rgb-b { + top: 105px; + left: 205px; +} +.ui-colorpicker-hsb-h { + top: 52px; + left: 290px; +} +.ui-colorpicker-hsb-s { + top: 78px; + left: 290px; +} +.ui-colorpicker-hsb-b { + top: 105px; + left: 290px; +} + +.ui-colorpicker-field label { + font-weight: normal; +} +.ui-colorpicker-field span { + width: 7px; + background: url(images/888888_11x11_icon_arrows_updown.gif) 50% 50% no-repeat; + right: 5px; + top: 0; + height: 20px; + position: absolute; +} +.ui-colorpicker-field span:hover { + background: url(images/222222_11x11_icon_arrows_updown.gif) 50% 50% no-repeat; +} + +.ui-colorpicker-submit { + right: 14px; + top: 134px; + position: absolute; +} + + + + + + + + +/* +Generic ThemeRoller Classes +>> Make your jQuery Components ThemeRoller-Compatible! +*/ + +/*component global class*/ +.ui-component { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; + font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; + font-size: 1.2em; +} +/*component content styles*/ +.ui-component-content { + border: 1px solid #dddddd; + background: #f3f3f3 url(images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x; + color: #362b36; +} +.ui-component-content a { + color: #362b36; + text-decoration: underline; +} +/*component states*/ +.ui-default-state { + border: 1px solid #cccccc; + background: #e0e0e0 url(images/e0e0e0_40x100_textures_02_glass_80.png) 0 50% repeat-x; + font-weight: normal; + color: #444444 !important; +} +.ui-default-state a { + color: #444444; +} +.ui-default-state:hover, .ui-hover-state { + border: 1px solid #888888; + background: #d8d8d8 url(images/d8d8d8_40x100_textures_02_glass_90.png) 0 50% repeat-x; + font-weight: normal; + color: #111111 !important; +} +.ui-hover-state a { + color: #111111; +} +.ui-default-state:active, .ui-active-state { + border: 1px solid #2694e8; + background: #8ab9ff url(images/8ab9ff_40x100_textures_02_glass_50.png) 0 50% repeat-x; + font-weight: normal; + color: #000000 !important; + outline: none; +} +.ui-active-state a { + color: #000000; + outline: none; +} +/*icons*/ +.ui-arrow-right-default {background: url(images/888888_7x7_arrow_right.gif) no-repeat 50% 50%;} +.ui-arrow-right-default:hover, .ui-arrow-right-hover {background: url(images/222222_7x7_arrow_right.gif) no-repeat 50% 50%;} +.ui-arrow-right-default:active, .ui-arrow-right-active {background: url(images/ffffff_7x7_arrow_right.gif) no-repeat 50% 50%;} +.ui-arrow-right-content {background: url(images/222222_7x7_arrow_right.gif) no-repeat 50% 50%;} + +.ui-arrow-left-default {background: url(images/888888_7x7_arrow_left.gif) no-repeat 50% 50%;} +.ui-arrow-left-default:hover, .ui-arrow-left-hover {background: url(images/222222_7x7_arrow_left.gif) no-repeat 50% 50%;} +.ui-arrow-left-default:active, .ui-arrow-left-active {background: url(images/ffffff_7x7_arrow_left.gif) no-repeat 50% 50%;} +.ui-arrow-left-content {background: url(images/222222_7x7_arrow_left.gif) no-repeat 50% 50%;} + +.ui-arrow-down-default {background: url(images/888888_7x7_arrow_down.gif) no-repeat 50% 50%;} +.ui-arrow-down-default:hover, .ui-arrow-down-hover {background: url(images/222222_7x7_arrow_down.gif) no-repeat 50% 50%;} +.ui-arrow-down-default:active, .ui-arrow-down-active {background: url(images/ffffff_7x7_arrow_down.gif) no-repeat 50% 50%;} +.ui-arrow-down-content {background: url(images/222222_7x7_arrow_down.gif) no-repeat 50% 50%;} + +.ui-arrow-up-default {background: url(images/888888_7x7_arrow_up.gif) no-repeat 50% 50%;} +.ui-arrow-up-default:hover, .ui-arrow-up-hover {background: url(images/222222_7x7_arrow_up.gif) no-repeat 50% 50%;} +.ui-arrow-up-default:active, .ui-arrow-up-active {background: url(images/ffffff_7x7_arrow_up.gif) no-repeat 50% 50%;} +.ui-arrow-up-content {background: url(images/222222_7x7_arrow_up.gif) no-repeat 50% 50%;} + +.ui-close-default {background: url(images/888888_11x11_icon_close.gif) no-repeat 50% 50%;} +.ui-close-default:hover, .ui-close-hover {background: url(images/222222_11x11_icon_close.gif) no-repeat 50% 50%;} +.ui-close-default:active, .ui-close-active {background: url(images/ffffff_11x11_icon_close.gif) no-repeat 50% 50%;} +.ui-close-content {background: url(images/ffffff_11x11_icon_close.gif) no-repeat 50% 50%;} + +.ui-folder-closed-default {background: url(images/888888_11x11_icon_folder_closed.gif) no-repeat 50% 50%;} +.ui-folder-closed-default:hover, .ui-folder-closed-hover {background: url(images/222222_11x11_icon_folder_closed.gif) no-repeat 50% 50%;} +.ui-folder-closed-default:active, .ui-folder-closed-active {background: url(images/ffffff_11x11_icon_folder_closed.gif) no-repeat 50% 50%;} +.ui-folder-closed-content {background: url(images/888888_11x11_icon_folder_closed.gif) no-repeat 50% 50%;} + +.ui-folder-open-default {background: url(images/888888_11x11_icon_folder_open.gif) no-repeat 50% 50%;} +.ui-folder-open-default:hover, .ui-folder-open-hover {background: url(images/222222_11x11_icon_folder_open.gif) no-repeat 50% 50%;} +.ui-folder-open-default:active, .ui-folder-open-active {background: url(images/ffffff_11x11_icon_folder_open.gif) no-repeat 50% 50%;} +.ui-folder-open-content {background: url(images/ffffff_11x11_icon_folder_open.gif) no-repeat 50% 50%;} + +.ui-doc-default {background: url(images/888888_11x11_icon_doc.gif) no-repeat 50% 50%;} +.ui-doc-default:hover, .ui-doc-hover {background: url(images/222222_11x11_icon_doc.gif) no-repeat 50% 50%;} +.ui-doc-default:active, .ui-doc-active {background: url(images/ffffff_11x11_icon_doc.gif) no-repeat 50% 50%;} +.ui-doc-content {background: url(images/222222_11x11_icon_doc.gif) no-repeat 50% 50%;} + +.ui-arrows-leftright-default {background: url(images/888888_11x11_icon_arrows_leftright.gif) no-repeat 50% 50%;} +.ui-arrows-leftright-default:hover, .ui-arrows-leftright-hover {background: url(images/222222_11x11_icon_arrows_leftright.gif) no-repeat 50% 50%;} +.ui-arrows-leftright-default:active, .ui-arrows-leftright-active {background: url(images/ffffff_11x11_icon_arrows_leftright.gif) no-repeat 50% 50%;} +.ui-arrows-leftright-content {background: url(images/222222_11x11_icon_arrows_leftright.gif) no-repeat 50% 50%;} + +.ui-arrows-updown-default {background: url(images/888888_11x11_icon_arrows_updown.gif) no-repeat 50% 50%;} +.ui-arrows-updown-default:hover, .ui-arrows-updown-hover {background: url(images/222222_11x11_icon_arrows_updown.gif) no-repeat 50% 50%;} +.ui-arrows-updown-default:active, .ui-arrows-updown-active {background: url(images/ffffff_11x11_icon_arrows_updown.gif) no-repeat 50% 50%;} +.ui-arrows-updown-content {background: url(images/222222_11x11_icon_arrows_updown.gif) no-repeat 50% 50%;} + +.ui-minus-default {background: url(images/888888_11x11_icon_minus.gif) no-repeat 50% 50%;} +.ui-minus-default:hover, .ui-minus-hover {background: url(images/222222_11x11_icon_minus.gif) no-repeat 50% 50%;} +.ui-minus-default:active, .ui-minus-active {background: url(images/ffffff_11x11_icon_minus.gif) no-repeat 50% 50%;} +.ui-minus-content {background: url(images/222222_11x11_icon_minus.gif) no-repeat 50% 50%;} + +.ui-plus-default {background: url(images/888888_11x11_icon_plus.gif) no-repeat 50% 50%;} +.ui-plus-default:hover, .ui-plus-hover {background: url(images/222222_11x11_icon_plus.gif) no-repeat 50% 50%;} +.ui-plus-default:active, .ui-plus-active {background: url(images/ffffff_11x11_icon_plus.gif) no-repeat 50% 50%;} +.ui-plus-content {background: url(images/222222_11x11_icon_plus.gif) no-repeat 50% 50%;} + +/*hidden elements*/ +.ui-hidden { + display: none;/* for accessible hiding: position: absolute; left: -99999999px*/; +} +.ui-accessible-hidden { + position: absolute; left: -99999999px; +} +/*reset styles*/ +.ui-reset { + /*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; +} +/*clearfix class*/ +.ui-clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.ui-clearfix {display: inline-block;} +/* Hides from IE-mac \*/ +* html .ui-clearfix {height: 1%;} +.ui-clearfix {display: block;} +/* End hide from IE-mac */ + +/* Note: for resizable styles, use the styles listed above in the dialog section */ + + diff --git a/xCAT-web/lib/CommandWindow.js b/xCAT-web/lib/CommandWindow.js deleted file mode 100644 index f2deb9bf1..000000000 --- a/xCAT-web/lib/CommandWindow.js +++ /dev/null @@ -1,56 +0,0 @@ -var CommandWindow = {}; - -CommandWindow.updateCommandResult = function() { - //todo: add commandQueryObj.value to the history select box - - var commandQueryObj = $('commandQuery'); - var copyChkBoxObj = $('copyChkBox'); - var nodelistTxtObj = $('nodeList'); - var nodegrpsCboBoxObj = $('nodegrpsCboBox'); - var pshChkBoxObj = $('pshChkBox'); - - var serialChkBoxObj = $('serialChkBox'); - var verifyChkBoxObj = $('verifyChkBox'); - var fanoutTxtBoxObj = $('fanoutTxtBox'); - var userIDTxtBoxObj = $('userIDTxtBox'); - var rshellTxtBoxObj = $('rshellTxtBox'); - var monitorChkBoxObj = $('monitorChkBox'); - var ret_codeChkBoxObj = $('ret_codeChkBox'); - - // Do AJAX call and get HTML here. - var url = "dsh_action.php"; - var postPara = "command=" + encodeURIComponent(commandQueryObj.value); - if (nodelistTxtObj) { postPara += "&node=" + encodeURIComponent(nodelistTxtObj.value); } - if (nodegrpsCboBoxObj) { postPara += "&nodegrps=" + encodeURIComponent(nodegrpsCboBoxObj.options[nodegrpsCboBoxObj.selectedIndex].value); } - if (copyChkBoxObj.checked == true) postPara += "©=on"; else postPara += "©=off"; - if (pshChkBoxObj.checked == true) postPara += "&psh=on"; else postPara += "&psh=off"; - if (serialChkBoxObj.checked == true) postPara += "&serial=on"; else postPara += "&serial=off"; - if (verifyChkBoxObj.checked == true) postPara += "&verify=on"; else postPara += "&verify=off"; - postPara += "&fanout=" + encodeURIComponent(fanoutTxtBoxObj.value); - postPara += "&userID=" + encodeURIComponent(userIDTxtBoxObj.value); - postPara += "&rshell=" + encodeURIComponent(rshellTxtBoxObj.value); - if (monitorChkBoxObj.checked == true) postPara += "&monitor=on"; else postPara += "&monitor=off"; - if (ret_codeChkBoxObj.checked == true) postPara += "&ret_code=on"; else postPara += "&ret_code=off"; - - new Ajax.Request(url, { - method: 'post', postBody: postPara, - onSuccess: function(transport) { - var htmlContent = transport.responseText; - - var win = new Window({className: "dialog", - width: 350, - height: 400, - zIndex: 100, - resizable: true, - title: "Running commands", - showEffect: Effect.BlindDown, - hideEffect: Effect.SwitchOff, - draggable: true, - wiredDrag: true}); - - win.getContent().innerHTML = htmlContent; - //win.setStatusBar("Status bar info"); - win.showCenter(); - } - }); -}; diff --git a/xCAT-web/lib/functions.js b/xCAT-web/lib/functions.js index 02ff7bafa..c54dcdbac 100644 --- a/xCAT-web/lib/functions.js +++ b/xCAT-web/lib/functions.js @@ -18,70 +18,16 @@ for (i in cookies) { var pair = cookies[i].split('='); cookret[pair[0]] = unesca return cookret; } -function selectAll(element, objectName) +// Check or uncheck all checkboxes that start with objectName +function selectAllCheckBoxes(element, objectName) { + //todo: use jQuery to accomplish this var sel = element.checked; var form = element.form; - var searchstr = '^' + objectName + '\\d'; + var searchstr = '^' + objectName + '\d'; for(var i = 0; i < form.length; i++) { var e = form.elements[i]; if (e.type == "checkbox" && e.name.search(searchstr) > -1) { e.checked = sel; } } } - -function isSelected(form, objectName) -{ -var searchstr = '^' + objectName + '\\d'; -for(var i = 0; i < form.length; i++) - { - var e = form.elements[i]; - if (e.type == "checkbox" && e.name.search(searchstr) > -1 && e.checked) { return true; } - } -return false; -} - -function numSelected(form, objectName) -{ -var searchstr = '^' + objectName + '\\d'; -var j = 0; -for(var i = 0; i < form.length; i++) - { - var e = form.elements[i]; - if (e.type == "checkbox" && e.name.search(searchstr) > -1 && e.checked) - { - if (++j == 2) { return j; } - } - } -return j; -} - -function toggleSection(para, tableId) -{ - var t; var i; - var imageId = tableId + '-im'; - if (document.all) { t = document.all[tableId]; i = document.all[imageId]; } // IE 4+ - else if (document.getElementById) { t = document.getElementById(tableId); i = document.getElementById(imageId); } // Netscape 6 - else { alert('Cannot expand or collapse sections in this version of your browser.'); return false; } - if (!t) { alert('Error: section ' + tableId + ' not found.'); return false; } - - if (!t.style.display || t.style.display == 'inline') // the inner table is currently visible - { - t.style.display = 'none'; - para.title = 'Click to expand section'; - //if (txt) { txt = txt.replace(/^-/i, '+'); } - i.src = 'images/plus-sign.gif'; - //i.alt = '+'; - } - else // the inner table is currently invisible - { - t.style.display = 'inline'; - para.title = 'Click to collapse section'; - //if (txt) { txt = txt.replace(/^\+/i, '-'); } - i.src = 'images/minus-sign.gif'; - //i.alt = '-'; - } - - return true; -} - diff --git a/xCAT-web/lib/functions.php b/xCAT-web/lib/functions.php index 8ea0a5aba..c06d31221 100644 --- a/xCAT-web/lib/functions.php +++ b/xCAT-web/lib/functions.php @@ -26,19 +26,24 @@ function insertHeader($title, $stylesheets, $javascripts, $currents) { global $TOPDIR; // Remember the current page so we can open it again the next time they come to the web interface -$expire_time = gmmktime(0, 0, 0, 1, 1, 2038); -foreach ($currents as $key => $value) { setcookie("currentpage[$key]", $value, $expire_time, '/'); } +if ($currents[0] != 'logout') { + $expire_time = gmmktime(0, 0, 0, 1, 1, 2038); + foreach ($currents as $key => $value) { setcookie("currentpage[$key]", $value, $expire_time, '/'); } + } -echo << $title - + + + + -EOS; +EOS1; if ($stylesheets) { @@ -52,23 +57,52 @@ if ($javascripts) { } } echo "\n"; -echo <<
-EOS; +EOS3; //echo "
\n"; //echo "
\n"; // end the top div + +if (!isAuthenticated()) { + insertLogin(); // display the login dialog and page footer + exit; // Do not want to continue with the rest of the page + // If the login dialog is successful, it will load index.php which will remember what + // page they were trying to go to. +} } // end insertHeader +//----------------------------------------------------------------------------- +// If they are not authenticated yet, display the login dialog +function insertLogin() { +global $TOPDIR; +// The javascript in xcatauth.js will add the Login button and display the dialog +echo << +
+

Note: The username and password used must be in the passwd table in the xCAT database.

+ + + +
+


+
+ +EOS2; + +insertFooter(); +} + + // This is the data structure that represents the menu for each page. $MENU = array( 'machines' => array( @@ -135,6 +169,13 @@ $MENU = array( 'about' => array('label' => 'About', 'url' => "$TOPDIR/support/about.php"), ) ), + 'logout' => array( + 'label' => 'Logout', + 'default' => 'logout', + 'list' => array( + 'logout' => array('label' => 'Logout/Login', 'url' => "$TOPDIR/lib/logout.php"), + ) + ), ); @@ -208,10 +249,18 @@ echo '