From cebb002cdede621b0f00af4ed40ca831d9a7e29b Mon Sep 17 00:00:00 2001 From: phamt Date: Wed, 14 Jul 2010 18:06:01 +0000 Subject: [PATCH] Changed code structure git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6763 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/css/jquery-ui-1.8.custom.css | 36 +++++++++--------- xCAT-UI/css/superfish.css | 2 +- .../jquery}/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../jquery}/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../jquery}/ui-bg_glass_65_ffffff_1x400.png | Bin .../jquery}/ui-bg_glass_75_dadada_1x400.png | Bin .../jquery}/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../jquery}/ui-bg_glass_75_ffffff_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../ui-bg_inset-soft_95_fef1ec_1x100.png | Bin .../jquery}/ui-icons_222222_256x240.png | Bin .../jquery}/ui-icons_2e83ff_256x240.png | Bin .../jquery}/ui-icons_454545_256x240.png | Bin .../jquery}/ui-icons_888888_256x240.png | Bin .../jquery}/ui-icons_cd0a0a_256x240.png | Bin xCAT-UI/js/{ => configure}/configure.js | 0 xCAT-UI/js/{ => custom}/zUtils.js | 0 xCAT-UI/js/{ => jquery}/hoverIntent.js | 0 xCAT-UI/js/{ => jquery}/jquery-1.4.2.min.js | 0 .../{ => jquery}/jquery-impromptu.3.0.min.js | 0 .../{ => jquery}/jquery-ui-1.8.custom.min.js | 0 .../js/{ => jquery}/jquery.autocomplete.js | 0 xCAT-UI/js/{ => jquery}/jquery.contextmenu.js | 0 xCAT-UI/js/{ => jquery}/jquery.cookie.js | 0 .../js/{ => jquery}/jquery.dataTables.min.js | 0 xCAT-UI/js/{ => jquery}/jquery.form.js | 0 xCAT-UI/js/{ => jquery}/jquery.jeditable.js | 0 xCAT-UI/js/{ => jquery}/jquery.tree.js | 0 xCAT-UI/js/{ => jquery}/superfish.js | 0 xCAT-UI/js/{ => monitor}/monitor.js | 0 xCAT-UI/js/{ => nodes}/nodes.js | 0 xCAT-UI/js/{ => provision}/provision.js | 0 xCAT-UI/lib/ui.php | 36 +++++++++--------- 33 files changed, 37 insertions(+), 37 deletions(-) rename xCAT-UI/{css/images => images/jquery}/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-bg_glass_65_ffffff_1x400.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-bg_glass_75_dadada_1x400.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-bg_glass_75_ffffff_1x400.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-bg_inset-soft_95_fef1ec_1x100.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-icons_222222_256x240.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-icons_2e83ff_256x240.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-icons_454545_256x240.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-icons_888888_256x240.png (100%) rename xCAT-UI/{css/images => images/jquery}/ui-icons_cd0a0a_256x240.png (100%) rename xCAT-UI/js/{ => configure}/configure.js (100%) rename xCAT-UI/js/{ => custom}/zUtils.js (100%) rename xCAT-UI/js/{ => jquery}/hoverIntent.js (100%) rename xCAT-UI/js/{ => jquery}/jquery-1.4.2.min.js (100%) rename xCAT-UI/js/{ => jquery}/jquery-impromptu.3.0.min.js (100%) rename xCAT-UI/js/{ => jquery}/jquery-ui-1.8.custom.min.js (100%) rename xCAT-UI/js/{ => jquery}/jquery.autocomplete.js (100%) rename xCAT-UI/js/{ => jquery}/jquery.contextmenu.js (100%) rename xCAT-UI/js/{ => jquery}/jquery.cookie.js (100%) rename xCAT-UI/js/{ => jquery}/jquery.dataTables.min.js (100%) rename xCAT-UI/js/{ => jquery}/jquery.form.js (100%) rename xCAT-UI/js/{ => jquery}/jquery.jeditable.js (100%) rename xCAT-UI/js/{ => jquery}/jquery.tree.js (100%) rename xCAT-UI/js/{ => jquery}/superfish.js (100%) rename xCAT-UI/js/{ => monitor}/monitor.js (100%) rename xCAT-UI/js/{ => nodes}/nodes.js (100%) rename xCAT-UI/js/{ => provision}/provision.js (100%) diff --git a/xCAT-UI/css/jquery-ui-1.8.custom.css b/xCAT-UI/css/jquery-ui-1.8.custom.css index 5e843415a..e119d1a74 100644 --- a/xCAT-UI/css/jquery-ui-1.8.custom.css +++ b/xCAT-UI/css/jquery-ui-1.8.custom.css @@ -111,7 +111,7 @@ .ui-widget-content { border: 1px solid #aaaaaa; - background: #ffffff url(images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% + background: #ffffff url(../images/jquery/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #222222; } @@ -122,7 +122,7 @@ .ui-widget-header { border: 1px solid #aaaaaa; - background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) + background: #cccccc url(../images/jquery/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; @@ -136,7 +136,7 @@ ----------------------------------*/ .ui-state-default,.ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; - background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% + background: #e6e6e6 url(../images/jquery/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; @@ -151,7 +151,7 @@ .ui-state-hover,.ui-widget-content .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus { border: 1px solid #999999; - background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% + background: #dadada url(../images/jquery/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; @@ -164,7 +164,7 @@ .ui-state-active,.ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; - background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% + background: #ffffff url(../images/jquery/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; @@ -183,7 +183,7 @@ ----------------------------------*/ .ui-state-highlight,.ui-widget-content .ui-state-highlight { border: 1px solid #fcefa1; - background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% + background: #fbf9ee url(../images/jquery/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; } @@ -194,7 +194,7 @@ .ui-state-error,.ui-widget-content .ui-state-error { border: 1px solid #cd0a0a; - background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% + background: #fef1ec url(../images/jquery/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; } @@ -229,35 +229,35 @@ .ui-icon { width: 16px; height: 16px; - background-image: url(images/ui-icons_222222_256x240.png); + background-image: url(../images/jquery/ui-icons_222222_256x240.png); } .ui-widget-content .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png); + background-image: url(../images/jquery/ui-icons_222222_256x240.png); } .ui-widget-header .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png); + background-image: url(../images/jquery/ui-icons_222222_256x240.png); } .ui-state-default .ui-icon { - background-image: url(images/ui-icons_888888_256x240.png); + background-image: url(../images/jquery/ui-icons_888888_256x240.png); } .ui-state-hover .ui-icon,.ui-state-focus .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png); + background-image: url(../images/jquery/ui-icons_454545_256x240.png); } .ui-state-active .ui-icon { - background-image: url(images/ui-icons_454545_256x240.png); + background-image: url(../images/jquery/ui-icons_454545_256x240.png); } .ui-state-highlight .ui-icon { - background-image: url(images/ui-icons_2e83ff_256x240.png); + background-image: url(../images/jquery/ui-icons_2e83ff_256x240.png); } .ui-state-error .ui-icon,.ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_cd0a0a_256x240.png); + background-image: url(../images/jquery/ui-icons_cd0a0a_256x240.png); } /* positioning */ @@ -1028,7 +1028,7 @@ /* Overlays */ .ui-widget-overlay { - background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% + background: #aaaaaa url(../images/jquery/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30; filter: Alpha(Opacity = 30); @@ -1037,7 +1037,7 @@ .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; - background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% + background: #aaaaaa url(../images/jquery/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30; filter: Alpha(Opacity = 30); @@ -1186,7 +1186,7 @@ } .ui-autocomplete-loading { - background: white url('images/ui-anim_basic_16x16.gif') right center + background: white url('../images/jquery/ui-anim_basic_16x16.gif') right center no-repeat; } diff --git a/xCAT-UI/css/superfish.css b/xCAT-UI/css/superfish.css index bd47c2375..42acddb19 100644 --- a/xCAT-UI/css/superfish.css +++ b/xCAT-UI/css/superfish.css @@ -60,7 +60,7 @@ ul.sf-menu li li li:hover ul,ul.sf-menu li li li.sfHover ul { -moz-border-radius: .5em; -webkit-border-radius: .5em; font-size: 12px; - background: #E6E6E6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% + background: #E6E6E6 url(../images/jquery/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; } diff --git a/xCAT-UI/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/xCAT-UI/images/jquery/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_flat_0_aaaaaa_40x100.png rename to xCAT-UI/images/jquery/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/xCAT-UI/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/xCAT-UI/images/jquery/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_glass_55_fbf9ee_1x400.png rename to xCAT-UI/images/jquery/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/xCAT-UI/css/images/ui-bg_glass_65_ffffff_1x400.png b/xCAT-UI/images/jquery/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_glass_65_ffffff_1x400.png rename to xCAT-UI/images/jquery/ui-bg_glass_65_ffffff_1x400.png diff --git a/xCAT-UI/css/images/ui-bg_glass_75_dadada_1x400.png b/xCAT-UI/images/jquery/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_glass_75_dadada_1x400.png rename to xCAT-UI/images/jquery/ui-bg_glass_75_dadada_1x400.png diff --git a/xCAT-UI/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/xCAT-UI/images/jquery/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_glass_75_e6e6e6_1x400.png rename to xCAT-UI/images/jquery/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/xCAT-UI/css/images/ui-bg_glass_75_ffffff_1x400.png b/xCAT-UI/images/jquery/ui-bg_glass_75_ffffff_1x400.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_glass_75_ffffff_1x400.png rename to xCAT-UI/images/jquery/ui-bg_glass_75_ffffff_1x400.png diff --git a/xCAT-UI/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/xCAT-UI/images/jquery/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to xCAT-UI/images/jquery/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/xCAT-UI/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/xCAT-UI/images/jquery/ui-bg_inset-soft_95_fef1ec_1x100.png similarity index 100% rename from xCAT-UI/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png rename to xCAT-UI/images/jquery/ui-bg_inset-soft_95_fef1ec_1x100.png diff --git a/xCAT-UI/css/images/ui-icons_222222_256x240.png b/xCAT-UI/images/jquery/ui-icons_222222_256x240.png similarity index 100% rename from xCAT-UI/css/images/ui-icons_222222_256x240.png rename to xCAT-UI/images/jquery/ui-icons_222222_256x240.png diff --git a/xCAT-UI/css/images/ui-icons_2e83ff_256x240.png b/xCAT-UI/images/jquery/ui-icons_2e83ff_256x240.png similarity index 100% rename from xCAT-UI/css/images/ui-icons_2e83ff_256x240.png rename to xCAT-UI/images/jquery/ui-icons_2e83ff_256x240.png diff --git a/xCAT-UI/css/images/ui-icons_454545_256x240.png b/xCAT-UI/images/jquery/ui-icons_454545_256x240.png similarity index 100% rename from xCAT-UI/css/images/ui-icons_454545_256x240.png rename to xCAT-UI/images/jquery/ui-icons_454545_256x240.png diff --git a/xCAT-UI/css/images/ui-icons_888888_256x240.png b/xCAT-UI/images/jquery/ui-icons_888888_256x240.png similarity index 100% rename from xCAT-UI/css/images/ui-icons_888888_256x240.png rename to xCAT-UI/images/jquery/ui-icons_888888_256x240.png diff --git a/xCAT-UI/css/images/ui-icons_cd0a0a_256x240.png b/xCAT-UI/images/jquery/ui-icons_cd0a0a_256x240.png similarity index 100% rename from xCAT-UI/css/images/ui-icons_cd0a0a_256x240.png rename to xCAT-UI/images/jquery/ui-icons_cd0a0a_256x240.png diff --git a/xCAT-UI/js/configure.js b/xCAT-UI/js/configure/configure.js similarity index 100% rename from xCAT-UI/js/configure.js rename to xCAT-UI/js/configure/configure.js diff --git a/xCAT-UI/js/zUtils.js b/xCAT-UI/js/custom/zUtils.js similarity index 100% rename from xCAT-UI/js/zUtils.js rename to xCAT-UI/js/custom/zUtils.js diff --git a/xCAT-UI/js/hoverIntent.js b/xCAT-UI/js/jquery/hoverIntent.js similarity index 100% rename from xCAT-UI/js/hoverIntent.js rename to xCAT-UI/js/jquery/hoverIntent.js diff --git a/xCAT-UI/js/jquery-1.4.2.min.js b/xCAT-UI/js/jquery/jquery-1.4.2.min.js similarity index 100% rename from xCAT-UI/js/jquery-1.4.2.min.js rename to xCAT-UI/js/jquery/jquery-1.4.2.min.js diff --git a/xCAT-UI/js/jquery-impromptu.3.0.min.js b/xCAT-UI/js/jquery/jquery-impromptu.3.0.min.js similarity index 100% rename from xCAT-UI/js/jquery-impromptu.3.0.min.js rename to xCAT-UI/js/jquery/jquery-impromptu.3.0.min.js diff --git a/xCAT-UI/js/jquery-ui-1.8.custom.min.js b/xCAT-UI/js/jquery/jquery-ui-1.8.custom.min.js similarity index 100% rename from xCAT-UI/js/jquery-ui-1.8.custom.min.js rename to xCAT-UI/js/jquery/jquery-ui-1.8.custom.min.js diff --git a/xCAT-UI/js/jquery.autocomplete.js b/xCAT-UI/js/jquery/jquery.autocomplete.js similarity index 100% rename from xCAT-UI/js/jquery.autocomplete.js rename to xCAT-UI/js/jquery/jquery.autocomplete.js diff --git a/xCAT-UI/js/jquery.contextmenu.js b/xCAT-UI/js/jquery/jquery.contextmenu.js similarity index 100% rename from xCAT-UI/js/jquery.contextmenu.js rename to xCAT-UI/js/jquery/jquery.contextmenu.js diff --git a/xCAT-UI/js/jquery.cookie.js b/xCAT-UI/js/jquery/jquery.cookie.js similarity index 100% rename from xCAT-UI/js/jquery.cookie.js rename to xCAT-UI/js/jquery/jquery.cookie.js diff --git a/xCAT-UI/js/jquery.dataTables.min.js b/xCAT-UI/js/jquery/jquery.dataTables.min.js similarity index 100% rename from xCAT-UI/js/jquery.dataTables.min.js rename to xCAT-UI/js/jquery/jquery.dataTables.min.js diff --git a/xCAT-UI/js/jquery.form.js b/xCAT-UI/js/jquery/jquery.form.js similarity index 100% rename from xCAT-UI/js/jquery.form.js rename to xCAT-UI/js/jquery/jquery.form.js diff --git a/xCAT-UI/js/jquery.jeditable.js b/xCAT-UI/js/jquery/jquery.jeditable.js similarity index 100% rename from xCAT-UI/js/jquery.jeditable.js rename to xCAT-UI/js/jquery/jquery.jeditable.js diff --git a/xCAT-UI/js/jquery.tree.js b/xCAT-UI/js/jquery/jquery.tree.js similarity index 100% rename from xCAT-UI/js/jquery.tree.js rename to xCAT-UI/js/jquery/jquery.tree.js diff --git a/xCAT-UI/js/superfish.js b/xCAT-UI/js/jquery/superfish.js similarity index 100% rename from xCAT-UI/js/superfish.js rename to xCAT-UI/js/jquery/superfish.js diff --git a/xCAT-UI/js/monitor.js b/xCAT-UI/js/monitor/monitor.js similarity index 100% rename from xCAT-UI/js/monitor.js rename to xCAT-UI/js/monitor/monitor.js diff --git a/xCAT-UI/js/nodes.js b/xCAT-UI/js/nodes/nodes.js similarity index 100% rename from xCAT-UI/js/nodes.js rename to xCAT-UI/js/nodes/nodes.js diff --git a/xCAT-UI/js/provision.js b/xCAT-UI/js/provision/provision.js similarity index 100% rename from xCAT-UI/js/provision.js rename to xCAT-UI/js/provision/provision.js diff --git a/xCAT-UI/lib/ui.php b/xCAT-UI/lib/ui.php index 418936962..00933da98 100644 --- a/xCAT-UI/lib/ui.php +++ b/xCAT-UI/lib/ui.php @@ -17,24 +17,24 @@ function loadPage(){ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + '; // Header menu @@ -93,7 +93,7 @@ function login() { echo '
-

Give the username and password configured in the passwd table

+

Give the user name and password for the xCAT management node