java/code
by Partha Aji
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 b5aa175bcaae5abca0f60bbdfa46fac2b053d02e
Author: Partha Aji <paji(a)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 e9a7323..ab2a6c4 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
@@ -31,20 +31,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"/>
@@ -59,8 +45,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>
@@ -78,37 +62,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>
-
15 years
Changes to 'refs/tags/spacewalk-branding-0.6.7-1'
by Miroslav Suchý
Tag 'spacewalk-branding-0.6.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-06-30 11:45 +0000
Tagging package [spacewalk-branding] version [0.6.7-1] in directory [branding/].
Changes since rhn-client-tools-0.6.1-1:
Brad Buckingham (1):
508141 - api - system.config.deployAll updated w/ better exception when system not config capable
Devan Goodwin (1):
Fix API call to remove server custom data value.
Justin Sherrill (1):
508323 - fixing issue with creating cobbler system records with spaces (which would fail)
Mike McCune (1):
removing spammy debug from log4j properties file
Miroslav Suchý (2):
508710 - make bar on top of page wider, so we do not get empty space on wider displays
Automatic commit of package [spacewalk-branding] release [0.6.7-1].
Partha Aji (3):
508736 - Corrected spec to properly set the cobbler/snippets/spacewalk symlink
508376 - fix for a typo in the previous commit
Made the radio button in schedule ks page choose scheduleAsap by default
Shannon Hughes (1):
508220 - fixed channel sharing syntax error on english side
---
branding/img/nav/utilBkgdRight.png |binary
branding/spacewalk-branding.spec | 5 +
java/code/src/com/redhat/rhn/domain/server/Server.java | 4 -
java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 1
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 5 +
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java | 10 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 9 ++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 21 +++++-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 3
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java | 2
java/code/src/log4j.properties | 3
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 -----
java/spacewalk-java.spec | 12 +--
rel-eng/packages/spacewalk-branding | 2
17 files changed, 95 insertions(+), 55 deletions(-)
---
15 years
branding/spacewalk-branding.spec rel-eng/packages
by Miroslav Suchý
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4ebf9a50ed9a534226961db3a4402ed443860961
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 30 13:45:37 2009 +0200
Automatic commit of package [spacewalk-branding] release [0.6.7-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index f4bb8bb..eb017b7 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 0.6.6
+Version: 0.6.7
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Jun 30 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.6.7-1
+- 508710 - make bar on top of page wider, so we do not get empty space on wider displays
+
* Thu Jun 25 2009 John Matthews <jmatthew(a)redhat.com> 0.6.6-1
- 506489 - remove the link associated with the org name present in the UI
header (bbuckingham(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index ed657c3..660ed0e 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-0.6.6-1 branding/
+0.6.7-1 branding/
15 years
branding/img
by Miroslav Suchý
branding/img/nav/utilBkgdRight.png |binary
1 file changed
New commits:
commit 4ec8b88442ab9238427b480e553852c3543d2fa6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 30 13:43:34 2009 +0200
508710 - make bar on top of page wider, so we do not get empty space on wider displays
diff --git a/branding/img/nav/utilBkgdRight.png b/branding/img/nav/utilBkgdRight.png
index aa2043c..78ac2e4 100644
Binary files a/branding/img/nav/utilBkgdRight.png and b/branding/img/nav/utilBkgdRight.png differ
15 years
Branch 'VADER' - java/code
by Partha Aji
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 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/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 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="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">
15 years
java/code
by Partha Aji
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">
15 years
Branch 'VADER' - java/spacewalk-java.spec
by Partha Aji
java/spacewalk-java.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 693a797ce5d438539fec061b66a6fbfc499095e3
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jun 29 18:03:07 2009 -0400
508376 - fix for a typo in the previous commit
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 48648b9..499b827 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -209,7 +209,7 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT/%{_datad
install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
-mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir}
+install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir}
ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
%clean
15 years
java/spacewalk-java.spec
by Partha Aji
java/spacewalk-java.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 4b80c5d58eea761e92eeaf7df4a5ee7238d35db0
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jun 29 18:03:07 2009 -0400
508376 - fix for a typo in the previous commit
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 22e3f09..206f021 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -203,7 +203,7 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT/%{_datad
install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
-mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir}
+install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir}
ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
%clean
@@ -497,7 +497,6 @@ fi
code had been ripped out, so i converted it to java (jsherril(a)redhat.com)
- 491361 - Added note to error messages to check the log for error messages. (jason.dobies(a)redhat.com)
- 500891 - fixed an unescaped string on snippets delete confirm page (paji(a)redhat.com)
-dually.rdu.redhat.com,10.11.228.46 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt3L3QI0h+nKNrRIrd/Qj/l2aaPAtSk1O7smalVJZYLx8JCwmYLd+XzWc9b951l6zevxMIHfHRFjA2EwoJWKVzffNE/91RVs9jQ3M5289YX5VZbu6g/9PZ6gj5JG7EN+Q6h29iDhJ/LBrZb62ytXru+jBGMcoBoZggQ+nAtjZstZcOwlIOZ0ldLMJycsWV2aKXwhbVgowtE/evPuF+lF68Z4Fdfi/ScznuF7mQlHAnxQNEQCQojjqf37fgW8dQENIxoaFOJXOFjeW57X2HIgz0XX3ux3kgtGgmKvQanVRpISnUBnlEEXtDvYxO73mlTen+eS+wbyhF0Wkpg3OEWaTOQ==
- 500887 -Fix to not escape contents in cobbler snippet detials page (paji(a)redhat.com)
- 5/14 update of webui translation strings (shughes(a)redhat.com)
- 500727 - Just noticed this was flagged as NOTABUG since we don't want to
15 years
Branch 'VADER' - java/code
by Mike McCune
java/code/src/log4j.properties | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 412f83ad0ec27e320e00157c7eb1168ce8d6f5d2
Author: Mike McCune <mmccune(a)gibson.pdx.redhat.com>
Date: Mon Jun 29 14:51:37 2009 -0700
removing spammy debug from log4j properties file
diff --git a/java/code/src/log4j.properties b/java/code/src/log4j.properties
index d2f0275..de268b7 100644
--- a/java/code/src/log4j.properties
+++ b/java/code/src/log4j.properties
@@ -40,8 +40,5 @@ log4j.logger.com.redhat.rhn.taskomatic.SchedulerKernel=INFO
#log4j.logger.net.rkbloom.logdriver.LogCallableStatement=DEBUG
#log4j.logger.net.rkbloom.logdriver.LogConnection=DEBUG,HibernateAppender
-log4j.logger.org.cobbler.CobblerConnection=DEBUG
-log4j.logger.com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper=DEBUG
-
# General debug for everything. Very noisy
#log4j.logger.com.redhat.rhn=DEBUG
15 years
java/code
by Mike McCune
java/code/src/log4j.properties | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit c98efa074c95300f32c21172abf9a40148eb3f07
Author: Mike McCune <mmccune(a)gibson.pdx.redhat.com>
Date: Mon Jun 29 14:51:37 2009 -0700
removing spammy debug from log4j properties file
diff --git a/java/code/src/log4j.properties b/java/code/src/log4j.properties
index d2f0275..de268b7 100644
--- a/java/code/src/log4j.properties
+++ b/java/code/src/log4j.properties
@@ -40,8 +40,5 @@ log4j.logger.com.redhat.rhn.taskomatic.SchedulerKernel=INFO
#log4j.logger.net.rkbloom.logdriver.LogCallableStatement=DEBUG
#log4j.logger.net.rkbloom.logdriver.LogConnection=DEBUG,HibernateAppender
-log4j.logger.org.cobbler.CobblerConnection=DEBUG
-log4j.logger.com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper=DEBUG
-
# General debug for everything. Very noisy
#log4j.logger.com.redhat.rhn=DEBUG
15 years
