diff --git a/.f12 b/.f12
index 9aea1bc3e..bf37c83e6 100755
--- a/.f12
+++ b/.f12
@@ -8,7 +8,10 @@
BASEDIR=/opt/local/nagvis
$SUDO rsync -av etc $BASEDIR/
- $SUDO sed "s|@NAGVIS_WEB@|/nagvis|g;s|@NAGVIS_PATH@|/opt/local/nagvis/share|g" $BASEDIR/etc/apache2-nagvis.conf-sample > $BASEDIR/etc/apache.conf
+ $SUDO cp $BASEDIR/etc/apache2-nagvis.conf-sample $BASEDIR/etc/apache.conf
+ $SUDO gsed -i -e 's|@NAGVIS_WEB@|/nagvis|g' \
+ -e 's|@NAGVIS_PATH@|/opt/local/nagvis/share|g' $BASEDIR/etc/apache.conf
+ $SUDO apachectl restart
if [ ! -f $BASEDIR/etc/nagvis.ini.php ]; then
$SUDO cp $BASEDIR/etc/nagvis.ini.php{-sample,}
fi
diff --git a/ChangeLog b/ChangeLog
index 9121c8ebd..dfd341387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Core:
objects that are not aggregations.
Frontend:
+ * FIX: Prevent JS/CSS caching issues during updates of NagVis
* FIX: Improved error handling in case of modifying objects which
backends report issues
* FIX: Improved error handling in case of missing backend configured
diff --git a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
index 83275be31..da5d09a02 100644
--- a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
+++ b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
@@ -358,7 +358,7 @@ private function getStaticMacros() {
'currentUri' => preg_replace('/[&?]lang=[a-z]{2}_[A-Z]{2}/', '', $UHANDLER->getRequestUri()),
'pathImages' => cfg('paths', 'htmlimages'),
'showStates' => cfg('defaults', 'header_show_states'),
- 'pathHeaderJs' => path('html', 'global', 'templates', $this->templateName.'.header.js'),
+ 'pathHeaderJs' => path('html', 'global', 'templates', $this->templateName.'.header.js?v='.CONST_VERSION),
'pathTemplates' => path('html', 'global', 'templates'),
'pathTemplateImages' => path('html', 'global', 'templateimages'),
'langSearch' => l('Search'),
diff --git a/share/frontend/nagvis-js/classes/NagVisIndexView.php b/share/frontend/nagvis-js/classes/NagVisIndexView.php
index cf2dcb9ac..11f63cd9e 100644
--- a/share/frontend/nagvis-js/classes/NagVisIndexView.php
+++ b/share/frontend/nagvis-js/classes/NagVisIndexView.php
@@ -67,6 +67,7 @@ public function parse() {
'htmlBase' => cfg('paths', 'htmlbase'),
'htmlJs' => cfg('paths', 'htmljs'),
'htmlCss' => cfg('paths', 'htmlcss'),
+ 'version' => CONST_VERSION,
'htmlTemplates' => path('html', 'global', 'templates'),
'bUseCompressedJs' => $this->checkJsCompressed(),
'customStylesheet' => $this->sCustomStylesheet,
diff --git a/share/userfiles/templates/default.index.html b/share/userfiles/templates/default.index.html
index 05d52f6e1..3c77bec7a 100644
--- a/share/userfiles/templates/default.index.html
+++ b/share/userfiles/templates/default.index.html
@@ -9,54 +9,54 @@
{if $bUseCompressedJs}
-
+
{else}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{/if}
-
+
{if $customStylesheet != ""}
{/if}