ui: add version to extjs script urls

So that we circumvent browsers caching 6.0 extjs js/css
this should (at least for new users upgrading) fix the browser caching
issue for extjs (we had some now in the forums)

I did it this way since we do not often change version of the extjs
package (since its a big task everytime anyway), but if wanted i can
do it differently. e.g.:
    * hardcode it in the perl code
    * generate it during the build (also for the control file)

But this is fine for ExtJS as we rarely update that and especially for
major releases we would need to adapt stuff anyway

Also bump the versioned dependency on extjs to 7.0.0 in the Debian
control file.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/control b/debian/control
index ce0a54c7220e45fb77bfd8d96b0031120d2ddec4..7b4e1b3c762f9633a620d3945d63eaa11ecbaa95 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends: apt-transport-https | apt (>= 1.5~),
          libcrypt-ssleay-perl,
          libfile-readbackwards-perl,
          libfilesys-df-perl,
-         libjs-extjs (>= 6.0.1),
+         libjs-extjs (>= 7.0.0),
          libjson-perl,
          liblwp-protocol-https-perl,
          libnet-dns-perl,

diff --git a/www/index.html.tpl b/www/index.html.tpl
index fd0877993b6118d18507d02aa3b503e95358b373..7f07ea1834e4c1f3a2cb84f764322378ad2f81e9 100644 (file)
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -7,8 +7,8 @@
     <title>[% nodename %] - Proxmox Virtual Environment</title>
     <link rel="icon" sizes="128x128" href="/pve2/images/logo-128.png" />
     <link rel="apple-touch-icon" sizes="128x128" href="/pve2/images/logo-128.png" />
-    <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/ext6/theme-crisp/resources/theme-crisp-all.css?ver=7.0.0" />
+    <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css?ver=7.0.0" />
     <link rel="stylesheet" type="text/css" href="/pve2/fa/css/font-awesome.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext6-pve.css?ver=[% version %]" />
     <link rel="stylesheet" type="text/css" href="/pwt/css/ext6-pmx.css?ver=[% wtversion %]" />
@@ -18,11 +18,11 @@
     <script type='text/javascript'>function gettext(buf) { return buf; }</script>
     [% END %]
     [%- IF debug %]
-    <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js"></script>
-    <script type="text/javascript" src="/pve2/ext6/charts-debug.js"></script>
+    <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js?ver=7.0.0"></script>
+    <script type="text/javascript" src="/pve2/ext6/charts-debug.js?ver=7.0.0"></script>
     [%- ELSE %]
-    <script type="text/javascript" src="/pve2/ext6/ext-all.js"></script>
-    <script type="text/javascript" src="/pve2/ext6/charts.js"></script>
+    <script type="text/javascript" src="/pve2/ext6/ext-all.js?ver=7.0.0"></script>
+    <script type="text/javascript" src="/pve2/ext6/charts.js?ver=7.0.0"></script>
     [% END %]
     <script type="text/javascript" src="/pve2/js/u2f-api.js"></script>
     <script type="text/javascript" src="/pve2/js/qrcode.min.js"></script>
@@ -36,7 +36,7 @@
     </script>
     <script type="text/javascript" src="/proxmoxlib.js?ver=[% wtversion %]"></script>
     <script type="text/javascript" src="/pve2/js/pvemanagerlib.js?ver=[% version %]"></script>
-    <script type="text/javascript" src="/pve2/ext6/locale/locale-[% lang %].js"></script>
+    <script type="text/javascript" src="/pve2/ext6/locale/locale-[% lang %].js?ver=7.0.0"></script>
 
     <script type="text/javascript">
     if (typeof(PVE) === 'undefined') PVE = {};