java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 59 +++++++++- java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 47 ------- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 46 ------- 3 files changed, 61 insertions(+), 91 deletions(-)
New commits: commit af5ad64f3539e8fda3fd765391910c90d541705f Author: Partha Aji paji@redhat.com Date: Tue Jun 30 12:30:37 2009 -0400
508885 - fixed ks schedule pages to remember proxy host
Also fixed forgotten values such as postKernelParams
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 index 806895f..1c415bd 100644 --- 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 @@ -2,7 +2,50 @@ <%@ 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" %> + <!--Store form variables obtained from previous page --> + <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> + <input type="hidden" name="targetProfile" value="${form.targetProfile}" />
+ <input type="hidden" name="postKernelParamsType" value="${form.postKernelParamsType}" /> + <input type="hidden" name="postKernelParams" value="${form.postKernelParams}" /> + <input type="hidden" name="kernelParamsType" value="${form.kernelParamsType}" /> + <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> + + <!-- Store useful id fields--> + <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> + <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> + <input type="hidden" name="sid" value="${form.sid}" /> + + <c:if test="${empty regularKS}"> + <!-- Store guest provisioning info --> + <input type="hidden" name="memoryAllocation" value="${form.memoryAllocation}" /> + <input type="hidden" name="virtualCpus" value="${form.virtualCpus}" /> + <input type="hidden" name="localStorageMegabytes" value="${form.localStorageMegabytes}" /> + <input type="hidden" name="diskPath" value="${form.diskPath}" /> + </c:if> + + <c:if test="${requestScope.hasProxies == 'true'}"> + <h2> + <img src="/img/rhn-icon-proxy.gif" + alt="<bean:message key='system.common.proxyAlt' />" /> + <bean:message key="kickstart.schedule.heading.proxy.jsp"/> + </h2> + <p> + <bean:message key="kickstart.schedule.msg.proxy.jsp"/> + </p> + <p> + <select name="proxyHost"> + <c:forEach var="proxy" items="${proxies}"> + <option + <c:if test="${proxy.value == param.proxyHost}">selected="selected"</c:if> + value='${proxy.value}'>${proxy.label}</option> + </c:forEach> + </select> + <br /> + <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" alt="<bean:message key='system.common.scheduleAlt' />" /> @@ -31,4 +74,18 @@ </td> </tr> </table> - <hr /> \ No newline at end of file + <hr /> + <table width="100%"> + <tr> + <td align="right"> + <c:if test="${not empty regularKS}"> + <input type="button" + value="<bean:message key="kickstart.schedule.button0.jsp" />" + onclick="setStep('fourth');this.form.submit();" /> + </c:if> + <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> + <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> + </td> + </tr> + </table> + </c:if> \ 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 e7afbe1..e824a80 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 @@ -58,19 +58,6 @@ function setStep(stepName) { <c:set var="form" value="${kickstartScheduleWizardForm.map}"/>
<rl:listset name="wizard-form"> - <!--Store form variables obtained from previous page --> - <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> - <input type="hidden" name="targetProfile" value="${form.targetProfile}" /> - - <input type="hidden" name="postKernelParamsType" value="${form.postKernelParamsType}" /> - <input type="hidden" name="postKernelParams" value="${form.postKernelParams}" /> - <input type="hidden" name="kernelParamsType" value="${form.kernelParamsType}" /> - <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> - - <!-- Store useful id fields--> - <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> - <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> - <input type="hidden" name="sid" value="${form.sid}" /> <rl:list width="100%" emptykey = "kickstart.schedule.no.profiles.jsp" alphabarcolumn="label"> <rl:decorator name = "PageSizeDecorator"/> <rl:radiocolumn value="${current.cobblerId}" styleclass="first-column"/> @@ -95,38 +82,8 @@ function setStep(stepName) { </rl:column> </rl:list> rhn:tooltip* - <bean:message key="kickstart.distro.cobbler-only.tooltip"/></rhn:tooltip> - <c:if test="${requestScope.hasProxies == 'true'}"> - <h2> - <img src="/img/rhn-icon-proxy.gif" - alt="<bean:message key='system.common.proxyAlt' />" /> - <bean:message key="kickstart.schedule.heading.proxy.jsp"/> - </h2> - <p> - <bean:message key="kickstart.schedule.msg.proxy.jsp"/> - </p> - <p> - <select name="proxyHost"> - <c:forEach var="proxy" items="${proxies}"> - <option <c:if test="${proxy.value eq proxyHost}">selected="selected"</c:if> value='${proxy.value}'>${proxy.label}</option> - </c:forEach> - </select> - <br /> - <bean:message key="kickstart.schedule.tip.proxy.jsp"/> - </p> - </c:if> - <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"> - <input type="button" value="<bean:message key="kickstart.schedule.button0.jsp" />" onclick="setStep('fourth');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> - </td> - </tr> - </table> - </c:if> + <c:set var="regularKS" value="true"/> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> </rl:listset> </div> </c:if> 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 f3f8fdd..38dcac4 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 @@ -34,20 +34,6 @@ function setStep(stepName) { <div> <c:set var="form" value="${kickstartScheduleWizardForm.map}"/> <rl:listset name="wizard-form"> - <!--Store form variables obtained from previous page --> - <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> - <input type="hidden" name="targetProfile" value="${form.targetProfile}" /> - <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> - <input type="hidden" name="memoryAllocation" value="${form.memoryAllocation}" /> - <input type="hidden" name="virtualCpus" value="${form.virtualCpus}" /> - <input type="hidden" name="localStorageMegabytes" value="${form.localStorageMegabytes}" /> - <input type="hidden" name="diskPath" value="${form.diskPath}" /> - - <!-- Store useful id fields--> - <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> - <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> - <input type="hidden" name="sid" value="${form.sid}" /> - <rl:list width="100%" emptykey = "virtualization.provision.first.jsp.no.profiles" alphabarcolumn="label"> <rl:decorator name = "PageSizeDecorator"/> <rl:radiocolumn value="${current.cobblerId}" styleclass="first-column"/> @@ -62,8 +48,6 @@ function setStep(stepName) { </rl:list> <h2><bean:message key="virtualization.provision.first.jsp.header2" /></h2> - - <table class="details"> <tr> <th><rhn:required-field key="virtualization.provision.first.jsp.guest_name.header"/></th> @@ -81,37 +65,9 @@ function setStep(stepName) { <bean:message key="virtualization.provision.override.jsp.goto.advanced.options" arg0="${rhn:localize('kickstart.schedule.button1.jsp')}"/> <br/><br/> - - <c:if test="${requestScope.hasProxies == 'true'}"> - <h2><img src="/img/rhn-icon-proxy.gif"/><bean:message key="kickstart.schedule.heading.proxy.jsp"/></h2> - <p> - <bean:message key="kickstart.schedule.msg.proxy.jsp"/> - </p> - <p> - <select name="proxyHost"> - <c:forEach var="proxy" items="${proxies}"> - <option <c:if test="${proxy.value eq proxyHost}">selected="selected"</c:if> value='${proxy.value}'>${proxy.label}</option> - </c:forEach> - </select> - <br /> - <bean:message key="kickstart.schedule.tip.proxy.jsp"/> - </p> - </c:if> - <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"> - <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> - </td> - </tr> - </table> - </c:if> - </div> +<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> </rl:listset> </div>
</body> </html> -
spacewalk-commits@lists.fedorahosted.org