From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 30 Oct 2019 06:03:31 +0000 (+0100)
Subject: baculum: Move refresh job button and log order button to job log tab
X-Git-Tag: Release-9.6.0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=597d99af0a5aeccb264a441457dd3492b97d847f;p=thirdparty%2Fbacula.git

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 78c10d413..96ab103de 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 ceb0b154f..f2ce7046e 100644
--- 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 b94432bc4..e33f848f2 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 a802e4781..32b22ec29 100644
--- 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 6b5ab56b0..48fd52f63 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 7607cd8e3..894d82331 100644
--- 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 72cc92958..562489f1c 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 2923475bb..814b116cd 100644
--- 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 386b9983a..9e0f01c20 100644
--- 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 b01035364..2b03ebedc 100644
--- 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;
+}