Reorganized images so that images are grouped under a plugin folder.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8661 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

xCAT-UI/css/jstree.css

@@ -1 +1 @@
-.jstree-default li,.jstree-default ins{background-image:url("../images/jstree.png");background-repeat:no-repeat;background-color:transparent;}.jstree-default li{background-position:-90px 0;background-repeat:repeat-y;}.jstree-default li.jstree-last{background:transparent;}.jstree-default .jstree-open>ins{background-position:-72px 0;}.jstree-default .jstree-closed>ins{background-position:-54px 0;}.jstree-default .jstree-leaf>ins{background-position:-36px 0;}.jstree-default .jstree-hovered{background:#e7f4f9;border:1px solid #d8f0fa;padding:0 2px 0 1px;}.jstree-default .jstree-clicked{background:#C0E2FF;border:1px solid #79B7E7;padding:0 2px 0 1px;}.jstree-default a .jstree-icon{background-position:-56px -19px;}.jstree-default a.jstree-loading .jstree-icon{background:url("../images/throbber.gif") center center no-repeat!important;}.jstree-default .jstree-no-dots li,.jstree-default .jstree-no-dots .jstree-leaf>ins{background:transparent;}.jstree-default .jstree-no-dots .jstree-open>ins{background-position:-18px 0;}.jstree-default .jstree-no-dots .jstree-closed>ins{background-position:0 0;}.jstree-default .jstree-no-icons a .jstree-icon{display:none;}.jstree-default .jstree-search{font-style:italic;}.jstree-default .jstree-no-icons .jstree-checkbox{display:inline-block;}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important;}.jstree-default .jstree-checked>a>.jstree-checkbox{background-position:-38px -19px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox{background-position:-2px -19px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox{background-position:-20px -19px;}.jstree-default .jstree-checked>a>.jstree-checkbox:hover{background-position:-38px -37px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox:hover{background-position:-2px -37px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox:hover{background-position:-20px -37px;}#vakata-dragged.jstree-default ins{background:transparent!important;}#vakata-dragged.jstree-default .jstree-ok{background:url("../images/jstree.png") -2px -53px no-repeat!important;}#vakata-dragged.jstree-default .jstree-invalid{background:url("../images/jstree.png") -18px -53px no-repeat!important;}#jstree-marker.jstree-default{background:url("../images/jstree.png") -41px -57px no-repeat!important;}.jstree-default a.jstree-search{color:aqua;}#vakata-contextmenu.jstree-default-context,#vakata-contextmenu.jstree-default-context li ul{background:#f0f0f0;border:1px solid #979797;-moz-box-shadow:1px 1px 2px #999;-webkit-box-shadow:1px 1px 2px #999;box-shadow:1px 1px 2px #999;}#vakata-contextmenu.jstree-default-context a{color:black;}#vakata-contextmenu.jstree-default-context a:hover,#vakata-contextmenu.jstree-default-context .vakata-hover>a{padding:0 5px;background:#e8eff7;border:1px solid #aecff7;color:black;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;}#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a,#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover{color:silver;background:transparent;border:0;padding:1px 4px;}#vakata-contextmenu.jstree-default-context li.vakata-separator{background:white;border-top:1px solid #e0e0e0;margin:0;}#vakata-contextmenu.jstree-default-context li ul{margin-left:-4px;}.jstree-default li,.jstree-default ins,#vakata-dragged.jstree-default .jstree-invalid,#vakata-dragged.jstree-default .jstree-ok,#jstree-marker.jstree-default{_background-image:url("../images/jstree.gif");}.jstree-default .jstree-open ins{_background-position:-72px 0;}.jstree-default .jstree-closed ins{_background-position:-54px 0;}.jstree-default .jstree-leaf ins{_background-position:-36px 0;}.jstree-default a ins.jstree-icon{_background-position:-56px -19px;}#vakata-contextmenu.jstree-default-context ins{_display:none;}#vakata-contextmenu.jstree-default-context li{_zoom:1;}.jstree-default .jstree-undetermined a .jstree-checkbox{_background-position:-20px -19px;}.jstree-default .jstree-checked a .jstree-checkbox{_background-position:-38px -19px;}.jstree-default .jstree-unchecked a .jstree-checkbox{_background-position:-2px -19px;}
+.jstree-default li,.jstree-default ins{background-image:url("../images/jstree/jstree.png");background-repeat:no-repeat;background-color:transparent;}.jstree-default li{background-position:-90px 0;background-repeat:repeat-y;}.jstree-default li.jstree-last{background:transparent;}.jstree-default .jstree-open>ins{background-position:-72px 0;}.jstree-default .jstree-closed>ins{background-position:-54px 0;}.jstree-default .jstree-leaf>ins{background-position:-36px 0;}.jstree-default .jstree-hovered{background:#e7f4f9;border:1px solid #d8f0fa;padding:0 2px 0 1px;}.jstree-default .jstree-clicked{background:#C0E2FF;border:1px solid #79B7E7;padding:0 2px 0 1px;}.jstree-default a .jstree-icon{background-position:-56px -19px;}.jstree-default a.jstree-loading .jstree-icon{background:url("../images/loader.gif") center center no-repeat!important;}.jstree-default .jstree-no-dots li,.jstree-default .jstree-no-dots .jstree-leaf>ins{background:transparent;}.jstree-default .jstree-no-dots .jstree-open>ins{background-position:-18px 0;}.jstree-default .jstree-no-dots .jstree-closed>ins{background-position:0 0;}.jstree-default .jstree-no-icons a .jstree-icon{display:none;}.jstree-default .jstree-search{font-style:italic;}.jstree-default .jstree-no-icons .jstree-checkbox{display:inline-block;}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important;}.jstree-default .jstree-checked>a>.jstree-checkbox{background-position:-38px -19px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox{background-position:-2px -19px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox{background-position:-20px -19px;}.jstree-default .jstree-checked>a>.jstree-checkbox:hover{background-position:-38px -37px;}.jstree-default .jstree-unchecked>a>.jstree-checkbox:hover{background-position:-2px -37px;}.jstree-default .jstree-undetermined>a>.jstree-checkbox:hover{background-position:-20px -37px;}#vakata-dragged.jstree-default ins{background:transparent!important;}#vakata-dragged.jstree-default .jstree-ok{background:url("../images/jstree/jstree.png") -2px -53px no-repeat!important;}#vakata-dragged.jstree-default .jstree-invalid{background:url("../images/jstree/jstree.png") -18px -53px no-repeat!important;}#jstree-marker.jstree-default{background:url("../images/jstree/jstree.png") -41px -57px no-repeat!important;}.jstree-default a.jstree-search{color:aqua;}#vakata-contextmenu.jstree-default-context,#vakata-contextmenu.jstree-default-context li ul{background:#f0f0f0;border:1px solid #979797;-moz-box-shadow:1px 1px 2px #999;-webkit-box-shadow:1px 1px 2px #999;box-shadow:1px 1px 2px #999;}#vakata-contextmenu.jstree-default-context a{color:black;}#vakata-contextmenu.jstree-default-context a:hover,#vakata-contextmenu.jstree-default-context .vakata-hover>a{padding:0 5px;background:#e8eff7;border:1px solid #aecff7;color:black;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;}#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a,#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover{color:silver;background:transparent;border:0;padding:1px 4px;}#vakata-contextmenu.jstree-default-context li.vakata-separator{background:white;border-top:1px solid #e0e0e0;margin:0;}#vakata-contextmenu.jstree-default-context li ul{margin-left:-4px;}.jstree-default li,.jstree-default ins,#vakata-dragged.jstree-default .jstree-invalid,#vakata-dragged.jstree-default .jstree-ok,#jstree-marker.jstree-default{_background-image:url("../images/jstree/jstree.gif");}.jstree-default .jstree-open ins{_background-position:-72px 0;}.jstree-default .jstree-closed ins{_background-position:-54px 0;}.jstree-default .jstree-leaf ins{_background-position:-36px 0;}.jstree-default a ins.jstree-icon{_background-position:-56px -19px;}#vakata-contextmenu.jstree-default-context ins{_display:none;}#vakata-contextmenu.jstree-default-context li{_zoom:1;}.jstree-default .jstree-undetermined a .jstree-checkbox{_background-position:-20px -19px;}.jstree-default .jstree-checked a .jstree-checkbox{_background-position:-38px -19px;}.jstree-default .jstree-unchecked a .jstree-checkbox{_background-position:-2px -19px;}

xCAT-UI/css/style.css

@@ -449,7 +449,7 @@ legend {
 
 /*--------------- jQuery context menu ---------------*/
 .context-menu-theme-vista {
-	background: #FAFAFA url(../images/context-menu-bg.gif) repeat-y left top
+	background: #FAFAFA url(../images/contextmenu/context-menu-bg.gif) repeat-y left top
 		;
 	border: 1px solid #868686;
 }
@@ -470,7 +470,7 @@ legend {
 }
 
 .context-menu-theme-vista .context-menu-item-hover {
-	background: transparent url(../images/context-menu-item-hover.gif)
+	background: transparent url(../images/contextmenu/context-menu-item-hover.gif)
 		repeat-x left center;
 	border: 1px solid #D7D0B3;
 }

xCAT-UI/css/superfish.css

@@ -1 +1 @@
-.sf-menu,.sf-menu *{margin:0;padding:0;list-style:none;}.sf-menu{line-height:1.0;}.sf-menu ul{position:absolute;top:-999em;width:10em;}.sf-menu ul li{width:100%;}.sf-menu li{float:left;position:relative;}.sf-menu a{display:block;position:relative;}.sf-menu li:hover ul,.sf-menu li.sfHover ul{left:0;top:2.5em;z-index:99;}ul.sf-menu li:hover li ul,ul.sf-menu li.sfHover li ul{top:-999em;}ul.sf-menu li li:hover ul,ul.sf-menu li li.sfHover ul{left:10em;top:0;}ul.sf-menu li li:hover li ul,ul.sf-menu li li.sfHover li ul{top:-999em;}ul.sf-menu li li li:hover ul,ul.sf-menu li li li.sfHover ul{left:10em;top:0;}.sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;background:#E6E6E6 url(../images/jquery/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x;}.sf-menu .sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;}.sf-menu a{padding:.3em 1em;text-decoration:none;color:#2E6E9E;}.sf-menu li:hover,.sf-menu li.sfHover{background:url(../images/jquery/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x;outline:0;}.sf-menu a.sf-with-ul{padding-right:2.25em;min-width:1px;}.sf-sub-indicator{position:absolute;display:block;right:.75em;top:1.05em;width:10px;height:10px;text-indent:-999em;overflow:hidden;background:url('../images/arrows-ffffff.png') no-repeat -10px -100px;}a>.sf-sub-indicator{top:.8em;background-position:0 -100px;}a:focus>.sf-sub-indicator,a:hover>.sf-sub-indicator,a:active>.sf-sub-indicator,li:hover>a>.sf-sub-indicator,li.sfHover>a>.sf-sub-indicator{background-position:-10px -100px;}.sf-menu ul .sf-sub-indicator{background-position:-10px 0;}.sf-menu ul a>.sf-sub-indicator{background-position:0 0;}.sf-menu ul a:focus>.sf-sub-indicator,.sf-menu ul a:hover>.sf-sub-indicator,.sf-menu ul a:active>.sf-sub-indicator,.sf-menu ul li:hover>a>.sf-sub-indicator,.sf-menu ul li.sfHover>a>.sf-sub-indicator{background-position:-10px 0;}.sf-shadow ul{padding:0 9px 9px 0;}.sf-shadow ul.sf-shadow-off{background:transparent;}
+.sf-menu,.sf-menu *{margin:0;padding:0;list-style:none;}.sf-menu{line-height:1.0;}.sf-menu ul{position:absolute;top:-999em;width:10em;}.sf-menu ul li{width:100%;}.sf-menu li{float:left;position:relative;}.sf-menu a{display:block;position:relative;}.sf-menu li:hover ul,.sf-menu li.sfHover ul{left:0;top:2.5em;z-index:99;}ul.sf-menu li:hover li ul,ul.sf-menu li.sfHover li ul{top:-999em;}ul.sf-menu li li:hover ul,ul.sf-menu li li.sfHover ul{left:10em;top:0;}ul.sf-menu li li:hover li ul,ul.sf-menu li li.sfHover li ul{top:-999em;}ul.sf-menu li li li:hover ul,ul.sf-menu li li li.sfHover ul{left:10em;top:0;}.sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;background:#E6E6E6 url(../images/jquery/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x;}.sf-menu .sf-menu{float:left;margin-bottom:.5em;border:1px solid #79B7E7;-moz-border-radius:.5em;-webkit-border-radius:.5em;font-size:12px;}.sf-menu a{padding:.3em 1em;text-decoration:none;color:#2E6E9E;}.sf-menu li:hover,.sf-menu li.sfHover{background:url(../images/jquery/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x;outline:0;}.sf-menu a.sf-with-ul{padding-right:2.25em;min-width:1px;}.sf-sub-indicator{position:absolute;display:block;right:.75em;top:1.05em;width:10px;height:10px;text-indent:-999em;overflow:hidden;background:url('../images/superfish/arrows-ffffff.png') no-repeat -10px -100px;}a>.sf-sub-indicator{top:.8em;background-position:0 -100px;}a:focus>.sf-sub-indicator,a:hover>.sf-sub-indicator,a:active>.sf-sub-indicator,li:hover>a>.sf-sub-indicator,li.sfHover>a>.sf-sub-indicator{background-position:-10px -100px;}.sf-menu ul .sf-sub-indicator{background-position:-10px 0;}.sf-menu ul a>.sf-sub-indicator{background-position:0 0;}.sf-menu ul a:focus>.sf-sub-indicator,.sf-menu ul a:hover>.sf-sub-indicator,.sf-menu ul a:active>.sf-sub-indicator,.sf-menu ul li:hover>a>.sf-sub-indicator,.sf-menu ul li.sfHover>a>.sf-sub-indicator{background-position:-10px 0;}.sf-shadow ul{padding:0 9px 9px 0;}.sf-shadow ul.sf-shadow-off{background:transparent;}

xCAT-UI/js/monitor/gangliamon.js

@@ -1,7 +1,7 @@
 /**
  * Global variables
  */
-var gangliaTableId = 'gangliaDatatable';
+var gangliaTableId = 'nodesDatatable';
 var gangliaNodesList;
 
 /**
@@ -542,10 +542,10 @@ function loadNodes4Ganglia(data) {
 
 	// Instead refresh the ping status and power status
 	pingCol.find('span a').bind('click', function(event) {
-		refreshNodeStatus(group);
+		refreshNodeStatus(group, gangliaTableId);
 	});
 	powerCol.find('span a').bind('click', function(event) {
-		refreshPowerStatus(group);
+		refreshPowerStatus(group, gangliaTableId);
 	});
 	gangliaCol.bind('click', function(event) {
 		refreshGangliaStatus(group);

xCAT-UI/js/nodes/nodes.js

@@ -518,9 +518,9 @@ function loadNodes(data) {
 			var iconSrc;
 			if (!comments) {
 				comments = 'No comments';
-				iconSrc = 'images/ui-icon-no-comment.png';
+				iconSrc = 'images/nodes/ui-icon-no-comment.png';
 			} else {
-				iconSrc = 'images/ui-icon-comment.png';
+				iconSrc = 'images/nodes/ui-icon-comment.png';
 			}
 					
 			// Create comments icon
@@ -810,10 +810,10 @@ function loadNodes(data) {
 	
 	// Instead refresh the node status and power status
 	pingCol.find('span a').click(function() {
-		refreshNodeStatus(group);
+		refreshNodeStatus(group, nodesTableId);
 	});
 	powerCol.find('span a').click(function() {
-		refreshPowerStatus(group);
+		refreshPowerStatus(group, nodesTableId);
 	});
 	
 	// Create tooltip for status
@@ -1163,9 +1163,9 @@ function addNodes2Table(data) {
 		var iconSrc;
 		if (!comments) {
 			comments = 'No comments';
-			iconSrc = 'images/ui-icon-no-comment.png';
+			iconSrc = 'images/nodes/ui-icon-no-comment.png';
 		} else {
-			iconSrc = 'images/ui-icon-comment.png';
+			iconSrc = 'images/nodes/ui-icon-comment.png';
 		}
 				
 		// Create icon for node comments
@@ -1333,15 +1333,17 @@ function loadPowerStatus(data) {
  * 
  * @param group
  *            Group name
+ * @param tableId
+ * 			  Table to update node status
  * @return Nothing
  */
-function refreshPowerStatus(group) {
+function refreshPowerStatus(group, tableId) {
 	// Show power loader
-	var powerCol = $('#' + nodesTableId + ' thead tr th').eq(3);
+	var powerCol = $('#' + tableId + ' thead tr th').eq(3);
 	powerCol.find('img').show();
 	
 	// Get power status for nodes shown
-	var nodes = getNodesShown(nodesTableId);
+	var nodes = getNodesShown(tableId);
 		
 	// Get power status
 	$.ajax( {
@@ -1395,15 +1397,17 @@ function loadNodeStatus(data) {
  * 
  * @param group
  *            Group name
+ * @param tableId
+ * 			  Table to update node status
  * @return Nothing
  */
-function refreshNodeStatus(group) {
+function refreshNodeStatus(group, tableId) {
 	// Show ping loader
-	var pingCol = $('#' + nodesTableId + ' thead tr th').eq(2);
+	var pingCol = $('#' + tableId + ' thead tr th').eq(2);
 	pingCol.find('img').show();
 	
 	// Get power status for nodes shown
-	var nodes = getNodesShown(nodesTableId);
+	var nodes = getNodesShown(tableId);
 	
 	// Get the node status
 	$.ajax( {

xCAT-UI/js/nodes/physical.js

@@ -502,7 +502,7 @@ function createFspDiv(fspName, mtm, fsp){
 		}
 		var lparName = fsp[fspName]['children'][lparIndex];
 		var color = statusMap(lparList[lparName]);
-		lparStatusRow += '<td class="lparStatus" style="background-image:url(images/' + color + '.gif);padding: 0px;" name="' + lparName + '"></td>';
+		lparStatusRow += '<td class="lparStatus" style="background-image:url(images/nodes/' + color + '.gif);padding: 0px;" name="' + lparName + '"></td>';
 	}
 	
 	//select the backgroud
@@ -632,12 +632,12 @@ function changeNode(lparName, status){
 	var checkFlag = true;
 	if ('select' == status){
 		selectNode[lparName] = 1;
-		imgUrl = 'url(images/s-'+ statusMap(lparList[lparName]) + '.gif)';
+		imgUrl = 'url(images/nodes/s-'+ statusMap(lparList[lparName]) + '.gif)';
 		checkFlag = true;
 	}
 	else{
 		delete selectNode[lparName];
-		imgUrl = 'url(images/'+ statusMap(lparList[lparName]) + '.gif)';
+		imgUrl = 'url(images/nodes/'+ statusMap(lparList[lparName]) + '.gif)';
 		checkFlag = false;
 	}
 	$('#graphTable [name=' + lparName + ']').css('background-image', imgUrl);

xCAT-UI/js/nodes/updatenode.js

@@ -96,8 +96,8 @@ function loadUpdatenodePage(tgtNodes) {
     			image : 'desktop.png',
     			path : '/install'
     		} ],
-    		imageUrl : 'images/',
-    		systemImageUrl : 'images/',
+    		imageUrl : 'images/serverbrowser/',
+    		systemImageUrl : 'images/serverbrowser/',
     		handlerUrl : 'lib/getpath.php',
     		title : 'Browse',
     		requestMethod : 'POST',
@@ -143,8 +143,8 @@ function loadUpdatenodePage(tgtNodes) {
 			image : 'desktop.png',
 			path : '/install'
 		} ],
-		imageUrl : 'images/',
-		systemImageUrl : 'images/',
+		imageUrl : 'images/serverbrowser/',
+		systemImageUrl : 'images/serverbrowser/',
 		handlerUrl : 'lib/getpath.php',
 		title : 'Browse',
 		requestMethod : 'POST',

xCAT-UI/js/provision/images.js

@@ -480,8 +480,8 @@ function loadEditImagePage(tgtImage) {
             			image : 'desktop.png',
             			path : '/install'
             		}],
-            		imageUrl : 'images/',
-            		systemImageUrl : 'images/',
+            		imageUrl : 'images/serverbrowser/',
+            		systemImageUrl : 'images/serverbrowser/',
             		handlerUrl : 'lib/getpath.php',
             		title : 'Browse',
             		requestMethod : 'POST',
@@ -504,8 +504,8 @@ function loadEditImagePage(tgtImage) {
             			image : 'desktop.png',
             			path : '/install'
             		}],
-            		imageUrl : 'images/',
-            		systemImageUrl : 'images/',
+            		imageUrl : 'images/serverbrowser/',
+            		systemImageUrl : 'images/serverbrowser/',
             		handlerUrl : 'lib/getpath.php',
             		title : 'Browse',
             		requestMethod : 'POST',
@@ -528,8 +528,8 @@ function loadEditImagePage(tgtImage) {
             			image : 'desktop.png',
             			path : '/install'
             		}],
-            		imageUrl : 'images/',
-            		systemImageUrl : 'images/',
+            		imageUrl : 'images/serverbrowser/',
+            		systemImageUrl : 'images/serverbrowser/',
             		handlerUrl : 'lib/getpath.php',
             		title : 'Browse',
             		requestMethod : 'POST',
@@ -552,8 +552,8 @@ function loadEditImagePage(tgtImage) {
             			image : 'desktop.png',
             			path : '/install'
             		}],
-            		imageUrl : 'images/',
-            		systemImageUrl : 'images/',
+            		imageUrl : 'images/serverbrowser/',
+            		systemImageUrl : 'images/serverbrowser/',
             		handlerUrl : 'lib/getpath.php',
             		title : 'Browse',
             		requestMethod : 'POST',
@@ -576,8 +576,8 @@ function loadEditImagePage(tgtImage) {
             			image : 'desktop.png',
             			path : '/install'
             		}],
-            		imageUrl : 'images/',
-            		systemImageUrl : 'images/',
+            		imageUrl : 'images/serverbrowser/',
+            		systemImageUrl : 'images/serverbrowser/',
             		handlerUrl : 'lib/getpath.php',
             		title : 'Browse',
             		requestMethod : 'POST',
@@ -769,8 +769,8 @@ function loadCopyCdPage() {
 			image : 'desktop.png',
 			path : '/install'
 		} ],
-		imageUrl : 'images/',
-		systemImageUrl : 'images/',
+		imageUrl : 'images/serverbrowser/',
+		systemImageUrl : 'images/serverbrowser/',
 		handlerUrl : 'lib/getpath.php',
 		title : 'Browse',
 		requestMethod : 'POST',