baculum: Move refresh job button and log order button to job log tab

diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index 78c10d413792b00ef608e07e403302a047cfabf6..96ab103de507d91d1fb1d0a954abc08dab5f2222 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po
index ceb0b154fcd72427563aecfb6010b27790575a2a..f2ce7046eef5082889dc44ff7539ed8ab7456dea 100644 (file)
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -2392,3 +2392,9 @@ msgstr "Item count:"
 
 msgid "No item result"
 msgstr "No item result"
+
+msgid "Refresh job log"
+msgstr "Refresh job log"
+
+msgid "Set job log order (ascending/descending)"
+msgstr "Set job log order (ascending/descending)"

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

diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po
index a802e4781f26ae252de20444bd3d2904fe987ca4..32b22ec2937455d77d4dbd63eb88ddaec46413cc 100644 (file)
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -2478,3 +2478,9 @@ msgstr "Item count:"
 
 msgid "No item result"
 msgstr "No item result"
+
+msgid "Refresh job log"
+msgstr "Refresh job log"
+
+msgid "Set job log order (ascending/descending)"
+msgstr "Set job log order (ascending/descending)"

diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index 6b5ab56b0eed53c81c950c5c59abdb261532184f..48fd52f633971a7ebcdbf37c12210c0cc69b80e3 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po
index 7607cd8e31552704da923ce731dbe4edff63315e..894d823316819fb329172c8b72cb1942287eef51 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -2399,3 +2399,9 @@ msgstr "Ilość elementów:"
 
 msgid "No item result"
 msgstr "Brak wyniku"
+
+msgid "Refresh job log"
+msgstr "Odśwież dziennik zadania"
+
+msgid "Set job log order (ascending/descending)"
+msgstr "Ustaw kolejność dziennika zadania (rosnąco/malejąco)"

diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index 72cc9295879d454491f0925298db7997ca58e62c..562489f1ce9def7e794fac83b6705e303c54b14b 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po
index 2923475bbd36584a10a3354a1f8bbf8341731cad..814b116cd918ec0dfe89338f05283d571dab3b47 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -2407,3 +2407,9 @@ msgstr "Item count:"
 
 msgid "No item result"
 msgstr "No item result"
+
+msgid "Refresh job log"
+msgstr "Refresh job log"
+
+msgid "Set job log order (ascending/descending)"
+msgstr "Set job log order (ascending/descending)"

diff --git a/gui/baculum/protected/Web/Pages/JobHistoryView.page b/gui/baculum/protected/Web/Pages/JobHistoryView.page
index 386b9983a625142a4927641e76f4f787bc24e56d..9e0f01c2086cce720293a3715ecf435dabfeaf01 100644 (file)
--- a/gui/baculum/protected/Web/Pages/JobHistoryView.page
+++ b/gui/baculum/protected/Web/Pages/JobHistoryView.page
@@ -58,7 +58,6 @@
                >
                        <prop:Text><%=Prado::localize('Delete')%> &nbsp;<i class="fa fa-trash-alt"></i></prop:Text>
                </com:TActiveLinkButton>
-               <button type="button" class="w3-button w3-green w3-margin-bottom" onclick="job_callback_func(true);"><%[ Refresh log ]%> &nbsp;<i class="fa fa-sync"></i></button>
                <com:TActiveLinkButton
                        ID="RestoreBtn"
                        Attributes.onclick="document.location = '<%=$this->Service->constructUrl('RestoreWizard', array('jobid' => $this->getJobId()))%>';"
@@ -67,14 +66,6 @@
                >
                        <%[ Restore ]%> &nbsp;<i class="fa fa-reply"></i>
                </com:TActiveLinkButton>
-               <com:TActiveLinkButton
-                       ID="LogOrderBtn"
-                       CssClass="w3-button w3-green w3-margin-bottom"
-                       OnClick="changeJobLogOrder"
-               >
-                       <%[ Log order ]%> &nbsp;<i class="fa fa-sort-amount-down"></i>
-               </com:TActiveLinkButton>
-               <i id="joblog_loading" class="fa fa-sync w3-spin" style="display: none; vertical-align: super;"></i>
                <div class="w3-panel w3-card w3-light-grey">
                        <h3><%[ Job: ]%> <%=$this->getJobUname()%> &nbsp;
                                <com:TActiveLabel ID="RunningIcon">
@@ -87,14 +78,21 @@
                        <com:TCallback
                                ID="RunningJobStatusCb"
                                OnCallback="runningJobStatus"
-                               ClientSide.OnComplete="oRunningJobStatus.init_refresh();"
+                               ClientSide.OnLoading="oRunningJobStatus.show_loader(true);"
+                               ClientSide.OnComplete="oRunningJobStatus.init_refresh(); oRunningJobStatus.show_loader(false);"
                        />
                        <div class="w3-row">
                                <a href="javascript:void(0)" onclick="W3SubTabs.open('status_running_job_subtab_graphical', 'status_running_job_graphical_output');"<%=!$this->allow_graph_mode ? ' style="display: none"' : ''%>>
-                                       <div id="status_running_job_subtab_graphical" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-border-red w3-padding"><%[ Running job status ]%></div>
+                                       <div id="status_running_job_subtab_graphical" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-border-red w3-padding">
+                                               <%[ Running job status ]%>
+                                               <i id="status_running_job_loading" class="fa fa-sync w3-spin w3-right" style="display: none; vertical-align: super;"></i>
+                                       </div>
                                </a>
                                <a href="javascript:void(0)" onclick="W3SubTabs.open('joblog_subtab_text', 'joblog_text_output');">
-                                       <div id="joblog_subtab_text" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-padding"><%[ Raw job log ]%></div>
+                                       <div id="joblog_subtab_text" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-padding">
+                                               <%[ Raw job log ]%>
+                                               <i id="joblog_loading" class="fa fa-sync w3-spin w3-right" style="display: none; vertical-align: super;"></i>
+                                       </div>
                                </a>
                                <a href="javascript:void(0)" onclick="W3SubTabs.open('jobfiles_subtab_text', 'jobfiles_list'); load_job_list_files();"<%=!$this->allow_list_files_mode ? ' style="display: none"' : ''%>>
                                        <div id="jobfiles_subtab_text" class="subtab_btn w3-half w3-bottombar w3-hover-light-grey w3-padding"><%[ Job files ]%></div>
@@ -120,6 +118,7 @@ var oRunningJobStatus = {
        data: {},
        refresh_timeout: null,
        ids: {
+               loader: 'status_running_job_loading',
                running_job: 'status_running_job',
                refresh_interval: 'status_running_job_refresh_interval',
                status_not_supported: 'status_running_job_status_not_supported',
@@ -373,6 +372,9 @@ var oRunningJobStatus = {
                        W3SubTabs.open('joblog_subtab_text', 'joblog_text_output');
                }
                return supported;
+       },
+       show_loader: function(show) {
+               document.getElementById(this.ids.loader).style.display = (show === true ? '' : 'none');
        }
 }
 
@@ -407,6 +409,17 @@ $(function() {
                                </prop:FalseTemplate>
                        </com:TConditional>
                        <div id="joblog_text_output" class="subtab_item" style="display: none">
+                               <div class="w3-right w3-margin-top w3-margin-right" title="<%[ Refresh job log ]%>">
+                                       <a href="javascript:void(0)"class="w3-margin-bottom raw" onclick="job_callback_func(true);"><%[ Refresh log ]%> &nbsp;<i class="fa fa-sync"></i></a>
+                               </div>
+                               <com:TActiveLinkButton
+                                       ID="LogOrderBtn"
+                                       CssClass="w3-margin-top w3-margin-right w3-right raw"
+                                       OnClick="changeJobLogOrder"
+                                       Attributes.title="<%[ Set job log order (ascending/descending) ]%>"
+                               >
+                                       <%[ Log order ]%> &nbsp;<i class="fa fa-sort-amount-down"></i>
+                               </com:TActiveLinkButton>
                                <div class="w3-code">
                                        <pre><com:TActiveLabel ID="JobLog" /></pre>
                                </div>

diff --git a/gui/baculum/themes/Baculum-v2/css/baculum.css b/gui/baculum/themes/Baculum-v2/css/baculum.css
index b01035364e4094b21f106b735adf055e3290c71e..2b03ebedc4dfc2737cd9cb9b973a68a02576d150 100644 (file)
--- a/gui/baculum/themes/Baculum-v2/css/baculum.css
+++ b/gui/baculum/themes/Baculum-v2/css/baculum.css
@@ -266,3 +266,7 @@ table.status_table td, table.status_table td i {
 .smallbox {
        width: 160px;
 }
+
+a.raw {
+       text-decoration: none;
+}