java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |
4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf |
22 +--
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp |
57 ++++++++++
java/code/webapp/WEB-INF/struts-config.xml |
4
4 files changed, 72 insertions(+), 15 deletions(-)
New commits:
commit 770c6a6d788c0689da987657ae6ffed56851c4bb
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Jul 1 19:53:01 2009 -0400
Added kernel options
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 7527dd8..48ab0ab 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -16427,10 +16427,10 @@ the <a
href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Acti
<source>Bootloader</source>
</trans-unit>
<trans-unit id="kickstart.schedule.kernel.options.distro">
- <source><strong>As specified by Kickstart
Distribution</strong>({0})</source>
+ <source><strong>As specified by Kickstart
Distribution</strong></source>
</trans-unit>
<trans-unit id="kickstart.schedule.kernel.options.profile">
- <source><strong>As specified by Kickstart
Profile</strong>({0})</source>
+ <source><strong>As specified by Kickstart
Profile</strong></source>
</trans-unit>
<trans-unit id="kickstart.schedule.kernel.options.custom.tip">
<source>If you would not like any kernel options, select '{0}' and
leave the form field blank.</source>
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 602b346..bacd83e 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
@@ -6,27 +6,27 @@
<tr>
<th width="10%"><bean:message
key="kickstartdetails.jsp.kernel_options" />:</th>
<td>
- <c:set var="profile_url"><a
href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${requestScope.profile.id}">${requestScope.profile.label}</a></c:set>
+ <c:set var="profile_url">(<a
href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${requestScope.profile.id}">${requestScope.profile.label}</a>)</c:set>
<c:choose>
<c:when test = "${not requestScope.distro.rhnTree}">
- <c:set var="distro_url"><a
href="/rhn/kickstart/TreeEdit.do?kstid=${requestScope.distro.id}">${requestScope.distro.label}</a></c:set>
+ <c:set var="distro_url">(<a
href="/rhn/kickstart/TreeEdit.do?kstid=${requestScope.distro.id}">${requestScope.distro.label}</a>)</c:set>
</c:when>
<c:otherwise>
- <c:set
var="distro_url">${requestScope.distro.label}</c:set>
+ <c:set
var="distro_url">(${requestScope.distro.label})</c:set>
</c:otherwise>
</c:choose>
<html:radio value="distro" property="kernelParamsType"
onclick="form.kernelParamsId.disabled = true;">
- <bean:message key="kickstart.schedule.kernel.options.distro"
arg0="${distro_url}"/>
- </html:radio>:<br/>
+ <bean:message
key="kickstart.schedule.kernel.options.distro"/>
+ </html:radio> ${distro_url}:<br/>
<c:choose> <c:when test = "${not empty
requestScope.distro_kernel_params}">
${requestScope.distro_kernel_params}</c:when>
<c:otherwise>(<bean:message key="none
specified"/>)</c:otherwise>
</c:choose>
<br /><br />
<html:radio value="profile" property="kernelParamsType"
onclick="form.kernelParamsId.disabled = true;">
- <bean:message key="kickstart.schedule.kernel.options.profile"
arg0="${profile_url}"/>
- </html:radio>:<br/>
+ <bean:message
key="kickstart.schedule.kernel.options.profile"/>
+ </html:radio> ${profile_url}:<br/>
<c:choose> <c:when test = "${not empty
requestScope.profile_kernel_params}">
${requestScope.profile_kernel_params}</c:when>
<c:otherwise>(<bean:message key="none
specified"/>)</c:otherwise>
</c:choose>
@@ -42,15 +42,15 @@
<th width="10%"><bean:message
key="kickstartdetails.jsp.post_kernel_options" />:</th>
<td>
<html:radio value="distro" property="postKernelParamsType"
onclick="form.postKernelParamsId.disabled = true;">
- <bean:message key="kickstart.schedule.kernel.options.distro"
arg0="${distro_url}"/>
- </html:radio>:<br/>
+ <bean:message key="kickstart.schedule.kernel.options.distro"/>
+ </html:radio> ${distro_url}:<br/>
<c:choose> <c:when test = "${not empty
requestScope.distro_post_kernel_params}">
${requestScope.distro_post_kernel_params}</c:when>
<c:otherwise>(<bean:message key="none
specified"/>)</c:otherwise>
</c:choose><br /><br />
<html:radio value="profile" property="postKernelParamsType"
onclick="form.postKernelParamsId.disabled = true;">
- <bean:message key="kickstart.schedule.kernel.options.profile"
arg0="${profile_url}"/>
- </html:radio>:<br/>
+ <bean:message
key="kickstart.schedule.kernel.options.profile"/>
+ </html:radio> ${profile_url}:<br/>
<c:choose> <c:when test = "${not empty
requestScope.profile_post_kernel_params}">
${requestScope.profile_post_kernel_params}</c:when>
<c:otherwise>(<bean:message key="none
specified"/>)</c:otherwise>
</c:choose><br /><br />
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 4a562e2..e133e27 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
@@ -40,6 +40,63 @@
<%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf"
%>
</c:if>
<%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf"
%>
+ <br/>
+ <h2>
+ <bean:message key="ssm.kickstart.schedule.advanced.options"/>
+ </h2>
+ <table class="details">
+ <tr>
+ <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>
+ />
+ <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>
+ 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>
+ 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>
+ 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>
+ </tr>
+ <tr>
+ <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>
+ />
+ <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>
+ />
+ <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>
+ />
+ <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>
+ 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>
+ </table>
+
<%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf"
%>
<div align="right">
<hr />
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 2e4399c..ba9acbc 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -4620,7 +4620,7 @@
redirect= "true"/>
</action>
<action path="/systems/ssm/kickstart/ScheduleByProfile"
- name ="datePickerForm"
+ name ="kickstartScheduleWizardForm"
scope="request"
input="/WEB-INF/pages/kickstart/ssm/schedule.jsp"
type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKSScheduleAction"
@@ -4634,7 +4634,7 @@
</action>
<action path="/systems/ssm/kickstart/ScheduleByIp"
- name ="datePickerForm"
+ name ="kickstartScheduleWizardForm"
scope="request"
input="/WEB-INF/pages/kickstart/ssm/schedule.jsp"
type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKSScheduleAction"
Show replies by date