java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 56
+++---
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 56
++----
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 59
++----
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 55
++----
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 49
++---
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 88
++++------
java/spacewalk-java.spec | 14
+
rel-eng/packages/spacewalk-java | 2
9 files changed, 167 insertions(+), 218 deletions(-)
New commits:
commit 67f0e9a33af3f8b47c8efba87b935853ccbcd752
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jan 28 12:52:39 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.134-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index de2c030..f94c613 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.133
+Version: 2.1.134
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,18 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jan 28 2014 Jan Dobes 2.1.134-1
+- remove old message
+- Datepicker UI unification: Systems/Software/Packages/List-Remove
+- Datepicker UI unification: SSM/Configuration/Enable
+- Datepicker UI unification: SSM/Packages/Upgrade
+- Datepicker UI unification: SSM/Packages/Verify
+- Datepicker UI unification: SSM/Packages/Install
+- Datepicker UI unification: SSM/Packages/Remove
+- add javadoc comment
+- removing @Override annotation from method that isn't overriden
+- remove unnecessary cast
+
* Mon Jan 27 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.133-1
- Unstyled Systems/Software/Channels
- Fixed unstyled form for XCCDF scaner on SSM and single system
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 92c46e7..5f6c19e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.133-1 java/
+2.1.134-1 java/
commit 316dffcf8eccf2b37ec5762fc4adbed6da6dffa0
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jan 28 12:40:07 2014 +0100
remove old message
there is no longer asap and select date option, only select date
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index 879c85b..569314b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -46,7 +46,6 @@
<jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="date"/>
</jsp:include>
- <span class="help-block"><bean:message
key="${widgetSummary}"/></span>
</div>
</div>
<div class="form-group">
commit e9cd596285ff0d2f66fa7ef61c5add172736bb1d
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 17:08:39 2014 +0100
Datepicker UI unification: Systems/Software/Packages/List-Remove
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index f9bbe02..879c85b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -37,60 +37,47 @@
</rl:list>
<c:if test="${not empty requestScope.pageList}">
- <div class="text-right">
- <div align="left">
- <p><bean:message key="${widgetSummary}"/></p>
- </div>
-
- <table class="schedule-action-interface"
align="center">
-
- <tr>
- <td><input type="radio" name="use_date"
value="false" checked="checked" /></td>
- <th><bean:message key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date"
value="true"/></td>
- <th><bean:message key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule"
title="confirm.jsp.selection" />
- </th>
- <td>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
<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="${not empty requestScope.enableRemoteCommand}">
- <rhn:require
mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"
acl="system_feature(ftr_remote_command); client_capable(script.run)">
- <c:choose>
- <c:when test="${requestScope.mode == 'remove'}">
- <input type="submit"
- name ="dispatch"
- value='<bean:message
key="removeconfirm.jsp.runremotecommand"/>'/>
- </c:when>
- <c:when test="${requestScope.mode == 'install'}">
- <input type="submit"
- name ="dispatch"
- value='<bean:message
key="installconfirm.jsp.runremotecommand"/>'/>
- </c:when>
- <c:otherwise>
- <input type="submit"
- name ="dispatch"
- value='<bean:message
key="upgradeconfirm.jsp.runremotecommand"/>'/>
- </c:otherwise>
- </c:choose>
- </rhn:require>
- </c:if>
- <input type="submit"
- name ="dispatch"
- value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
- </div>
-
- <input type="hidden" name="sid"
value="${param.sid}" /></c:if>
+ <span class="help-block"><bean:message
key="${widgetSummary}"/></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:if test="${not empty
requestScope.enableRemoteCommand}">
+ <rhn:require
mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"
+ acl="system_feature(ftr_remote_command);
client_capable(script.run)">
+ <c:choose>
+ <c:when test="${requestScope.mode ==
'remove'}">
+ <input type="submit" name
="dispatch"
+ value='<bean:message
key="removeconfirm.jsp.runremotecommand"/>'/>
+ </c:when>
+ <c:when test="${requestScope.mode ==
'install'}">
+ <input type="submit" name
="dispatch"
+ value='<bean:message
key="installconfirm.jsp.runremotecommand"/>'/>
+ </c:when>
+ <c:otherwise>
+ <input type="submit" name
="dispatch"
+ value='<bean:message
key="upgradeconfirm.jsp.runremotecommand"/>'/>
+ </c:otherwise>
+ </c:choose>
+ </rhn:require>
+ </c:if>
+ <input type="submit" name ="dispatch"
+ value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ <input type="hidden" name="sid"
value="${param.sid}" />
+ </div>
+ </div>
+ </div>
+ <input type="hidden" name="use_date" value="true"
/>
+</c:if>
</rl:listset>
</body>
commit b8520bbad4aa47a4e9a0aee5035ecbcf25d0368c
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 16:05:57 2014 +0100
Datepicker UI unification: SSM/Configuration/Enable
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
index 770a620..c83408b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
@@ -4,31 +4,31 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"%>
<c:if test="${not empty requestScope.pageList}">
-<p><bean:message key="targetsystems.jsp.widgetsummary"
/></p>
-<table class="table">
- <tr>
- <td><html:radio property="use_date" value="false"
/></td>
- <td><bean:message key="targetsystems.jsp.now"/></td>
- </tr>
- <tr>
- <td><html:radio property="use_date" value="true"
/></td>
- <td><bean:message
key="targetsystems.jsp.usedate"/></td>
- </tr>
- <tr>
- <td>
- <rhn:icon type="header-system" />
- </td>
- <td>
- <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
-</table>
-
-<div class="pull-right">
- <html:submit property="dispatch">
- <bean:message key="targetsystems.jsp.enable" />
- </html:submit>
-</div>
-</c:if>
\ No newline at end of file
+ <div class="form-horizontal">
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <span class="help-block">
+ <bean:message key="targetsystems.jsp.widgetsummary"
/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-md-6">
+ <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="dispatch">
+ <bean:message key="targetsystems.jsp.enable" />
+ </html:submit>
+ <input type="hidden" name="use_date"
value="true" />
+ </div>
+ </div>
+ </div>
+</c:if>
commit 26e92d487ccaaa6f66aaa4326c427bb6b6428750
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 15:44:34 2014 +0100
Datepicker UI unification: SSM/Packages/Upgrade
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
index e258855..a5bc167 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
@@ -52,45 +52,32 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message
key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
</div>
-
- <table class="schedule-action-interface"
align="center">
-
- <tr>
- <td><input type="radio" name="use_date"
value="false" checked="checked"/>
- </td>
- <th><bean:message
key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date"
value="true"/></td>
- <th><bean:message
key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule"
title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget"
value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message
key="upgradeconfirm.jsp.runremotecommand"/>'/>
- <input type="submit"
- name="dispatch"
- value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message
key="upgradeconfirm.jsp.runremotecommand"/>'/>
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ </div>
+ </div>
</div>
<input type="hidden" name="packagesDecl"
value="${requestScope.packagesDecl}" />
<input type="hidden" name="mode"
value="${param.mode}" />
+ <input type="hidden" name="use_date" value="true"
/>
</rl:listset>
commit 51291b3b14b7cda1c84b5fc9a320db4f54d80bf2
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 15:42:39 2014 +0100
Datepicker UI unification: SSM/Packages/Verify
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
index 9780610..83b129c 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
@@ -47,42 +47,29 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message
key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
</div>
-
- <table class="schedule-action-interface"
align="center">
-
- <tr>
- <td><input type="radio" name="use_date"
value="false" checked="checked"/>
- </td>
- <th><bean:message
key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date"
value="true"/></td>
- <th><bean:message
key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule"
title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget"
value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ </div>
+ </div>
</div>
<input type="hidden" name="packagesDecl"
value="${requestScope.packagesDecl}" />
<input type="hidden" name="cid" value="${param.cid}"
/>
+ <input type="hidden" name="use_date" value="true"
/>
</rl:listset>
commit 6a37c8307a3d05db5e40757c1689df04d347c83d
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 15:35:10 2014 +0100
Datepicker UI unification: SSM/Packages/Install
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
index 8e3fa1d..2b4c50e 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
@@ -38,46 +38,34 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message
key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message
key="installconfirm.jsp.runremotecommand"/>'/>
+ <input type="submit"
+ name="dispatch"
+ value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ </div>
</div>
-
- <table class="schedule-action-interface"
align="center">
-
- <tr>
- <td><input type="radio" name="use_date"
value="false" checked="checked"/>
- </td>
- <th><bean:message
key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date"
value="true"/></td>
- <th><bean:message
key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule"
title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget"
value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message
key="installconfirm.jsp.runremotecommand"/>'/>
- <input type="submit"
- name="dispatch"
- value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
</div>
<input type="hidden" name="packagesDecl"
value="${requestScope.packagesDecl}" />
<input type="hidden" name="cid" value="${param.cid}"
/>
<input type="hidden" name="mode"
value="${param.mode}" />
+ <input type="hidden" name="use_date" value="true"
/>
+
</rl:listset>
</body>
commit 8af83156f3b89186d7cc73adc5db046cddf8496d
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Wed Jan 15 14:55:39 2014 +0100
Datepicker UI unification: SSM/Packages/Remove
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 059a4a4..6b09a0e 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
@@ -6240,6 +6240,12 @@ value for this entitlement, excluding the default
organization's consumption.</s
<context
context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="schedule.jsp.at">
+ <source>Schedule no sooner than a specified time:</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="scheduleremote.jsp.schedulepackageremoval">
<source>Confirm Remote Command and Schedule Package Removal</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
index 7299058..e2d98cf 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
@@ -47,46 +47,29 @@
</rl:list>
- <div class="text-right">
-
- <div align="left">
- <p><bean:message
key="installconfirm.jsp.widgetsummary"/></p>
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="schedule.jsp.at"/>
+ </label>
+ <div class="col-lg-6">
+ <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </div>
</div>
-
- <table class="schedule-action-interface"
align="center">
-
- <tr>
- <td><input type="radio" name="use_date"
value="false" checked="checked"/>
- </td>
- <th><bean:message
key="confirm.jsp.now"/></th>
- </tr>
- <tr>
- <td><input type="radio" name="use_date"
value="true"/></td>
- <th><bean:message
key="confirm.jsp.than"/></th>
- </tr>
- <tr>
- <th><rhn:icon type="header-schedule"
title="confirm.jsp.selection" />
- </th>
- <td>
- <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget"
value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
-
- <hr/>
- <input type="submit"
- name="dispatch"
- value='<bean:message
key="removeconfirm.jsp.runremotecommand"/>'/>
- <input type="submit"
- name="dispatch"
- value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit" name="dispatch"
class="btn btn-success"
+ value='<bean:message
key="removeconfirm.jsp.runremotecommand"/>'/>
+ <input type="submit" name="dispatch"
class="btn btn-success"
+ value='<bean:message
key="installconfirm.jsp.confirm"/>'/>
+ </div>
+ </div>
+ <input type="hidden" name="packagesDecl"
value="${requestScope.packagesDecl}" />
+ <input type="hidden" name="mode"
value="${param.mode}" />
+ <input type="hidden" name="use_date"
value="true" />
</div>
-
- <input type="hidden" name="packagesDecl"
value="${requestScope.packagesDecl}" />
- <input type="hidden" name="mode"
value="${param.mode}" />
-
</rl:listset>
</body>