[pve-devel] r5814 - in pve-manager/pve2: . www www/css www/ext4 www/templates

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-04-18 11:53:37 +0200 (Mon, 18 Apr 2011)
New Revision: 5814

Modified:
   pve-manager/pve2/configure.in
   pve-manager/pve2/www/Makefile.am
   pve-manager/pve2/www/css/ext-pve.css
   pve-manager/pve2/www/ext4/Makefile.am
   pve-manager/pve2/www/templates/pve.conf.in
Log:
update for extjs4 beta3


Modified: pve-manager/pve2/configure.in
===================================================================
--- pve-manager/pve2/configure.in	2011-04-18 09:51:38 UTC (rev 5813)
+++ pve-manager/pve2/configure.in	2011-04-18 09:53:37 UTC (rev 5814)
@@ -31,7 +31,7 @@
 WWW_CSSDIR="${WWW_BASEDIR}/css"
 AC_SUBST(WWW_CSSDIR)
 
-WWW_EXTDIR="${WWW_BASEDIR}/ext"
+WWW_EXTDIR="${WWW_BASEDIR}/ext4"
 AC_SUBST(WWW_EXTDIR)
 
 #AM_GNU_GETTEXT
@@ -56,8 +56,8 @@
 www/Makefile
 www/templates/Makefile
 www/css/Makefile
-www/ext/Makefile
-www/manager/Makefile
+www/ext4/Makefile
+www/new/Makefile
 www/images/Makefile
 www/templates/pve.conf
 ])

Modified: pve-manager/pve2/www/Makefile.am
===================================================================
--- pve-manager/pve2/www/Makefile.am	2011-04-18 09:51:38 UTC (rev 5813)
+++ pve-manager/pve2/www/Makefile.am	2011-04-18 09:53:37 UTC (rev 5814)
@@ -1,6 +1,6 @@
 include $(top_builddir)/common.mk
 
-SUBDIRS = templates images ext css manager
+SUBDIRS = templates images ext4 css new
 
 install-data-hook:
 	chown -R www-data:www-data ${DESTDIR}${WWW_BASEDIR}

Modified: pve-manager/pve2/www/css/ext-pve.css
===================================================================
--- pve-manager/pve2/www/css/ext-pve.css	2011-04-18 09:51:38 UTC (rev 5813)
+++ pve-manager/pve2/www/css/ext-pve.css	2011-04-18 09:53:37 UTC (rev 5814)
@@ -1,4 +1,5 @@
-.pve-itype-icon-vm,
+.pve-itype-icon-qemu,
+.pve-itype-icon-openvz,
 .pve-itype-icon-node,
 .pve-itype-icon-storage,
 .pve-itype-icon-itype
@@ -9,27 +10,28 @@
     padding-left: 20px;
 }
 
-.pve-itype-icon-vm,
-.x-tree-node-computer .x-tree-node-icon 
+.pve-itype-icon-qemu,
+.pve-itype-icon-openvz,
+.x-tree-node-computer
 {
     background-image:url(../images/computer.png);
 }
 
 .pve-itype-icon-node,
-.x-tree-node-server .x-tree-node-icon
+.x-tree-node-server
 {
     background-image:url(../images/network-server.png);
 }
 
 .pve-itype-icon-storage,
-.x-tree-node-harddisk .x-tree-node-icon
+.x-tree-node-harddisk
 {
     background-image:url(../images/drive-harddisk.png);
 }
 
 .pve-itype-icon-itype
 {
-    background-image:url(../images/default/tree/folder.gif);
+    background-image:url(../ext4/resources/themes/images/default/tree/folder.gif);
 }
 
 .pve-bar-wrap
@@ -82,38 +84,3 @@
     width:200px;
     height:12px;
 }
-
-
-/*!
- * Ext JS Library 3.2.1
- * Copyright(c) 2006-2010 Ext JS, Inc.
- * licensing at extjs.com
- * http://www.extjs.com/license
- */
-/*
- * FileUploadField component styles
- */
-.x-form-file-wrap {
-    position: relative;
-    height: 22px;
-}
-.x-form-file-wrap .x-form-file {
-	position: absolute;
-	right: 0;
-	-moz-opacity: 0;
-	filter:alpha(opacity: 0);
-	opacity: 0;
-	z-index: 2;
-    height: 22px;
-}
-.x-form-file-wrap .x-form-file-btn {
-	position: absolute;
-	right: 0;
-	z-index: 1;
-}
-.x-form-file-wrap .x-form-file-text {
-    position: absolute;
-    left: 0;
-    z-index: 3;
-    color: #777;
-}
\ No newline at end of file

Modified: pve-manager/pve2/www/ext4/Makefile.am
===================================================================
--- pve-manager/pve2/www/ext4/Makefile.am	2011-04-18 09:51:38 UTC (rev 5813)
+++ pve-manager/pve2/www/ext4/Makefile.am	2011-04-18 09:53:37 UTC (rev 5814)
@@ -11,17 +11,20 @@
 ext_DATA = 					\
 	extjs/ext-all.js 			\
 	extjs/ext-all-debug.js			\
-	extjs/bootstrap.js			\
+	extjs/bootstrap.js
+
+extdir = ${WWW_EXTDIR}
+
+extcssdir = ${WWW_EXTDIR}/resources/css
+extcss_DATA = 					\
 	extjs/resources/css/ext-all-debug.css 	\
 	extjs/resources/css/ext-all.css
 
-extdir = ${WWW_EXTDIR}
-
-install-data-hook: 
-	cp -a extjs/resources/themes/images/default ${DESTDIR}/${WWW_IMAGEDIR}
+install-data-hook:
+	mkdir -p ${DESTDIR}/${WWW_EXTDIR}/resources/themes/images
+	cp -a extjs/resources/themes/images/default ${DESTDIR}/${WWW_EXTDIR}/resources/themes/images
 	chown -R www-data:www-data ${DESTDIR}/${extdir}
-	chown -R www-data:www-data ${DESTDIR}/${WWW_IMAGEDIR}
-	find ${DESTDIR}/${WWW_IMAGEDIR} -type f -exec chmod -R 0644 '{}' ';'
+	find ${DESTDIR}/${WWW_EXTDIR} -type f -exec chmod -R 0644 '{}' ';'
 
 clean-local:
 	-rm -rf *~ ${EXTJSDIR} extjs

Modified: pve-manager/pve2/www/templates/pve.conf.in
===================================================================
--- pve-manager/pve2/www/templates/pve.conf.in	2011-04-18 09:51:38 UTC (rev 5813)
+++ pve-manager/pve2/www/templates/pve.conf.in	2011-04-18 09:53:37 UTC (rev 5814)
@@ -42,9 +42,7 @@
 
 CustomLog /var/log/apache2/access.log combined 
 
-Alias /images/  @WWW_IMAGEDIR@/
-Alias /css/ @WWW_CSSDIR@/
-Alias /ext/ @WWW_EXTDIR@/
+Alias /pve2/ @WWW_BASEDIR@/
 Alias /vncterm/ /usr/share/vncterm/
  
 # avoid authentication when accessing favicon