]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Implement ideas and fixes proposed by Wanderlei Huttel
authorMarcin Haba <marcin.haba@bacula.pl>
Thu, 26 Jul 2018 05:31:34 +0000 (07:31 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Thu, 26 Jul 2018 05:31:34 +0000 (07:31 +0200)
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

27 files changed:
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/Pages/ApplicationSettings.page
gui/baculum/protected/Web/Pages/ClientList.page
gui/baculum/protected/Web/Pages/ClientView.page
gui/baculum/protected/Web/Pages/Dashboard.page
gui/baculum/protected/Web/Pages/FileSetList.page
gui/baculum/protected/Web/Pages/JobHistoryList.page
gui/baculum/protected/Web/Pages/JobList.page
gui/baculum/protected/Web/Pages/PoolList.page
gui/baculum/protected/Web/Pages/PoolView.page
gui/baculum/protected/Web/Pages/RestoreWizard.page
gui/baculum/protected/Web/Pages/ScheduleList.page
gui/baculum/protected/Web/Pages/StorageList.page
gui/baculum/protected/Web/Pages/VolumeList.page
gui/baculum/protected/Web/Pages/VolumeView.page
gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.tpl
gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
gui/baculum/protected/Web/Portlets/MainSideBar.tpl
gui/baculum/themes/Baculum-v2/css/baculum.css

index e73c7965a39945c6aaa1e496fc181f40558bdb98..ef485bb2b72b0046833999c681146939555ac296 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 e43bb2a0b6e4188b7b71733a3eb94b8729571ccb..fe3bbd932205311f0d791bd98cf74f66e32a21c4 100644 (file)
@@ -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"
index 03e9b0b3b14ef521313b0d91e4e6f4f8cde25a7c..b2e7a791537e24ebd9f2e8411cce2e0dc5eaaa44 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 cbcc9e211cdb5b31136a3c9595ba2ac70795fd10..ddea82e883b69e0c04c8a8e9cfa8c9bae9a1a846 100644 (file)
@@ -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"
index e775dea757732849b7144f5f30556d36dc932af0..c3942485a33554516484bd4bdcc5f5b3f5146c6c 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 48f0dc1f8d4f76bb7d305e6446d7373e80e4bf5b..ac06df7492eb6480bab3230efaf9c36b51d35870 100644 (file)
@@ -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"
index e61d1319cec6768de83c7e59b1ebcec10aecf041..6a990f4efe4e713187b63b2d60fbddffe6225abb 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 d2dfd13f4b28443a9a05fd353b4ff78aa3dd0986..51851d79b4d5e51995193678591f05337fbd4c54 100644 (file)
@@ -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"
index be15173517191cfefd6aa680fcd8ef7ec0f28898..cfd7f057c50cb199e3158a231714eab1af374623 100644 (file)
@@ -64,7 +64,7 @@
                <div class="w3-modal-content w3-card-4 w3-animate-zoom w3-padding" style="max-width: 600px">
                        <span onclick="document.getElementById('debug_confirm').style.display='none'" class="w3-button w3-xlarge w3-hover-red w3-display-topright">&times;</span>
                        <h4><%[ Enable debug ]%></h4>
-                       <p>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?</p>
+                       <p><%[ 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? ]%></p>
                        <div class="w3-center">
                                <button class="w3-button w3-red" type="button" onclick="document.getElementById('<%=$this->Debug->ClientID%>').checked = false; document.getElementById('debug_confirm').style.display='none'"><i class="fa fa-times"></i> &nbsp;<%[ No ]%></button>
                                <button class="w3-button w3-green" type="button" onclick="document.getElementById('debug_confirm').style.display='none'"><i class="fa fa-check"></i> &nbsp;<%[ Yes ]%></button>
index 6fbaefd21611fb2a4f3fb94adee9b7f6385490f0..ecb1c9c6ca9a771ed927ee3202a98b929c363ef8 100644 (file)
@@ -108,6 +108,10 @@ var oClientList = {
                                className: 'control',
                                orderable: false,
                                targets: 0
+                       },
+                       {
+                               className: "dt-center",
+                               targets: [ 1, 4, 5, 6, 7 ]
                        }],
                        order: [2, 'asc']
                });
index b8ea4320b4359a122745736e6243ba84ef9b80ff..15ae5585d933cdf13d60a0b9e25312c40c797378 100644 (file)
@@ -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']
                });
index f37e399996b60eb4c92b7be2f8aa3993c51ee079..9d5cd107bccb7e50e6f1dc039885ea9d37f54883 100644 (file)
@@ -98,7 +98,7 @@
                                </table>
                                <button type="button" class="w3-button w3-dark-grey w3-right w3-margin-bottom" onclick="document.location.href='<%=$this->Service->constructUrl('JobHistoryList')%>'"><%[ More jobs ]%> &nbsp;<i class="fa fa-arrow-right"></i></button>
                                <div class="w3-clear"></div>
-                               <div class="w3-container w3-blue w3-half w3-center w3-padding-16">
+                               <div class="w3-container w3-blue w3-third w3-center w3-padding-16 w3-margin-right">
                                        <com:TActiveLinkButton
                                                OnClick="loadRunJobModal"
                                                Attributes.onclick="document.getElementById('run_job').style.display='block'"
                                                <h1><%[ Run job ]%>  <i class="fa fa-play w3-xlarge"></i></h1>
                                        </com:TActiveLinkButton>
                                </div>
-                               <div class="w3-container w3-blue w3-half w3-center w3-padding-16">
+                               <div class="w3-container w3-blue w3-rest w3-center w3-padding-16">
                                        <a href="<%=$this->Service->constructUrl('RestoreWizard')%>" style="text-decoration: none"><h1><%[ Perform restore ]%>  <i class="fa fa-reply w3-xlarge"></i></h1></a>
                                </div>
                                <com:Application.Web.Portlets.RunJob ID="RunJobModal" />
index 55c962d434c12609728bb72b3eadfe4901504558..ee43ecaa67b430840445748715fb2fc91cd6fb6d 100644 (file)
@@ -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']
                });
index ec0e19d16db3c9bd7e6f96fe63724bd889214f26..36a1e1dbbcc9d0e6e87522907badbf0bf0b09627 100644 (file)
@@ -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']
                });
index 451573b3c35a4b7bd14f98ad60ce5c167e06718e..4e95b9f68d88040671b87aedada4dda43d5e5a50 100644 (file)
@@ -3,7 +3,7 @@
        <!-- Header -->
        <header class="w3-container">
                <h5>
-                       <b><i class="fa fa-tasks"></i> <%[ Job history list ]%></b>
+                       <b><i class="fa fa-tasks"></i> <%[ Job list ]%></b>
                </h5>
        </header>
        <div class="w3-margin-left w3-margin-bottom">
@@ -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']
                });
index 3ddbf6e1cb4af3b1f58a98ffeb866be84b1fa68e..5e5fb73d507083a2f1772ba2762b8db963958c36 100644 (file)
@@ -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']
                });
index c085a39fd639484677c8d9da752af3befcee1641..47094ff0de57a70c343d6fffe4da49d041115157 100644 (file)
@@ -41,7 +41,7 @@
                </com:TActiveLinkButton>
                <i id="status_pool_loading" class="fa fa-sync w3-spin" style="display: none; vertical-align: super;"></i>
                <div class="w3-row">
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+                       <div class="w3-card w3-quarter w3-padding w3-margin-right details_card">
                                <h4><%[ Limits ]%></h4>
                                <table style="width: 90%">
                                        <tr>
@@ -66,7 +66,7 @@
                                        </tr>
                                </table>
                        </div>
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+                       <div class="w3-card w3-quarter w3-padding w3-margin-right details_card">
                                <h4><%[ Recycling ]%></h4>
                                <table style="width: 90%">
                                        <tr>
@@ -87,7 +87,7 @@
                                        </tr>
                                </table>
                        </div>
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+                       <div class="w3-card w3-quarter w3-padding w3-margin-right details_card">
                                <h4><%[ Options ]%></h4>
                                <table style="width: 90%">
                                        <tr>
@@ -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']
                });
index 00dac6284c1150bdd43e94a3f52edd08d1916a30..772995e793d6ec1daf3e4d4e29ffb8ea5eb7d251 100644 (file)
@@ -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']
                });
index b794eb612c88b3e8f654c18c43671058a15a6131..d3b2946348ef9bd8d476d60147edcc341ac9287e 100644 (file)
@@ -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']
                });
index 35268fc70d1e69faba7b6b478d1c8dc442b65147..f5f8975c69b8632f259d34362d3a6522c336e919 100644 (file)
@@ -81,6 +81,10 @@ var oStorageList = {
                                className: 'control',
                                orderable: false,
                                targets: 0
+                       },
+                       {
+                               className: "dt-center",
+                               targets: [ 1, 3, 4 ]
                        }],
                        order: [1, 'asc']
                });
index be2c523147686fe1c86fd5df265f9cf6658fc709..f453ccf2e0a80596d55630d2bf259089f4264351 100644 (file)
@@ -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']
                });
index 278efb8b650b815114a410c5493ba3148066dbc2..c3db559edf90286e0abec3b620cfdcc4b4b11099 100644 (file)
@@ -35,8 +35,8 @@
                                <pre><com:TActiveLabel ID="VolumeActionLog" /></pre>
                        </div>
                </div>
-               <div class="w3-row">
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+               <div class="w3-row" style="display: flex; flex-wrap: wrap;">
+                       <div class="w3-card w3-padding w3-margin-right w3-margin-bottom details_card">
                                <h4><%[ Limits ]%></h4>
                                <table style="width: 90%">
                                        <tr>
@@ -57,7 +57,7 @@
                                        </tr>
                                </table>
                        </div>
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+                       <div class="w3-card w3-padding w3-margin-right w3-margin-bottom details_card">
                                <h4><%[ Recycling ]%></h4>
                                <table style="width: 90%">
                                        <tr>
@@ -78,7 +78,7 @@
                                        </tr>
                                </table>
                        </div>
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+                       <div class="w3-card w3-padding w3-margin-right w3-margin-bottom details_card">
                                <h4><%[ Options ]%></h4>
                                <table style="width: 90%">
                                        <tr>
                                        </tr>
                                </table>
                        </div>
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+                       <div class="w3-card w3-padding w3-margin-right w3-margin-bottom details_card">
                                <h4><%[ Writing ]%></h4>
                                <table style="width: 100%">
                                        <tr>
                                        </tr>
                                </table>
                        </div>
-                       <div class="w3-card w3-quarter w3-padding w3-margin-right" style="min-height: 200px">
+                       <div class="w3-card w3-padding w3-margin-right w3-margin-bottom details_card">
                                <h4><%[ Status ]%></h4>
                                <table style="width: 100%">
                                        <tr>
@@ -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']
                });
index 425fc6450d5963a0ddea7b5a7a198ef0b823aabd..5367cc5b69af266c2ca26b6db198f0eec9078d10 100644 (file)
@@ -18,7 +18,7 @@
                                                        <i class="fa fa-sync w3-spin" style="display: none"><i/>
                                                </td>
                                                <td class="right" style="width: 20%">
-                                                       <a class="w3-button w3-green w3-right" href="javascript:void(0)" onmousedown="openElementOnCursor(event, '<%=$this->ResourcesMenu->ClientID%>_new_resource', -80, 20);"><i class="fa fa-plus"></i> &nbsp;<%[ Add ]%></a>
+                                                       <a class="w3-button w3-green w3-right button_fixed" href="javascript:void(0)" onmousedown="openElementOnCursor(event, '<%=$this->ResourcesMenu->ClientID%>_new_resource', -80, 20);"><i class="fa fa-plus"></i> &nbsp;<%[ Add ]%></a>
                                                        <com:Application.Web.Portlets.NewResourceMenu ID="ResourcesMenu" />
                                                </td>
                                        </tr>
index 4d6da117bb3aaae7e0afe8062430793cb93e30bf..2d661dbebc5d0795537861b4dda48d9aef388c2f 100644 (file)
@@ -15,7 +15,7 @@
                        <com:TActiveLinkButton
                                ID="RemoveResource"
                                OnCommand="SourceTemplateControl.removeResource"
-                               CssClass="w3-button w3-green"
+                               CssClass="w3-button w3-green button_fixed"
                                Visible="<%=$this->ShowRemoveButton && $this->LoadValues%>"
                                Attributes.onclick="$(this).closest('div.resource_remove_confirm').hide();"
                        >
index b2283c1b516cfd16b730f4f57edd5bef27a683e6..192b6260e079c9a138dcb2eff699f2f20f68bead 100644 (file)
@@ -42,7 +42,7 @@
                                                        <com:TActiveLinkButton
                                                                ID="RemoveResource"
                                                                OnCommand="SourceTemplateControl.removeResource"
-                                                               CssClass="action_link w3-button w3-green w3-right"
+                                                               CssClass="action_link w3-button w3-green w3-right button_fixed"
                                                        >
                                                        <prop:ClientSide.OnComplete>
                                                                var vid = '<%=$this->SourceTemplateControl->RemoveResourceError->ClientId%>';
@@ -59,7 +59,7 @@
                                                </td>
                                        </tr>
                                </table>
-                               <div class="config_directives" style="display: none">
+                               <div class="config_directives w3-khaki" style="display: none">
                                <com:Application.Web.Portlets.BaculaConfigDirectives
                                        Resource="<%#$this->Data['resource_name']%>"
                                        LoadValues="<%=true%>"
index 2d8ddaac3f973f95c48330b2c671b1a9e66ef6e5..b0ea46e64d0c771e5e4da86a69406531b6b481ab 100644 (file)
@@ -23,7 +23,7 @@
                <h5>Baculum Menu</h5>
        </div>
        <div class="w3-bar-block" style="margin-bottom: 45px;">
-               <a href="#" class="w3-bar-item w3-button w3-padding-16 w3-black w3-hover-black" onclick="W3SideBar.close(); return false;" title="close menu">  Close Menu <i class="fa fa-window-close fa-fw w3-right w3-xlarge"></i></a>
+               <a href="#" class="w3-bar-item w3-button w3-padding-16 w3-black w3-hover-black" onclick="W3SideBar.close(); return false;" title="close menu">  <%[ Close Menu ]%> <i class="fa fa-window-close fa-fw w3-right w3-xlarge"></i></a>
                <a href="<%=$this->Service->constructUrl('Dashboard')%>" class="w3-bar-item w3-button w3-padding<%=$this->Service->getRequestedPagePath() == 'Dashboard' ? ' w3-blue': ''%>"><i class="fa fa-tachometer-alt fa-fw"></i>  <%[ Dashboard ]%></a>
                <a href="<%=$this->Service->constructUrl('JobHistoryList')%>" class="w3-bar-item w3-button w3-padding<%=in_array($this->Service->getRequestedPagePath(), array('JobHistoryList', 'JobHistoryView')) ? ' w3-blue': ''%>"><i class="fa fa-history fa-fw"></i>  <%[ Job history ]%></a>
                <a href="<%=$this->Service->constructUrl('JobList')%>" class="w3-bar-item w3-button w3-padding<%=in_array($this->Service->getRequestedPagePath(), array('JobList', 'JobView')) ? ' w3-blue': ''%>"><i class="fa fa-tasks fa-fw"></i>  <%[ Jobs ]%></a>
index 3fbedd19c5e0f3cda115252fabb93782a3a6ed08..675ec098b296c496c45f6d1c02b7176ddff48de5 100644 (file)
@@ -95,3 +95,26 @@ div.directive_value svg {
 div.directive_value:hover svg.reset_btn, div.directive_value:hover svg.remove_btn {
        display: inline;
 }
+
+div.details_card {
+       min-height: 200px;
+}
+
+@media screen and (max-width: 620px) {
+       div.details_card {
+               width: 100%;
+       }
+}
+@media screen and (min-width: 621px) {
+       div.details_card {
+               width: 270px;
+       }
+}
+
+.button_fixed {
+       min-width: 125px;
+}
+
+div.config_directives {
+       padding: 10px;
+}