From 60725820dbce1d19f307b8d81ddfd21145b74f9e Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 18 Oct 2014 20:47:45 +0200
Subject: [PATCH] baculum: Tweak default button to new framework version

---
 gui/baculum/protected/Portlets/ClientConfiguration.tpl | 2 ++
 gui/baculum/protected/Portlets/ConfigurationPanel.tpl  | 3 ++-
 gui/baculum/protected/Portlets/JobConfiguration.tpl    | 2 ++
 gui/baculum/protected/Portlets/JobRunConfiguration.tpl | 2 ++
 gui/baculum/protected/Portlets/PoolConfiguration.tpl   | 2 ++
 gui/baculum/protected/Portlets/VolumeConfiguration.tpl | 2 ++
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gui/baculum/protected/Portlets/ClientConfiguration.tpl b/gui/baculum/protected/Portlets/ClientConfiguration.tpl
index 5f7ce4439b..f0aed64fa2 100644
--- a/gui/baculum/protected/Portlets/ClientConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/ClientConfiguration.tpl
@@ -1,5 +1,6 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
+	<com:TActivePanel DefaultButton="Apply.ApplyChanges">
 		<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 />
@@ -48,4 +49,5 @@
 		<div class="button">
 			<com:Application.Portlets.BActiveButton ValidationGroup="ClientGroup" CausesValidation="true" ID="Apply" Text="<%[ Apply ]%>" />
 		</div>
+	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/ConfigurationPanel.tpl b/gui/baculum/protected/Portlets/ConfigurationPanel.tpl
index 103618d390..624db1cb84 100644
--- a/gui/baculum/protected/Portlets/ConfigurationPanel.tpl
+++ b/gui/baculum/protected/Portlets/ConfigurationPanel.tpl
@@ -1,8 +1,9 @@
 <div id="<%=$this->ClientID%>configuration" class="configuration">
 	<div id="<%=$this->ClientID%>configuration-window-container" class="configuration-window-container">
-		<com:TActivePanel DefaultButton="ApplyChanges" CssClass="configuration-window-content">
+		<com:TActivePanel ID="ConfigurationWindowBox" CssClass="configuration-window-content">
 			<com:TImageButton ImageUrl="<%=$this->getPage()->getTheme()->getBaseUrl()%>/icon_close.png" ImageAlign="right" Attributes.onclick="ConfigurationWindow<%=$this->ClientID%>.hide(); return false;" ToolTip="<%[ Close]%>" />
 			<com:TContentPlaceHolder ID="ConfigurationWindowContent" />
+
 		</com:TActivePanel>
 	</div>
 </div>
diff --git a/gui/baculum/protected/Portlets/JobConfiguration.tpl b/gui/baculum/protected/Portlets/JobConfiguration.tpl
index 8e57bbdd5d..cd8fd6e5dd 100644
--- a/gui/baculum/protected/Portlets/JobConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/JobConfiguration.tpl
@@ -1,5 +1,6 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
+	<com:TActivePanel DefaultButton="Run.ApplyChanges">
 		<strong><%[ Job name: ]%> <com:TActiveLabel ID="JobName" /><com:TActiveLabel ID="JobID" Visible="false" /></strong>
 		<hr />
 		<com:TValidationSummary
@@ -73,4 +74,5 @@
 		<div class="button">
 			<com:Application.Portlets.BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" />
 		</div>
+	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
index 649b87417d..f58cb06db6 100644
--- a/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/JobRunConfiguration.tpl
@@ -1,5 +1,6 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
+	<com:TActivePanel DefaultButton="Run.ApplyChanges">
 		<strong><%[ Job name: ]%> <com:TActiveLabel ID="JobName" /><com:TActiveLabel ID="JobID" Visible="false" /></strong>
 		<hr />
 		<com:TValidationSummary
@@ -70,4 +71,5 @@
 		<div class="button">
 			<com:Application.Portlets.BActiveButton ID="Estimate" Text="<%[ Estimate job ]%>" />
 		</div>
+	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/PoolConfiguration.tpl b/gui/baculum/protected/Portlets/PoolConfiguration.tpl
index f350ba9c23..5777174ca8 100644
--- a/gui/baculum/protected/Portlets/PoolConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/PoolConfiguration.tpl
@@ -1,5 +1,6 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
+	<com:TActivePanel DefaultButton="Apply.ApplyChanges">
 		<strong><%[ Pool name: ]%> <com:TActiveLabel ID="PoolName" /><com:TActiveLabel ID="PoolID" Visible="false" /></strong><br />
 		<hr />
 		<com:TValidationSummary
@@ -94,4 +95,5 @@
 			<com:Application.Portlets.BActiveButton ID="UpdateVolumes" Text="<%[ Update volumes ]%>" />&nbsp;
 			<com:Application.Portlets.BActiveButton ID="Apply" ValidationGroup="PoolGroup" CausesValidation="true" Text="<%[ Apply ]%>" />
 		</div>
+	</com:TActivePanel>
 </com:TContent>
diff --git a/gui/baculum/protected/Portlets/VolumeConfiguration.tpl b/gui/baculum/protected/Portlets/VolumeConfiguration.tpl
index f4d4f0436e..70934be0ff 100644
--- a/gui/baculum/protected/Portlets/VolumeConfiguration.tpl
+++ b/gui/baculum/protected/Portlets/VolumeConfiguration.tpl
@@ -1,5 +1,6 @@
 <%@ MasterClass="Application.Portlets.ConfigurationPanel"%>
 <com:TContent ID="ConfigurationWindowContent">
+	<com:TActivePanel DefaultButton="Apply.ApplyChanges">
 		<strong><%[ Volume name: ]%> <com:TActiveLabel ID="VolumeName" /><com:TActiveLabel ID="VolumeID" Visible="false" /></strong>
 		<hr />
 		<com:TValidationSummary
@@ -88,4 +89,5 @@
 		<div class="button">
 			<com:Application.Portlets.BActiveButton ID="Purge" Text="<%[ Purge ]%>" />&nbsp;<com:Application.Portlets.BActiveButton ID="Prune" Text="<%[ Prune ]%>" />&nbsp;<com:Application.Portlets.BActiveButton ValidationGroup="VolumeGroup" CausesValidation="true" ID="Apply" Text="<%[ Apply ]%>" />
 		</div>
+	</com:TActivePanel>
 </com:TContent>
-- 
2.39.5