From partha@fedoraproject.org Thu Aug 20 11:57:52 2015
From: Partha Aji <partha@fedoraproject.org>
To: spacewalk-commits@lists.fedorahosted.org
Subject: Branch 'VADER' - java/code
Date: Tue, 30 Jun 2009 02:37:18 +0000
Message-ID: <20090630023718.387A51201FE@lists.fedorahosted.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7637601908334272278=="

--===============7637601908334272278==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

 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/firs=
t.jsp        |   17 -----
 3 files changed, 38 insertions(+), 33 deletions(-)

New commits:
commit 8ccdc822e745b008a7c16bd04c16f8cfcbc7b47c
Author: Partha Aji <paji(a)redhat.com>
Date:   Mon Jun 29 22:28:59 2009 -0400

    508816 - Corrected the behaviour of the radio button in schedule ks page

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedu=
le/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ki=
ckstart/schedule/schedule-options.jspf
new file mode 100644
index 0000000..806895f
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/sche=
dule-options.jspf
@@ -0,0 +1,34 @@
+<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %>
+<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %>
+<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"bean=
" %>
+<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"html=
" %>
+
+          <h2>
+            <img src=3D"/img/rhn-icon-schedule.gif"
+                 alt=3D"<bean:message key=3D'system.common.scheduleAlt' />" =
/>
+            <bean:message key=3D"kickstart.schedule.heading3.jsp" />
+          </h2>
+          <c:choose>
+          	<c:when test=3D"${empty param.scheduleAsap or param.scheduleAsap =
=3D=3D 'true'}">
+          	<c:set var=3D"byAsap" value=3D"checked=3D&quot;checked&quot;"/>
+          	<c:set var=3D"byDate" value=3D""/>
+          	</c:when>
+          	<c:otherwise>
+          	<c:set var=3D"byDate" value=3D"checked=3D&quot;checked&quot;"/>
+          	<c:set var=3D"byAsap" value=3D""/>
+          	</c:otherwise>
+          </c:choose>
+         =20
+          <table width=3D"50%">
+            <tr>
+              <td><input type=3D"radio" name=3D"scheduleAsap" value=3D"true"=
 id=3D"scheduleAsap" ${byAsap} /><bean:message key=3D"kickstart.schedule.head=
ing3.option1.jsp" /></td>
+            </tr>
+            <tr>
+              <td><input type=3D"radio" name=3D"scheduleAsap" value=3D"false=
" id=3D"scheduleDate" ${byDate} /><bean:message key=3D"kickstart.schedule.hea=
ding3.option2.jsp" /><br /><br />
+                  <jsp:include page=3D"/WEB-INF/pages/common/fragments/date-=
picker.jsp">
+                    <jsp:param name=3D"widget" value=3D"date"/>
+                  </jsp:include>
+              </td>
+            </tr>    =20
+          </table>
+          <hr />
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.j=
sp 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=3D"${requestScope.hasProfiles =3D=3D 'true'}">   =20
-          <h2>
-            <img src=3D"/img/rhn-icon-schedule.gif"
-                 alt=3D"<bean:message key=3D'system.common.scheduleAlt' />" =
/>
-            <bean:message key=3D"kickstart.schedule.heading3.jsp" />
-          </h2>
-          <table width=3D"50%">
-            <tr>
-              <td><input type=3D"radio" name=3D"scheduleAsap" value=3D"true"=
 id=3D"scheduleAsap"/><bean:message key=3D"kickstart.schedule.heading3.option=
1.jsp" /></td>
-            </tr>
-            <tr>
-              <td><input type=3D"radio" name=3D"scheduleAsap" value=3D"false=
" id=3D"scheduleDate" /><bean:message key=3D"kickstart.schedule.heading3.opti=
on2.jsp" /><br /><br />
-                  <jsp:include page=3D"/WEB-INF/pages/common/fragments/date-=
picker.jsp">
-                    <jsp:param name=3D"widget" value=3D"date"/>
-                  </jsp:include>
-              </td>
-            </tr>
-          </table>
-          <hr />
+		 <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/sc=
hedule-options.jspf" %>
+         =20
           <table width=3D"100%">
             <tr>
               <td align=3D"right">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/pr=
ovision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualiza=
tion/provision/first.jsp
index 42359c3..f3f8fdd 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
@@ -97,21 +97,8 @@ function setStep(stepName) {
     <bean:message key=3D"kickstart.schedule.tip.proxy.jsp"/>
     </p>
     </c:if>
-    <c:if test=3D"${requestScope.hasProfiles =3D=3D 'true'}">   =20
-      <h2><img src=3D"/img/rhn-icon-schedule.gif" /><bean:message key=3D"kic=
kstart.schedule.heading3.jsp" /></h2>
-          <table width=3D"50%">
-            <tr>
-              <td><input type=3D"radio" name=3D"scheduleAsap" value=3D"true"=
 id=3D"scheduleAsap"/><bean:message key=3D"kickstart.schedule.heading3.option=
1.jsp" /></td>
-            </tr>
-            <tr>
-              <td><input type=3D"radio" name=3D"scheduleAsap" value=3D"false=
" id=3D"scheduleDate" /><bean:message key=3D"kickstart.schedule.heading3.opti=
on2.jsp" /><br /><br />
-                  <jsp:include page=3D"/WEB-INF/pages/common/fragments/date-=
picker.jsp">
-                    <jsp:param name=3D"widget" value=3D"date"/>
-                  </jsp:include>
-              </td>
-            </tr>
-          </table>
-      <hr />
+    <c:if test=3D"${requestScope.hasProfiles =3D=3D 'true'}"> =20
+    <%@ include file=3D"/WEB-INF/pages/common/fragments/kickstart/schedule/s=
chedule-options.jspf" %>
 	  <table width=3D"100%">
 	    <tr>
 	      <td align=3D"right">



--===============7637601908334272278==--