[pve-devel] r6074 - in pve-manager/pve2/www: ext4 manager manager/dc manager/qemu

svn-commits at proxmox.com svn-commits at proxmox.com
Tue Jun 14 11:14:19 CEST 2011


Author: dietmar
Date: 2011-06-14 11:14:19 +0200 (Tue, 14 Jun 2011)
New Revision: 6074

Added:
   pve-manager/pve2/www/ext4/ext-4.0.2.zip
Removed:
   pve-manager/pve2/www/ext4/ext-4.0.1.zip
Modified:
   pve-manager/pve2/www/ext4/Makefile.am
   pve-manager/pve2/www/manager/PVEUtils.js
   pve-manager/pve2/www/manager/dc/Tasks.js
   pve-manager/pve2/www/manager/qemu/HardwareView.js
Log:
update to extjs 4.0.2


Modified: pve-manager/pve2/www/ext4/Makefile.am
===================================================================
--- pve-manager/pve2/www/ext4/Makefile.am	2011-06-14 04:04:21 UTC (rev 6073)
+++ pve-manager/pve2/www/ext4/Makefile.am	2011-06-14 09:14:19 UTC (rev 6074)
@@ -1,6 +1,6 @@
 include $(top_builddir)/common.mk
 
-EXTJSDIR=ext-4.0.1
+EXTJSDIR=ext-4.0.2
 EXTJSSRC=${EXTJSDIR}.zip
 
 extjs/ext-all.js: ${EXTJSSRC}

Deleted: pve-manager/pve2/www/ext4/ext-4.0.1.zip
===================================================================
(Binary files differ)

Added: pve-manager/pve2/www/ext4/ext-4.0.2.zip
===================================================================
(Binary files differ)


Property changes on: pve-manager/pve2/www/ext4/ext-4.0.2.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pve-manager/pve2/www/manager/PVEUtils.js
===================================================================
--- pve-manager/pve2/www/manager/PVEUtils.js	2011-06-14 04:04:21 UTC (rev 6073)
+++ pve-manager/pve2/www/manager/PVEUtils.js	2011-06-14 09:14:19 UTC (rev 6074)
@@ -401,7 +401,7 @@
     render_resource_type: function(value, metaData, record, rowIndex, colIndex, store) {
 
 	var cls = 'pve-itype-icon-' + value;
-	metaData.css = cls;
+	metaData.tdCls = cls;
 	return value;
     },
 

Modified: pve-manager/pve2/www/manager/dc/Tasks.js
===================================================================
--- pve-manager/pve2/www/manager/dc/Tasks.js	2011-06-14 04:04:21 UTC (rev 6073)
+++ pve-manager/pve2/www/manager/dc/Tasks.js	2011-06-14 09:14:19 UTC (rev 6074)
@@ -69,7 +69,7 @@
 		    width: 100,
 		    renderer: function(value, metaData, record) {
 			if (record.data.pid) {
-			    metaData.css =  "x-grid-row-loading";
+			    metaData.tdCls =  "x-grid-row-loading";
 			    return "";
 			}
 			return Ext.Date.format(value, "M d H:i:s"); 
@@ -97,7 +97,7 @@
 		    width: 200,
 		    renderer: function(value, metaData, record) { 
 			if (record.data.pid) {
-			    metaData.css =  "x-grid-row-loading";
+			    metaData.tdCls =  "x-grid-row-loading";
 			    return "";
 		      }
 		      if (value == 'OK')

Modified: pve-manager/pve2/www/manager/qemu/HardwareView.js
===================================================================
--- pve-manager/pve2/www/manager/qemu/HardwareView.js	2011-06-14 04:04:21 UTC (rev 6073)
+++ pve-manager/pve2/www/manager/qemu/HardwareView.js	2011-06-14 09:14:19 UTC (rev 6074)
@@ -7,17 +7,17 @@
 	var rows = me.rows;
 	var rowdef = rows[key] || {};
 
-	if (rowdef.css) {
-	    if (rowdef.css == 'pve-itype-icon-storage') { 
+	if (rowdef.tdCls) {
+	    if (rowdef.tdCls == 'pve-itype-icon-storage') { 
 		if (record.data.value.match(/media=cdrom/)) {
-		    metaData.css = 'pve-itype-icon-cdrom';
+		    metaData.tdCls = 'pve-itype-icon-cdrom';
 		    return 'CD/DVD';
 		} else {
-		    metaData.css = rowdef.css;
+		    metaData.tdCls = rowdef.tdCls;
 		    return 'Hard Disk';
 		}
 	    } else
-		metaData.css = rowdef.css;
+		metaData.tdCls = rowdef.tdCls;
 	}
 	return rowdef.header || key;
     },
@@ -37,14 +37,14 @@
 	var rows = {
 	    memory: {
 		header: 'Memory',
-		css: 'pve-itype-icon-memory',
+		tdCls: 'pve-itype-icon-memory',
 		renderer: function(value) {
 		    return PVE.Utils.format_size(value*1024*1024);
 		}
 	    },
 	    sockets: {
 		header: 'Processors',
-		css: 'pve-itype-icon-processor',
+		tdCls: 'pve-itype-icon-processor',
 		defaultValue: 1,
 		renderer: function(value, metaData, record, rowIndex, colIndex, store) {
 		    var cores = (store.snapshot || store.data).get('cores');
@@ -53,12 +53,12 @@
 	    },
 	    keyboard: {
 		header: 'Keyboard',
-		css: 'pve-itype-icon-keyboard',
+		tdCls: 'pve-itype-icon-keyboard',
 		defaultValue: 'default'
 	    },
 	    vga: {
 		header: 'Display',
-		css: 'pve-itype-icon-display',
+		tdCls: 'pve-itype-icon-display',
 		defaultValue: 'default'		
 	    },
 	    cores: {
@@ -69,13 +69,13 @@
 
 	for (i = 0; i < 4; i++) {
 	    rows["ide" + i] = {
-		css: 'pve-itype-icon-storage',
+		tdCls: 'pve-itype-icon-storage',
 		header: 'Hard Disk (IDE)'
 	    };
 	}
 	for (i = 0; i < 16; i++) {
 	    rows["net" + i] = {
-		css: 'pve-itype-icon-network',
+		tdCls: 'pve-itype-icon-network',
 		header: 'Network Adapter'
 	    };
 	}



More information about the pve-devel mailing list