branding/css/spacewalk-fixes.less |
8 +
branding/css/spacewalk-theme.less |
6 +
branding/spacewalk-branding.spec |
1
java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp |
36 +++---
java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp |
8 -
java/code/webapp/WEB-INF/pages/admin/config/general.jsp |
54 +++++-----
java/code/webapp/WEB-INF/pages/common/fragments/probes/create-form-body.jspf |
8 +
java/code/webapp/WEB-INF/pages/common/fragments/probes/render-param-value-list.jspf |
14 +-
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp |
16 +-
9 files changed, 92 insertions(+), 59 deletions(-)
New commits:
commit dd2a83ecf1ba8e980f29cbd0284ab161c3a2da0f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 14:10:15 2014 +0100
fixed detail probe page alignment
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 5b62f7b..02829a1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -41,34 +41,34 @@
method="get">
<div class="form-group">
- <label class="col-lg-3 text-right">
+ <label class="col-lg-3 control-label">
<bean:message key="probedetails.jsp.probe" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-6 text">
${probe.description}
</div>
</div>
<div class="form-group">
- <label class="col-lg-3 text-right">
+ <label class="col-lg-3 control-label">
<bean:message key="probeedit.jsp.satclusterdesc"
/>
</label>
- <div class="col-lg-6">
+ <div class="col-lg-6 text">
${probe.satCluster.description}
</div>
</div>
<div class="form-group">
- <label class="col-lg-3 text-right">
+ <label class="col-lg-3 control-label">
<bean:message key="probedetails.jsp.status" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-6 text">
<span class=${status_class}>${status}</span>
</div>
</div>
<div class="form-group">
- <label class="col-lg-3 text-right">
+ <label class="col-lg-3 control-label">
<bean:message key="probedetails.jsp.last_update"
/>
</label>
- <div class="col-lg-6">
+ <div class="col-lg-6 text">
<fmt:formatDate value="${probe.state.lastCheck}"
type="both" dateStyle="short" timeStyle="long"/>
</div>
</div>
commit aa18a436ec205731ab0f2f5be3b7145d0787280e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 14:01:10 2014 +0100
fixed create probe page aligning
diff --git a/branding/css/spacewalk-fixes.less b/branding/css/spacewalk-fixes.less
index 5f2e885..d65e452 100644
--- a/branding/css/spacewalk-fixes.less
+++ b/branding/css/spacewalk-fixes.less
@@ -5,4 +5,10 @@
margin-right: 0;
margin-left: 0;
}
-}
\ No newline at end of file
+}
+
+.form-horizontal .text {
+ margin-top: 0;
+ margin-bottom: 0;
+ padding-top: 7px;
+}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/probes/create-form-body.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/probes/create-form-body.jspf
index 6197d99..c31b16f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/create-form-body.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/create-form-body.jspf
@@ -68,7 +68,9 @@ function refreshNotifFields() {
<bean:message key="probeedit.jsp.commandrequirements" />
</label>
<div class="col-lg-6">
+ <div class="text">
<bean:message key="${command.systemRequirements}"/>
+ </div>
</div>
</div>
</c:if>
@@ -78,7 +80,9 @@ function refreshNotifFields() {
<label class="col-lg-3 control-label">
<bean:message key="probeedit.jsp.versionsupport" />
</label>
- <div class="col-lg-6">${command.versionSupport}</div>
+ <div class="col-lg-6">
+ <div class="text">${command.versionSupport}</div>
+ </div>
</div>
</c:if>
@@ -96,7 +100,9 @@ function refreshNotifFields() {
<bean:message key="probeedit.jsp.notification" />
</label>
<div class="col-lg-6">
+ <div class="checkbox">
<html:checkbox onclick="refreshNotifFields()"
property="notification" styleId="notif"/>
+ </div>
</div>
</div>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/probes/render-param-value-list.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/probes/render-param-value-list.jspf
index a63ebfc..eba0d79 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/render-param-value-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/render-param-value-list.jspf
@@ -4,15 +4,21 @@
<div class="form-group">
<label class="col-lg-3 control-label">
<c:if test="${not empty field.label}">
- <bean:message key="${field.label}" />
- <c:if test="${field.mandatory}"><span
class="required-form-field">*</span></c:if>:
+ <c:choose>
+ <c:when test="${field.mandatory}">
+ <rhn:required-field key="${field.label}"/>:
+ </c:when>
+ <c:otherwise>
+ <bean:message key="${field.label}" />
+ </c:otherwise>
+ </c:choose>
</c:if>
</label>
<c:choose>
<c:when test="${empty field.threshold}">
</c:when>
<c:otherwise>
- <div class="col-lg-2"><bean:message
key="${field.threshold}"/></div>
+ <div class="col-lg-2 text"><bean:message
key="${field.threshold}"/></div>
</c:otherwise>
</c:choose>
<c:choose>
@@ -37,7 +43,7 @@
</c:when>
</c:choose>
<c:if test="${not empty field.unit}">
- <label class="col-lg-2"><bean:message
key="${field.unit}"/></label>
+ <span class="col-lg-2 text"><bean:message
key="${field.unit}"/></span>
</c:if>
</div>
</c:forEach>
commit d1c932658a9bf85f8c3a0a9d1ecd88ac1a0b620b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 14:00:08 2014 +0100
required field marker used to be red
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less
index 4935e58..82f2902 100644
--- a/branding/css/spacewalk-theme.less
+++ b/branding/css/spacewalk-theme.less
@@ -714,3 +714,9 @@ ul.nav.nav-tabs:last-child {
display: none;
}
+/* required field marker */
+.required-form-field {
+ font-weight: bold;
+ color: #c00;
+
+}
commit 3f34bb9d1d472a34237f1a64c1c53bc0a151a0e0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 10:15:40 2014 +0100
password meter needs pwstrength-bootstrap
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index d3fab4d..c3f8ed6 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -27,6 +27,7 @@ Requires: httpd
Requires: bootstrap <= 3.0.0
Requires: font-awesome >= 4.0.0
Requires: roboto >= 1.2
+Requires: pwstrength-bootstrap
%description
Spacewalk specific branding, CSS, and images.
commit c09f0afc753435684362a88fc41d00272767e3d7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 09:58:10 2014 +0100
unify cobbler page with other tabs
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
index 7f13047..3b9b57f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
@@ -25,11 +25,11 @@
</div>
<div class="panel-body">
<form action="/rhn/admin/config/Cobbler.do"
method="POST">
- <div class="row">
- <div class="col-md-2 text-right">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
<bean:message key="cobbler.jsp.sync"/>
- </div>
- <div class="col-md-10">
+ </label>
+ <div class="col-lg-6">
<input type="submit" class="btn
btn-default" name="cobbler_sync"
value="${rhn:localize('update')}" />
<rhn:csrf />
<rhn:submitted/>
commit 687420345840c74b5e366814d8040ecd749f7159
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 09:35:55 2014 +0100
moved labels back
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
index 2e23f29..b17f7d4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
@@ -90,35 +90,43 @@
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="ssl_available">
+ <label class="col-lg-3 control-label"
for="web|ssl_available">
+ <bean:message
key="general.jsp.defaultTo_ssl"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<html:checkbox property="web|ssl_available"
styleId="ssl_available" />
- <bean:message
key="general.jsp.defaultTo_ssl"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="solaris">
+ <label class="col-lg-3 control-label"
for="web|enable_solaris_support">
+ <bean:message key="general.jsp.solaris"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<html:checkbox
property="web|enable_solaris_support" styleId="solaris" />
- <bean:message
key="general.jsp.solaris"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="disconnected">
+ <label class="col-lg-3 control-label"
for="disconnected">
+ <bean:message
key="general.jsp.disconnected"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<html:checkbox property="disconnected"
styleId="disconnected" />
- <bean:message
key="general.jsp.disconnected"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="is_monitoring_backend">
+ <label class="col-lg-3 control-label"
for="web|is_monitoring_backend">
+ <bean:message
key="general.jsp.monitoring_backend"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<html:checkbox
property="web|is_monitoring_backend" styleId="is_monitoring_backend"
/>
- <bean:message
key="general.jsp.monitoring_backend"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
commit aa3b948a2c6497617afb1dfc0fb7b39cf066b70a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 09:47:02 2014 +0100
removed colons to unify page with other tabs
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
index 2532a86..2e23f29 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
@@ -21,7 +21,7 @@
<rhn:csrf />
<div class="form-group">
<label for="admin_email" class="col-lg-3
control-label">
- <rhn:required-field
key="general.jsp.admin_email"/>:
+ <rhn:required-field
key="general.jsp.admin_email"/>
</label>
<div class="col-lg-6">
<html:text property="traceback_mail"
@@ -31,7 +31,7 @@
</div>
<div class="form-group">
<label for="hostname" class="col-lg-3
control-label">
- <rhn:required-field
key="general.jsp.hostname"/>:
+ <rhn:required-field
key="general.jsp.hostname"/>
</label>
<div class="col-lg-6">
<html:text property="server|jabber_server"
@@ -41,7 +41,7 @@
</div>
<div class="form-group">
<label for="proxy" class="col-lg-3
control-label">
- <bean:message key="general.jsp.proxy"/>:
+ <bean:message key="general.jsp.proxy"/>
</label>
<div class="col-lg-6">
<html:text
property="server|satellite|http_proxy"
@@ -51,7 +51,7 @@
</div>
<div class="form-group">
<label for="proxy_user" class="col-lg-3
control-label">
- <bean:message
key="general.jsp.proxy_username"/>:
+ <bean:message
key="general.jsp.proxy_username"/>
</label>
<div class="col-lg-6">
<html:text
property="server|satellite|http_proxy_username"
@@ -61,7 +61,7 @@
</div>
<div class="form-group">
<label for="proxy_password" class="col-lg-3
control-label">
- <bean:message
key="general.jsp.proxy_password"/>:
+ <bean:message
key="general.jsp.proxy_password"/>
</label>
<div class="col-lg-6">
<html:password
property="server|satellite|http_proxy_password"
@@ -71,7 +71,7 @@
</div>
<div class="form-group">
<label for="proxy_password_confirm"
class="col-lg-3 control-label">
- <bean:message
key="general.jsp.proxy_password_confirm"/>:
+ <bean:message
key="general.jsp.proxy_password_confirm"/>
</label>
<div class="col-lg-6">
<html:password
property="server|satellite|http_proxy_password_confirm"
@@ -81,7 +81,7 @@
</div>
<div class="form-group">
<label for="mount_point" class="col-lg-3
control-label">
- <bean:message
key="general.jsp.mount_point"/>:
+ <bean:message
key="general.jsp.mount_point"/>
</label>
<div class="col-lg-6">
<html:text property="mount_point"
size="32"
commit 67e36f40bc8fe9d3ba0c0e9843c663311d46d946
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 09:35:55 2014 +0100
moved labels back
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
index da55096..78c1a9e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
@@ -21,7 +21,7 @@
<rhn:csrf />
<div class="form-group">
<label for="hostname" class="col-lg-3
control-label">
- <rhn:required-field
key="bootstrap.jsp.hostname"/>:
+ <rhn:required-field
key="bootstrap.jsp.hostname"/>
</label>
<div class="col-lg-6">
<html:text size="32"
property="hostname" styleId="hostname"
styleClass="form-control" />
@@ -29,49 +29,49 @@
</div>
<div class="form-group">
<label class="col-lg-3 control-label"
for="ssl-cert">
- <rhn:required-field
key="bootstrap.jsp.ssl-cert"/>:
+ <rhn:required-field
key="bootstrap.jsp.ssl-cert"/>
</label>
<div class="col-lg-6">
<html:text size="32"
property="ssl-cert" styleId="ssl-cert"
styleClass="form-control" />
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
+ <label class="col-lg-3 control-label"
for="ssl">
+ <bean:message key="bootstrap.jsp.ssl"/>
+ </label>
+ <div class="col-lg-6">
<div class="checkbox">
- <label>
<html:checkbox property="ssl"
styleId="ssl" />
- <bean:message
key="bootstrap.jsp.ssl"/>
- </label>
</div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
+ <label class="col-lg-3 control-label"
for="gpg">
+ <bean:message key="bootstrap.jsp.gpg"/>
+ </label>
+ <div class="col-lg-6">
<div class="checkbox">
- <label>
<html:checkbox property="gpg"
styleId="gpg" />
- <bean:message
key="bootstrap.jsp.gpg"/>
- </label>
</div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
+ <label class="col-lg-3 control-label"
for="allow-config-actions">
+ <bean:message
key="bootstrap.jsp.allow-config-actions"/>
+ </label>
+ <div class="col-lg-6">
<div class="checkbox">
- <label>
<html:checkbox
property="allow-config-actions" styleId="allow-config-actions"/>
- <bean:message
key="bootstrap.jsp.allow-config-actions"/>
- </label>
</div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
+ <label class="col-lg-3 control-label"
for="allow-remote-commands">
+ <bean:message
key="bootstrap.jsp.allow-remote-commands"/>
+ </label>
+ <div class="col-lg-6">
<div class="checkbox">
- <label>
<html:checkbox
property="allow-remote-commands" styleId="allow-remote-commands"
/>
- <bean:message
key="bootstrap.jsp.allow-remote-commands"/>
- </label>
</div>
</div>
</div>
Show replies by date