baculum: Tweak default button to new framework version

diff --git a/gui/baculum/protected/Portlets/ClientConfiguration.tpl b/gui/baculum/protected/Portlets/ClientConfiguration.tpl
index 5f7ce4439b41bdc769972a1b4531cbfba1b8965f..f0aed64fa24a1d44e47f3dce97b0a64e4c4921f7 100644 (file)
--- 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 103618d39040ffaa5f51e6e04991c92981f4b24f..624db1cb84d57a40fbcd627f00162d211195ff35 100644 (file)
--- 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 8e57bbdd5d3975320e4c1c9b237990428d374c6e..cd8fd6e5dd3074b52c326434838436791b5b4e1a 100644 (file)
--- 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 649b87417dea75db7424a0726919fdce4d3e1e49..f58cb06db6bc05fd87b800d9821507db7ac9fb9c 100644 (file)
--- 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 f350ba9c23717a79da0c47b563ff8d0f79c1a42e..5777174ca8e1ae937cd08ecfe7e1efb5bdf21ce6 100644 (file)
--- 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 f4d4f0436e3c45fe7d7211b6327fe3be44887434..70934be0ffafe571fa8ffcb90c7bcf823468c7ce 100644 (file)
--- 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>