]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Misc visual improvements
authorMarcin Haba <marcin.haba@bacula.pl>
Mon, 8 Nov 2021 04:12:56 +0000 (05:12 +0100)
committerMarcin Haba <marcin.haba@bacula.pl>
Mon, 8 Nov 2021 04:12:56 +0000 (05:12 +0100)
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

22 files changed:
gui/baculum/protected/Common/JavaScript/misc.js
gui/baculum/protected/Web/Lang/en/messages.mo
gui/baculum/protected/Web/Lang/en/messages.po
gui/baculum/protected/Web/Lang/ja/messages.mo
gui/baculum/protected/Web/Lang/ja/messages.po
gui/baculum/protected/Web/Lang/pl/messages.mo
gui/baculum/protected/Web/Lang/pl/messages.po
gui/baculum/protected/Web/Lang/pt/messages.mo
gui/baculum/protected/Web/Lang/pt/messages.po
gui/baculum/protected/Web/Lang/ru/messages.mo
gui/baculum/protected/Web/Lang/ru/messages.po
gui/baculum/protected/Web/Pages/ClientView.page
gui/baculum/protected/Web/Pages/JobHistoryView.page
gui/baculum/protected/Web/Pages/PoolView.page
gui/baculum/protected/Web/Pages/StorageView.page
gui/baculum/protected/Web/Pages/VolumeView.page
gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.php
gui/baculum/protected/Web/Portlets/BaculaConfigResourceList.tpl
gui/baculum/protected/Web/Portlets/DirectiveSchedule.tpl
gui/baculum/protected/Web/Portlets/NewMessagesMenu.tpl
gui/baculum/protected/Web/Portlets/NewRunscriptMenu.tpl
gui/baculum/protected/Web/Portlets/NewScheduleMenu.tpl

index feced2b32c7efb179d2d35cf1972ec4f04758fb5..3f5d76f5e3fc2aaab5286512cd2d0f8859b3a17a 100644 (file)
@@ -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
                        }
index 481fc5b895af6988d09d37a619d7770c6424b100..4ea1175659eb9a70ca1bf0507579d2dc71292367 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ
index dc7583ed281f9feb0d3d5ce03b576c53d8835e56..f293d3ea648ec4af081c434bd27b55b6e1bddb61 100644 (file)
@@ -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 &#10148; Pools &#10148; [NEW POOL] &#10148; 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 &#10148; Pools &#10148; [NEW POOL] &#10148; 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"
index afc214198969d29bc86fda3f9d820c0b5767a4ea..6de456b0c05ec1bbee47ce0774218c03984b6eea 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ
index 0bdd102d340bec75f7674061706ebc7172908a3c..7ed22678ecd514e05345b3aaebf48355363401ec 100644 (file)
@@ -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 &#10148; Pools &#10148; [NEW POOL] &#10148; 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 &#10148; Pools &#10148; [NEW POOL] &#10148; 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"
index 992de1555776b3bdc46b94431d433086c8b6bdd0..4cb83ff863f68a1476a7e8e75ea37dc335574704 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ
index 0f7e73213da877fe870cfdc6ce3e228a2c65e875..33167775c952d75938d20caa8f594fa38508d627 100644 (file)
@@ -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 &#10148; Pools &#10148; [NEW POOL] &#10148; 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 &#10148; Pule wolumenów &#10148; [NOWA PULA] &#10148; 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"
index d318f7593bc40ed361225e3c8c98618d1f680cb7..e1748920125b751f03a69838356cc930994477e6 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ
index 2d090475bd245cf309bfc7d3b68a58e2eed760e3..92fc62190a2c095b1709f9fbe6b0d0ce6bb3ebb6 100644 (file)
@@ -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 &#10148; Pools &#10148; [NEW POOL] &#10148; 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 &#10148; Pools &#10148; [Nova Pool] &#10148; 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"
index fb26ae4d936ed58668e2fe9e6b86b617b2aea673..b7ce3261cc15c99951b5a09fc844d19933d3dcec 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/ru/messages.mo and b/gui/baculum/protected/Web/Lang/ru/messages.mo differ
index b88e6ec1500e2322d802c7c4fe89f21378fc8ecb..6987afdd689e7d4ab8bc5e51cbc322912cf00131 100644 (file)
@@ -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 &#10148; Pools &#10148; [NEW POOL] &#10148; Tab: Actions and please use the 'Assign volumes' button. After re-assgning volumes you can delete the original pool."
 msgstr "Пул не был переименован, но был скопирован с новым именем. Пожалуйста, обратите внимание, что если в первоначальном пуле содержались тома, они не были перемещены, и они по-прежнему назначены в исходный пул в базе данных каталога. Чтобы переназначить тома из исходного пула к этому пулу, перейдите к Главному меню &#10148; Пулы &#10148; [НОВЫЙ ПУЛ] &#10148; Вкладка: Действия и, пожалуйста, используйте кнопку «Назначить тома». После восстановления томов вы можете удалить исходный пул."
 
+
+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"
index 32c84c9e302d838dc3ae91f20d3a63dd1e195a1b..1432b84c1d210983e3a973f5519c31e0e232ef17 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-desktop"></i> <%[ Client details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left">[ClientId <%=$this->getClientId()%>] <%[ Client: ]%> <%=$this->getClientName()%></h3>
+       <h3 class="w3-margin-left"><%[ Client: ]%> <%=$this->getClientName()%> &nbsp;<span class="w3-small">[ClientId <%=$this->getClientId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('ClientList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_client_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'client_actions');"><%[ Actions ]%></button>
@@ -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';
index edd4f04bb6524ef6abb8737733ae28344b18db15..283129a1be6efdc141e0fc8adb79bf4964b9016b 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-tasks"></i> <%[ Job history details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left">[<%[ JobId ]%> <%=$this->getJobId()%>] <%[ Job: ]%> <%=$this->getJobName()%> &nbsp;</h3>
+       <h3 class="w3-margin-left"><%[ Job: ]%> <%=$this->getJobName()%> &nbsp;<span class="w3-small">[<%[ JobId ]%> <%=$this->getJobId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('JobHistoryList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_job_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'job_actions'); job_callback_func(); oRunningJobStatus.init_refresh();"><%[ Actions ]%></button>
                        <i class="fa fa-reply"></i> &nbsp;<%[ Restore ]%>
                </com:TActiveLinkButton>
                <div class="w3-panel w3-card w3-light-grey">
-                       <h3><%[ Job: ]%> <%=$this->getJobUname()%> &nbsp;
+                       <h5><%[ Job: ]%> <%=$this->getJobUname()%> &nbsp;
                                <com:TActiveLabel ID="RunningIcon" Attributes.title="<%[ Job is running ]%>">
-                                       <i class="fa fa-sync-alt w3-spin"></i>
+                                       <i class="fa fa-cog w3-spin"></i>
                                </com:TActiveLabel>
                                <com:TActiveLabel ID="FinishedIcon" Attributes.title="<%[ Job is finished ]%>">
                                        <i class="fa fa-check"></i>
                                </com:TActiveLabel>
-                       </h3>
+                       </h5>
                        <com:TCallback
                                ID="RunningJobStatusCb"
                                OnCallback="runningJobStatus"
index d31f9d1d51bbbcc1e627f41a049a48158ac4a5e8..8b6b995d4058b265700378f56033659f85246639 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-tape"></i> <%[ Pool details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left">[PoolId <%=$this->getPoolId()%>] <%[ Pool: ]%> <%=$this->getPoolName()%></h3>
+       <h3 class="w3-margin-left"><%[ Pool: ]%> <%=$this->getPoolName()%> &nbsp;<span class="w3-small">[PoolId <%=$this->getPoolId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('PoolList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_pool_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'pool_actions');"><%[ Actions ]%></button>
index a31cb0084dd5f17d925714315b0cea0cf9c191eb..83523455be093d3d400b03b0992f7e56aa2cd3a3 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-database"></i> <%[ Storage details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left">[StorageId <%=$this->getStorageId()%>] <%[ Storage: ]%> <%=$this->getStorageName()%> &nbsp;</h3>
+       <h3 class="w3-margin-left"><%[ Storage: ]%> <%=$this->getStorageName()%> &nbsp;<span class="w3-small">[StorageId <%=$this->getStorageId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('StorageList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_storage_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'storage_actions');"><%[ Actions ]%></button>
@@ -142,7 +142,7 @@ var oStorageActions = {
        }
 };
                </script>
-               <i id="status_storage_loading" class="fa fa-sync w3-spin" style="display: none; vertical-align: super;"></i> <span id="status_storage_error" class="w3-text-red" style="display: none"></span>
+               <i id="status_storage_loading" class="fa fa-sync w3-spin w3-margin-left" style="display: none; vertical-align: super;"></i> <span id="status_storage_error" class="w3-text-red" style="display: none"></span>
                <com:TActivePanel ID="Autochanger" Display="None" Height="61px">
                        <div class="w3-left w3-margin-right">
                                <label><%[ Drive number: ]%></label>
@@ -181,6 +181,7 @@ var oStorageActions = {
                                />
                        </div>
                </com:TActivePanel>
+               <div class="w3-clear"></div>
                <div id="storage_action_text_output" class="w3-code" style="display: none; clear: both;">
                        <pre id="storage_action_log"></pre>
                </div>
@@ -220,7 +221,8 @@ var oStorageActions = {
                                </table>
                        </div>
                </div>
-               <div id="status_storage_container" class="w3-clear w3-margin-top" style="display: none">
+               <div class="w3-clear"></div>
+               <div id="status_storage_container" style="display: none">
                        <div class="w3-right w3-margin-top w3-margin-right" title="<%[ To disable refreshing please type 0. ]%>">
                                <span style="line-height: 41px"><%[ Refresh interval (sec.): ]%></span> <input type="text" id="status_storage_refresh_interval" class="w3-input w3-border w3-right w3-margin-left" value="10" style="width: 50px"/>
                        </div>
index 48f62d8eecb2c58633aca9d40ae17e6f7abfd275..f4290f17734b51b2bbdc828359cb957d4b3edde3 100644 (file)
@@ -6,7 +6,7 @@
                        <b><i class="fa fa-hdd"></i> <%[ Volume details ]%></b>
                </h5>
        </header>
-       <h3 class="w3-margin-left">[MediaId <%=$this->getMediaId()%>] <%[ Volume: ]%> <%=$this->getVolumeName()%></h3>
+       <h3 class="w3-margin-left"><%[ Volume: ]%> <%=$this->getVolumeName()%> &nbsp;<span class="w3-small">[MediaId <%=$this->getMediaId()%>]</span></h3>
        <div class="w3-bar w3-green w3-margin-bottom">
                <a class="w3-bar-item w3-button tab_btn" href="<%=$this->Service->constructUrl('VolumeList')%>"><i class="fa fa-angle-left"></i></a>
                <button id="btn_volume_actions" type="button" class="w3-bar-item w3-button tab_btn w3-grey" onclick="W3Tabs.open(this.id, 'volume_actions');"><%[ Actions ]%></button>
index 9ed5cf58e0367282e43b5eca1ea43eb080ce0dd3..b4ed26591e25fe047a87977cdfa8c24101309e15 100644 (file)
@@ -73,7 +73,9 @@ class BaculaConfigResourceList extends Portlets {
                $this->showError(false);
                $component_type = $this->getComponentType();
                $resource_type = $this->getResourceType();
-               $this->ResourceTypeLink->Text = $resource_type;
+               $this->ResourceTypeAddLink->Text = $resource_type;
+               $this->ResourceTypeAddWindowTitle->Text = $resource_type;
+               $this->ResourceTypeEditWindowTitle->Text = $resource_type;
                $config = $this->getModule('api')->get(
                        [
                                'config',
index 23bb3a80c05c811c803d22f5c171e801fad0c1f6..94dc6b0bc3e63f0b967cd8f4590279d4a9ed421b 100644 (file)
@@ -3,7 +3,7 @@
 </span>
 <div id="<%=$this->ClientID%>_container">
        <div class="w3-container">
-               <a href="javascript:void(0)" class="w3-button w3-margin-bottom w3-green" onclick="oBaculaConfigResourceWindow<%=$this->ClientID%>.load_resource_window();"><i class="fa fa-plus"></i> &nbsp;<%[ Add ]%> <com:TActiveLabel ID="ResourceTypeLink" /></a>
+               <a href="javascript:void(0)" class="w3-button w3-margin-bottom w3-green" onclick="oBaculaConfigResourceWindow<%=$this->ClientID%>.load_resource_window();"><i class="fa fa-plus"></i> &nbsp;<%[ Add ]%> <com:TActiveLabel ID="ResourceTypeAddLink" /></a>
        </div>
        <table id="<%=$this->ClientID%>_list" class="w3-table w3-striped w3-hoverable w3-white w3-margin-bottom" style="width: 100%">
                <thead>
@@ -130,8 +130,8 @@ var oBaculaConfigResourceList<%=$this->ClientID%> = {
        <div class="w3-modal-content w3-animate-top w3-card-4">
                <header class="w3-container w3-teal">
                        <span onclick="oBaculaConfigResourceWindow<%=$this->ClientID%>.close_resource_window();" class="w3-button w3-display-topright">&times;</span>
-                       <h2 id="resource_window_title_add<%=$this->ClientID%>" style="display: none"><%[ Add ]%> <%=$this->getResourceType()%></h2>
-                       <h2 id="resource_window_title_edit<%=$this->ClientID%>" style="display: none"><%[ Edit ]%> <%=$this->getResourceType()%></h2>
+                       <h2 id="resource_window_title_add<%=$this->ClientID%>" style="display: none"><%[ Add ]%> <com:TActiveLabel ID="ResourceTypeAddWindowTitle" /></h2>
+                       <h2 id="resource_window_title_edit<%=$this->ClientID%>" style="display: none"><%[ Edit ]%> <com:TActiveLabel ID="ResourceTypeEditWindowTitle" /></h2>
                </header>
                <div class="w3-container w3-margin-left w3-margin-right w3-margin-top">
                        <com:Application.Web.Portlets.BaculaConfigDirectives
index f6376d37424fe8259985deb7929c4d1597f0d7f4..153678c852467b7ac1898d5e19aa43f610f1b697 100644 (file)
@@ -1,10 +1,10 @@
-<button type="button" class="w3-button w3-green w3-margin-bottom" onmousedown="openElementOnCursor(event, '<%=$this->RunscriptMenu->ClientID%>_new_schedule', 0, 20);"><i class="fa fa-plus"></i> &nbsp;<%[ Add ]%></button>
-<com:Application.Web.Portlets.NewScheduleMenu ID="RunscriptMenu" />
+<button type="button" class="w3-button w3-green w3-margin-bottom" onmousedown="openElementOnCursor(event, '<%=$this->ScheduleMenu->ClientID%>_new_schedule', 0, 20);"><i class="fa fa-plus"></i> &nbsp;<%[ Add ]%></button>
+<com:Application.Web.Portlets.NewScheduleMenu ID="ScheduleMenu" />
 <com:TActiveRepeater ID="RepeaterScheduleRuns" OnItemDataBound="createRunItem">
        <prop:ItemTemplate>
                <div class="w3-card-4 w3-padding w3-margin-bottom directive runscript">
                <com:TActiveLinkButton
-                       CssClass="w3-button w3-green w3-right"
+                       CssClass="w3-button w3-red w3-right"
                        OnCommand="SourceTemplateControl.removeSchedule"
                        CommandName="<%=$this->ItemIndex%>"
                >
index f60c76fbba7c0b7c036c1ec976ec5827fab8b66f..b342dae7473e813ddbd68756ed92f04e5f36d43a 100644 (file)
@@ -7,7 +7,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Console
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Console directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -16,7 +16,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Stdout
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Stdout directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -25,7 +25,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Stderr
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Stderr directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -34,7 +34,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Syslog
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Syslog directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -43,7 +43,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Catalog
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Catalog directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -52,7 +52,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Director
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Director directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -61,7 +61,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;File
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add File directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -70,7 +70,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Append
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Append directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -79,7 +79,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Mail
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Mail directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -88,7 +88,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;MailOnError
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add MailOnError directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
@@ -97,7 +97,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;MailOnSuccess
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add MailOnSuccess directive ]%>
                </com:TActiveLinkButton>
                </li>
                <li><com:TActiveLinkButton
                        ClientSide.OnComplete="var el = $('#<%=$this->ClientID%>_new_messages').next().find('div.directive'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_messages').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Operator
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Operator directive ]%>
                </com:TActiveLinkButton>
                </li>
        </ul>
index 9d6ce5df176c036c1edfa23ff279c2abc858d2f7..3df83e5e52e3387f815a3791968f16605eb7b70c 100644 (file)
@@ -7,7 +7,7 @@
                        ClientSide.OnComplete="var el = $('#<%=$this->RunscriptItem->ClientID%>').parents('div').find('h3.runscript_options'); BaculaConfig.scroll_to_element(el[el.length-1]);"
                        Attributes.onclick="$(this).closest('div.config_new_runscript').hide();"
                        >
-                       <i class='fa fa-plus'></i> &nbsp;Runscript
+                       <i class='fa fa-plus'></i> &nbsp;<%[ Add Runscript block ]%>
                </com:TActiveLinkButton>
                </li>
        </ul>
index 421b52f696e60cfa20ec9c4c247e40e39828660d..9883bbf09331153661acc658437a7322f0f440ad 100644 (file)
@@ -1,13 +1,13 @@
 <div id="<%=$this->ClientID%>_new_schedule" class="w3-card w3-white w3-padding config_new_schedule left" style="display: none">
        <i class="fa fa-times w3-right" onclick="$('#<%=$this->ClientID%>_new_schedule').hide();" /></i>
-       <ul style="margin-top: 0">
+       <ul class="w3-ul new_element_menu">
                <li><com:TActiveLinkButton
                        ID="RunscriptItem"
                        OnCommand="Parent.SourceTemplateControl.newScheduleDirective"
                        ClientSide.OnComplete="var el = $('#<%=$this->RunscriptItem->ClientID%>').parents('div').find('h2.schedule_options'); BaculaConfig.scroll_to_element(el[el.length-1], -50);"
                        Attributes.onclick="$(this).closest('div.config_new_schedule').hide();"
                        >
-                               <%=$this->SourceTemplateControl->ComponentType == 'dir' ? 'Run' : ($this->SourceTemplateControl->ComponentType == 'fd' ? 'Connect' : '')%>
+                               <i class='fa fa-plus'></i> &nbsp;<%=$this->SourceTemplateControl->ComponentType == 'dir' ? Prado::localize('Add Run directive') : ($this->SourceTemplateControl->ComponentType == 'fd' ? Prado::localize('Add Connect directive') : '')%>
                </com:TActiveLinkButton>
                </li>
        </ul>