java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 10 -
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf | 27 ++--
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 57
++++++----
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
5 files changed, 64 insertions(+), 39 deletions(-)
New commits:
commit 4db14ff8a09d9f2a88bff3f8aa602bee9560e1a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 4 16:03:15 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.143-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 03cf0bb..0660015 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.142
+Version: 2.1.143
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Feb 04 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.143-1
+- restored Monitoring Scout label
+- removed unnecessary spacing and restored left side labels
+- unify probe detail page look
+
* Tue Feb 04 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.142-1
- swapping struts tag with input html to allow the use of the placeholder
- perform password validation within the java class
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 07c0635..60eb858 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.142-1 java/
+2.1.143-1 java/
commit ce4bfc6f0705d1fde300d83e51b0db6daf43c29d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 3 15:32:23 2014 +0100
restored Monitoring Scout label
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
index b2bc502..a6663ca 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
@@ -18,12 +18,12 @@
method="POST">
<rhn:csrf />
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
+ <label class="col-lg-3 control-label"
for="is_monitoring_scout">
+ <bean:message
key="general.jsp.monitoring_scout"/>
+ </label>
+ <div class="col-lg-6">
<div class="checkbox">
- <label for="is_monitoring_scout"
class="control-label">
- <html:checkbox
property="is_monitoring_scout" styleId="is_monitoring_scout" />
- <bean:message
key="general.jsp.monitoring_scout"/>
- </label>
+ <html:checkbox property="is_monitoring_scout"
styleId="is_monitoring_scout" />
</div>
</div>
</div>
commit 41e00b944563fdf9298f7743be940ca9cc743c24
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 3 15:01:05 2014 +0100
removed unnecessary spacing and restored left side labels
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
index 8715cf6..aef467e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
@@ -16,7 +16,7 @@
<bean:message
key="kickstart.activationkeys.jsp.description"/>:
</label>
<div class="col-lg-6">
- <html:text property="description"
styleClass="form-control" styleId="description"/><br/>
+ <html:text property="description"
styleClass="form-control" styleId="description"/>
<span class="help-block">
<bean:message
key="activation-key.jsp.edit-description-tooltip"
arg0 =
"${requestScope.blankDescription}"/>
@@ -97,23 +97,26 @@
</div>
<c:if test="${not requestScope.create}">
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="activation-key.jsp.enable-config-auto-deploy"/>:
+ </label>
+ <div class="col-lg-6">
<rhn:require
acl="token_has_entitlement(provisioning_entitled)"
mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler">
- <label>
+ <div class="checkbox">
<html:checkbox property="autoDeploy"
styleId="enable-config-auto-deploy" />
- <bean:message
key="activation-key.jsp.enable-config-auto-deploy"/>
- </label>
+ <br/>
+ </div>
<span class="help-block">
<bean:message
key="activation-key.jsp.config-auto-deploy-tooltip"/>
</span>
</rhn:require>
<rhn:require acl="not
token_has_entitlement(provisioning_entitled)"
mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler">
- <label>
+ <div class="checkbox">
<input type=checkbox disabled=true/>
- <bean:message
key="activation-key.jsp.enable-config-auto-deploy"/>
- </label>
+ <br/>
+ </div>
<span class="help-block">
<bean:message
key="activation-key.jsp.disabled-config-auto-deploy-tooltip"
arg0="${rhn:localize('provisioning_entitled')}"
@@ -124,10 +127,12 @@
</div>
</c:if>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="activation-key.jsp.universal-default"/>:
+ </label>
+ <div class="col-lg-6">
<div class="checkbox">
- <html:checkbox property="universal"
styleId="universal" />
- <bean:message
key="activation-key.jsp.universal-default"/>
+ <html:checkbox property="universal"
styleId="universal" /><br/>
</div>
<span class="help-block">
<rhn:tooltip
key="activation-key.jsp.edit.universal-default-tooltip"/>
commit d691ee9b0663f8db8a71ae689a44e83235cb240c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 4 15:54:02 2014 +0100
unify probe detail page look
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
index f7db58e..5b62f7b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -36,28 +36,43 @@
</rhn:toolbar>
</c:if>
- <ul class="list-group">
- <li class="list-group-item">
- <strong><bean:message key="probedetails.jsp.probe"
/></strong><br/>
- ${probe.description}
- </li>
- <li class="list-group-item">
- <strong><bean:message
key="probeedit.jsp.satclusterdesc" /></strong><br/>
- ${probe.satCluster.description}
- </li>
- <li class="list-group-item">
- <strong><bean:message key="probedetails.jsp.status"
/></strong><br/>
- <span class=${status_class}>${status}</span>
- </li>
- <li class="list-group-item">
- <strong><bean:message
key="probedetails.jsp.last_update" /></strong><br/>
- <fmt:formatDate value="${probe.state.lastCheck}"
type="both" dateStyle="short" timeStyle="long"/>
- </li>
- </ul>
-
<html:form action="/systems/details/probes/ProbeDetails"
styleClass="form-horizontal"
method="get">
+
+ <div class="form-group">
+ <label class="col-lg-3 text-right">
+ <bean:message key="probedetails.jsp.probe" />
+ </label>
+ <div class="col-lg-6">
+ ${probe.description}
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 text-right">
+ <bean:message key="probeedit.jsp.satclusterdesc"
/>
+ </label>
+ <div class="col-lg-6">
+ ${probe.satCluster.description}
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 text-right">
+ <bean:message key="probedetails.jsp.status" />
+ </label>
+ <div class="col-lg-6">
+ <span class=${status_class}>${status}</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 text-right">
+ <bean:message key="probedetails.jsp.last_update"
/>
+ </label>
+ <div class="col-lg-6">
+ <fmt:formatDate value="${probe.state.lastCheck}"
type="both" dateStyle="short" timeStyle="long"/>
+ </div>
+ </div>
+
<!-- For some reason we cant render date picker during export. -->
<c:if test="${param.lde != 1}">
<div class="form-group">
@@ -99,7 +114,7 @@
<bean:message key="probedetails.jsp.show_graph"
/>
</label>
<div class="col-lg-6">
- <html:checkbox property="show_graph" />
+ <span class="checkbox"><html:checkbox
property="show_graph" /></span>
</div>
</div>
</c:if>
@@ -108,7 +123,7 @@
<bean:message key="probedetails.jsp.show_event_log"
/>
</label>
<div class="col-lg-6">
- <html:checkbox property="show_log" />
+ <span class="checkbox"><html:checkbox
property="show_log" styleClass="checkbox" /></span>
</div>
</div>
<div class="form-group">