java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 8 +
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 50 ++++++----
java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 12 +-
3 files changed, 41 insertions(+), 29 deletions(-)
New commits:
commit b04e871eefdf54c4c2cefaa0f53ce1dee045852e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 16:24:36 2014 +0100
fixed entitlement orgs page layout
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
index ab5ffad..fb7e45f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
@@ -61,12 +61,12 @@
sortable="false"
headerkey="entitlementorgs.proposed_total">
<div class="row">
- <div class="col-lg-1">
+ <div class="col-lg-6">
<div class="input-group">
- <span class="input-group-btn">
- <html:text
property="newCount_${current.orgid}" size="5"
value="${current.total}"
+ <html:text property="newCount_${current.orgid}"
size="5" value="${current.total}"
styleClass="form-control"
onkeydown="return blockEnter(event)"
/>
+ <span class="input-group-btn">
<html:submit styleClass="btn btn-info"
onclick="this.form.orgClicked.value = '${current.orgid}'">
<bean:message
key="entitlementorgs.update"/>
</html:submit>
@@ -99,7 +99,7 @@
<bean:message key="entitlementorgs.total_allocated"/>:
</label>
<div class="col-lg-6">
- <div class="well well-sm">
+ <div class="text">
${maxEnt}
</div>
<span class="help-block">
@@ -112,7 +112,7 @@
<bean:message key="entitlementorgs.total_inuse"/>:
</label>
<div class="col-lg-6">
- <div class="well well-sm">
+ <div class="text">
${curEnt}
</div>
</div>
@@ -122,7 +122,7 @@
<bean:message key="entitlementorgs.total_orguse"/>:
</label>
<div class="col-lg-6">
- <div class="well well-sm">
+ <div class="text">
<bean:message key="entitlementorgs.total_orgusedata"
arg0="${alloc}" arg1="${orgsnum}"
arg2="${ratio}"/>
</div>
commit c08684eeba33bf67f4b394481e99c227c28d21a0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 15:33:12 2014 +0100
fixed org configuration page alignment
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
index ade2c98..d8a1ce4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -60,20 +60,25 @@ function modifyUploadCheckbox(checkbox) {
<rhn:submitted/>
<input type="hidden" name="oid"
value="${param.oid}"/>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.staging-content.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="staging_content_enabled"
value="enabled"
id="staging_content_enabled"
<c:if test =
"${org.orgConfig.stagingContentEnabled}">
checked="checked"
</c:if>/>
- <bean:message
key="org-config.staging-content.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.crash-reporting.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="crash_reporting_enabled"
value="enabled"
@@ -82,13 +87,15 @@ function modifyUploadCheckbox(checkbox) {
<c:if test =
"${org.orgConfig.crashReportingEnabled}">
checked="checked"
</c:if>/>
- <bean:message
key="org-config.crash-reporting.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message
key="org-config.crashfile-upload.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="crashfile_upload_enabled"
value="enabled"
@@ -99,8 +106,7 @@ function modifyUploadCheckbox(checkbox) {
<c:if test =
"${org.orgConfig.crashfileUploadEnabled}">
checked="checked"
</c:if>/>
- <bean:message
key="org-config.crashfile-upload.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
@@ -116,8 +122,11 @@ function modifyUploadCheckbox(checkbox) {
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.scapfile-upload.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="scapfile_upload_enabled"
value="enabled"
@@ -125,8 +134,7 @@ function modifyUploadCheckbox(checkbox) {
<c:if test =
"${org.orgConfig.scapfileUploadEnabled}">
checked="checked"
</c:if>/>
- <bean:message
key="org-config.scapfile-upload.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
@@ -142,8 +150,11 @@ function modifyUploadCheckbox(checkbox) {
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.scap-retention"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="scap_retention_set"
value="on"
@@ -152,8 +163,7 @@ function modifyUploadCheckbox(checkbox) {
<c:if test =
"${org.orgConfig.scapRetentionPeriodDays != null}">
checked="checked"
</c:if>/>
- <bean:message key="org-config.scap-retention"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
commit a77a50d4f88d7576619eccf15199615bf2c5e295
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 15:22:24 2014 +0100
fixed suite / detail probe page alignment
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
index 0366746..4457f45 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
@@ -39,14 +39,14 @@
<label class="col-lg-3 control-label">
<bean:message key="probeedit.jsp.probecommand" />
</label>
- <div
class="col-lg-6">${probe.command.description}</div>
+ <div class="col-lg-6
text">${probe.command.description}</div>
</div>
<c:if test='${not empty probe.command.systemRequirements}'>
<div class="form-group">
<label class="col-lg-3 control-label">
<bean:message
key="probeedit.jsp.commandrequirements" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-6 text">
<bean:message
key="${probe.command.systemRequirements}"/>
</div>
</div>
@@ -56,7 +56,7 @@
<label class="col-lg-3 control-label">
<bean:message key="probeedit.jsp.versionsupport"
/>
</label>
- <div
class="col-lg-6">${probe.command.versionSupport}</div>
+ <div class="col-lg-6
text">${probe.command.versionSupport}</div>
</div>
</c:if>
<div class="form-group">
@@ -76,9 +76,11 @@
<bean:message key="probeedit.jsp.notification" />
</label>
<div class="col-lg-6">
+ <div class="checkbox">
<html:checkbox onclick="refreshNotifFields()"
property="notification"
styleId="notification"/>
+ </div>
</div>
</div>
<div class="form-group">
Show replies by date