]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
projects / thirdparty / bacula.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d44719a)
baculum: Solve old browser cache problem for javascript after upgrade
authorMarcin Haba <marcin.haba@bacula.pl>
Wed, 11 Apr 2018 17:06:00 +0000 (19:06 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Sat, 14 Apr 2018 13:06:39 +0000 (15:06 +0200)
gui/baculum/protected/API/Pages/Panel/APIHome.page patch | blob | blame | history
gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page patch | blob | blame | history
gui/baculum/protected/Web/Layouts/Main.tpl patch | blob | blame | history
gui/baculum/protected/Web/Layouts/Wizard.tpl patch | blob | blame | history
gui/baculum/protected/application.xml patch | blob | blame | history

diff --git a/gui/baculum/protected/API/Pages/Panel/APIHome.page b/gui/baculum/protected/API/Pages/Panel/APIHome.page
index 414aed3c838070df2f92fa131c00a0d48120e4df..6222224fb07c096a29fdb65d5e85c13e91b6c62c 100644 (file)
--- a/gui/baculum/protected/API/Pages/Panel/APIHome.page
+++ b/gui/baculum/protected/API/Pages/Panel/APIHome.page
@@ -1,6 +1,6 @@
 <%@ MasterClass="Application.API.Layouts.Main" Theme="Baculum-v1"%>
 <com:TContent ID="Main">
-       <com:TClientScript ScriptUrl=<%~ ../../JavaScript/misc.js %> />
+       <com:BClientScript ScriptUrl=<%~ ../../JavaScript/misc.js %> />
        <h3 style="clear: left"><%[ Welcome on the Baculum API default page ]%> <input type="button" class="bbutton" onclick="window.location.href='<%=$this->getService()->constructUrl('Panel.APIInstallWizard')%>'" value="<%[ Go to configuration wizard ]%>" style="float: right" /></h3>
        <div id="tabs">
                <ul>
diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
index 92d43f394a05e88a33c234c59c316d62f526d591..994cb4851fc534a80deb0bb9de49aad71ec6c928 100644 (file)
--- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
+++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page
@@ -1,6 +1,6 @@
 <%@ MasterClass="Application.API.Layouts.Wizard" Theme="Baculum-v1"%>
 <com:TContent ID="Wizard">
-       <com:TClientScript ScriptUrl=<%~ ../../JavaScript/misc.js %> />
+       <com:BClientScript ScriptUrl=<%~ ../../JavaScript/misc.js %> />
        <com:TWizard ID="InstallWizard"
                CssClass="wizard"
                StepStyle.CssClass="steps"
diff --git a/gui/baculum/protected/Web/Layouts/Main.tpl b/gui/baculum/protected/Web/Layouts/Main.tpl
index b3a9622b3e58ea0c8a96dfd6578f2f3a97584b5d..cb8738120179737bd7e1c49fb633ed70eae61a22 100644 (file)
--- a/gui/baculum/protected/Web/Layouts/Main.tpl
+++ b/gui/baculum/protected/Web/Layouts/Main.tpl
@@ -8,16 +8,16 @@
        <body  class="w3-light-grey">
                <com:TForm>
                        <com:TClientScript PradoScripts="ajax, effects" />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/flotr2.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/fontawesome-all.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/datatables.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/dataTables.responsive.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/responsive.jqueryui.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/excanvas.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/bacula-config.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/misc.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/graph.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/statistics.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/flotr2.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/fontawesome-all.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/datatables.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/dataTables.responsive.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/responsive.jqueryui.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/excanvas.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/bacula-config.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/misc.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/graph.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/statistics.js %> />
                        <!-- Top container -->
                        <div class="w3-bar w3-top w3-black w3-large" style="z-index:4">
                                <button type="button" class="w3-bar-item w3-button w3-hover-none w3-hover-text-light-grey" onclick="W3SideBar.open();"><i class="fa fa-bars"></i>  Menu</button>
diff --git a/gui/baculum/protected/Web/Layouts/Wizard.tpl b/gui/baculum/protected/Web/Layouts/Wizard.tpl
index 99f0ad7e5867a238b8df2c421fc9b7428a8773ca..7342b8d15d28d68933db1f06bbea89232159e632 100644 (file)
--- a/gui/baculum/protected/Web/Layouts/Wizard.tpl
+++ b/gui/baculum/protected/Web/Layouts/Wizard.tpl
@@ -8,13 +8,13 @@
        <body  class="w3-light-grey">
                <com:TForm>
                        <com:TClientScript PradoScripts="ajax, effects" />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/fontawesome-all.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/datatables.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/dataTables.responsive.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/responsive.jqueryui.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/opentip.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/tooltip.js %> />
-                       <com:TClientScript ScriptUrl=<%~ ../JavaScript/misc.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/fontawesome-all.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/datatables.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/dataTables.responsive.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/responsive.jqueryui.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/opentip.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/tooltip.js %> />
+                       <com:BClientScript ScriptUrl=<%~ ../JavaScript/misc.js %> />
                        <!-- Top container -->
                                <com:TContentPlaceHolder ID="Wizard" />
                </com:TForm>
diff --git a/gui/baculum/protected/application.xml b/gui/baculum/protected/application.xml
index 51027aabb3b730cb6721c6278ce7ad48a3a9e06c..b258eec537c2e614773248ebbfe06b06cddb1718 100644 (file)
--- a/gui/baculum/protected/application.xml
+++ b/gui/baculum/protected/application.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<application id="baculum" mode="Debug">
+<application id="baculum" mode="Normal">
        <paths>
                <using namespace="System.I18N.*" />
                <using namespace="Application.Common.Portlets.BButton" />
                <using namespace="Application.Common.Portlets.BActiveButton" />
+               <using namespace="Application.Common.Class.BClientScript" />
        </paths>
        <modules>
                <!-- generic common modules -->
Mirror of http://git.bacula.org/bacula.git