From abefb0befa65121a360b69246a0ccdc886694ee5 Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 29 Nov 2014 16:45:39 +0100
Subject: [PATCH] baculum: Update buttons in wizards and volumes tools panel

---
 .../protected/Pages/ConfigurationWizard.page   | 18 +++++++++---------
 gui/baculum/protected/Pages/RestoreWizard.page | 18 +++++++++---------
 .../protected/Portlets/VolumesTools.tpl        | 16 ++++++++--------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gui/baculum/protected/Pages/ConfigurationWizard.page b/gui/baculum/protected/Pages/ConfigurationWizard.page
index 61eda516c6..7fcef5ed36 100644
--- a/gui/baculum/protected/Pages/ConfigurationWizard.page
+++ b/gui/baculum/protected/Pages/ConfigurationWizard.page
@@ -34,23 +34,23 @@
 			</div>
 		</prop:HeaderTemplate>
 		<prop:StartNavigationTemplate>
-				<com:TPanel CssClass="button-cancel" Visible="<%=$this->getPage()->firstRun === false%>"><com:Application.Portlets.BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></com:TPanel>
-				<div <%=$this->getPage()->firstRun === false ? 'class="button-prev-next"' : ''%>><com:Application.Portlets.BButton CommandName="NextStep" Text="<%[ Next &raquo; ]%>" /></div>
+				<com:TPanel CssClass="button-cancel" Visible="<%=$this->getPage()->firstRun === false%>"><com:BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></com:TPanel>
+				<div <%=$this->getPage()->firstRun === false ? 'class="button-prev-next"' : ''%>><com:BButton CommandName="NextStep" Text="<%[ Next &raquo; ]%>" /></div>
 		</prop:StartNavigationTemplate>
 
 		<prop:StepNavigationTemplate>
-			<com:TPanel CssClass="button-cancel" Visible="<%=$this->getPage()->firstRun === false%>"><com:Application.Portlets.BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></com:TPanel>
+			<com:TPanel CssClass="button-cancel" Visible="<%=$this->getPage()->firstRun === false%>"><com:BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></com:TPanel>
 			<div <%=$this->getPage()->firstRun === false ? 'class="button-prev-next"' : ''%>>
-				<com:Application.Portlets.BButton CausesValidation="False" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
-				<com:Application.Portlets.BButton ID="NextButton" CommandName="NextStep" Text="<%[ Next &raquo; ]%>" />
+				<com:BButton CausesValidation="False" CssClass="bbutton" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
+				<com:BButton ID="NextButton" CommandName="NextStep" Text="<%[ Next &raquo; ]%>" />
 			</div>
 		</prop:StepNavigationTemplate>
 		 
 		<prop:FinishNavigationTemplate>
-			<com:TPanel CssClass="button-cancel" Visible="<%=$this->getPage()->firstRun === false%>"><com:Application.Portlets.BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></com:TPanel>
+			<com:TPanel CssClass="button-cancel" Visible="<%=$this->getPage()->firstRun === false%>"><com:BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></com:TPanel>
 			<div <%=$this->getPage()->firstRun === false ? 'class="button-prev-next"' : ''%>>
-				<com:Application.Portlets.BButton CausesValidation="False" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
-				<com:Application.Portlets.BButton CommandName="Complete" Text="<%[ Save ]%>" />
+				<com:BButton CausesValidation="False" CssClass="bbutton" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
+				<com:BButton CommandName="Complete" Text="<%[ Save ]%>" />
 			</div>
 		</prop:FinishNavigationTemplate>
 		<com:TWizardStep ID="Step1" Title="<%[ Step 1 - select language ]%>" StepType="Auto">
@@ -320,4 +320,4 @@
 			</fieldset>
 		</com:TWizardStep>
 	</com:TWizard>
-</com:TContent>
\ No newline at end of file
+</com:TContent>
diff --git a/gui/baculum/protected/Pages/RestoreWizard.page b/gui/baculum/protected/Pages/RestoreWizard.page
index 0546e88d01..63b79bd94a 100644
--- a/gui/baculum/protected/Pages/RestoreWizard.page
+++ b/gui/baculum/protected/Pages/RestoreWizard.page
@@ -34,23 +34,23 @@
 			</div>
 		</prop:HeaderTemplate>
 		<prop:StartNavigationTemplate>
-				<div class="button-cancel"><com:Application.Portlets.BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></div>
-				<div class="button-prev-next"><com:Application.Portlets.BButton CommandName="NextStep" Text="<%[ Next &raquo; ]%>" /></div>
+				<div class="button-cancel"><com:BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></div>
+				<div class="button-prev-next"><com:BButton CommandName="NextStep" Text="<%[ Next &raquo; ]%>" /></div>
 		</prop:StartNavigationTemplate>
 
 		<prop:StepNavigationTemplate>
-			<div class="button-cancel"><com:Application.Portlets.BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></div>
+			<div class="button-cancel"><com:BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></div>
 			<div class="button-prev-next">
-				<com:Application.Portlets.BButton CausesValidation="False" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
-				<com:Application.Portlets.BButton ID="NextButton" CommandName="NextStep" Text="<%[ Next &raquo; ]%>" Visible="<%=($this->getPage()->RestoreWizard->ActiveStepIndex != 1 || ($this->getPage()->RestoreWizard->ActiveStepIndex == 1 && $this->getPage()->BackupToRestore->ItemCount > 0))%>" />
+				<com:BButton CausesValidation="False" CssClass="bbutton" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
+				<com:BButton ID="NextButton" CommandName="NextStep" Text="<%[ Next &raquo; ]%>" Visible="<%=($this->getPage()->RestoreWizard->ActiveStepIndex != 1 || ($this->getPage()->RestoreWizard->ActiveStepIndex == 1 && $this->getPage()->BackupToRestore->ItemCount > 0))%>" />
 			</div>
 		</prop:StepNavigationTemplate>
 		 
 		<prop:FinishNavigationTemplate>
-			<div class="button-cancel"><com:Application.Portlets.BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></div>
+			<div class="button-cancel"><com:BButton CommandName="Cancel" Text="<%[ Cancel ]%>" /></div>
 			<div class="button-prev-next">
-			<com:Application.Portlets.BButton CausesValidation="False" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
-			<com:Application.Portlets.BButton CommandName="Complete" Text="<%[ Run restore ]%>" />
+			<com:BButton CausesValidation="False" CssClass="bbutton" CommandName="PreviousStep" Text="<%[ &laquo; Previous ]%>" />
+			<com:BButton CommandName="Complete" Text="<%[ Run restore ]%>" />
 			</div>
 		</prop:FinishNavigationTemplate>
 		<com:TWizardStep ID="Step1" Title="<%[ Step 1 - select source backup client ]%>" StepType="Auto">
@@ -327,4 +327,4 @@
 			</fieldset>
 		</com:TWizardStep>
 	</com:TWizard>
-</com:TContent>
\ No newline at end of file
+</com:TContent>
diff --git a/gui/baculum/protected/Portlets/VolumesTools.tpl b/gui/baculum/protected/Portlets/VolumesTools.tpl
index 452c2398b9..55f361b5a1 100644
--- a/gui/baculum/protected/Portlets/VolumesTools.tpl
+++ b/gui/baculum/protected/Portlets/VolumesTools.tpl
@@ -44,7 +44,7 @@
 			<div class="field"><com:TActiveDropDownList ID="PoolLabel" CssClass="textbox" /></div>
 		</div>
 		<div class="button" style="margin-top: 10px;">
-				<com:Application.Portlets.BActiveButton ID="LabelButton" Text="<%[ Label ]%>" CausesValidation="true" ValidationGroup="VolumesActionGroup" />
+				<com:BActiveButton ID="LabelButton" Text="<%[ Label ]%>" CausesValidation="true" ValidationGroup="VolumesActionGroup" />
 		</div>
 	</com:TActivePanel>
 	<div class="line"><com:TActiveRadioButton ID="UpdateSlots" GroupName="VolumeAction" OnCallback="setUpdateSlots" ActiveControl.ClientSide.OnComplete="window.scrollTo(0, document.body.scrollHeight);" /><com:TLabel ForControl="UpdateSlots" Text="<%[ Update slots using barcodes ]%>" /></div>
@@ -62,7 +62,7 @@
 				<div class="field"><com:TActiveTextBox ID="SlotsUpdateSlots" CssClass="textbox" /></div>
 			</div>
 			<div class="button" style="margin-top: 10px;">
-				<com:Application.Portlets.BActiveButton ID="UpdateSlotsButton" Text="<%[ Update barcodes slots ]%>" CausesValidation="true" ValidationGroup="VolumesActionGroup" />
+				<com:BActiveButton ID="UpdateSlotsButton" Text="<%[ Update barcodes slots ]%>" CausesValidation="true" ValidationGroup="VolumesActionGroup" />
 		</div>
 	</com:TActivePanel>
 	<div class="line"><com:TActiveRadioButton ID="UpdateSlotsScan" GroupName="VolumeAction" OnCallback="setUpdateSlotsScan" ActiveControl.ClientSide.OnComplete="window.scrollTo(0, document.body.scrollHeight);" /><com:TLabel ForControl="UpdateSlotsScan" Text="<%[ Update slots without barcodes ]%>" /></div>
@@ -80,12 +80,12 @@
 				<div class="field"><com:TActiveTextBox ID="SlotsUpdateSlotsScan" CssClass="textbox" /></div>
 			</div>
 			<div class="button" style="margin-top: 10px;">
-				<com:Application.Portlets.BActiveButton ID="UpdateSlotsScanButton" Text="<%[ Update slots scan ]%>" CausesValidation="true" ValidationGroup="VolumesActionGroup" />
+				<com:BActiveButton ID="UpdateSlotsScanButton" Text="<%[ Update slots scan ]%>" CausesValidation="true" ValidationGroup="VolumesActionGroup" />
 		</div>
 	</com:TActivePanel>
 </com:TActivePanel>
 <script type="text/javascript">
-	$$('#volumes_tools_launcher', '#<%=$this->LabelButton->ApplyChanges->ClientID%>', '#<%=$this->UpdateSlotsButton->ApplyChanges->ClientID%>', '#<%=$this->UpdateSlotsScanButton->ApplyChanges->ClientID%>').each(function(el){
+	$$('#volumes_tools_launcher', '#<%=$this->LabelButton->ClientID%>', '#<%=$this->UpdateSlotsButton->ClientID%>', '#<%=$this->UpdateSlotsScanButton->ClientID%>').each(function(el){
 		el.observe('click', function(){
 			if(VolumesToolsValidation(el) === true) {
 				$('<%=$this->getPage()->Console->ConsoleContainer->ClientID%>').hide();
@@ -108,7 +108,7 @@
 		var slotsPattern = new RegExp("<%=$this->slotsPattern%>");
 		var drivePattern = new RegExp("<%=$this->drivePattern%>");
 		var labelNamePattern = new RegExp("<%=$this->labelVolumePattern%>");
-		if(el.id == '<%=$this->LabelButton->ApplyChanges->ClientID%>') {
+		if(el.id == '<%=$this->LabelButton->ClientID%>') {
 			if($('<%=$this->Barcodes->ClientID%>').checked === true) {
 				if(slotsPattern.test($('<%=$this->SlotsLabel->ClientID%>').value) === false) {
 					var validation = false;
@@ -121,15 +121,15 @@
 			if(drivePattern.test($('<%=$this->DriveLabel->ClientID%>').value) === false) {
 				var validation = false;
 			}
-		} else if(el.id == '<%=$this->UpdateSlotsButton->ApplyChanges->ClientID%>') {
+		} else if(el.id == '<%=$this->UpdateSlotsButton->ClientID%>') {
 			if(drivePattern.test($('<%=$this->DriveUpdateSlots->ClientID%>').value) === false || slotsPattern.test($('<%=$this->SlotsUpdateSlots->ClientID%>').value) === false) {
 				var validation = false;
 			}
-		} else if(el.id == '<%=$this->UpdateSlotsScanButton->ApplyChanges->ClientID%>') {
+		} else if(el.id == '<%=$this->UpdateSlotsScanButton->ClientID%>') {
 			if(drivePattern.test($('<%=$this->DriveUpdateSlotsScan->ClientID%>').value) === false || slotsPattern.test($('<%=$this->SlotsUpdateSlotsScan->ClientID%>').value) === false) {
 				var validation = false;
 			}
 		}
 		return validation;
 	}
-</script>
\ No newline at end of file
+</script>
-- 
2.39.5