[pve-devel] [PATCH manager 1/4] ext6migrate: add charts js/css to index html

Dominik Csapak d.csapak at proxmox.com
Thu Mar 31 10:30:17 CEST 2016


adds the sencha charts lib to the makefile and
the index file

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 PVE/ExtJSIndex6.pm | 2 ++
 www/ext6/Makefile  | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/PVE/ExtJSIndex6.pm b/PVE/ExtJSIndex6.pm
index 59648e6..61c60c0 100644
--- a/PVE/ExtJSIndex6.pm
+++ b/PVE/ExtJSIndex6.pm
@@ -24,9 +24,11 @@ sub get_index {
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>$nodename - Proxmox Virtual Environment</title>
     <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css" />
+    <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext-pve.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext6-pve.css" />
     <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js"></script>
+    <script type="text/javascript" src="/pve2/ext6/charts-debug.js"></script>
 _EOD
 
     my $langfile = "/usr/share/pve-manager/locale/pve-lang-${lang}.js";
diff --git a/www/ext6/Makefile b/www/ext6/Makefile
index 1385dc4..92e73c3 100644
--- a/www/ext6/Makefile
+++ b/www/ext6/Makefile
@@ -7,11 +7,14 @@ EXTJSSRC=${EXTJSDIR}-gpl.zip
 
 EXTDATA=	\
 	extjs/build/ext-all.js	\
-	extjs/build/ext-all-debug.js
+	extjs/build/ext-all-debug.js	\
+	extjs/build/packages/charts/classic/charts.js	\
+	extjs/build/packages/charts/classic/charts-debug.js	\
 
 EXT_THEME=	\
 	extjs/build/classic/theme-classic	\
-	extjs/build/classic/theme-crisp
+	extjs/build/classic/theme-crisp		\
+	extjs/build/packages/charts/classic/crisp	\
 
 all: ${EXTDATA}
 
-- 
2.1.4





More information about the pve-devel mailing list