java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp | 155 ++++++++++-------
1 file changed, 92 insertions(+), 63 deletions(-)
New commits:
commit e75634f296d321fe0c9ce1914b491f9124aa64c1
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Feb 10 13:16:28 2014 +0100
style ProbeEdit page
fix HTML so it uses new styling items
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
index e275bd4..32cbc82 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
@@ -29,77 +29,106 @@ function refreshNotifFields() {
<bean:message key="probeedit.jsp.editprobe" />
</rhn:toolbar>
<html:form action="/systems/details/probes/ProbeEdit"
method="POST">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th><bean:message key="probeedit.jsp.probecommand"
/></th>
- <td colspan="3">${probe.command.description}</td>
- </tr>
- <tr>
- <th><bean:message key="probeedit.jsp.satclusterdesc"
/></th>
- <td colspan="3">${probe.satCluster.description}</td>
- </tr>
+ <div class="form-horizontal">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.probecommand" />
+ </label>
+ <div class="col-lg-2 text">
+ ${probe.command.description}
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.satclusterdesc" />
+ </label>
+ <div class="col-lg-2 text">
+ ${probe.satCluster.description}
+ </div>
+ </div>
<c:if test='${not empty probe.command.systemRequirements}'>
- <tr>
- <th><bean:message key="probeedit.jsp.commandrequirements"
/></th>
- <td colspan="3"><bean:message
key="${probe.command.systemRequirements}"/></td>
- </tr>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.commandrequirements" />
+ </label>
+ <div class="col-lg-2 text">
+ <bean:message key="${probe.command.systemRequirements}"/>
+ </div>
+ </div>
</c:if>
<c:if test='${not empty probe.command.versionSupport}'>
- <tr>
- <th><bean:message key="probeedit.jsp.versionsupport"
/></th>
- <td colspan="3">${probe.command.versionSupport}</td>
- </tr>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.versionsupport" />
+ </label>
+ <div class="col-lg-2 text">
+ ${probe.command.versionSupport}
+ </div>
+ </div>
</c:if>
- <tr>
- <th><label for="description"><bean:message
key="probeedit.jsp.description" /></label></th>
- <td colspan="3"><html:text property="description"
maxlength="100" size="50"
styleId="description"/></td>
- </tr>
- <tr>
- <th><label for="notification"><bean:message
key="probeedit.jsp.notification" /></label></th>
- <td colspan="3"><html:checkbox
onclick="refreshNotifFields()" property="notification"
styleId="notification"/></td>
- </tr>
- <tr>
- <th><label for="notifmin"><bean:message
key="probeedit.jsp.notifmin" /></label></th>
- <td colspan="3">
- <html:select property="notification_interval_min"
- disabled="${not probeEditForm.map.notification}"
styleId="notifmin">
- <html:options collection="intervals"
- property="value"
- labelProperty="label" />
- </html:select>
- </td>
- </tr>
- <tr>
- <th><label for="notifmethod"><bean:message
key="probeedit.jsp.notifmethod" /></label></th>
- <td colspan="3"><html:select
property="contact_group_id"
- disabled="${not probeEditForm.map.notification}"
styleId="notifmethod">
- <html:options collection="contactGroups"
- property="value"
- labelProperty="label" />
- </html:select>
- </td>
- </tr>
- <tr>
- <th><label for="checkinterval"><bean:message
key="probeedit.jsp.checkinterval" /></label></th>
- <td colspan="3">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.description" />
+ </label>
+ <div class="col-lg-2 text">
+ <html:text property="description" maxlength="100"
size="50" styleId="description"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.notification" />
+ </label>
+ <div class="col-lg-2 text">
+ <html:checkbox onclick="refreshNotifFields()"
property="notification" styleId="notification"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.notifmin" />
+ </label>
+ <div class="col-lg-2 text">
+ <html:select property="notification_interval_min"
+ disabled="${not probeEditForm.map.notification}"
styleId="notifmin">
+ <html:options collection="intervals"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.notifmethod" />
+ </label>
+ <div class="col-lg-2 text">
+ <html:select property="contact_group_id"
+ disabled="${not probeEditForm.map.notification}"
styleId="notifmethod">
+ <html:options collection="contactGroups"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="probeedit.jsp.checkinterval" />
+ </label>
+ <div class="col-lg-2 text">
<html:select property="check_interval_min"
styleId="checkinterval">
- <html:options collection="intervals"
- property="value"
- labelProperty="label" />
+ <html:options collection="intervals"
+ property="value"
+ labelProperty="label" />
</html:select>
- </td>
- </tr>
+ </div>
+ </div>
<%@ include
file="/WEB-INF/pages/common/fragments/probes/render-param-value-list.jspf"
%>
- <tr>
- <td></td>
- <td colspan="3"
align="right"><html:submit><bean:message
key="probedit.jsp.updateprobe"/></html:submit></td>
- </tr>
- </table>
- <html:hidden property="sid" value="${param.sid}"/>
- <html:hidden property="probe_id" value="${probe.id}"/>
- <html:hidden property="submitted" value="true"/>
+
+ <html:submit styleClass="btn btn-success pull-right"><bean:message
key="probedit.jsp.updateprobe" /></html:submit>
+ <html:hidden property="sid" value="${param.sid}"/>
+ <html:hidden property="probe_id" value="${probe.id}"/>
+ <html:hidden property="submitted" value="true"/>
+ </div>
</html:form>
</body>
Show replies by date