From: Marcin Haba Date: Thu, 26 Jul 2018 05:31:34 +0000 (+0200) Subject: baculum: Implement ideas and fixes proposed by Wanderlei Huttel X-Git-Tag: Release-9.2.1~57 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49d1358a212f12fc2dabf4b54fe847360ea29d64;p=thirdparty%2Fbacula.git baculum: Implement ideas and fixes proposed by Wanderlei Huttel 1) The word in the menu "Close menu" is not translatable 2) In the menu "Job History" and "Job" using the same title "Job history list". 3) Centralize selected column in data tables 4) Use flex container type to store volume detail cards 5) Add margin between "Run job" and "Perform restore" buttons 6) The same size action buttons on the Bacula configuration page 7) Add new color as background to config resource area 8) Debug text message is not translatable --- diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo index e73c7965a3..ef485bb2b7 100644 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 e43bb2a0b6..fe3bbd9322 100644 --- a/gui/baculum/protected/Web/Lang/en/messages.po +++ b/gui/baculum/protected/Web/Lang/en/messages.po @@ -684,7 +684,7 @@ msgid "This action will clear bvfs cache that was created during preparing resto msgstr "This action will clear bvfs cache that was created during preparing restore files.\\n\\nThere is not recommended use this action during restore job working.\\n\\nAre you sure?" msgid "Debug files enable possibility to save most of actions executed on Baculum WebGUI. Debug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working. After confirmation this message Baculum debug files will be continuously saving in /protected/Web/Logs/ directory. Are you sure?" -msgstr "Debug files enable possibility to save most of actions executed on Baculum WebGUI.\\n\\nDebug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working.\\n\\nAfter confirmation this message Baculum debug files will be continuously saving in /protected/Web/Logs/ directory.\\n\\nAre you sure?" +msgstr "Debug files enable possibility to save most of actions executed on Baculum WebGUI. Debug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working. After confirmation this message Baculum debug files will be continuously saving in /protected/Web/Logs/ directory. Are you sure?" msgid "10 elements" msgstr "10 elements" @@ -1825,3 +1825,6 @@ msgstr "Max. number of jobs value must be integer greather than 0." msgid "Log order" msgstr "Log order" + +msgid "Close Menu" +msgstr "Close Menu" diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo index 03e9b0b3b1..b2e7a79153 100644 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 cbcc9e211c..ddea82e883 100644 --- a/gui/baculum/protected/Web/Lang/ja/messages.po +++ b/gui/baculum/protected/Web/Lang/ja/messages.po @@ -740,8 +740,8 @@ msgstr "unmark all and close" msgid "This action will clear bvfs cache that was created during preparing restore files. There is not recommended use this action during restore job working. Are you sure?" msgstr "リストアファイル準備中に作成されたbvfsキャッシュをクリアします。\\n\\nリストアジョブ実行中にbvfsキャッシュクリアは実行しないでください。\\n\\n実行しますか？" -msgid "Debug files enable possibility to save most of actions executed on Baculum WebGUI. Debug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working. After confirmation this message Baculum debug files will be continuously saving in /protected/Data/ directory. Are you sure?" -msgstr "デバッグを有効にするとBaculumに関するほとんどのアクションを保存することができます。\\n\\nデバックを有効にすることによりBaculumのバグや作業中の問題検出をするために役立ちます。\\n\\nデバッグログは/usr/share/baculum/htdocs/protected/Dataに出力されます。\\n\\nデバッグを有効にしますか?" +msgid "Debug files enable possibility to save most of actions executed on Baculum WebGUI. Debug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working. After confirmation this message Baculum debug files will be continuously saving in /protected/Web/Logs/ directory. Are you sure?" +msgstr "デバッグを有効にするとBaculumに関するほとんどのアクションを保存することができます。デバックを有効にすることによりBaculumのバグや作業中の問題検出をするために役立ちます。デバッグログは/protected/Web/Logs/に出力されます。デバッグを有効にしますか?" msgid "10 elements" msgstr "10件" @@ -1576,3 +1576,6 @@ msgstr "Max. number of jobs value must be integer greather than 0." msgid "Log order" msgstr "Log order" + +msgid "Close Menu" +msgstr "Close Menu" diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo index e775dea757..c3942485a3 100644 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 48f0dc1f8d..ac06df7492 100644 --- a/gui/baculum/protected/Web/Lang/pl/messages.po +++ b/gui/baculum/protected/Web/Lang/pl/messages.po @@ -669,7 +669,7 @@ msgid "This action will clear bvfs cache that was created during preparing resto msgstr "Ta akcja wyczyści bvfs cache który był stworzony podczas przygotowania każdej akcji przywracania danych.\\n\\nNie jest zalecane używanie tej akcji podczas gdy jest uruchomione zadanie przywracania danych.\\n\\nCzy chcesz kontynuować?" msgid "Debug files enable possibility to save most of actions executed on Baculum WebGUI. Debug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working. After confirmation this message Baculum debug files will be continuously saving in /protected/Web/Logs/ directory. Are you sure?" -msgstr "Pliki rozszerzonych dzienników programu (tzw. debug programu) umożliwiają zapisywanie akcji wykonywanych na interfejsie Baculum.\\n\\nFunkcjonalność dzienników programu powinna być załączana jeśli wydarzy się coś złego z interfejsem Baculum lub coś co wygląda jak błąd.\\n\\nRozszerzone dzienniki programu mogą być użyteczne przy wykrywaniu problemów w działaniu Baculum. Po potwierdzeniu tej wiadomości debug Baculum będą zapisywany w lokalizacji /protected/Web/Logs/.\\n\\nCzy chcesz kontynuować?" +msgstr "Pliki rozszerzonych dzienników programu (tzw. debug programu) umożliwiają zapisywanie akcji wykonywanych na interfejsie Baculum. Funkcjonalność dzienników programu powinna być załączana jeśli wydarzy się coś złego z interfejsem Baculum lub coś co wygląda jak błąd. Rozszerzone dzienniki programu mogą być użyteczne przy wykrywaniu problemów w działaniu Baculum. Po potwierdzeniu tej wiadomości debug Baculum będą zapisywany w lokalizacji /protected/Web/Logs/. Czy chcesz kontynuować?" msgid "unlimited" msgstr "bez limitu" @@ -1832,3 +1832,6 @@ msgstr "Maks. liczba zadań musi być liczbą całkowitą większą od zera." msgid "Log order" msgstr "Kolejność dziennika" + +msgid "Close Menu" +msgstr "Zamknij Menu" diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo index e61d1319ce..6a990f4efe 100644 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 d2dfd13f4b..51851d79b4 100644 --- a/gui/baculum/protected/Web/Lang/pt/messages.po +++ b/gui/baculum/protected/Web/Lang/pt/messages.po @@ -1840,3 +1840,6 @@ msgstr "O número máximo de jobs deve ser um valor inteiro maior que 0." msgid "Log order" msgstr "Ordenar log" + +msgid "Close Menu" +msgstr "Close Menu" diff --git a/gui/baculum/protected/Web/Pages/ApplicationSettings.page b/gui/baculum/protected/Web/Pages/ApplicationSettings.page index be15173517..cfd7f057c5 100644 --- a/gui/baculum/protected/Web/Pages/ApplicationSettings.page +++ b/gui/baculum/protected/Web/Pages/ApplicationSettings.page @@ -64,7 +64,7 @@
×

<%[ Enable debug ]%>

-

Debug files enable possibility to save most of actions executed on Baculum WebGUI. Debug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working. After confirmation this message Baculum debug files will be continuously saving in /protected/Web/Logs/ directory. Are you sure?

+

<%[ Debug files enable possibility to save most of actions executed on Baculum WebGUI. Debug functionality should be enabled if is happening shomething wrong with Baculum or something that looks like a bug. Logs can be useful for detecting a problems in Baculum working. After confirmation this message Baculum debug files will be continuously saving in /protected/Web/Logs/ directory. Are you sure? ]%>

diff --git a/gui/baculum/protected/Web/Pages/ClientList.page b/gui/baculum/protected/Web/Pages/ClientList.page index 6fbaefd216..ecb1c9c6ca 100644 --- a/gui/baculum/protected/Web/Pages/ClientList.page +++ b/gui/baculum/protected/Web/Pages/ClientList.page @@ -108,6 +108,10 @@ var oClientList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 4, 5, 6, 7 ] }], order: [2, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/ClientView.page b/gui/baculum/protected/Web/Pages/ClientView.page index b8ea4320b4..15ae5585d9 100644 --- a/gui/baculum/protected/Web/Pages/ClientView.page +++ b/gui/baculum/protected/Web/Pages/ClientView.page @@ -156,6 +156,14 @@ var oJobForClientList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4, 5, 6, 7, 9, 10 ] + }, + { + className: "dt-body-right", + targets: [ 8 ] }], order: [1, 'desc'] }); diff --git a/gui/baculum/protected/Web/Pages/Dashboard.page b/gui/baculum/protected/Web/Pages/Dashboard.page index f37e399996..9d5cd107bc 100644 --- a/gui/baculum/protected/Web/Pages/Dashboard.page +++ b/gui/baculum/protected/Web/Pages/Dashboard.page @@ -98,7 +98,7 @@
-
+
<%[ Run job ]%>
-
+

<%[ Perform restore ]%>

diff --git a/gui/baculum/protected/Web/Pages/FileSetList.page b/gui/baculum/protected/Web/Pages/FileSetList.page index 55c962d434..ee43ecaa67 100644 --- a/gui/baculum/protected/Web/Pages/FileSetList.page +++ b/gui/baculum/protected/Web/Pages/FileSetList.page @@ -59,8 +59,7 @@ var oFileSetList = { btn.appendChild(label); btn.setAttribute('onclick', "document.location.href = '/web/fileset/" + data + "/'"); return btn.outerHTML; - }, - className: 'w3-center' + } } ], responsive: { @@ -72,6 +71,10 @@ var oFileSetList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 3 ] }], order: [1, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/JobHistoryList.page b/gui/baculum/protected/Web/Pages/JobHistoryList.page index ec0e19d16d..36a1e1dbbc 100644 --- a/gui/baculum/protected/Web/Pages/JobHistoryList.page +++ b/gui/baculum/protected/Web/Pages/JobHistoryList.page @@ -126,6 +126,14 @@ var oJobList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4, 5, 6, 7, 9, 10 ] + }, + { + className: "dt-body-right", + targets: [ 8 ] }], order: [1, 'desc'] }); diff --git a/gui/baculum/protected/Web/Pages/JobList.page b/gui/baculum/protected/Web/Pages/JobList.page index 451573b3c3..4e95b9f68d 100644 --- a/gui/baculum/protected/Web/Pages/JobList.page +++ b/gui/baculum/protected/Web/Pages/JobList.page @@ -3,7 +3,7 @@
- <%[ Job history list ]%> + <%[ Job list ]%>
@@ -67,8 +67,7 @@ var oJobHistoryList = { btn.appendChild(label); btn.setAttribute('onclick', "document.location.href = '/web/job/" + data + "/'"); return btn.outerHTML; - }, - className: 'w3-center' + } } ], responsive: { @@ -80,6 +79,10 @@ var oJobHistoryList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 3 ] }], order: [1, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/PoolList.page b/gui/baculum/protected/Web/Pages/PoolList.page index 3ddbf6e1cb..5e5fb73d50 100644 --- a/gui/baculum/protected/Web/Pages/PoolList.page +++ b/gui/baculum/protected/Web/Pages/PoolList.page @@ -51,12 +51,10 @@ var oPoolList = { {data: 'poolid'}, {data: 'name'}, { - data: 'numvols', - className: 'w3-center' + data: 'numvols' }, { - data: 'maxvols', - className: 'w3-center' + data: 'maxvols' }, { data: 'volretention', @@ -73,14 +71,12 @@ var oPoolList = { }, { data: 'autoprune', - className: 'w3-center', render: function(data, type, row) { return (data == 1 ? '<%[ Yes ]%>' : '<%[ No ]%>'); } }, { data: 'recycle', - className: 'w3-center', render: function(data, type, row) { return (data == 1 ? '<%[ Yes ]%>' : '<%[ No ]%>'); } @@ -111,6 +107,10 @@ var oPoolList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4, 6, 7, 8 ] }], order: [2, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/PoolView.page b/gui/baculum/protected/Web/Pages/PoolView.page index c085a39fd6..47094ff0de 100644 --- a/gui/baculum/protected/Web/Pages/PoolView.page +++ b/gui/baculum/protected/Web/Pages/PoolView.page @@ -41,7 +41,7 @@
-
+

<%[ Limits ]%>

@@ -66,7 +66,7 @@
-
+

<%[ Recycling ]%>

@@ -87,7 +87,7 @@
-
+

<%[ Options ]%>

@@ -169,12 +169,10 @@ var oVolumeList = { {data: 'mediaid'}, {data: 'volumename'}, { - data: 'slot', - className: 'w3-center' + data: 'slot' }, { data: 'inchanger', - className: 'w3-center', render: function(data, type, row) { return (data === 1) ? '<%[ Yes ]%>' : '<%[ No ]%>'; } @@ -221,6 +219,14 @@ var oVolumeList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4, 5, 7, 8, 10 ] + }, + { + className: "dt-body-right", + targets: [ 9 ] }], order: [3, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page index 00dac6284c..772995e793 100644 --- a/gui/baculum/protected/Web/Pages/RestoreWizard.page +++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page @@ -226,7 +226,6 @@ var oJobsToRestoreList = { } return ret; }, - className: 'w3-center', aresponsivePriority: 6 }, { @@ -259,8 +258,6 @@ var oJobsToRestoreList = { radio.type = 'radio'; radio.name = 'backup_to_restore'; radio.value = data; - radio.style.display = 'block'; - radio.style.margin = 'auto'; radio.className = 'w3-radio'; ret = radio.outerHTML; } else { @@ -280,6 +277,14 @@ var oJobsToRestoreList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4, 5, 7, 8, 9 ] + }, + { + className: "dt-body-right", + targets: [ 6 ] }], order: [1, 'desc'] }); diff --git a/gui/baculum/protected/Web/Pages/ScheduleList.page b/gui/baculum/protected/Web/Pages/ScheduleList.page index b794eb612c..d3b2946348 100644 --- a/gui/baculum/protected/Web/Pages/ScheduleList.page +++ b/gui/baculum/protected/Web/Pages/ScheduleList.page @@ -57,8 +57,7 @@ var oScheduleList = { btn.appendChild(label); btn.setAttribute('onclick', "document.location.href = '/web/schedule/" + data + "/'"); return btn.outerHTML; - }, - className: 'w3-center' + } } ], responsive: { @@ -70,6 +69,10 @@ var oScheduleList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 2 ] }], order: [1, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/StorageList.page b/gui/baculum/protected/Web/Pages/StorageList.page index 35268fc70d..f5f8975c69 100644 --- a/gui/baculum/protected/Web/Pages/StorageList.page +++ b/gui/baculum/protected/Web/Pages/StorageList.page @@ -81,6 +81,10 @@ var oStorageList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4 ] }], order: [1, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/VolumeList.page b/gui/baculum/protected/Web/Pages/VolumeList.page index be2c523147..f453ccf2e0 100644 --- a/gui/baculum/protected/Web/Pages/VolumeList.page +++ b/gui/baculum/protected/Web/Pages/VolumeList.page @@ -53,12 +53,10 @@ var oVolumeList = { {data: 'mediaid'}, {data: 'volumename'}, { - data: 'slot', - className: 'w3-center' + data: 'slot' }, { data: 'inchanger', - className: 'w3-center', render: function(data, type, row) { return (data === 1) ? '<%[ Yes ]%>' : '<%[ No ]%>'; } @@ -104,6 +102,14 @@ var oVolumeList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4, 5, 7, 9 ] + }, + { + className: "dt-body-right", + targets: [ 8 ] }], order: [3, 'asc'] }); diff --git a/gui/baculum/protected/Web/Pages/VolumeView.page b/gui/baculum/protected/Web/Pages/VolumeView.page index 278efb8b65..c3db559edf 100644 --- a/gui/baculum/protected/Web/Pages/VolumeView.page +++ b/gui/baculum/protected/Web/Pages/VolumeView.page @@ -35,8 +35,8 @@
-
-
+
+

<%[ Limits ]%>

@@ -57,7 +57,7 @@
-
+

<%[ Recycling ]%>

@@ -78,7 +78,7 @@
-
+

<%[ Options ]%>

@@ -103,7 +103,7 @@
-
+

<%[ Writing ]%>

@@ -128,7 +128,7 @@
-
+

<%[ Status ]%>

@@ -393,8 +393,7 @@ var oJobsOnVolumeList = { ret = data; } return ret; - }, - className: 'w3-center' + } }, { data: 'jobbytes', @@ -435,6 +434,14 @@ var oJobsOnVolumeList = { className: 'control', orderable: false, targets: 0 + }, + { + className: "dt-center", + targets: [ 1, 3, 4, 5, 7, 9, 10 ] + }, + { + className: "dt-body-right", + targets: [ 8 ] }], order: [1, 'desc'] }); diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl index 425fc6450d..5367cc5b69 100644 --- a/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl +++ b/gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl @@ -18,7 +18,7 @@
-  <%[ Add ]%> +  <%[ Add ]%>