From 87108179780719f2f03fe45ee369e1596e1f0c7e Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 28 Nov 2015 11:16:37 +0100
Subject: [PATCH] baculum: Split configuration windows into two tabs: actions
 and console

---
 .../JavaScript/configuration-window.js        |  33 ++
 gui/baculum/protected/Lang/en/messages.mo     | Bin 26828 -> 26860 bytes
 gui/baculum/protected/Lang/en/messages.po     |   3 +
 gui/baculum/protected/Lang/pl/messages.mo     | Bin 28957 -> 28987 bytes
 gui/baculum/protected/Lang/pl/messages.po     |   3 +
 .../Portlets/ClientConfiguration.tpl          | 101 +++---
 .../protected/Portlets/JobConfiguration.php   |   7 +
 .../protected/Portlets/JobConfiguration.tpl   | 325 ++++++++++--------
 .../Portlets/JobRunConfiguration.tpl          | 264 +++++++-------
 .../Portlets/StorageConfiguration.php         |   9 +-
 .../Portlets/StorageConfiguration.tpl         |  93 +++--
 gui/baculum/themes/Baculum-v1/style.css       |  39 ++-
 12 files changed, 530 insertions(+), 347 deletions(-)

diff --git a/gui/baculum/protected/JavaScript/configuration-window.js b/gui/baculum/protected/JavaScript/configuration-window.js
index dbbe28268d..cd4ff3fb3a 100644
--- a/gui/baculum/protected/JavaScript/configuration-window.js
+++ b/gui/baculum/protected/JavaScript/configuration-window.js
@@ -13,6 +13,7 @@ var ConfigurationWindowClass = new Class.create({
 
 	show: function() {
 		this.hideAll();
+		this.initTabs();
 		$(this.window_id).setStyle({'display' : 'block'});
 		$$('div[id=' + this.window_id + '] input[type="submit"]').each(function(el) {
 			el.observe('click', function() {
@@ -60,6 +61,38 @@ var ConfigurationWindowClass = new Class.create({
 	is_progress: function() {
 		return $(this.progress_id).getStyle('display') == 'block';
 	},
+
+	initTabs: function() {
+		var show_elements = [];
+		var element;
+		var tabs = $$('div[id=' + this.window_id + '] span.tab');
+		tabs.each(function(el) {
+			element = el.readAttribute('rel');
+			show_elements.push($(element));
+			el.observe('click', function() {
+				show_elements.invoke('hide');
+				tabs.invoke('removeClassName', 'tab_active');
+				el.addClassName('tab_active');
+				var show_el = $(el.readAttribute('rel'));
+				$(show_el).show();
+			}.bind(this));
+		}.bind(this));
+	},
+
+	switchTab: function(tab_rel) {
+		var tabs = $$('div[id=' + this.window_id + '] span.tab');
+		tabs.each(function(el) {
+			element = el.readAttribute('rel');
+			if (element == tab_rel) {
+				el.addClassName('tab_active');
+			} else {
+				el.removeClassName('tab_active');
+			}
+			$(element).hide();
+		});
+		$(tab_rel).show();
+	},
+
 	openConfigurationWindow: function(slideWindowObj) {
 		if(this.is_progress() === false) {
 			this.progress(true);
diff --git a/gui/baculum/protected/Lang/en/messages.mo b/gui/baculum/protected/Lang/en/messages.mo
index e7d19e89dd9b755eeb018492331dd8e14380b00c..52ab131e484da7f1ced9af2f0e6186a22c76b707 100644
GIT binary patch
delta 7294
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
ZBgft|VbjAYUuONkytc%qKfCTr`yVu7@vr~@

delta 7259
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

diff --git a/gui/baculum/protected/Lang/en/messages.po b/gui/baculum/protected/Lang/en/messages.po
index 84dd8cb876..4d5d1c4e28 100644
--- a/gui/baculum/protected/Lang/en/messages.po
+++ b/gui/baculum/protected/Lang/en/messages.po
@@ -1013,3 +1013,6 @@ msgstr "Finished jobs:"
 msgid "Add"
 msgstr "Add"
 
+msgid "Actions"
+msgstr "Actions"
+
diff --git a/gui/baculum/protected/Lang/pl/messages.mo b/gui/baculum/protected/Lang/pl/messages.mo
index d6f894677936e7eccbcc62883a072e9221d858af..b83bca1bed863d26169db876c4c921e36f887eea 100644
GIT binary patch
delta 7288
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
Ods@kiss*_l)Bga)2m87J

delta 7259
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

diff --git a/gui/baculum/protected/Lang/pl/messages.po b/gui/baculum/protected/Lang/pl/messages.po
index 761e21bf98..13a8987db3 100644
--- a/gui/baculum/protected/Lang/pl/messages.po
+++ b/gui/baculum/protected/Lang/pl/messages.po
@@ -1014,3 +1014,6 @@ msgstr "Zakończone zadania:"
 msgid "Add"
 msgstr "Dodaj"
 
+msgid "Actions"
+msgstr "Akcje"
+
diff --git a/gui/baculum/protected/Portlets/ClientConfiguration.tpl b/gui/baculum/protected/Portlets/ClientConfiguration.tpl
index 0660892bd4..6bf974ea4a 100644
--- a/gui/baculum/protected/Portlets/ClientConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/ClientConfiguration.tpl
@@ -1,53 +1,66 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
 	<com:TActivePanel DefaultButton="Apply">
-		<strong><%[ Client name: ]%> <com:TActiveLabel ID="ClientName" /><com:TActiveLabel ID="ClientIdentifier" Visible="false" /></strong><br />
-		<com:TActiveLabel ID="ClientDescription" Style="font-style: italic; font-size: 12px"/>
-		<hr />
-		<com:TValidationSummary
-			ID="ValidationSummary"
-			CssClass="validation-error-summary"
-			ValidationGroup="ClientGroup"
-			AutoUpdate="true"
-			Display="Dynamic"
-			HeaderText="<%[ There is not possible to run selected action because: ]%>" />
-		<div class="text small"><%[ Console status ]%></div>
-		<div class="field-full" style="min-height: 172px">
-			<com:TActiveTextBox ID="ShowClient" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 162px; font-size: 11px;" ReadOnly="true" />
-		</div>
-		<div class="button">
-			<com:BActiveButton ID="Status" Text="<%[ Status ]%>" ClientSide.OnSuccess="ConfigurationWindow.getObj('ClientWindow').progress(false);" OnClick="status" />
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="FileRetention" Text="<%[ File retention (in days): ]%>" /></div>
-			<div class="field">
-				<com:TActiveTextBox ID="FileRetention" MaxLength="14" AutoPostBack="false" CssClass="textbox-auto" Text="" />
-				<com:TActiveCustomValidator ID="FileRetentionValidator" ValidationGroup="ClientGroup" ControlToValidate="FileRetention" ErrorMessage="<%[ File retention value must be positive integer or zero. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="fileRetentionValidator" />
+		<h4><%[ Client name: ]%> <com:TActiveLabel ID="ClientName" /><com:TActiveLabel ID="ClientIdentifier" Visible="false" /></h4>
+		<com:TActiveLabel ID="ClientDescription" CssClass="description" />
+		<span class="text tab tab_active" rel="client_actions_tab"><%[ Actions ]%></span>
+		<span class="text tab" rel="client_console_tab"><%[ Console status ]%></span>
+		<hr class="tabs" />
+		<div id="client_actions_tab">
+			<com:TValidationSummary
+				ID="ValidationSummary"
+				CssClass="validation-error-summary"
+				ValidationGroup="ClientGroup"
+				AutoUpdate="true"
+				Display="Dynamic"
+				HeaderText="<%[ There is not possible to run selected action because: ]%>" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="FileRetention" Text="<%[ File retention (in days): ]%>" /></div>
+				<div class="field">
+					<com:TActiveTextBox ID="FileRetention" MaxLength="14" AutoPostBack="false" CssClass="textbox-auto" Text="" />
+					<com:TActiveCustomValidator ID="FileRetentionValidator" ValidationGroup="ClientGroup" ControlToValidate="FileRetention" ErrorMessage="<%[ File retention value must be positive integer or zero. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="fileRetentionValidator" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="JobRetention" Text="<%[ Job retention (in days): ]%>" /></div>
-			<div class="field">
-				<com:TActiveTextBox ID="JobRetention" MaxLength="14" AutoPostBack="false" CssClass="textbox-auto" Text="" />
-				<com:TActiveCustomValidator ID="JobRetentionValidator" ValidationGroup="ClientGroup" ControlToValidate="JobRetention" ErrorMessage="<%[ Job retention value must be positive integer or zero. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="jobRetentionValidator" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="JobRetention" Text="<%[ Job retention (in days): ]%>" /></div>
+				<div class="field">
+					<com:TActiveTextBox ID="JobRetention" MaxLength="14" AutoPostBack="false" CssClass="textbox-auto" Text="" />
+					<com:TActiveCustomValidator ID="JobRetentionValidator" ValidationGroup="ClientGroup" ControlToValidate="JobRetention" ErrorMessage="<%[ Job retention value must be positive integer or zero. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="jobRetentionValidator" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="AutoPrune" Text="<%[ AutoPrune: ]%>" /></div>
-			<div class="field"><com:TActiveCheckBox ID="AutoPrune" AutoPostBack="false" /></div>
-		</div>
-		<com:TCallback ID="ReloadClients" OnCallback="Page.ClientWindow.prepareData" ClientSide.OnComplete="SlideWindow.getObj('ClientWindow').setLoadRequest();" />
-		<script type="text/javascript">
-			var client_callback_func = function() {
-				var mainForm = Prado.Validation.getForm();
-				var callback = <%=$this->ReloadClients->ActiveControl->Javascript%>;
-				if (Prado.Validation.managers[mainForm].getValidatorsWithError('ClientGroup').length == 0) {
-					callback.dispatch();
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="AutoPrune" Text="<%[ AutoPrune: ]%>" /></div>
+				<div class="field"><com:TActiveCheckBox ID="AutoPrune" AutoPostBack="false" /></div>
+			</div>
+			<com:TCallback ID="ReloadClients" OnCallback="Page.ClientWindow.prepareData" ClientSide.OnComplete="SlideWindow.getObj('ClientWindow').setLoadRequest();" />
+			<script type="text/javascript">
+				var client_callback_func = function() {
+					var mainForm = Prado.Validation.getForm();
+					var callback = <%=$this->ReloadClients->ActiveControl->Javascript%>;
+					if (Prado.Validation.managers[mainForm].getValidatorsWithError('ClientGroup').length == 0) {
+						callback.dispatch();
+					}
 				}
-			}
-		</script>
-		<div class="button">
-			<com:BActiveButton ValidationGroup="ClientGroup" OnClick="apply" CausesValidation="true" ID="Apply" Text="<%[ Apply ]%>" ClientSide.OnSuccess="ConfigurationWindow.getObj('ClientWindow').progress(false);client_callback_func();" />
+			</script>
+			<div class="button">
+				<com:BActiveButton ID="Status" Text="<%[ Status ]%>" OnClick="status">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('ClientWindow').progress(false);
+						ConfigurationWindow.getObj('ClientWindow').switchTab('client_console_tab');
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+				<com:BActiveButton ValidationGroup="ClientGroup" OnClick="apply" CausesValidation="true" ID="Apply" Text="<%[ Apply ]%>">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('ClientWindow').progress(false);
+						client_callback_func();
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+			</div>
+		</div>
+		<div id="client_console_tab" style="display: none">
+			<div class="field-full">
+				<com:TActiveTextBox ID="ShowClient" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 475px" ReadOnly="true" />
+			</div>
 		</div>
 	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/JobConfiguration.php b/gui/baculum/protected/Portlets/JobConfiguration.php
index 061db24313..0be1ad5c71 100644
--- a/gui/baculum/protected/Portlets/JobConfiguration.php
+++ b/gui/baculum/protected/Portlets/JobConfiguration.php
@@ -113,6 +113,9 @@ class JobConfiguration extends Portlets {
 		$this->Priority->Text = ($jobdata->priorjobid == 0) ? self::DEFAULT_JOB_PRIORITY : $jobdata->priorjobid;
 		$this->DeleteButton->Visible = true;
 		$this->CancelButton->Visible = $this->RefreshStart->Value = in_array($jobdata->jobstatus, $runningJobStates);
+		$this->Run->Display = 'Dynamic';
+		$this->EstimateLine->Display = 'Dynamic';
+		$this->Status->Visible = true;
 	}
 
 	public function status($sender, $param) {
@@ -131,12 +134,16 @@ class JobConfiguration extends Portlets {
 
 	public function delete($sender, $param) {
 		$this->Application->getModule('api')->remove(array('jobs', $this->JobID->Text));
+		$this->Status->Visible = false;
+		$this->Run->Display = 'None';
 		$this->DeleteButton->Visible = false;
+		$this->EstimateLine->Display = 'None';
 	}
 
 	public function cancel($sender, $param) {
 		$this->Application->getModule('api')->set(array('jobs', 'cancel', $this->JobID->Text), array('a' => 'b'));
 		$this->CancelButton->Visible = false;
+		$this->status(null, null);
 	}
 
 	public function run_again($sender, $param) {
diff --git a/gui/baculum/protected/Portlets/JobConfiguration.tpl b/gui/baculum/protected/Portlets/JobConfiguration.tpl
index 2d0d73df8f..71e78dbe57 100644
--- a/gui/baculum/protected/Portlets/JobConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/JobConfiguration.tpl
@@ -1,164 +1,201 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
 	<com:TActivePanel DefaultButton="Run">
-		<strong><%[ Job name: ]%> <com:TActiveLabel ID="JobName" /><com:TActiveLabel ID="JobID" Visible="false" /></strong>
-		<hr />
-		<com:TValidationSummary
-			ID="ValidationSummary"
-			CssClass="validation-error-summary"
-			ValidationGroup="JobGroup"
-			AutoUpdate="true"
-			Display="Dynamic"
-			/>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Level" Text="<%[ Level: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Level" AutoPostBack="false" CssClass="textbox-auto">
-					<prop:Attributes.onchange>
-						var job_to_verify = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
-						var verify_options = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
-						var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
-						var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
-						var accurate = $('<%=$this->AccurateLine->ClientID%>');
-						var estimate = $('<%=$this->EstimateLine->ClientID%>');
-						var verify_current_opt = $('<%=$this->JobToVerifyOptions->ClientID%>').value;
-						if(/^(<%=implode('|', $this->jobToVerify)%>)$/.test(this.value)) {
-							accurate.hide();
-							estimate.hide();
-							verify_options.show();
-							job_to_verify.show();
-							if (verify_current_opt == 'jobid') {
+		<h4><%[ Job name: ]%> <com:TActiveLabel ID="JobName" /><com:TActiveLabel ID="JobID" Visible="false" /></h4>
+		<span class="text tab tab_active" rel="job_actions_tab"><%[ Actions ]%></span>
+		<span class="text tab" rel="job_console_tab"><%[ Console status ]%></span>
+		<hr class="tabs" />
+		<div id="job_actions_tab">
+			<com:TValidationSummary
+				ID="ValidationSummary"
+				CssClass="validation-error-summary"
+				ValidationGroup="JobGroup"
+				AutoUpdate="true"
+				Display="Dynamic"
+				/>
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Level" Text="<%[ Level: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Level" AutoPostBack="false" CssClass="textbox-auto">
+						<prop:Attributes.onchange>
+							var job_to_verify = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
+							var verify_options = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
+							var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
+							var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
+							var accurate = $('<%=$this->AccurateLine->ClientID%>');
+							var estimate = $('<%=$this->EstimateLine->ClientID%>');
+							var verify_current_opt = $('<%=$this->JobToVerifyOptions->ClientID%>').value;
+							if(/^(<%=implode('|', $this->jobToVerify)%>)$/.test(this.value)) {
+								accurate.hide();
+								estimate.hide();
+								verify_options.show();
+								job_to_verify.show();
+								if (verify_current_opt == 'jobid') {
+									verify_by_job_name.hide();
+									verify_by_jobid.show();
+								} else if (verify_current_opt == 'jobname') {
+									verify_by_job_name.show();
+									verify_by_jobid.hide();
+								}
+							} else if (job_to_verify.visible()) {
+								job_to_verify.hide();
+								verify_options.hide();
 								verify_by_job_name.hide();
-								verify_by_jobid.show();
-							} else if (verify_current_opt == 'jobname') {
-								verify_by_job_name.show();
 								verify_by_jobid.hide();
+								accurate.show();
+								estimate.show();
 							}
-						} else if (job_to_verify.visible()) {
-							job_to_verify.hide();
-							verify_options.hide();
-							verify_by_job_name.hide();
-							verify_by_jobid.hide();
-							accurate.show();
-							estimate.show();
-						}
-					</prop:Attributes.onchange>
-				</com:TActiveDropDownList>
-			</div>
-		</div>
-		<com:TActivePanel ID="JobToVerifyOptionsLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="JobToVerifyOptions" Text="<%[ Verify option: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="JobToVerifyOptions" AutoPostBack="false" CssClass="textbox-auto">
-					<prop:Attributes.onchange>
-						var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
-						var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
-						if (this.value == 'jobname') {
-							verify_by_jobid.hide();
-							verify_by_job_name.show();
-						} else if (this.value == 'jobid') {
-							verify_by_job_name.hide();
-							verify_by_jobid.show();
-						} else {
-							verify_by_job_name.hide();
-							verify_by_jobid.hide();
-						}
-					</prop:Attributes.onchange>
-				</com:TActiveDropDownList>
+						</prop:Attributes.onchange>
+					</com:TActiveDropDownList>
+				</div>
 			</div>
-		</com:TActivePanel>
-		<com:TActivePanel ID="JobToVerifyJobNameLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="JobToVerifyJobName" Text="<%[ Job to Verify: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="JobToVerifyJobName" AutoPostBack="false" CssClass="textbox-auto" />
-			</div>
-		</com:TActivePanel>
-		<com:TActivePanel ID="JobToVerifyJobIdLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="JobToVerifyJobId" Text="<%[ JobId to Verify: ]%>" /></div>
-			<div class="field">
-				<com:TActiveTextBox ID="JobToVerifyJobId" CssClass="textbox-auto" AutoPostBack="false" />
-				<com:TActiveCustomValidator ID="JobToVerifyJobIdValidator" ValidationGroup="JobGroup" ControlToValidate="JobToVerifyJobId" ErrorMessage="<%[ JobId to Verify value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="jobIdToVerifyValidator" />
+			<com:TActivePanel ID="JobToVerifyOptionsLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="JobToVerifyOptions" Text="<%[ Verify option: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="JobToVerifyOptions" AutoPostBack="false" CssClass="textbox-auto">
+						<prop:Attributes.onchange>
+							var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
+							var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
+							if (this.value == 'jobname') {
+								verify_by_jobid.hide();
+								verify_by_job_name.show();
+							} else if (this.value == 'jobid') {
+								verify_by_job_name.hide();
+								verify_by_jobid.show();
+							} else {
+								verify_by_job_name.hide();
+								verify_by_jobid.hide();
+							}
+						</prop:Attributes.onchange>
+					</com:TActiveDropDownList>
+				</div>
+			</com:TActivePanel>
+			<com:TActivePanel ID="JobToVerifyJobNameLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="JobToVerifyJobName" Text="<%[ Job to Verify: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="JobToVerifyJobName" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
+			</com:TActivePanel>
+			<com:TActivePanel ID="JobToVerifyJobIdLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="JobToVerifyJobId" Text="<%[ JobId to Verify: ]%>" /></div>
+				<div class="field">
+					<com:TActiveTextBox ID="JobToVerifyJobId" CssClass="textbox-auto" AutoPostBack="false" />
+					<com:TActiveCustomValidator ID="JobToVerifyJobIdValidator" ValidationGroup="JobGroup" ControlToValidate="JobToVerifyJobId" ErrorMessage="<%[ JobId to Verify value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="jobIdToVerifyValidator" />
+				</div>
+			</com:TActivePanel>
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Client" Text="<%[ Client: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Client" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</com:TActivePanel>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Client" Text="<%[ Client: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Client" AutoPostBack="false" CssClass="textbox-auto" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="FileSet" Text="<%[ FileSet: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="FileSet" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="FileSet" Text="<%[ FileSet: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="FileSet" AutoPostBack="false" CssClass="textbox-auto" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Pool" Text="<%[ Pool: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Pool" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Pool" Text="<%[ Pool: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Pool" AutoPostBack="false" CssClass="textbox-auto" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Storage" Text="<%[ Storage: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Storage" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Storage" Text="<%[ Storage: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Storage" AutoPostBack="false" CssClass="textbox-auto" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" /></div>
+				<div class="field">
+					<com:TActiveTextBox ID="Priority" CssClass="textbox-auto" AutoPostBack="false" />
+					<com:TActiveCustomValidator ID="PriorityValidator" ValidationGroup="JobGroup" ControlToValidate="Priority" ErrorMessage="<%[ Priority value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="priorityValidator" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" /></div>
-			<div class="field">
-				<com:TActiveTextBox ID="Priority" CssClass="textbox-auto" AutoPostBack="false" />
-				<com:TActiveCustomValidator ID="PriorityValidator" ValidationGroup="JobGroup" ControlToValidate="Priority" ErrorMessage="<%[ Priority value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="priorityValidator" />
+			<com:TActivePanel ID="AccurateLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="Accurate" Text="<%[ Accurate: ]%>" /></div>
+				<div class="field"><com:TActiveCheckBox ID="Accurate" AutoPostBack="false" /></div>
+			</com:TActivePanel>
+			<com:TCallback ID="ReloadJobs" OnCallback="Page.JobWindow.prepareData" ClientSide.OnComplete="SlideWindow.getObj('JobWindow').setLoadRequest(); job_callback_duration = new Date().getTime();" />
+			<script type="text/javascript">
+				var job_callback_duration;
+				var job_callback_func = function() {
+					/*
+					 * Check if Job list window is open and if any checkbox from actions is not checked.
+					 * If yes, then is possible to refresh Job list window.
+					 */
+					if(SlideWindow.getObj('JobWindow').isWindowOpen() === true && SlideWindow.getObj('JobWindow').areActionsOpen() === false) {
+						var mainForm = Prado.Validation.getForm();
+						var callback = <%=$this->ReloadJobs->ActiveControl->Javascript%>;
+						if (Prado.Validation.managers[mainForm].getValidatorsWithError('JobGroup').length == 0) {
+							SlideWindow.getObj('JobWindow').markAllChecked(false);
+							callback.dispatch();
+						}
+					}
+				}
+			</script>
+			<div class="button">
+				<com:BActiveButton ID="Status" Text="<%[ Job status ]%>" CausesValidation="false" OnClick="status" CssClass="bbutton">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('JobWindow').progress(false);
+						job_callback_func();
+						ConfigurationWindow.getObj('JobWindow').switchTab('job_console_tab');
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+				<com:TActiveLabel ID="DeleteButton">
+					<com:BActiveButton ID="Delete" Text="<%[ Delete job ]%>" CausesValidation="false" OnClick="delete" CssClass="bbutton">
+						<prop:ClientSide.OnSuccess>
+							ConfigurationWindow.getObj('JobWindow').progress(false);
+							job_callback_func();
+						</prop:ClientSide.OnSuccess>
+					</com:BActiveButton>
+				</com:TActiveLabel>
+				<com:TActiveLabel ID="CancelButton">
+					<com:BActiveButton ID="Cancel" Text="<%[ Cancel job ]%>" CausesValidation="false" OnClick="cancel" CssClass="bbutton">
+						<prop:ClientSide.OnSuccess>
+							ConfigurationWindow.getObj('JobWindow').progress(false);
+							job_callback_func();
+							ConfigurationWindow.getObj('JobWindow').switchTab('job_console_tab');
+						</prop:ClientSide.OnSuccess>
+					</com:BActiveButton>
+				</com:TActiveLabel>
+				<com:TActivePanel ID="EstimateLine" CssClass="button_line">
+					<com:BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" OnClick="estimate" CssClass="bbutton">
+						<prop:ClientSide.OnSuccess>
+							ConfigurationWindow.getObj('JobWindow').progress(false);
+							ConfigurationWindow.getObj('JobWindow').switchTab('job_console_tab');
+						</prop:ClientSide.OnSuccess>
+					</com:BActiveButton>
+				</com:TActivePanel>
+				<com:BActiveButton ID="Run" Text="<%[ Run job again ]%>" ValidationGroup="JobGroup" CausesValidation="true" OnClick="run_again">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('JobWindow').progress(false);
+						job_callback_func();
+						oMonitor();
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
 			</div>
 		</div>
-		<com:TCallback ID="ReloadJobs" OnCallback="Page.JobWindow.prepareData" ClientSide.OnComplete="SlideWindow.getObj('JobWindow').setLoadRequest(); job_callback_duration = new Date().getTime();" />
-		<script type="text/javascript">
-			var job_callback_duration;
-			var job_callback_func = function() {
-				/*
-				 * Check if Job list window is open and if any checkbox from actions is not checked.
-				 * If yes, then is possible to refresh Job list window.
-				 */
-				if(SlideWindow.getObj('JobWindow').isWindowOpen() === true && SlideWindow.getObj('JobWindow').areActionsOpen() === false) {
-					var mainForm = Prado.Validation.getForm();
-					var callback = <%=$this->ReloadJobs->ActiveControl->Javascript%>;
-					if (Prado.Validation.managers[mainForm].getValidatorsWithError('JobGroup').length == 0) {
-						SlideWindow.getObj('JobWindow').markAllChecked(false);
+		<div id="job_console_tab" style="display: none"> 
+			<com:TCallback ID="RefreshStatus" OnCallback="status" ClientSide.OnComplete="job_callback_duration = new Date().getTime();" />
+			<script type="text/javascript">
+				var status_prev = false;
+				var status_callback_func = function() {
+					if($('<%=$this->getID()%>configuration').visible() && ($('<%=$this->RefreshStart->ClientID%>').value === 'true' || status_prev === true)) {
+						status_prev = ($('<%=$this->RefreshStart->ClientID%>').value === 'true');
+						var callback = <%=$this->RefreshStatus->ActiveControl->Javascript%>;
 						callback.dispatch();
+					} else {
+						status_prev = false;
 					}
 				}
-			}
-		</script>
-		<div class="button">
-			<com:BActiveButton ID="Status" Text="<%[ Job status ]%>" CausesValidation="false" OnClick="status" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();" CssClass="bbutton" />
-			<com:TActiveLabel ID="DeleteButton"><com:BActiveButton ID="Delete" Text="<%[ Delete job ]%>" CausesValidation="false" OnClick="delete" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();" CssClass="bbutton" /> </com:TActiveLabel>
-			<com:TActiveLabel ID="CancelButton"><com:BActiveButton ID="Cancel" Text="<%[ Cancel job ]%>" CausesValidation="false" OnClick="cancel" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();" CssClass="bbutton" /> </com:TActiveLabel>
-			<com:BActiveButton ID="Run" Text="<%[ Run job again ]%>" ValidationGroup="JobGroup" CausesValidation="true" OnClick="run_again" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();oMonitor();"/>
-		</div>
-		<com:TCallback ID="RefreshStatus" OnCallback="status" ClientSide.OnComplete="job_callback_duration = new Date().getTime();" />
-		<script type="text/javascript">
-			var status_prev = false;
-			var status_callback_func = function() {
-				if($('<%=$this->getID()%>configuration').visible() && ($('<%=$this->RefreshStart->ClientID%>').value === 'true' || status_prev === true)) {
-					status_prev = ($('<%=$this->RefreshStart->ClientID%>').value === 'true');
-					var callback = <%=$this->RefreshStatus->ActiveControl->Javascript%>;
-					callback.dispatch();
-				} else {
-					status_prev = false;
-				}
-			}
-		</script>
-		<com:TActiveHiddenField ID="RefreshStart" />
-		<div class="text small"><%[ Console status ]%></div>
-		<div class="field-full" style="min-height: 166px">
-			<com:TActiveTextBox ID="Estimation" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 145px" ReadOnly="true" />
+			</script>
+			<com:TActiveHiddenField ID="RefreshStart" />
+			<div class="field-full" style="min-height: 166px;">
+				<com:TActiveTextBox ID="Estimation" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 475px" ReadOnly="true" />
+			</div>
 		</div>
-		<com:TActivePanel ID="AccurateLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="Accurate" Text="<%[ Accurate: ]%>" /></div>
-			<div class="field"><com:TActiveCheckBox ID="Accurate" AutoPostBack="false" /></div>
-		</com:TActivePanel>
-		<com:TActivePanel ID="EstimateLine" CssClass="button">
-			<com:BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" OnClick="estimate" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobWindow').progress(false);job_callback_func();" />
-		</com:TActivePanel>
 	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
index 44e948a155..1fecd5e396 100644
--- a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
@@ -1,139 +1,161 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
 	<com:TActivePanel DefaultButton="Run">
-		<strong><%[ Job name: ]%> <com:TActiveLabel ID="JobName" /><com:TActiveLabel ID="JobID" Visible="false" /></strong>
-		<hr />
-		<com:TValidationSummary
-			ID="ValidationSummary"
-			CssClass="validation-error-summary"
-			ValidationGroup="JobRunGroup"
-			AutoUpdate="true"
-			Display="Dynamic"
-			HeaderText="<%[ There is not possible to run selected action because: ]%>" />
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Level" Text="<%[ Level: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Level" AutoPostBack="false" CssClass="textbox-auto">
-					<prop:Attributes.onchange>
-						var job_to_verify = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
-						var verify_options = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
-						var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
-						var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
-						var accurate = $('<%=$this->AccurateLine->ClientID%>');
-						var estimate = $('<%=$this->EstimateLine->ClientID%>');
-						var verify_current_opt = $('<%=$this->JobToVerifyOptions->ClientID%>').value;
-						if(/^(<%=implode('|', $this->jobToVerify)%>)$/.test(this.value)) {
-							accurate.hide();
-							estimate.hide();
-							verify_options.show();
-							job_to_verify.show();
-							if (verify_current_opt == 'jobid') {
+		<h4><%[ Job name: ]%> <com:TActiveLabel ID="JobName" /><com:TActiveLabel ID="JobID" Visible="false" /></h4>
+		<span class="text tab tab_active" rel="jobrun_actions_tab"><%[ Actions ]%></span>
+		<span class="text tab" rel="jobrun_console_tab"><%[ Console status ]%></span>
+		<hr class="tabs" />
+		<div id="jobrun_actions_tab">
+			<com:TValidationSummary
+				ID="ValidationSummary"
+				CssClass="validation-error-summary"
+				ValidationGroup="JobRunGroup"
+				AutoUpdate="true"
+				Display="Dynamic"
+				HeaderText="<%[ There is not possible to run selected action because: ]%>" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Level" Text="<%[ Level: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Level" AutoPostBack="false" CssClass="textbox-auto">
+						<prop:Attributes.onchange>
+							var job_to_verify = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
+							var verify_options = $('<%=$this->JobToVerifyOptionsLine->ClientID%>');
+							var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
+							var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
+							var accurate = $('<%=$this->AccurateLine->ClientID%>');
+							var estimate = $('<%=$this->EstimateLine->ClientID%>');
+							var verify_current_opt = $('<%=$this->JobToVerifyOptions->ClientID%>').value;
+							if(/^(<%=implode('|', $this->jobToVerify)%>)$/.test(this.value)) {
+								accurate.hide();
+								estimate.hide();
+								verify_options.show();
+								job_to_verify.show();
+								if (verify_current_opt == 'jobid') {
+									verify_by_job_name.hide();
+									verify_by_jobid.show();
+								} else if (verify_current_opt == 'jobname') {
+									verify_by_job_name.show();
+									verify_by_jobid.hide();
+								}
+							} else if (job_to_verify.visible()) {
+								job_to_verify.hide();
+								verify_options.hide();
 								verify_by_job_name.hide();
-								verify_by_jobid.show();
-							} else if (verify_current_opt == 'jobname') {
-								verify_by_job_name.show();
 								verify_by_jobid.hide();
+								accurate.show();
+								estimate.show();
 							}
-						} else if (job_to_verify.visible()) {
-							job_to_verify.hide();
-							verify_options.hide();
-							verify_by_job_name.hide();
-							verify_by_jobid.hide();
-							accurate.show();
-							estimate.show();
-						}
-					</prop:Attributes.onchange>
-				</com:TActiveDropDownList>
-			</div>
-		</div>
-		<com:TActivePanel ID="JobToVerifyOptionsLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="JobToVerifyOptions" Text="<%[ Verify option: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="JobToVerifyOptions" AutoPostBack="false" CssClass="textbox-auto">
-					<prop:Attributes.onchange>
-						var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
-						var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
-						if (this.value == 'jobname') {
-							verify_by_jobid.hide();
-							verify_by_job_name.show();
-						} else if (this.value == 'jobid') {
-							verify_by_job_name.hide();
-							verify_by_jobid.show();
-						} else {
-							verify_by_job_name.hide();
-							verify_by_jobid.hide();
-						}
-					</prop:Attributes.onchange>
-				</com:TActiveDropDownList>
+						</prop:Attributes.onchange>
+					</com:TActiveDropDownList>
+				</div>
 			</div>
-		</com:TActivePanel>
-		<com:TActivePanel ID="JobToVerifyJobNameLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="JobToVerifyJobName" Text="<%[ Job to Verify: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="JobToVerifyJobName" AutoPostBack="false" CssClass="textbox-auto" />
+			<com:TActivePanel ID="JobToVerifyOptionsLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="JobToVerifyOptions" Text="<%[ Verify option: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="JobToVerifyOptions" AutoPostBack="false" CssClass="textbox-auto">
+						<prop:Attributes.onchange>
+							var verify_by_job_name = $('<%=$this->JobToVerifyJobNameLine->ClientID%>');
+							var verify_by_jobid = $('<%=$this->JobToVerifyJobIdLine->ClientID%>');
+							if (this.value == 'jobname') {
+								verify_by_jobid.hide();
+								verify_by_job_name.show();
+							} else if (this.value == 'jobid') {
+								verify_by_job_name.hide();
+								verify_by_jobid.show();
+							} else {
+								verify_by_job_name.hide();
+								verify_by_jobid.hide();
+							}
+						</prop:Attributes.onchange>
+					</com:TActiveDropDownList>
+				</div>
+			</com:TActivePanel>
+			<com:TActivePanel ID="JobToVerifyJobNameLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="JobToVerifyJobName" Text="<%[ Job to Verify: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="JobToVerifyJobName" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
+			</com:TActivePanel>
+			<com:TActivePanel ID="JobToVerifyJobIdLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="JobToVerifyJobId" Text="<%[ JobId to Verify: ]%>" /></div>
+				<div class="field">
+					<com:TActiveTextBox ID="JobToVerifyJobId" CssClass="textbox-auto" AutoPostBack="false" />
+					<com:TActiveCustomValidator ID="JobToVerifyJobIdValidator" ValidationGroup="JobRunGroup" ControlToValidate="JobToVerifyJobId" ErrorMessage="<%[ JobId to Verify value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="jobIdToVerifyValidator" />
+				</div>
+			</com:TActivePanel>
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Client" Text="<%[ Client: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Client" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</com:TActivePanel>
-		<com:TActivePanel ID="JobToVerifyJobIdLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="JobToVerifyJobId" Text="<%[ JobId to Verify: ]%>" /></div>
-			<div class="field">
-				<com:TActiveTextBox ID="JobToVerifyJobId" CssClass="textbox-auto" AutoPostBack="false" />
-				<com:TActiveCustomValidator ID="JobToVerifyJobIdValidator" ValidationGroup="JobRunGroup" ControlToValidate="JobToVerifyJobId" ErrorMessage="<%[ JobId to Verify value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="jobIdToVerifyValidator" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="FileSet" Text="<%[ FileSet: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="FileSet" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</com:TActivePanel>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Client" Text="<%[ Client: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Client" AutoPostBack="false" CssClass="textbox-auto" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Pool" Text="<%[ Pool: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Pool" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="FileSet" Text="<%[ FileSet: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="FileSet" AutoPostBack="false" CssClass="textbox-auto" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Storage" Text="<%[ Storage: ]%>" /></div>
+				<div class="field">
+					<com:TActiveDropDownList ID="Storage" AutoPostBack="false" CssClass="textbox-auto" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Pool" Text="<%[ Pool: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Pool" AutoPostBack="false" CssClass="textbox-auto" />
+			<div class="line">
+				<div class="text"><com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" /></div>
+				<div class="field">
+					<com:TActiveTextBox ID="Priority" CssClass="textbox-auto" AutoPostBack="false" />
+					<com:TActiveCustomValidator ID="PriorityValidator" ValidationGroup="JobRunGroup" ControlToValidate="Priority" ErrorMessage="<%[ Priority value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="priorityValidator" />
+				</div>
 			</div>
-		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Storage" Text="<%[ Storage: ]%>" /></div>
-			<div class="field">
-				<com:TActiveDropDownList ID="Storage" AutoPostBack="false" CssClass="textbox-auto" />
+			<com:TPanel ID="AccurateLine" CssClass="line">
+				<div class="text"><com:TLabel ForControl="Accurate" Text="<%[ Accurate: ]%>" /></div>
+				<div class="field"><com:TActiveCheckBox ID="Accurate" AutoPostBack="false" /></div>
+			</com:TPanel>
+			<com:TCallback ID="ReloadRunJobs" OnCallback="Page.JobRunWindow.prepareData" ClientSide.OnComplete="RunSlideWindow.getObj('JobRunWindow').setLoadRequest();" />
+			<script type="text/javascript">
+				var jobrun_callback_func = function() {
+					var mainForm = Prado.Validation.getForm();
+					var callback = <%=$this->ReloadRunJobs->ActiveControl->Javascript%>;
+					if (Prado.Validation.managers[mainForm].getValidatorsWithError('JobRunGroup').length == 0) {
+						callback.dispatch();
+					}
+				}
+			</script>
+			<div class="button">
+				<com:BActiveButton ID="Run" Text="<%[ Run job ]%>" ValidationGroup="JobRunGroup" CausesValidation="true" OnClick="run_job">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('JobRunWindow').progress(false);
+						jobrun_callback_func();
+						if (Prado.Validation.isValid(Prado.Validation.getForm(), 'JobRunGroup') === true) {
+							ConfigurationWindow.getObj('JobRunWindow').switchTab('jobrun_console_tab');
+						}
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+				<com:TPanel ID="EstimateLine" CssClass="button_line">
+					<com:BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" OnClick="estimate">
+						<prop:ClientSide.OnSuccess>
+							ConfigurationWindow.getObj('JobRunWindow').progress(false);
+							jobrun_callback_func();
+							oMonitor();
+							if (Prado.Validation.isValid(Prado.Validation.getForm(), 'JobRunGroup') === true) {
+								ConfigurationWindow.getObj('JobRunWindow').switchTab('jobrun_console_tab');
+							}
+						</prop:ClientSide.OnSuccess>
+					</com:BActiveButton>
+				</com:TPanel>
 			</div>
 		</div>
-		<div class="line">
-			<div class="text"><com:TLabel ForControl="Priority" Text="<%[ Priority: ]%>" /></div>
-			<div class="field">
-				<com:TActiveTextBox ID="Priority" CssClass="textbox-auto" AutoPostBack="false" />
-				<com:TActiveCustomValidator ID="PriorityValidator" ValidationGroup="JobRunGroup" ControlToValidate="Priority" ErrorMessage="<%[ Priority value must be integer greather than 0. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="priorityValidator" />
+		<div id="jobrun_console_tab" style="display: none">
+			<div class="field-full">
+				<com:TActiveTextBox ID="Estimation" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 475px;" ReadOnly="true" />
 			</div>
 		</div>
-		<com:TCallback ID="ReloadRunJobs" OnCallback="Page.JobRunWindow.prepareData" ClientSide.OnComplete="RunSlideWindow.getObj('JobRunWindow').setLoadRequest();" />
-		<script type="text/javascript">
-			var jobrun_callback_func = function() {
-				var mainForm = Prado.Validation.getForm();
-				var callback = <%=$this->ReloadRunJobs->ActiveControl->Javascript%>;
-				if (Prado.Validation.managers[mainForm].getValidatorsWithError('JobRunGroup').length == 0) {
-					callback.dispatch();
-				}
-			}
-		</script>
-		<div class="button">
-			<com:BActiveButton ID="Run" Text="<%[ Run job ]%>" ValidationGroup="JobRunGroup" CausesValidation="true" OnClick="run_job" ClientSide.OnSuccess="ConfigurationWindow.getObj('JobRunWindow').progress(false);jobrun_callback_func();"/>
-		</div>
-		<div class="text small"><%[ Console status ]%></div>
-		<div class="field-full" style="min-height: 90px">
-			<com:TActiveTextBox ID="Estimation" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 116px; font-size: 11px;" ReadOnly="true" />
-		</div>
-		<com:TPanel ID="AccurateLine" CssClass="line">
-			<div class="text"><com:TLabel ForControl="Accurate" Text="<%[ Accurate: ]%>" /></div>
-			<div class="field"><com:TActiveCheckBox ID="Accurate" AutoPostBack="false" /></div>
-		</com:TPanel>
-		<com:TPanel ID="EstimateLine" CssClass="button">
-			<com:Application.Portlets.BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" OnClick="estimate"  ClientSide.OnSuccess="ConfigurationWindow.getObj('JobRunWindow').progress(false);jobrun_callback_func();oMonitor();" />
-		</com:TPanel>
 	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/StorageConfiguration.php b/gui/baculum/protected/Portlets/StorageConfiguration.php
index 6e9b5cb591..58eae5d3c6 100644
--- a/gui/baculum/protected/Portlets/StorageConfiguration.php
+++ b/gui/baculum/protected/Portlets/StorageConfiguration.php
@@ -46,7 +46,7 @@ class StorageConfiguration extends Portlets {
 	}
 
 	public function umount($sender, $param) {
-		$isValid = $this->DriveValidator->IsValid === true && $this->SlotValidator->IsValid === true;
+		$isValid = $this->DriveValidator->IsValid === true;
 		if($isValid === false) {
 			return;
 		}
@@ -57,7 +57,12 @@ class StorageConfiguration extends Portlets {
 	}
 
 	public function release($sender, $param) {
-		$release = $this->Application->getModule('api')->get(array('storages', 'release', $this->StorageID->Text))->output;
+		$isValid = $this->DriveValidator->IsValid === true;
+		if($isValid === false) {
+			return;
+		}
+		$drive = ($this->AutoChanger->Visible === true) ? intval($this->Drive->Text) : 0;
+		$release = $this->Application->getModule('api')->get(array('storages', 'release', $this->StorageID->Text, $drive))->output;
 		$this->ShowStorage->Text = implode(PHP_EOL, $release);
 	}
 
diff --git a/gui/baculum/protected/Portlets/StorageConfiguration.tpl b/gui/baculum/protected/Portlets/StorageConfiguration.tpl
index 6c5e9feb6d..7a1dcd42ee 100644
--- a/gui/baculum/protected/Portlets/StorageConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/StorageConfiguration.tpl
@@ -1,38 +1,69 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
-		<strong><%[ Storage name: ]%> <com:TActiveLabel ID="StorageName" /><com:TActiveLabel ID="StorageID" Visible="false" /></strong>
-		<hr />
-		<com:TValidationSummary
-			ID="ValidationSummary"
-			CssClass="validation-error-summary"
-			ValidationGroup="AutoChangerGroup"
-			AutoUpdate="true"
-			Display="Dynamic"
-			HeaderText="<%[ There is not possible to run selected action because: ]%>" />
-		<div class="text small"><%[ Console status ]%></div>
-		<div class="field-full">
-			<com:TActiveTextBox ID="ShowStorage" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 190px" ReadOnly="true" />
-		</div>
-		<com:TActivePanel ID="AutoChanger" Visible="false" Style="margin-bottom: 10px">
-			<div class="line">
-				<div class="text"><com:TLabel ForControl="Drive" Text="<%[ Drive number: ]%>" /></div>
-				<div class="field">
-					<com:TActiveTextBox ID="Drive" AutoPostBack="false" Text="0" MaxLength="3" CssClass="textbox-short" />
-					<com:TActiveCustomValidator ID="DriveValidator" ValidationGroup="AutoChangerGroup" ControlToValidate="Drive" ErrorMessage="<%[ Drive number must be integer. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="driveValidator" />
+		<h4><%[ Storage name: ]%> <com:TActiveLabel ID="StorageName" /><com:TActiveLabel ID="StorageID" Visible="false" /></h4>
+		<span class="text tab tab_active" rel="storage_actions_tab"><%[ Actions ]%></span>
+		<span class="text tab" rel="storage_console_tab"><%[ Console status ]%></span>
+		<hr class="tabs" />
+		<div id="storage_actions_tab">
+			<com:TValidationSummary
+				ID="ValidationSummary"
+				CssClass="validation-error-summary"
+				ValidationGroup="AutoChangerGroup"
+				AutoUpdate="true"
+				Display="Dynamic"
+				HeaderText="<%[ There is not possible to run selected action because: ]%>" />
+			<com:TActivePanel ID="AutoChanger" Visible="false" Style="margin-bottom: 10px">
+				<div class="line">
+					<div class="text"><com:TLabel ForControl="Drive" Text="<%[ Drive number: ]%>" /></div>
+					<div class="field">
+						<com:TActiveTextBox ID="Drive" AutoPostBack="false" Text="0" MaxLength="3" CssClass="textbox-short" />
+						<com:TActiveCustomValidator ID="DriveValidator" ValidationGroup="AutoChangerGroup" ControlToValidate="Drive" ErrorMessage="<%[ Drive number must be integer. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="driveValidator" />
+					</div>
 				</div>
-			</div>
-			<div class="line">
-				<div class="text"><com:TLabel ForControl="Slot" Text="<%[ Slot number: ]%>" /></div>
-				<div class="field">
-					<com:TActiveTextBox ID="Slot" AutoPostBack="false" Text="0" MaxLength="3" CssClass="textbox-short" />
-					<com:TActiveCustomValidator ID="SlotValidator" ValidationGroup="AutoChangerGroup" ControlToValidate="Slot" ErrorMessage="<%[ Slot number must be integer. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="slotValidator" />
+				<div class="line">
+					<div class="text"><com:TLabel ForControl="Slot" Text="<%[ Slot number: ]%>" /></div>
+					<div class="field">
+						<com:TActiveTextBox ID="Slot" AutoPostBack="false" Text="0" MaxLength="3" CssClass="textbox-short" />
+						<com:TActiveCustomValidator ID="SlotValidator" ValidationGroup="AutoChangerGroup" ControlToValidate="Slot" ErrorMessage="<%[ Slot number must be integer. ]%>" ControlCssClass="validation-error" Display="None" OnServerValidate="slotValidator" />
+					</div>
 				</div>
+			</com:TActivePanel>
+			<div class="button-center">
+				<com:BActiveButton ID="Mount" OnClick="mount" ValidationGroup="AutoChangerGroup" CausesValidation="true" Text="<%[ Mount ]%>">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('StorageWindow').progress(false);
+						if (Prado.Validation.isValid(Prado.Validation.getForm(), 'AutoChangerGroup') === true) {
+							ConfigurationWindow.getObj('StorageWindow').switchTab('storage_console_tab');
+						}
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+				<com:BActiveButton ID="Release" OnClick="release" Text="<%[ Release ]%>" ValidationGroup="AutoChangerGroup" CausesValidation="true">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('StorageWindow').progress(false);
+						if (Prado.Validation.isValid(Prado.Validation.getForm(), 'AutoChangerGroup') === true) {
+							ConfigurationWindow.getObj('StorageWindow').switchTab('storage_console_tab');
+						}
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+				<com:BActiveButton ID="Umount" OnClick="umount" ValidationGroup="AutoChangerGroup" CausesValidation="true" Text="<%[ Umount ]%>">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('StorageWindow').progress(false);
+						if (Prado.Validation.isValid(Prado.Validation.getForm(), 'AutoChangerGroup') === true) {
+							ConfigurationWindow.getObj('StorageWindow').switchTab('storage_console_tab');
+						}
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+				<com:BActiveButton ID="Status" OnClick="status" Text="<%[ Status ]%>">
+					<prop:ClientSide.OnSuccess>
+						ConfigurationWindow.getObj('StorageWindow').progress(false);
+						ConfigurationWindow.getObj('StorageWindow').switchTab('storage_console_tab');
+					</prop:ClientSide.OnSuccess>
+				</com:BActiveButton>
+			</div>
+		</div>
+		<div id="storage_console_tab" style="display: none">
+			<div class="field-full">
+				<com:TActiveTextBox ID="ShowStorage" TextMode="MultiLine" CssClass="textbox-auto" Style="height: 475px" ReadOnly="true" />
 			</div>
-		</com:TActivePanel>
-		<div class="button-center">
-			<com:BActiveButton ID="Mount" OnClick="mount" ValidationGroup="AutoChangerGroup" CausesValidation="true" Text="<%[ Mount ]%>" ClientSide.OnSuccess="ConfigurationWindow.getObj('StorageWindow').progress(false);" />
-			<com:BActiveButton ID="Release" OnClick="release" Text="<%[ Release ]%>" ClientSide.OnSuccess="ConfigurationWindow.getObj('StorageWindow').progress(false);" />
-			<com:BActiveButton ID="Umount" OnClick="umount" ValidationGroup="AutoChangerGroup" CausesValidation="true" Text="<%[ Umount ]%>" ClientSide.OnSuccess="ConfigurationWindow.getObj('StorageWindow').progress(false);" />
-			<com:BActiveButton ID="Status" OnClick="status" Text="<%[ Status ]%>" ClientSide.OnSuccess="ConfigurationWindow.getObj('StorageWindow').progress(false);" />
 		</div>
 </com:TContent>
diff --git a/gui/baculum/themes/Baculum-v1/style.css b/gui/baculum/themes/Baculum-v1/style.css
index c227e62780..1135fc81ed 100644
--- a/gui/baculum/themes/Baculum-v1/style.css
+++ b/gui/baculum/themes/Baculum-v1/style.css
@@ -384,7 +384,7 @@ input.bbutton {
 	cursor: pointer;
 	display: inline-block;
 	width: auto;
-	margin: 0 8px;
+	margin: 5px 8px;
 	padding: 0 18px;
 	min-width: 65px;
 	border-radius: 4px;
@@ -748,11 +748,15 @@ div.window-section span {
 	padding-left: 12px;
 }
 
-div.button {
+div.button, div.button_line {
 	text-align: right;
 	margin: 3px 2px 5px 0;
 }
 
+div.button_line {
+	display: inline;
+}
+
 div.button-center {
 	text-align: center;
 	margin: 5px 0;
@@ -811,6 +815,13 @@ textarea.console {
 	border: 0;
 }
 
+.description {
+	display: inline-block;
+	font-style: italic;
+	font-size: 12px;
+	padding: 4px 0;
+}
+
 fieldset {
 	margin-bottom: 15px;
 	font-size: 14px;
@@ -835,8 +846,21 @@ img {
 	border: none;
 }
 
-div.small {
-	font-size: 12px;
+h4 {
+	margin: 6px 0;
+}
+
+hr.tabs {
+	margin-top: 0;
+	background-color: black; /* Firefox and Opera */
+	border-color: black; /* Chrome and Safari */
+	color: black; /* IE 7+ */
+	clear: both;
+}
+
+span.tab, span.tab_active {
+	font-size: 13px;
+	font-weight: bold;
 	text-align: center;
 	width: 130px;
 	background-color: rgb(115, 143, 172);
@@ -845,7 +869,12 @@ div.small {
 	border-left: 1px solid black;
 	border-right: 1px solid black;
 	border-top: 1px solid black;
-	margin: 3px 0;
+	padding: 4px;
+	cursor: pointer;
+}
+
+span.tab_active {
+	background-color: rgb(163, 180, 197);
 }
 
 #graphs {
-- 
2.39.5