[pve-devel] r5875 - in pve-manager/pve2/www: css images new/qemu

svn-commits at proxmox.com svn-commits at proxmox.com
Mon Apr 25 11:11:06 CEST 2011


Author: dietmar
Date: 2011-04-25 11:11:06 +0200 (Mon, 25 Apr 2011)
New Revision: 5875

Added:
   pve-manager/pve2/www/images/cdrom.png
   pve-manager/pve2/www/images/display.png
   pve-manager/pve2/www/images/keyboard.png
   pve-manager/pve2/www/images/memory.png
   pve-manager/pve2/www/images/network.png
   pve-manager/pve2/www/images/processor.png
Removed:
   pve-manager/pve2/www/images/arr-right.png
   pve-manager/pve2/www/images/arrdown.png
   pve-manager/pve2/www/images/iarrdown.png
   pve-manager/pve2/www/images/tarrdown.png
   pve-manager/pve2/www/images/tarrright.png
Modified:
   pve-manager/pve2/www/css/ext-pve.css
   pve-manager/pve2/www/images/Makefile.am
   pve-manager/pve2/www/new/qemu/HardwareView.js
Log:
more icons


Modified: pve-manager/pve2/www/css/ext-pve.css
===================================================================
--- pve-manager/pve2/www/css/ext-pve.css	2011-04-25 08:08:41 UTC (rev 5874)
+++ pve-manager/pve2/www/css/ext-pve.css	2011-04-25 09:11:06 UTC (rev 5875)
@@ -1,3 +1,9 @@
+.pve-itype-icon-display,
+.pve-itype-icon-memory,
+.pve-itype-icon-processor,
+.pve-itype-icon-network,
+.pve-itype-icon-keyboard,
+.pve-itype-icon-cdrom,
 .pve-itype-icon-qemu,
 .pve-itype-icon-openvz,
 .pve-itype-icon-node,
@@ -38,6 +44,36 @@
     background-image:url(../ext4/resources/themes/images/default/tree/folder.gif);
 }
 
+.pve-itype-icon-network
+{
+    background-image:url(../images/network.png);
+}
+
+.pve-itype-icon-keyboard
+{
+    background-image:url(../images/keyboard.png);
+}
+
+.pve-itype-icon-cdrom
+{
+    background-image:url(../images/cdrom.png);
+}
+
+.pve-itype-icon-memory
+{
+    background-image:url(../images/memory.png);
+}
+
+.pve-itype-icon-processor
+{
+    background-image:url(../images/processor.png);
+}
+
+.pve-itype-icon-display
+{
+    background-image:url(../images/display.png);
+}
+
 .pve-bar-wrap
 {
 

Modified: pve-manager/pve2/www/images/Makefile.am
===================================================================
--- pve-manager/pve2/www/images/Makefile.am	2011-04-25 08:08:41 UTC (rev 5874)
+++ pve-manager/pve2/www/images/Makefile.am	2011-04-25 09:11:06 UTC (rev 5875)
@@ -1,18 +1,19 @@
 include $(top_builddir)/common.mk
 
 GNOME_IMAGES = 			\
+	display.png		\
+	keyboard.png		\
+	cdrom.png		\
+	network.png		\
 	drive-harddisk.png	\
 	network-server.png	\
 	computer.png
 
 images_DATA = ${GNOME_IMAGES}	\
+	memory.png		\
+	processor.png		\
 	proxmox_logo.png	\
 	logo_pve.jpg		\
-	arr-right.png		\
-	arrdown.png  		\
-	iarrdown.png  		\
-	tarrdown.png		\
-	tarrright.png		\
 	blank.gif
 
 imagesdir = ${WWW_IMAGEDIR}

Deleted: pve-manager/pve2/www/images/arr-right.png
===================================================================
(Binary files differ)

Deleted: pve-manager/pve2/www/images/arrdown.png
===================================================================
(Binary files differ)

Added: pve-manager/pve2/www/images/cdrom.png
===================================================================
(Binary files differ)


Property changes on: pve-manager/pve2/www/images/cdrom.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pve-manager/pve2/www/images/display.png
===================================================================
(Binary files differ)


Property changes on: pve-manager/pve2/www/images/display.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: pve-manager/pve2/www/images/iarrdown.png
===================================================================
(Binary files differ)

Added: pve-manager/pve2/www/images/keyboard.png
===================================================================
(Binary files differ)


Property changes on: pve-manager/pve2/www/images/keyboard.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pve-manager/pve2/www/images/memory.png
===================================================================
(Binary files differ)


Property changes on: pve-manager/pve2/www/images/memory.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pve-manager/pve2/www/images/network.png
===================================================================
(Binary files differ)


Property changes on: pve-manager/pve2/www/images/network.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pve-manager/pve2/www/images/processor.png
===================================================================
(Binary files differ)


Property changes on: pve-manager/pve2/www/images/processor.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: pve-manager/pve2/www/images/tarrdown.png
===================================================================
(Binary files differ)

Deleted: pve-manager/pve2/www/images/tarrright.png
===================================================================
(Binary files differ)

Modified: pve-manager/pve2/www/new/qemu/HardwareView.js
===================================================================
--- pve-manager/pve2/www/new/qemu/HardwareView.js	2011-04-25 08:08:41 UTC (rev 5874)
+++ pve-manager/pve2/www/new/qemu/HardwareView.js	2011-04-25 09:11:06 UTC (rev 5875)
@@ -17,19 +17,30 @@
 	var rows = {
 	    memory: {
 		header: 'Memory',
+		css: 'pve-itype-icon-memory',
 		renderer: function(value) {
 		    return PVE.Utils.format_size(value*1024*1024);
 		}
 	    },
 	    sockets: {
 		header: 'Processors',
+		css: 'pve-itype-icon-processor',
 		defaultValue: 1,
 		renderer: function(value, metaData, record, rowIndex, colIndex, store) {
 		    var cores = store.snapshot.get('cores');
-		    console.log(store);
 		    return cores ? value * cores.data.value : value;
 		}
 	    },
+	    keyboard: {
+		header: 'Keyboard',
+		css: 'pve-itype-icon-keyboard',
+		defaultValue: 'en'
+	    },
+	    vga: {
+		header: 'Display',
+		css: 'pve-itype-icon-display',
+		defaultValue: 'cirrus'		
+	    },
 	    cores: {
 		header: 'Cores',
 		visible: false
@@ -44,6 +55,7 @@
 	}
 	for (i = 0; i < 16; i++) {
 	    rows["net" + i] = {
+		css: 'pve-itype-icon-network',
 		header: 'Network Adapter'
 	    };
 	}
@@ -52,9 +64,18 @@
 	var render_key = function(key, metaData, record, rowIndex, colIndex, store) {
 	    var rowdef = rows[key] || {};
 
-	    if (rowdef.css)
-		metaData.css = rowdef.css;
-
+	    if (rowdef.css) {
+		if (rowdef.css == 'pve-itype-icon-storage') { 
+		    if (record.data.value.match(/media=cdrom/)) {
+			metaData.css = 'pve-itype-icon-cdrom';
+			return 'CD/DVD';
+		    } else {
+			metaData.css = rowdef.css;
+			return 'Hard Disk';
+		    }
+		} else
+		    metaData.css = rowdef.css;
+	    }
 	    return rowdef.header || key;
 	};
 



More information about the pve-devel mailing list