java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
| 34 ++++++++++
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
| 20 -----
java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
| 17 -----
3 files changed, 38 insertions(+), 33 deletions(-)
New commits:
commit a3f11584b0543c25b4b5b7bce8d222562c2023ce
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jun 29 22:28:59 2009 -0400
Made the radio button in schedule ks page choose scheduleAsap by default
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
new file mode 100644
index 0000000..806895f
--- /dev/null
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
@@ -0,0 +1,34 @@
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
+<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean" %>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html"
prefix="html" %>
+
+ <h2>
+ <img src="/img/rhn-icon-schedule.gif"
+ alt="<bean:message key='system.common.scheduleAlt'
/>" />
+ <bean:message key="kickstart.schedule.heading3.jsp" />
+ </h2>
+ <c:choose>
+ <c:when test="${empty param.scheduleAsap or param.scheduleAsap ==
'true'}">
+ <c:set var="byAsap"
value="checked="checked""/>
+ <c:set var="byDate" value=""/>
+ </c:when>
+ <c:otherwise>
+ <c:set var="byDate"
value="checked="checked""/>
+ <c:set var="byAsap" value=""/>
+ </c:otherwise>
+ </c:choose>
+
+ <table width="50%">
+ <tr>
+ <td><input type="radio" name="scheduleAsap"
value="true" id="scheduleAsap" ${byAsap} /><bean:message
key="kickstart.schedule.heading3.option1.jsp" /></td>
+ </tr>
+ <tr>
+ <td><input type="radio" name="scheduleAsap"
value="false" id="scheduleDate" ${byDate} /><bean:message
key="kickstart.schedule.heading3.option2.jsp" /><br /><br />
+ <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </td>
+ </tr>
+ </table>
+ <hr />
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
index 6c05b7d..e7afbe1 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
@@ -115,24 +115,8 @@ function setStep(stepName) {
</p>
</c:if>
<c:if test="${requestScope.hasProfiles == 'true'}">
- <h2>
- <img src="/img/rhn-icon-schedule.gif"
- alt="<bean:message key='system.common.scheduleAlt'
/>" />
- <bean:message key="kickstart.schedule.heading3.jsp" />
- </h2>
- <table width="50%">
- <tr>
- <td><input type="radio" name="scheduleAsap"
value="true" id="scheduleAsap"/><bean:message
key="kickstart.schedule.heading3.option1.jsp" /></td>
- </tr>
- <tr>
- <td><input type="radio" name="scheduleAsap"
value="false" id="scheduleDate" /><bean:message
key="kickstart.schedule.heading3.option2.jsp" /><br /><br />
- <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
- <hr />
+ <%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf"
%>
+
<table width="100%">
<tr>
<td align="right">
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
index e261f1d..e9a7323 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
@@ -94,21 +94,8 @@ function setStep(stepName) {
<bean:message key="kickstart.schedule.tip.proxy.jsp"/>
</p>
</c:if>
- <c:if test="${requestScope.hasProfiles == 'true'}">
- <h2><img src="/img/rhn-icon-schedule.gif" /><bean:message
key="kickstart.schedule.heading3.jsp" /></h2>
- <table width="50%">
- <tr>
- <td><input type="radio" name="scheduleAsap"
value="true" id="scheduleAsap"/><bean:message
key="kickstart.schedule.heading3.option1.jsp" /></td>
- </tr>
- <tr>
- <td><input type="radio" name="scheduleAsap"
value="false" id="scheduleDate" /><bean:message
key="kickstart.schedule.heading3.option2.jsp" /><br /><br />
- <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
- <hr />
+ <c:if test="${requestScope.hasProfiles == 'true'}">
+ <%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf"
%>
<table width="100%">
<tr>
<td align="right">