From: Marcin Haba Date: Mon, 8 Nov 2021 04:12:56 +0000 (+0100) Subject: baculum: Misc visual improvements X-Git-Tag: Release-11.0.6~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bfaa1a0c7382266a536e839b44b16ff40091e0d;p=thirdparty%2Fbacula.git baculum: Misc visual improvements Changes: - Improve schedule, messages and runscript submenus - Unify running job loaders - Tweak job, client, pool, storage and volume identifiers on view pages - Enhance titles in configuration windows --- diff --git a/gui/baculum/protected/Common/JavaScript/misc.js b/gui/baculum/protected/Common/JavaScript/misc.js index feced2b32..3f5d76f5e 100644 --- a/gui/baculum/protected/Common/JavaScript/misc.js +++ b/gui/baculum/protected/Common/JavaScript/misc.js @@ -193,9 +193,7 @@ function set_global_listeners() { var modals = document.getElementsByClassName('w3-modal'); for (var i = 0; i < modals.length; i++) { modals[i].addEventListener('click', function(e) { - var x = e.clientX; - var y = e.clientY; - var el = document.elementFromPoint(x, y); + var el = e.target || e.srcElement; if (el.classList.contains('w3-modal')) { $(this).hide(); // shadow clicked, hide modal } diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo index 481fc5b89..4ea117565 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 dc7583ed2..f293d3ea6 100644 --- a/gui/baculum/protected/Web/Lang/en/messages.po +++ b/gui/baculum/protected/Web/Lang/en/messages.po @@ -3835,3 +3835,48 @@ msgstr "No volumes in the pool to assign." msgid "The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool." msgstr "The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool." + +msgid "Add Connect directive" +msgstr "Add Connect directive" + +msgid "Add Run directive" +msgstr "Add Run directive" + +msgid "Add Runscript block" +msgstr "Add Runscript block" + +msgid "Add Console directive" +msgstr "Add Console directive" + +msgid "Add Stdout directive" +msgstr "Add Stdout directive" + +msgid "Add Stderr directive" +msgstr "Add Stderr directive" + +msgid "Add Syslog directive" +msgstr "Add Syslog directive" + +msgid "Add Catalog directive" +msgstr "Add Catalog directive" + +msgid "Add Director directive" +msgstr "Add Director directive" + +msgid "Add File directive" +msgstr "Add File directive" + +msgid "Add Append directive" +msgstr "Add Append directive" + +msgid "Add Mail directive" +msgstr "Add Mail directive" + +msgid "Add MailOnError directive" +msgstr "Add MailOnError directive" + +msgid "Add MailOnSuccess directive" +msgstr "Add MailOnSuccess directive" + +msgid "Add Operator directive" +msgstr "Add Operator directive" diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo index afc214198..6de456b0c 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 0bdd102d3..7ed22678e 100644 --- a/gui/baculum/protected/Web/Lang/ja/messages.po +++ b/gui/baculum/protected/Web/Lang/ja/messages.po @@ -3921,3 +3921,48 @@ msgstr "No volumes in the pool to assign." msgid "The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool." msgstr "The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool." + +msgid "Add Connect directive" +msgstr "Add Connect directive" + +msgid "Add Run directive" +msgstr "Add Run directive" + +msgid "Add Runscript block" +msgstr "Add Runscript block" + +msgid "Add Console directive" +msgstr "Add Console directive" + +msgid "Add Stdout directive" +msgstr "Add Stdout directive" + +msgid "Add Stderr directive" +msgstr "Add Stderr directive" + +msgid "Add Syslog directive" +msgstr "Add Syslog directive" + +msgid "Add Catalog directive" +msgstr "Add Catalog directive" + +msgid "Add Director directive" +msgstr "Add Director directive" + +msgid "Add File directive" +msgstr "Add File directive" + +msgid "Add Append directive" +msgstr "Add Append directive" + +msgid "Add Mail directive" +msgstr "Add Mail directive" + +msgid "Add MailOnError directive" +msgstr "Add MailOnError directive" + +msgid "Add MailOnSuccess directive" +msgstr "Add MailOnSuccess directive" + +msgid "Add Operator directive" +msgstr "Add Operator directive" diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo index 992de1555..4cb83ff86 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 0f7e73213..33167775c 100644 --- a/gui/baculum/protected/Web/Lang/pl/messages.po +++ b/gui/baculum/protected/Web/Lang/pl/messages.po @@ -3845,3 +3845,48 @@ msgstr "Brak wolumenów w puli do przypisania." msgid "The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool." msgstr "Nazwa puli wolumenów nie została zmieniona ale pula została skopiowana z nową nazwą. Proszę mieć na uwadze, że jeżeli pierwotna pula wolumenów zawierała wolumeny to nie zostały one przeniesione i ciągle istnieją one przypisane do pierwotnej puli w bazie danych. Aby przypisać wolumeny z pierwotnej puli do tej puli wolumenów, proszę przejść do MENU GŁÓWNE ➤ Pule wolumenów ➤ [NOWA PULA] ➤ Zakładka: Akcje i proszę użyć przycisku 'Przypisz wolumeny'. Po przypisaniu wolumenów możesz usunąć pierwotną pulę." + +msgid "Add Connect directive" +msgstr "Add Connect directive" + +msgid "Add Run directive" +msgstr "Add Run directive" + +msgid "Add Runscript block" +msgstr "Add Runscript block" + +msgid "Add Console directive" +msgstr "Add Console directive" + +msgid "Add Stdout directive" +msgstr "Add Stdout directive" + +msgid "Add Stderr directive" +msgstr "Add Stderr directive" + +msgid "Add Syslog directive" +msgstr "Add Syslog directive" + +msgid "Add Catalog directive" +msgstr "Add Catalog directive" + +msgid "Add Director directive" +msgstr "Add Director directive" + +msgid "Add File directive" +msgstr "Add File directive" + +msgid "Add Append directive" +msgstr "Add Append directive" + +msgid "Add Mail directive" +msgstr "Add Mail directive" + +msgid "Add MailOnError directive" +msgstr "Add MailOnError directive" + +msgid "Add MailOnSuccess directive" +msgstr "Add MailOnSuccess directive" + +msgid "Add Operator directive" +msgstr "Add Operator directive" diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo index d318f7593..e17489201 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 2d090475b..92fc62190 100644 --- a/gui/baculum/protected/Web/Lang/pt/messages.po +++ b/gui/baculum/protected/Web/Lang/pt/messages.po @@ -3846,3 +3846,48 @@ msgstr "Nenhum volume da pool para atribuir." msgid "The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool." msgstr "A pool não foi renomeado, mas foi copiada com o novo nome. Observe que, se a pool original continha volumes, eles não foram movidos e ainda estão atribuídos à pool original no catálogo do banco de dados. Para reatribuir volumes da pool original para esta, vá para o Menu Principal ➤ Pools ➤ [Nova Pool] ➤ Guia: Ações e use o botão 'Atribuir volumes'. Depois de reajustar os volumes, você pode excluir a pool original." + +msgid "Add Connect directive" +msgstr "Add Connect directive" + +msgid "Add Run directive" +msgstr "Add Run directive" + +msgid "Add Runscript block" +msgstr "Add Runscript block" + +msgid "Add Console directive" +msgstr "Add Console directive" + +msgid "Add Stdout directive" +msgstr "Add Stdout directive" + +msgid "Add Stderr directive" +msgstr "Add Stderr directive" + +msgid "Add Syslog directive" +msgstr "Add Syslog directive" + +msgid "Add Catalog directive" +msgstr "Add Catalog directive" + +msgid "Add Director directive" +msgstr "Add Director directive" + +msgid "Add File directive" +msgstr "Add File directive" + +msgid "Add Append directive" +msgstr "Add Append directive" + +msgid "Add Mail directive" +msgstr "Add Mail directive" + +msgid "Add MailOnError directive" +msgstr "Add MailOnError directive" + +msgid "Add MailOnSuccess directive" +msgstr "Add MailOnSuccess directive" + +msgid "Add Operator directive" +msgstr "Add Operator directive" diff --git a/gui/baculum/protected/Web/Lang/ru/messages.mo b/gui/baculum/protected/Web/Lang/ru/messages.mo index fb26ae4d9..b7ce3261c 100644 Binary files a/gui/baculum/protected/Web/Lang/ru/messages.mo and b/gui/baculum/protected/Web/Lang/ru/messages.mo differ diff --git a/gui/baculum/protected/Web/Lang/ru/messages.po b/gui/baculum/protected/Web/Lang/ru/messages.po index b88e6ec15..6987afdd6 100644 --- a/gui/baculum/protected/Web/Lang/ru/messages.po +++ b/gui/baculum/protected/Web/Lang/ru/messages.po @@ -3846,3 +3846,48 @@ msgstr "В пуле нет томов для назначения." msgid "The pool has not been renamed but it has been copied with the new name. Please note that if the original pool contained volumes, they have not been moved and they are still assigned to the original pool in the catalog database. To re-assign volumes from the original pool to this one please go to the MAIN MENU ➤ Pools ➤ [NEW POOL] ➤ Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool." msgstr "Пул не был переименован, но был скопирован с новым именем. Пожалуйста, обратите внимание, что если в первоначальном пуле содержались тома, они не были перемещены, и они по-прежнему назначены в исходный пул в базе данных каталога. Чтобы переназначить тома из исходного пула к этому пулу, перейдите к Главному меню ➤ Пулы ➤ [НОВЫЙ ПУЛ] ➤ Вкладка: Действия и, пожалуйста, используйте кнопку «Назначить тома». После восстановления томов вы можете удалить исходный пул." + +msgid "Add Connect directive" +msgstr "Add Connect directive" + +msgid "Add Run directive" +msgstr "Add Run directive" + +msgid "Add Runscript block" +msgstr "Add Runscript block" + +msgid "Add Console directive" +msgstr "Add Console directive" + +msgid "Add Stdout directive" +msgstr "Add Stdout directive" + +msgid "Add Stderr directive" +msgstr "Add Stderr directive" + +msgid "Add Syslog directive" +msgstr "Add Syslog directive" + +msgid "Add Catalog directive" +msgstr "Add Catalog directive" + +msgid "Add Director directive" +msgstr "Add Director directive" + +msgid "Add File directive" +msgstr "Add File directive" + +msgid "Add Append directive" +msgstr "Add Append directive" + +msgid "Add Mail directive" +msgstr "Add Mail directive" + +msgid "Add MailOnError directive" +msgstr "Add MailOnError directive" + +msgid "Add MailOnSuccess directive" +msgstr "Add MailOnSuccess directive" + +msgid "Add Operator directive" +msgstr "Add Operator directive" diff --git a/gui/baculum/protected/Web/Pages/ClientView.page b/gui/baculum/protected/Web/Pages/ClientView.page index 32c84c9e3..1432b84c1 100644 --- a/gui/baculum/protected/Web/Pages/ClientView.page +++ b/gui/baculum/protected/Web/Pages/ClientView.page @@ -6,7 +6,7 @@ <%[ Client details ]%> -

[ClientId <%=$this->getClientId()%>] <%[ Client: ]%> <%=$this->getClientName()%>

+

<%[ Client: ]%> <%=$this->getClientName()%>  [ClientId <%=$this->getClientId()%>]

@@ -315,6 +315,10 @@ var oGraphicalClientStatus = { var header = document.createElement('H4'); header.className = 'running_job_header'; header.textContent = '<%[ Job: ]%> #' + (job_nb+1) + ' ' + job.job; + var running_img = document.createElement('I'); + running_img.className = 'fas fa-cog w3-spin w3-margin-left'; + running_img.setAttribute('title', '<%[ Job is running ]%>'); + header.appendChild(running_img); var table = document.createElement('TABLE'); table.className = 'w3-table w3-stripped w3-border status_table running_job_table'; diff --git a/gui/baculum/protected/Web/Pages/JobHistoryView.page b/gui/baculum/protected/Web/Pages/JobHistoryView.page index edd4f04bb..283129a1b 100644 --- a/gui/baculum/protected/Web/Pages/JobHistoryView.page +++ b/gui/baculum/protected/Web/Pages/JobHistoryView.page @@ -6,7 +6,7 @@ <%[ Job history details ]%> -

[<%[ JobId ]%> <%=$this->getJobId()%>] <%[ Job: ]%> <%=$this->getJobName()%>  

+

<%[ Job: ]%> <%=$this->getJobName()%>  [<%[ JobId ]%> <%=$this->getJobId()%>]

@@ -61,14 +61,14 @@  <%[ Restore ]%>
-

<%[ Job: ]%> <%=$this->getJobUname()%>   +

<%[ Job: ]%> <%=$this->getJobUname()%>   - + -
+ <%[ Pool details ]%> -

[PoolId <%=$this->getPoolId()%>] <%[ Pool: ]%> <%=$this->getPoolName()%>

+

<%[ Pool: ]%> <%=$this->getPoolName()%>  [PoolId <%=$this->getPoolId()%>]

diff --git a/gui/baculum/protected/Web/Pages/StorageView.page b/gui/baculum/protected/Web/Pages/StorageView.page index a31cb0084..83523455b 100644 --- a/gui/baculum/protected/Web/Pages/StorageView.page +++ b/gui/baculum/protected/Web/Pages/StorageView.page @@ -6,7 +6,7 @@ <%[ Storage details ]%> -

[StorageId <%=$this->getStorageId()%>] <%[ Storage: ]%> <%=$this->getStorageName()%>  

+

<%[ Storage: ]%> <%=$this->getStorageName()%>  [StorageId <%=$this->getStorageId()%>]

@@ -142,7 +142,7 @@ var oStorageActions = { } }; - +
@@ -181,6 +181,7 @@ var oStorageActions = { />
+
@@ -220,7 +221,8 @@ var oStorageActions = {
-