java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf |
2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf |
4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf |
76 ++++++----
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp |
26 +--
4 files changed, 67 insertions(+), 41 deletions(-)
New commits:
commit c927b408893e93dc0229882640efa25a96b364b0
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Jul 1 21:24:20 2009 -0400
Adding profile stuff to the schedule UI
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
index 3840730..216b86b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
@@ -25,7 +25,7 @@ function setStep(stepName) {
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2><img src="/img/icon_kickstart_session-medium.gif"
/><bean:message key="kickstart.schedule.heading4.jsp" /></h2>
-
+<c:set var="form" value="${kickstartScheduleWizardForm.map}"/>
<html:form method="POST" action="${actionUrl}"
styleId="wizard-form">
<html:hidden property="wizardStep" value="third"
styleId="wizard-step" />
<html:hidden property="scheduleAsap" />
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf
index bacd83e..de3615e 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf
@@ -34,7 +34,7 @@
<html:radio value="custom" property="kernelParamsType"
onclick="form.kernelParamsId.disabled = false;">
<strong><bean:message key="Custom" /></strong>
- </html:radio>: <html:text styleId =
"kernelParamsId" property="kernelParams" onkeydown="return
blockEnter(event)" disabled= "${kickstartScheduleWizardForm.map.kernelParamsType
ne "custom"}" /><br /><br />
+ </html:radio>: <html:text styleId =
"kernelParamsId" property="kernelParams" onkeydown="return
blockEnter(event)" disabled= "${form.kernelParamsType ne
"custom"}" /><br /><br />
<rhn:tooltip><bean:message
key="kickstart.schedule.kernel.options.custom.tip"
arg0="${rhn:localize('Custom')}"/></rhn:tooltip>
</td>
</tr>
@@ -59,7 +59,7 @@
<strong><bean:message key="Custom" /></strong>
</html:radio>: <html:text styleId =
"postKernelParamsId"
property="postKernelParams"
- onkeydown="return blockEnter(event)" disabled=
"${kickstartScheduleWizardForm.map.postKernelParamsType ne
"custom"}"/><br /><br />
+ onkeydown="return blockEnter(event)" disabled=
"${form.postKernelParamsType ne "custom"}"/><br
/><br />
<rhn:tooltip><bean:message
key="kickstart.schedule.kernel.options.custom.tip"
arg0="${rhn:localize('Custom')}"/></rhn:tooltip>
</td>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
index 60fdf40..323fd86 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
@@ -7,35 +7,57 @@
<th width="10%"><bean:message
key="kickstart.schedule.sync.pkg.profile.jsp" />:</th>
<td>
<c:if test="${not empty regularKS}">
- <html:radio styleId="syncExisting" value="existing"
property="targetProfileType"
- onclick="form.syncPackageSelect.disabled = true;
form.syncSystemSelect.disabled = true;">
+ <input type="radio" name="targetProfileType"
value="existing"
+ onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled
= true;"
+ id="syncExisting"
+ <c:if test="${form.targetProfileType ==
'existing'}">checked="checked"</c:if>
+ />
<bean:message
key="kickstart.schedule.sync.pkg.profile.option1.jsp" />
- </html:radio><br /><br />
+ <br /><br />
</c:if>
- <html:radio styleId="syncPackage"
- onclick="form.syncPackageSelect.disabled = false;
form.syncSystemSelect.disabled = true;"
- value="package" property="targetProfileType"
disabled="${syncPackageDisabled}">
- <bean:message
key="kickstart.schedule.sync.pkg.profile.option2.jsp" />
- </html:radio>:
- <html:select styleId="syncPackageSelect"
property="targetProfile"
- disabled= "${kickstartScheduleWizardForm.map.targetProfileType ne
"package"}">
- <html:optionsCollection property="syncPackages"
- label="name" value="id"/>
- </html:select>
+
+ <input type="radio" name="targetProfileType"
value="package"
+ onclick="form.syncPackageSelect.disabled = false; form.syncSystemSelect.disabled
= true;"
+ id="syncPackage"
+ <c:if test="${form.targetProfileType ==
'package'}">checked="checked"</c:if>
+ <c:if test="${syncPackageDisabled or empty
form.syncPackages}">disabled="true"</c:if>
+ />
+ <bean:message
key="kickstart.schedule.sync.pkg.profile.option2.jsp"
/>:
+
+ <select name="targetProfile" id="syncPackageSelect"
+ <c:if test="${form.targetProfileType ne 'package' or empty
form.syncPackages}">disabled="true"</c:if>
+ >
+ <c:forEach var="package" items="${form.syncPackages}">
+ <option
+ <c:if test="${package.id ==
form.targetProfile}">selected="selected"</c:if>
+ value='${package.id}'>${package.name}</option>
+ </c:forEach>
+ </select>
<br /><br />
- <html:radio styleId="syncSystem" value="system"
property="targetProfileType"
- onclick="form.syncPackageSelect.disabled = true;
form.syncSystemSelect.disabled = false;"
- disabled="${syncSystemDisabled}">
- <bean:message
key="kickstart.schedule.sync.pkg.profile.option3.jsp" />
- </html:radio>:
- <html:select styleId="syncSystemSelect"
property="targetProfile"
- disabled= "${kickstartScheduleWizardForm.map.targetProfileType ne
"system"}">
- <html:optionsCollection property="syncSystems"
- label="name" value="id"/>
- </html:select>
- <br /><br />
- <html:radio styleId="syncNone" value="none"
property="targetProfileType"
- onclick="form.syncPackageSelect.disabled = true;
form.syncSystemSelect.disabled = true;">
- <bean:message
key="kickstart.schedule.sync.pkg.profile.option4.jsp"
/></html:radio><br />
+ <!--- System profile sync-->
+ <input type="radio" name="targetProfileType"
value="system"
+ onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled
= false;"
+ id="syncSystem"
+ <c:if test="${form.targetProfileType ==
'system'}">checked="checked"</c:if>
+ <c:if test="${syncSystemDisabled or empty
form.syncSystems}">disabled="true"</c:if>
+ />
+<bean:message key="kickstart.schedule.sync.pkg.profile.option3.jsp"
/>:
+
+ <select name="targetProfile" id="syncSystemSelect"
+ <c:if test="${form.targetProfileType ne 'system' or empty
form.syncSystems}">disabled="true"</c:if>
+ >
+ <c:forEach var="system" items="${form.syncSystems}">
+ <option
+ <c:if test="${system.id ==
form.targetProfile}">selected="selected"</c:if>
+ value='${system.id}'>${system.name}</option>
+ </c:forEach>
+ </select>
+ <br /><br />
+ <input type="radio" name="targetProfileType"
value="none"
+ onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled
= true;"
+ id="syncNone"
+ <c:if test="${empty form.targetProfileType or form.targetProfileType ==
'none'}">checked="checked"</c:if>
+ />
+<bean:message key="kickstart.schedule.sync.pkg.profile.option4.jsp"
/><br />
</td>
</tr>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
index e133e27..2c56ddd 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
@@ -35,6 +35,8 @@
<bean:message key="ssm.kickstart.schedule.heading2.text.jsp" />
</p>
</div>
+<c:set var="regularKS" value="true"/>
+<c:set var="form" value="${kickstartScheduleWizardForm.map}"/>
<rl:listset name="form">
<c:if test="${empty requestScope.isIP}">
<%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf"
%>
@@ -49,23 +51,23 @@
<th width="10%"><bean:message
key="kickstartdetails.jsp.kernel_options" />:</th>
<td>
<input type="radio" name="kernelParamsType"
value="distro" onclick="form.kernelParamsId.disabled = true;"
- <c:if test="${empty kickstartScheduleWizardForm.map.kernelParamsType or
kickstartScheduleWizardForm.map.kernelParamsType ==
'distro'}">checked="checked"</c:if>
+ <c:if test="${empty form.kernelParamsType or form.kernelParamsType ==
'distro'}">checked="checked"</c:if>
/>
<bean:message
key="kickstart.schedule.kernel.options.distro"/>
<br /><br />
<input type="radio" name="kernelParamsType"
value="profile"
- <c:if test="${kickstartScheduleWizardForm.map.kernelParamsType ==
'profile'}">checked="checked"</c:if>
+ <c:if test="${form.kernelParamsType ==
'profile'}">checked="checked"</c:if>
onclick="form.kernelParamsId.disabled = true;" />
<bean:message
key="kickstart.schedule.kernel.options.profile"/>
<br /><br />
<input type="radio" name="kernelParamsType"
value="custom"
- <c:if test="${kickstartScheduleWizardForm.map.kernelParamsType ==
'custom'}">checked="checked"</c:if>
+ <c:if test="${form.kernelParamsType ==
'custom'}">checked="checked"</c:if>
onclick="form.kernelParamsId.disabled = false;" />
<strong><bean:message key="Custom" /></strong>:
- <input type="text" name="kernelParams"
value="${kickstartScheduleWizardForm.map.kernelParams}"
- <c:if test="${kickstartScheduleWizardForm.map.kernelParamsType ne
'custom'}">disabled= "true"</c:if>
+ <input type="text" name="kernelParams"
value="${form.kernelParams}"
+ <c:if test="${form.kernelParamsType ne
'custom'}">disabled= "true"</c:if>
onkeydown="return blockEnter(event)"
id="kernelParamsId" /><br /><br />
<rhn:tooltip><bean:message
key="kickstart.schedule.kernel.options.custom.tip"
arg0="${rhn:localize('Custom')}"/></rhn:tooltip>
</td>
@@ -74,27 +76,29 @@
<th width="10%"><bean:message
key="kickstartdetails.jsp.post_kernel_options" />:</th>
<td>
<input type="radio" name="postKernelParamsType"
value="distro" onclick="form.postKernelParamsId.disabled = true;"
- <c:if test="${empty kickstartScheduleWizardForm.map.postKernelParamsType or
kickstartScheduleWizardForm.map.postKernelParamsType ==
'distro'}">checked="checked"</c:if>
+ <c:if test="${empty form.postKernelParamsType or form.postKernelParamsType
== 'distro'}">checked="checked"</c:if>
/>
<bean:message key="kickstart.schedule.kernel.options.distro"/>
<br /><br />
<input type="radio" name="postKernelParamsType"
value="profile" onclick="form.postKernelParamsId.disabled = true;"
- <c:if test="${kickstartScheduleWizardForm.map.postKernelParamsType ==
'profile'}">checked="checked"</c:if>
+ <c:if test="${form.postKernelParamsType ==
'profile'}">checked="checked"</c:if>
/>
<bean:message
key="kickstart.schedule.kernel.options.profile"/><br /><br />
<input type="radio" name="postKernelParamsType"
value="custom" onclick="form.postKernelParamsId.disabled = false;"
- <c:if test="${kickstartScheduleWizardForm.map.postKernelParamsType ==
'custom'}">checked="checked"</c:if>
+ <c:if test="${form.postKernelParamsType ==
'custom'}">checked="checked"</c:if>
/>
<strong><bean:message key="Custom" /></strong>:
- <input type="text" name="postKernelParams"
value="${kickstartScheduleWizardForm.map.postKernelParams}"
- <c:if test="${kickstartScheduleWizardForm.map.postKernelParamsType
ne 'custom'}">disabled= "true"</c:if>
+ <input type="text" name="postKernelParams"
value="${form.postKernelParams}"
+ <c:if test="${form.postKernelParamsType ne
'custom'}">disabled= "true"</c:if>
onkeydown="return blockEnter(event)"
id="postKernelParamsId" />
<br /><br />
<rhn:tooltip><bean:message
key="kickstart.schedule.kernel.options.custom.tip"
arg0="${rhn:localize('Custom')}"/></rhn:tooltip>
</td>
- </tr>
+ </tr>
+
+ <%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf"
%>
</table>
<%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf"
%>
Show replies by date