baculum: Add version number to API and Web - idea proposed by Wanderlei Huttel

diff --git a/gui/baculum/protected/API/Lang/en/messages.mo b/gui/baculum/protected/API/Lang/en/messages.mo
index b960d7efb823ad06605458b88cf301d3be88dc5c..f5f96700490812d024eeead2886903e9968dbf4f 100644 (file)
Binary files a/gui/baculum/protected/API/Lang/en/messages.mo and b/gui/baculum/protected/API/Lang/en/messages.mo differ

diff --git a/gui/baculum/protected/API/Lang/en/messages.po b/gui/baculum/protected/API/Lang/en/messages.po
index 88f2bac40a83ba0691b7e14d61e6e5a446e8949f..60a13bc463fc9a306d7ba50a31a2aaf12b330dd5 100644 (file)
--- a/gui/baculum/protected/API/Lang/en/messages.po
+++ b/gui/baculum/protected/API/Lang/en/messages.po
@@ -436,3 +436,6 @@ msgstr "Baculum working directory for Bacula config:"
 
 msgid "In this directory Baculum API saves temporarily Bacula configuration files (mainly for validation purposes) just before they are written as real Bacula configuration files."
 msgstr "In this directory Baculum API saves temporarily Bacula configuration files (mainly for validation purposes) just before they are written as real Bacula configuration files."
+
+msgid "Version:"
+msgstr "Version:"

diff --git a/gui/baculum/protected/API/Lang/pl/messages.mo b/gui/baculum/protected/API/Lang/pl/messages.mo
index 29417a62ac3f1322d2885e864a29a46bc7af7ce6..b8375ed654cd14d1f83e0597e93fa303d51542d0 100644 (file)
Binary files a/gui/baculum/protected/API/Lang/pl/messages.mo and b/gui/baculum/protected/API/Lang/pl/messages.mo differ

diff --git a/gui/baculum/protected/API/Lang/pl/messages.po b/gui/baculum/protected/API/Lang/pl/messages.po
index 27ebe088271f3cf0d09b8356315ae489e0d6d95a..2496aa75273f11761c69447618f52fd616362522 100644 (file)
--- a/gui/baculum/protected/API/Lang/pl/messages.po
+++ b/gui/baculum/protected/API/Lang/pl/messages.po
@@ -436,3 +436,6 @@ msgstr "Katalog roboczy Baculum dla plików konfiguracyjnych Bacula:"
 
 msgid "In this directory Baculum API saves temporarily Bacula configuration files (mainly for validation purposes) just before they are written as real Bacula configuration files."
 msgstr "W tym katalogu Baculum API tymczasowo zapisuje pliki konfiguracyjne Bacula (głównie do celów walidacji) zaraz przed tym, gdy są one zapisane jako właściwe pliki konfiguracyjne Bacula."
+
+msgid "Version:"
+msgstr "Wersja:"

diff --git a/gui/baculum/protected/API/Lang/pt/messages.mo b/gui/baculum/protected/API/Lang/pt/messages.mo
index f4f6583c2615ace018f12a7cfe62e03c086bf3a5..395b4cbf904a0827156bb5453d1c9da449c4a823 100644 (file)
Binary files a/gui/baculum/protected/API/Lang/pt/messages.mo and b/gui/baculum/protected/API/Lang/pt/messages.mo differ

diff --git a/gui/baculum/protected/API/Lang/pt/messages.po b/gui/baculum/protected/API/Lang/pt/messages.po
index ecda46e037df23531091aa7f844944994b51c513..5ec37453da80344375dfc9f85a093b2f9fbb87a2 100644 (file)
--- a/gui/baculum/protected/API/Lang/pt/messages.po
+++ b/gui/baculum/protected/API/Lang/pt/messages.po
@@ -436,3 +436,6 @@ msgstr "Baculum working directory for Bacula config:"
 
 msgid "In this directory Baculum API saves temporarily Bacula configuration files (mainly for validation purposes) just before they are written as real Bacula configuration files."
 msgstr "In this directory Baculum API saves temporarily Bacula configuration files (mainly for validation purposes) just before they are written as real Bacula configuration files."
+
+msgid "Version:"
+msgstr "Version:"

diff --git a/gui/baculum/protected/API/Layouts/Main.php b/gui/baculum/protected/API/Layouts/Main.php
index 355b9eaba03579c492d701a1a8d4cc1179f8e50a..2bd98a3f4c2292e14a0dc05add962305ddb0ddd0 100644 (file)
--- a/gui/baculum/protected/API/Layouts/Main.php
+++ b/gui/baculum/protected/API/Layouts/Main.php
@@ -3,7 +3,7 @@
  * Bacula(R) - The Network Backup Solution
  * Baculum   - Bacula web interface
  *
- * Copyright (C) 2013-2016 Kern Sibbald
+ * Copyright (C) 2013-2019 Kern Sibbald
  *
  * The main author of Baculum is Marcin Haba.
  * The original author of Bacula is Kern Sibbald, with contributions
@@ -20,7 +20,8 @@
  * Bacula(R) is a registered trademark of Kern Sibbald.
  */
  
-class Main extends TTemplateControl
-{
+Prado::using('Application.Common.Class.Params');
+
+class Main extends TTemplateControl {
 }
 ?>

diff --git a/gui/baculum/protected/API/Layouts/Main.tpl b/gui/baculum/protected/API/Layouts/Main.tpl
index 46463d6813f43678d451f81cd064854b5f637cf1..ba24a0c882de1216e7e406cafcedf8c89f5e257e 100644 (file)
--- a/gui/baculum/protected/API/Layouts/Main.tpl
+++ b/gui/baculum/protected/API/Layouts/Main.tpl
@@ -6,5 +6,6 @@
                        <com:TClientScript PradoScripts="effects" />
                        <com:TContentPlaceHolder ID="Main" />
                </com:TForm>
+               <footer class="footer"><%[ Version: ]%> <%=Params::BACULUM_VERSION%></footer>
        </body>
 </html>

diff --git a/gui/baculum/protected/Common/Class/Params.php b/gui/baculum/protected/Common/Class/Params.php
index b5e1a06c97a1b5e29e89fcabb8dd0ab0bdde47e9..c9f938bc0ff0df6df8a446be7a9a8cb0c2062190 100644 (file)
--- a/gui/baculum/protected/Common/Class/Params.php
+++ b/gui/baculum/protected/Common/Class/Params.php
@@ -3,7 +3,7 @@
  * Bacula(R) - The Network Backup Solution
  * Baculum   - Bacula web interface
  *
- * Copyright (C) 2013-2017 Kern Sibbald
+ * Copyright (C) 2013-2019 Kern Sibbald
  *
  * The main author of Baculum is Marcin Haba.
  * The original author of Bacula is Kern Sibbald, with contributions
@@ -21,10 +21,11 @@
  */
 
 Prado::using('Application.Common.Class.CommonModule');
-Prado::using('Application.Common.Class.Params');
 
 class Params extends CommonModule {
 
+       const BACULUM_VERSION = '11.0.0';
+
        public static $months = array(
                'jan' => 'January',
                'feb' => 'February',

diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index 29e9ae7a614d261011d1d94ff55875847bc6403b..8805a3477ec8a082f33485191ec83c089738709b 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po
index d2717fe9ffcf991a018931ba897e75f244895c08..6267cccbc408e48f3366cbe0c23aa11467446bc3 100644 (file)
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -2221,3 +2221,6 @@ msgstr "Differential"
 
 msgid "Custom time range"
 msgstr "Custom time range"
+
+msgid "Version:"
+msgstr "Version:"

diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo
index 9687013c1b168072a70d9393326c78dca8875b17..815e9c56433b734a2cae5c9a1028a9b4268841b3 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po
index 3a1c1682ee06c089b78036470033fbaaa5df234e..5339843a63ffe3862cc6224f05433008d5394461 100644 (file)
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -2311,3 +2311,6 @@ msgstr "Differential"
 
 msgid "Custom time range"
 msgstr "Custom time range"
+
+msgid "Version:"
+msgstr "Version:"

diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index b5e048b528bf0bd8f590cb6eff5f04857aef3a77..21bbd7e961355d9dbcaa696351af9d20d942f7be 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po
index 0bf84888e2c2fbed6ab98f0ed1abca182649c467..ecf50d7fb12b44fe2a33ec060a9559f895ff865d 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -2228,3 +2228,6 @@ msgstr "Różnicowy"
 
 msgid "Custom time range"
 msgstr "Dopasowany zakres czasu"
+
+msgid "Version:"
+msgstr "Wersja:"

diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index 81bf38d5c6cbcf1a9a15558b23d64deed2c353b0..70e416cc7a91ddecbaea4eeeb485ef8652ee0bca 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po
index ddddcc62c8e5d4775b4e6c4e8826f943cb2fe3f0..4f855d7329c026c7b61309dc4c2d22d8822dd5bb 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -2236,3 +2236,6 @@ msgstr "Differential"
 
 msgid "Custom time range"
 msgstr "Custom time range"
+
+msgid "Version:"
+msgstr "Version:"

diff --git a/gui/baculum/protected/Web/Layouts/Main.php b/gui/baculum/protected/Web/Layouts/Main.php
index b357f50b7dde804bb11e701b94355f14dea09835..edf597c885f0613000c245298120537ecc250615 100644 (file)
--- a/gui/baculum/protected/Web/Layouts/Main.php
+++ b/gui/baculum/protected/Web/Layouts/Main.php
@@ -20,6 +20,8 @@
  * Bacula(R) is a registered trademark of Kern Sibbald.
  */
  
+Prado::using('Application.Common.Class.Params');
+
 class Main extends TTemplateControl {
 
        public $web_config;

diff --git a/gui/baculum/protected/Web/Layouts/Main.tpl b/gui/baculum/protected/Web/Layouts/Main.tpl
index 237fd66a4165355a1b7dca0acece4ef25f8244bf..545bfd801554e8bc8abd81a8895f1143b3453acf 100644 (file)
--- a/gui/baculum/protected/Web/Layouts/Main.tpl
+++ b/gui/baculum/protected/Web/Layouts/Main.tpl
@@ -33,8 +33,7 @@
                                </span>
                                <com:TContentPlaceHolder ID="Main" />
                                <!-- Footer -->
-                               <footer class="w3-container w3-padding-16 w3-light-grey">
-                               </footer>
+                               <footer class="w3-container w3-right-align w3-small"><%[ Version: ]%> <%=Params::BACULUM_VERSION%></footer>
                        </div>
                </com:TForm>
                <div id="small" class="w3-hide-large"></div>

diff --git a/gui/baculum/themes/Baculum-v1/css/style.css b/gui/baculum/themes/Baculum-v1/css/style.css
index 224b54f899ba4fbe4fd5e6153c662679796f6c19..bf76b40bb04fd6c8b26ca6f12bfe265afe8664c1 100644 (file)
--- a/gui/baculum/themes/Baculum-v1/css/style.css
+++ b/gui/baculum/themes/Baculum-v1/css/style.css
@@ -172,6 +172,12 @@ input.bbutton:hover {
        width: 98%;
 }
 
+.footer {
+       font-size: 12px;
+       text-align: right;
+       margin-top: 5px;
+}
+
 /* API server OAuth2 progress bar */
 
 #progress_label {