branding/css/spacewalk-fixes.less | 8
branding/css/spacewalk-inputs.less | 15
branding/css/spacewalk.less | 13
java/code/webapp/WEB-INF/includes/header.jsp | 2
java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 49 +-
java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp | 37 --
java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf | 93 +++--
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf | 153
+++++----
java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp | 50 +--
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp | 70 ++--
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 164
+++++-----
web/html/network/systems/ssm/groups/create.pxt | 46 +-
web/html/network/systems/ssm/provisioning/tag_systems.pxt | 32 -
14 files changed, 406 insertions(+), 328 deletions(-)
New commits:
commit 9ecdf45a8ed267b25206860734b7dc7ca151a8d5
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 16:40:20 2014 +0100
Unstyled Systems/Software/Channels
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index 223f151..8a981f1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -11,21 +11,26 @@
<rhn:icon type="header-channel"
title="common.download.channelAlt" />
<bean:message key="sdc.channels.edit.header2"/>
</h2>
- <html:form method="post"
action="/systems/details/SystemChannels.do?sid=${system.id}">
+ <html:form method="post" styleClass="form-horizontal"
action="/systems/details/SystemChannels.do?sid=${system.id}">
<rhn:csrf />
<html:hidden property="submitted" value="true"/>
- <div class="page-summary">
- <p>
- <bean:message key="sdc.channels.edit.summary"/>
- </p>
- </div>
+ <p><bean:message key="sdc.channels.edit.summary"/></p>
<c:choose>
<c:when test="${system.baseChannel == null}">
- <bean:message key="sdc.channels.edit.nobasechannel"/>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <div class="alert alert-warning">
+ <bean:message
key="sdc.channels.edit.nobasechannel"/>
+ </div>
+ </div>
+ </div>
</c:when>
<c:otherwise>
- <ul class="list-channel">
- <li><a
href="/rhn/channels/ChannelDetail.do?cid=${system.baseChannel.id}">${system.baseChannel.name}</a>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <ul class="list-group">
+ <li class="list-group-item">
+ <a class="btn btn-info"
href="/rhn/channels/ChannelDetail.do?cid=${system.baseChannel.id}">${system.baseChannel.name}</a>
<ul>
<c:forEach items="${avail_child_channels}"
var="channel">
<c:choose>
@@ -43,7 +48,7 @@
<c:if test="${not channel.subscribed}">
<input ${disabledChannel} name="child_channel"
value="${channel.id}" type="checkbox" id="unchecked">
</c:if>
- <a
href="/rhn/channels/ChannelDetail.do?cid=${channel.id}">${channel.name}</a>
+ <a class="btn btn-info"
href="/rhn/channels/ChannelDetail.do?cid=${channel.id}">${channel.name}</a>
<c:if test="${system.virtualGuest}">
<c:if test="${not channel.freeForGuests}">
<span class="asterisk">* </span>
@@ -81,84 +86,97 @@
</ul>
</li>
</ul>
+ </div>
+ </div>
</c:otherwise>
</c:choose>
<c:if test="${pageScope.display_asterisk}">
<c:if test="${not empty system.virtualInstance.hostSystem.id}">
- <span class="asterisk">* </span><bean:message
key="sdc.channels.edit.virtsubwarning"
arg0="${system.virtualInstance.hostSystem.id}"
- arg1="${system.virtualInstance.hostSystem.name}"/>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <span class="asterisk">* </span>
+ <span class="help-block">
+ <bean:message
key="sdc.channels.edit.virtsubwarning"
+
arg0="${system.virtualInstance.hostSystem.id}"
+
arg1="${system.virtualInstance.hostSystem.name}"/>
+ </span>
+ </div>
+ </div>
</c:if>
<c:if test="${empty system.virtualInstance.hostSystem.id}">
- <span class="asterisk">* </span><bean:message
key="sdc.channels.edit.virtsubwarning_nohost"/>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <span class="asterisk">* </span>
+ <span class="help-block">
+ <bean:message
key="sdc.channels.edit.virtsubwarning_nohost"/>
+ </span>
+ </div>
+ </div>
</c:if>
</c:if>
- <hr/>
- <div class="text-right">
- <html:submit property="dispatch">
- <bean:message key="sdc.channels.edit.update_sub"/>
- </html:submit>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="dispatch"
styleClass="form-horizontal">
+ <bean:message key="sdc.channels.edit.update_sub"/>
+ </html:submit>
+ </div>
</div>
+
<rhn:require acl="not system_is_proxy(); not system_is_satellite()"
mixins="com.redhat.rhn.common.security.acl.SystemAclHandler">
- <h2>
+ <h2>
<rhn:icon type="header-channel" />
<bean:message key="sdc.channels.edit.base_software_channel"/>
- </h2>
-
-
- <div class="page-summary">
- <p>
- <bean:message key="sdc.channels.edit.summary2"/>
-
- <select name="new_base_channel_id"
size="${fn:length(base_channels)+fn:length(custom_base_channels)+3}">
- <option value="-1"
- <c:if test="${current_base_channel_id == -1}">
- selected="selected"
- </c:if> >
- <bean:message
key="sdc.channels.edit.no_base_channel"/></option>
- <c:if test="${not empty custom_base_channels}">
- <optgroup label='<bean:message
key="basesub.jsp.rhn-channels"/>'>
- </c:if>
- <c:forEach items="${base_channels}" var="chan">
- <c:choose>
- <c:when test="${current_base_channel_id == chan.id}">
- <option value="${chan.id}"
selected="selected"><c:out value="${chan.name}"
/></option>
- </c:when>
- <c:otherwise>
- <option value="${chan.id}"><c:out
value="${chan.name}" /></option>
- </c:otherwise>
- </c:choose>
- </c:forEach>
- <c:if test="${not empty custom_base_channels}">
- </optgroup>
- </c:if>
- <c:if test="${not empty custom_base_channels}">
- <optgroup label='<bean:message
key="basesub.jsp.custom-channels"/>'>
- <c:forEach items="${custom_base_channels}"
var="chan">
- <c:choose>
- <c:when test="${current_base_channel_id ==
chan.id}">
- <option value="${chan.id}"
selected="selected"><c:out value="${chan.name}"
/></option>
- </c:when>
- <c:otherwise>
- <option value="${chan.id}"><c:out
value="${chan.name}" /></option>
- </c:otherwise>
- </c:choose>
- </c:forEach>
- </optgroup>
- </c:if>
- </select>
+ </h2>
+ <p>
+ <bean:message key="sdc.channels.edit.summary2"/>
+ </p>
- <hr/>
- <div class="text-right">
- <html:submit property="dispatch">
- <bean:message
key="sdc.channels.edit.confirm_update_base"/>
- </html:submit>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <select class="form-control"
name="new_base_channel_id"
size="${fn:length(base_channels)+fn:length(custom_base_channels)+3}">
+ <option value="-1" <c:if
test="${current_base_channel_id ==
-1}">selected="selected"</c:if> />
+ <bean:message
key="sdc.channels.edit.no_base_channel"/></option>
+ <c:if test="${not empty custom_base_channels}">
+ <optgroup label='<bean:message
key="basesub.jsp.rhn-channels"/>'>
+ </c:if>
+ <c:forEach items="${base_channels}"
var="chan">
+ <c:choose>
+ <c:when test="${current_base_channel_id ==
chan.id}">
+ <option value="${chan.id}"
selected="selected"><c:out value="${chan.name}"
/></option>
+ </c:when>
+ <c:otherwise>
+ <option value="${chan.id}"><c:out
value="${chan.name}" /></option>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ <c:if test="${not empty custom_base_channels}">
+ </optgroup>
+ </c:if>
+ <c:if test="${not empty custom_base_channels}">
+ <optgroup label='<bean:message
key="basesub.jsp.custom-channels"/>'>
+ <c:forEach items="${custom_base_channels}"
var="chan">
+ <c:choose>
+ <c:when test="${current_base_channel_id ==
chan.id}">
+ <option value="${chan.id}"
selected="selected"><c:out value="${chan.name}"
/></option>
+ </c:when>
+ <c:otherwise>
+ <option
value="${chan.id}"><c:out value="${chan.name}"
/></option>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ </optgroup>
+ </c:if>
+ </select>
+ <span class="help-block">
+ <bean:message
key="sdc.channels.edit.fastrackBetaWarning"/>
+ </span>
+ </div>
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="dispatch" styleClass="btn
btn-success">
+ <bean:message
key="sdc.channels.edit.confirm_update_base"/>
+ </html:submit>
</div>
-
- <span class="small-text">
- <bean:message key="sdc.channels.edit.fastrackBetaWarning"/>
- </span>
- </div>
</rhn:require>
</html:form>
</body>
commit 8b4f2ebe529f0a097f5ed213726b5d126d263ac2
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 14:32:24 2014 +0100
Fixed unstyled form in PXT page: SSM/Groups
diff --git a/web/html/network/systems/ssm/groups/create.pxt
b/web/html/network/systems/ssm/groups/create.pxt
index ba148f9..35aa79a 100644
--- a/web/html/network/systems/ssm/groups/create.pxt
+++ b/web/html/network/systems/ssm/groups/create.pxt
@@ -22,31 +22,33 @@ into the new group.</p>
</div>
-<pxt-form method="post">
+<pxt-form method="post" class="form-horizontal">
<pxt-include-late file="/network/components/message_queues/local.pxi" />
-<table class="details" align="center">
- <tr>
- <th>Name<span
class="required-form-field">*</span>:</th>
- <td><input type="text" size="30" name="name"
value="" /></td>
- </tr>
- <tr>
- <th>Description<span
class="required-form-field">*</span>:</th>
- <td><textarea rows="4" cols="40"
name="description">Enter your description here</textarea></td>
- </tr>
-</table>
-
-<input type="hidden" name="import_ssm" value="yes"
/>
-<input type="hidden" name="redirect_to"
value="/network/systems/ssm/groups/index.pxt" />
-<input type="hidden" name="pxt:trap"
-value="rhn:server_group_create_cb" />
-
-<div align="right">
-<hr />
-<input type="submit" name="make_group" value="Create
Group" />
+<div class="form-group">
+ <label class="col-md-3 control-label">
+ Name<span class="required-form-field">*</span>:
+ </label>
+ <div class="col-md-6">
+ <input type="text" size="30" name="name"
value="" class="form-control"/>
+ </div>
+</div>
+<div class="form-group">
+ <label class="col-md-3 control-label">
+ Description<span class="required-form-field">*</span>:
+ </label>
+ <div class="col-md-6">
+ <textarea rows="4" cols="40" name="description"
class="form-control" placeholder="Enter your description
here"></textarea>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <input type="hidden" name="import_ssm"
value="yes" />
+ <input type="hidden" name="redirect_to"
value="/network/systems/ssm/groups/index.pxt" />
+ <input type="hidden" name="pxt:trap"
value="rhn:server_group_create_cb" />
+ <input type="submit" name="make_group" value="Create
Group" class="btn btn-success" />
+ </div>
</div>
</pxt-form>
-
-
</grail-canvas-template>
</pxt-passthrough>
commit 2cf518983f98ff64733adf00c7d2e08e7033c66c
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 13:57:18 2014 +0100
Fixed unstyled form in PXT page: SSM/Provisioning/TagSystems
diff --git a/web/html/network/systems/ssm/provisioning/tag_systems.pxt
b/web/html/network/systems/ssm/provisioning/tag_systems.pxt
index 52c2791..b3a7f18 100644
--- a/web/html/network/systems/ssm/provisioning/tag_systems.pxt
+++ b/web/html/network/systems/ssm/provisioning/tag_systems.pxt
@@ -18,24 +18,24 @@ Tag Systems
</h2>
-<pxt-form method="POST">
-
-<div class="page-summary">
-<p>You may tag the most recent snapshots for the selected systems.</p>
-<table class="details">
- <tr>
- <th>Tag name:</th>
- <td><input type="text" name="tag" size="30"
maxlength="256" /></td>
- </tr>
-</table>
-<input type="hidden" name="pxt:trap"
value="rhn:add_system_tag_bulk_cb" />
+<pxt-form method="POST" class="form-horizontal">
+<div class="form-group">
+ <label class="col-md-3 control-label">
+ Tag name:
+ </label>
+ <div class="col-md-6">
+ <input type="text" name="tag" size="30"
maxlength="256" class="form-control"/>
+ <span class="help-block">
+ You may tag the most recent snapshots for the selected systems.
+ </span>
+ </div>
</div>
-
-<div align="right">
-<hr />
-<input type="submit" value="Tag Current Snapshots" />
+<div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <input type="submit" value="Tag Current Snapshots"
class="btn btn-success" />
+ </div>
</div>
-
+<input type="hidden" name="pxt:trap"
value="rhn:add_system_tag_bulk_cb" />
</pxt-form>
<div class="page-summary">
commit 6bd2d85c472f686bc6ba462db7c8ee07f950138e
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Thu Jan 16 19:25:33 2014 +0100
Fixed unstyled form for XCCDF scaner on SSM and single system
diff --git a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp
b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp
index 741fe07..f2e1607 100644
--- a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp
@@ -6,26 +6,19 @@
<html>
-<body>
-
-<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
-<h2><bean:message
key="system.audit.schedulexccdf.jsp.schedule"/></h2>
-
-<div>
-<html:form method="post"
action="/systems/ssm/audit/ScheduleXccdf.do">
-
- <%@ include
file="/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf" %>
- <rhn:tooltip><bean:message
key="system.audit.schedulexccdf.jsp.tooltip"/></rhn:tooltip>
- <div class="text-right">
- </hr>
- <html:submit property="schedule_button">
- <bean:message key="system.audit.schedulexccdf.jsp.button"/>
- </html:submit>
- </div>
-</html:form>
-
-<%@ include file="/WEB-INF/pages/common/fragments/audit/scapcap-list.jspf"
%>
-</div>
-
-</body>
+ <body>
+ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf"
%>
+ <h2><bean:message
key="system.audit.schedulexccdf.jsp.schedule"/></h2>
+ <html:form method="post" styleClass="form-horizontal"
action="/systems/ssm/audit/ScheduleXccdf.do">
+ <%@ include
file="/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf" %>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="schedule_button"
styleClass="btn btn-success">
+ <bean:message
key="system.audit.schedulexccdf.jsp.button"/>
+ </html:submit>
+ </div>
+ </div>
+ </html:form>
+ <%@ include
file="/WEB-INF/pages/common/fragments/audit/scapcap-list.jspf" %>
+ </body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf
index 449fb30..599c59b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf
@@ -1,45 +1,56 @@
-
<c:if test="${empty readonly}">
- <c:set var="readonly" value="false"/>
+ <c:set var="readonly" value="false"/>
</c:if>
-
<rhn:csrf/>
-<table class="details">
-<tr>
- <th><bean:message
key="system.audit.schedulexccdf.jsp.command"/>:</th>
- <td>/usr/bin/oscap xccdf eval</td>
-</tr>
-<tr>
- <th><bean:message
key="system.audit.schedulexccdf.jsp.arguments"/>:</th>
- <td>
- <html:text property="params" maxlength="2048"
size="60" styleId="params"
- readonly="${readonly}"/>
- </td>
-</tr>
-<tr>
- <th><bean:message
key="system.audit.schedulexccdf.jsp.path"/><span
class="required-form-field">*</span>:</th>
- <td>
- <html:text property="path" size="60" styleId="path"
- readonly="${readonly}"/>
- </td>
-</tr>
-<tr>
- <th><bean:message
key="scheduleremote.jsp.nosoonerthan"/>:</th>
- <td>
- <c:choose>
- <c:when test="${readonly == 'true'}">
- <c:out value="${localizedDate}"/>
- <html:hidden property="use_date" value="true" />
- <%@ include
file="/WEB-INF/pages/common/fragments/date-picker-hidden.jspf" %>
- </c:when>
- <c:otherwise>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </c:otherwise>
- </c:choose>
- </td>
-</tr>
-</table>
-
+<div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="system.audit.schedulexccdf.jsp.command"/>:
+ </label>
+ <div class="col-md-6">
+ <div class="form-control">
+ /usr/bin/oscap xccdf eval
+ </div>
+ </div>
+</div>
+<div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="system.audit.schedulexccdf.jsp.arguments"/>:
+ </label>
+ <div class="col-md-6">
+ <html:text property="params" maxlength="2048"
size="60" styleId="params" styleClass="form-control"
readonly="${readonly}"/>
+ </div>
+</div>
+<div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="system.audit.schedulexccdf.jsp.path"/>
+ <span class="required-form-field">*</span>:
+ </label>
+ <div class="col-md-6">
+ <html:text property="path" size="60"
styleId="path" styleClass="form-control"
readonly="${readonly}"/>
+ </div>
+</div>
+<div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="scheduleremote.jsp.nosoonerthan"/>:
+ </label>
+ <div class="col-md-6">
+ <c:choose>
+ <c:when test="${readonly == 'true'}">
+ <c:out value="${localizedDate}"/>
+ <html:hidden property="use_date" value="true"
/>
+ <%@ include
file="/WEB-INF/pages/common/fragments/date-picker-hidden.jspf" %>
+ </c:when>
+ <c:otherwise>
+ <jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </c:otherwise>
+ </c:choose>
+ <span class="help-block">
+ <rhn:tooltip>
+ <bean:message
key="system.audit.schedulexccdf.jsp.tooltip"/>
+ </rhn:tooltip>
+ </span>
+ </div>
+</div>
<html:hidden property="submitted" value="true" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp
index 0bbd2d4..99a7ad0 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp
@@ -5,36 +5,26 @@
<html>
-
<body>
-
-<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-
-<h2><bean:message
key="system.audit.schedulexccdf.jsp.schedule"/></h2>
-
-<c:choose>
- <c:when test="${not requestScope.scapEnabled}">
- <p><bean:message key="system.audit.listscap.jsp.missing"
- arg0="${requiredPackage}"/></p>
- </c:when>
- <c:otherwise>
- <html:form method="post"
action="/systems/details/audit/ScheduleXccdf.do">
-
- <%@ include
file="/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf" %>
-
- <html:hidden property="sid" value="${param.sid}"/>
- <div class="text-right">
- </hr>
- <html:submit property="schedule_button">
- <bean:message key="system.audit.schedulexccdf.jsp.button"/>
- </html:submit>
- </div>
- </html:form>
- <rhn:tooltip>
- <bean:message key="system.audit.schedulexccdf.jsp.tooltip"/>
- </rhn:tooltip>
- </c:otherwise>
-</c:choose>
-
+ <%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
+ <h2><bean:message
key="system.audit.schedulexccdf.jsp.schedule"/></h2>
+ <c:choose>
+ <c:when test="${not requestScope.scapEnabled}">
+ <p><bean:message key="system.audit.listscap.jsp.missing"
arg0="${requiredPackage}"/></p>
+ </c:when>
+ <c:otherwise>
+ <html:form method="post" styleClass="form-horizontal"
action="/systems/details/audit/ScheduleXccdf.do">
+ <%@ include
file="/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf" %>
+ <html:hidden property="sid"
value="${param.sid}"/>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:submit property="schedule_button"
styleClass="btn btn-success">
+ <bean:message
key="system.audit.schedulexccdf.jsp.button"/>
+ </html:submit>
+ </div>
+ </div>
+ </html:form>
+ </c:otherwise>
+ </c:choose>
</body>
</html>
commit 81e3811eb211e51b65626e59cf8c505bf655c089
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Thu Jan 16 17:59:14 2014 +0100
Fixed scattered form for Systems/Conf/AddFiles/CreateFile
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
index 0091174..ed7b403 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
@@ -22,7 +22,7 @@
</div>
<div class="createfragment">
- <html:form
action="/systems/details/configuration/addfiles/CreateFile.do?sid=${system.id}">
+ <html:form styleClass="form-horizontal"
action="/systems/details/configuration/addfiles/CreateFile.do?sid=${system.id}">
<rhn:csrf />
<rhn:submitted />
<%@ include
file="/WEB-INF/pages/common/fragments/configuration/channel/create.jspf" %>
commit fe577748612c6f439bde149f17b125164dac46e0
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 17:17:49 2014 +0100
Fixed unstyled form: Systems/Software/Pkgs/Profiles/CreateNewProfile
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp
index 72e911f..beb6657 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp
@@ -3,40 +3,40 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-
<html>
-
-<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><bean:message
key="create.jsp.createstoredprofile"/></h2>
-
-<div class="page-summary">
- <p><bean:message key="create.jsp.pagesummary"/></p>
-</div>
-
-<html:form action="/systems/details/packages/profiles/Create">
- <rhn:csrf />
- <table class="details" align="center">
- <tr>
- <th><bean:message key="create.jsp.profilename"
/>:</th>
- <td><html:text property="name" maxlength="128"
size="48" /></td>
- </tr>
- <tr>
- <th valign="top"><bean:message
key="create.jsp.profiledescription" />:</th>
-
- <td><html:textarea property="description"
cols="48" rows="6" /></td>
- </tr>
- </table>
-
- <div class="text-right">
- <hr />
- <html:hidden property="sid" value="${param.sid}" />
- <html:hidden property="submitted" value="true" />
- <html:submit>
- <bean:message key="create.jsp.createprofile"/>
- </html:submit>
- </div>
-</html:form>
-
-</body>
+ <body>
+ <%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
+ <h2><bean:message
key="create.jsp.createstoredprofile"/></h2>
+ <p><bean:message key="create.jsp.pagesummary"/></p>
+
+ <html:form styleClass="form-horizontal"
action="/systems/details/packages/profiles/Create">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="create.jsp.profilename" />:
+ </label>
+ <div class="col-md-6">
+ <html:text property="name" maxlength="128"
size="48" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 control-label">
+ <bean:message key="create.jsp.profiledescription"
/>:
+ </label>
+ <div class="col-md-6">
+ <html:textarea property="description"
cols="48" rows="6" styleClass="form-control" />
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-6">
+ <html:hidden property="sid"
value="${param.sid}" />
+ <html:hidden property="submitted" value="true"
/>
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="create.jsp.createprofile"/>
+ </html:submit>
+ </div>
+ </div>
+ </html:form>
+ </body>
</html>
commit c39f9adf8cdb96e9a06fac024fe56141a678b517
Author: Michael Calmer <mc(a)suse.de>
Date: Tue Jan 21 10:34:32 2014 +0100
give search button an id
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index 328516d..824d83b 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -58,7 +58,7 @@
</div>
<div class="form-group">
<input type="hidden" name="submitted"
value="true" />
- <button type="submit" class="btn btn-info input-sm">
+ <button type="submit" class="btn btn-info input-sm"
id="search-btn">
<rhn:icon type="header-search" />
</button>
</div>
commit 7d77553f9ecea16435a02a1ecd9b76c37741b9c0
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Dec 17 10:36:38 2013 +0100
Make sure that all form fields are correctly aligned
Use 'form-control-static' and 'checkbox' classes.
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
index 4735276..c42252b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
@@ -21,12 +21,14 @@
<label class="col-lg-3
control-label"><bean:message
key="userdetails.jsp.adminRoles"/>:</label>
<div class="col-lg-6">
<c:forEach items="${adminRoles}"
var="role">
- <label>
- <input type="checkbox"
name="role_${role.value}"
- <c:if
test="${role.selected}">checked="true"</c:if>
- <c:if
test="${role.disabled}">disabled="true"</c:if>/>
- ${role.name}
- </label>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox"
name="role_${role.value}"
+ <c:if
test="${role.selected}">checked="true"</c:if>
+ <c:if
test="${role.disabled}">disabled="true"</c:if>/>
+ ${role.name}
+ </label>
+ </div>
</c:forEach>
</div>
</div>
@@ -36,16 +38,19 @@
</label>
<div class="col-lg-6">
<c:forEach items="${regularRoles}"
var="role">
- <label>
- <input type="checkbox"
name="role_${role.value}"
- <c:if
test="${role.selected}">checked="true"</c:if>
- <c:if
test="${role.disabled}">disabled="true"</c:if>/>
- ${role.name}
- </label>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox"
name="role_${role.value}"
+ <c:if
test="${role.selected}">checked="true"</c:if>
+ <c:if
test="${role.disabled}">disabled="true"</c:if>/>
+ ${role.name}
+ </label>
+ </div>
</c:forEach>
<c:if test="${orgAdmin}">
-
- <bean:message
key="userdetails.jsp.grantedByOrgAdmin"/>
+ <p class="form-control-static">
+ <small><bean:message
key="userdetails.jsp.grantedByOrgAdmin"/></small>
+ </p>
</c:if>
</div>
</div>
@@ -53,18 +58,22 @@
<label class="col-lg-3 control-label">
<bean:message key="created.displayname"/>
</label>
- <label class="col-lg-6">
- ${created}
- </label>
+ <div class="col-lg-6">
+ <p class="form-control-static">
+ ${created}
+ </p>
+ </div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">
<bean:message
key="last_sign_in.displayname"/>
</label>
- <label class="col-lg-6">
- ${lastLoggedIn}
- </label>
+ <div class="col-lg-6">
+ <p class="form-control-static">
+ ${lastLoggedIn}
+ </p>
+ </div>
</div>
<input type="hidden" name="disabledRoles"
value="${disabledRoles}"/>
commit 2561b5d83517faaa690cf2f9a6094f386548e88f
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 16 17:48:48 2013 +0100
Panels added in the html of ipranges.jspf
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
index abcb1f5..a82ba54 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
@@ -3,86 +3,103 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<h2><bean:message key="kickstartips.jsp.baremetal"/></h2>
-<bean:message key="kickstartips.jsp.baremetal_summary"/>
-<p>${url}</p>
-<span class="help-block">
- <bean:message key="kickstartips.jsp.resource"/>
-</span>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h2><bean:message
key="kickstartips.jsp.baremetal"/></h2>
+ </div>
+ <div class="panel-body">
+ <bean:message key="kickstartips.jsp.baremetal_summary"/>
+ <p>${url}</p>
+ <span class="help-block">
+ <bean:message key="kickstartips.jsp.resource"/>
+ </span>
+ </div>
+</div>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h2><bean:message
key="kickstartips.jsp.baremetal2"/></h2>
+ </div>
+ <div class="panel-body">
+ <p><bean:message
key="kickstartips.jsp.baremetal_summary2"/></p>
+ <p>${urlRange}</p>
+ <span class="help-block">
+ <bean:message key="kickstartips.jsp.tip"/>
+ </span>
+ </div>
+</div>
-<h2><bean:message key="kickstartips.jsp.baremetal2"/></h2>
-<p><bean:message
key="kickstartips.jsp.baremetal_summary2"/></p>
-<p>${urlRange}</p>
-<span class="help-block">
- <bean:message key="kickstartips.jsp.tip"/>
-</span>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h2><bean:message
key="kickstartips.jsp.ranges"/></h2>
+ </div>
+ <div class="panel-body">
+ <p><bean:message
key="kickstartips.jsp.ranges_summary"/></p>
-<h2><bean:message key="kickstartips.jsp.ranges"/></h2>
-<p><bean:message key="kickstartips.jsp.ranges_summary"/></p>
+ <html:form method="post" styleClass="form-horizontal"
action="${param.range_edit_url}">
+ <c:forEach items="${ranges}" var="ip_range">
+ <div class="form-group">
+ <label class="col-lg-2 control-label">
+ <bean:message key="kickstartips.jsp.label" />:
+ </label>
+ <div class="col-lg-8">
+ <div class="input-group">
+ <input type="text" disabled=""
class="form-control" value="${ip_range.range}"
name="dummy">
+ <span class="input-group-btn">
+ <a class="btn btn-default"
+
href="${param.range_delete_url}?ksid=${ksdata.id}&min=${ip_range.min.number}&max=${ip_range.max.number}">
+ <i class="fa fa-trash-o"></i>
+ </a>
+ </span>
+ </div>
+ </div>
+ </div>
+ </c:forEach>
+
+ <rhn:csrf />
+ <div class="form-group">
+ <div class="row">
+ <label class="col-lg-2 control-label">
+ <bean:message key="kickstartips.jsp.label" />:
+ </label>
+ <fieldset class="col-md-8">
+
+ <html:text styleClass="input-ip-range"
property="octet1a" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet1b" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet1c" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet1d" maxlength="3" size="3" />
+ <span class="dash-ip-range"> - </span>
-<html:form method="post" styleClass="form-horizontal"
action="${param.range_edit_url}">
- <c:forEach items="${ranges}" var="ip_range">
- <div class="form-group">
- <label class="col-lg-2 control-label">
- <bean:message key="kickstartips.jsp.label" />:
- </label>
- <div class="col-lg-8">
- <div class="input-group">
- <input type="text" disabled=""
class="form-control" value="${ip_range.range}"
name="dummy">
- <span class="input-group-btn">
- <a class="btn btn-default"
-
href="${param.range_delete_url}?ksid=${ksdata.id}&min=${ip_range.min.number}&max=${ip_range.max.number}">
- <i class="fa fa-trash-o"></i>
- </a>
- </span>
+ <html:text styleClass="input-ip-range"
property="octet2a" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet2b" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet2c" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet2d" maxlength="3" size="3" />
+
+ </fieldset>
</div>
</div>
- </div>
- </c:forEach>
-
- <rhn:csrf />
- <div class="form-group">
- <div class="row">
- <label class="col-lg-2 control-label">
- <bean:message key="kickstartips.jsp.label" />:
- </label>
- <fieldset class="col-md-8">
-
- <html:text styleClass="input-ip-range"
property="octet1a" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range"
property="octet1b" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range"
property="octet1c" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
- <html:text styleClass="input-ip-range"
property="octet1d" maxlength="3" size="3" />
- <span class="dash-ip-range"> - </span>
+ <div class="form-group">
+ <div class="col-lg-offset-2 col-lg-8">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="kickstartips.jsp.addrange"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="ksid"
value="${ksdata.id}"/>
+ <html:hidden property="submitted" value="true"/>
+ </html:form>
- <html:text styleClass="input-ip-range"
property="octet2a" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range"
property="octet2b" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range"
property="octet2c" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range"
property="octet2d" maxlength="3" size="3" />
-
- </fieldset>
- </div>
</div>
-
- <div class="form-group">
- <div class="col-lg-offset-2 col-lg-8">
- <html:submit styleClass="btn btn-success">
- <bean:message key="kickstartips.jsp.addrange"/>
- </html:submit>
- </div>
- </div>
- <html:hidden property="ksid" value="${ksdata.id}"/>
- <html:hidden property="submitted" value="true"/>
-</html:form>
-
+</div>
\ No newline at end of file
commit cf641521d85dc419824214a0d45818dd83b54338
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 16 17:34:46 2013 +0100
re-organized the HTML to display the in-range inputs correctly
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
index 898897b..abcb1f5 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
@@ -2,67 +2,87 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<div class="page-summary">
+
<h2><bean:message key="kickstartips.jsp.baremetal"/></h2>
- <bean:message key="kickstartips.jsp.baremetal_summary"/>
- <p>
- ${url}
- </p>
- <p>
+<bean:message key="kickstartips.jsp.baremetal_summary"/>
+<p>${url}</p>
+<span class="help-block">
<bean:message key="kickstartips.jsp.resource"/>
- </p>
-</div>
+</span>
-<div class="page-summary">
<h2><bean:message key="kickstartips.jsp.baremetal2"/></h2>
- <p>
- <bean:message key="kickstartips.jsp.baremetal_summary2"/>
- </p>
- <p>
- ${urlRange}
- </p>
- <p>
+<p><bean:message
key="kickstartips.jsp.baremetal_summary2"/></p>
+<p>${urlRange}</p>
+<span class="help-block">
<bean:message key="kickstartips.jsp.tip"/>
- </p>
-</div>
-
+</span>
-<div class="page-summary">
<h2><bean:message key="kickstartips.jsp.ranges"/></h2>
- <p>
- <bean:message key="kickstartips.jsp.ranges_summary"/>
- </p>
+<p><bean:message key="kickstartips.jsp.ranges_summary"/></p>
- <table class="details">
- <c:forEach items="${ranges}" var="ip_range">
- <tr>
- <th><bean:message key="kickstartips.jsp.label"
/>:</th>
- <td>${ip_range.range}</td>
- <td><a
href="${param.range_delete_url}?ksid=${ksdata.id}&min=${ip_range.min.number}&max=${ip_range.max.number}">delete</a></td>
- </tr>
- </c:forEach>
- </table>
+<html:form method="post" styleClass="form-horizontal"
action="${param.range_edit_url}">
+ <c:forEach items="${ranges}" var="ip_range">
+ <div class="form-group">
+ <label class="col-lg-2 control-label">
+ <bean:message key="kickstartips.jsp.label" />:
+ </label>
+ <div class="col-lg-8">
+ <div class="input-group">
+ <input type="text" disabled=""
class="form-control" value="${ip_range.range}"
name="dummy">
+ <span class="input-group-btn">
+ <a class="btn btn-default"
+
href="${param.range_delete_url}?ksid=${ksdata.id}&min=${ip_range.min.number}&max=${ip_range.max.number}">
+ <i class="fa fa-trash-o"></i>
+ </a>
+ </span>
+ </div>
+ </div>
+ </div>
+ </c:forEach>
+
+ <rhn:csrf />
+ <div class="form-group">
+ <div class="row">
+ <label class="col-lg-2 control-label">
+ <bean:message key="kickstartips.jsp.label" />:
+ </label>
+ <fieldset class="col-md-8">
+
+ <html:text styleClass="input-ip-range"
property="octet1a" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet1b" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet1c" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet1d" maxlength="3" size="3" />
+ <span class="dash-ip-range"> - </span>
- <html:form method="post"
action="${param.range_edit_url}">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th><bean:message key="kickstartips.jsp.label"
/>:</th>
- <td><html:text property="octet1a" maxlength="3"
size="3" />.
- <html:text property="octet1b" maxlength="3"
size="3" />.
- <html:text property="octet1c" maxlength="3"
size="3" />.
- <html:text property="octet1d" maxlength="3"
size="3" /> -
- <html:text property="octet2a" maxlength="3"
size="3" />.
- <html:text property="octet2b" maxlength="3"
size="3" />.
- <html:text property="octet2c" maxlength="3"
size="3" />.
- <html:text property="octet2d" maxlength="3"
size="3" /></td>
- </tr>
- <tr>
- <td align="right"
colspan="2"><html:submit><bean:message
key="kickstartips.jsp.addrange"/></html:submit></td>
- </tr>
- </table>
- <html:hidden property="ksid" value="${ksdata.id}"/>
- <html:hidden property="submitted" value="true"/>
- </html:form>
-</div>
+ <html:text styleClass="input-ip-range"
property="octet2a" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet2b" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet2c" maxlength="3" size="3" />
+ <span class="dot-ip-range">.</span>
+
+ <html:text styleClass="input-ip-range"
property="octet2d" maxlength="3" size="3" />
+
+ </fieldset>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-lg-offset-2 col-lg-8">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="kickstartips.jsp.addrange"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="ksid" value="${ksdata.id}"/>
+ <html:hidden property="submitted" value="true"/>
+</html:form>
commit 535648644707ae43352592fe24c138a7c1e78938
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 16 17:13:56 2013 +0100
New less file added to style Inputs. New less file added for the minor fixes of TB3
for spacewalk layout
diff --git a/branding/css/spacewalk-fixes.less b/branding/css/spacewalk-fixes.less
new file mode 100644
index 0000000..5f2e885
--- /dev/null
+++ b/branding/css/spacewalk-fixes.less
@@ -0,0 +1,8 @@
+/* fixing margin issue in Bootstrap 3 */
+
+@media (min-width: 768px) {
+ .row {
+ margin-right: 0;
+ margin-left: 0;
+ }
+}
\ No newline at end of file
diff --git a/branding/css/spacewalk-inputs.less b/branding/css/spacewalk-inputs.less
new file mode 100644
index 0000000..4488bfa
--- /dev/null
+++ b/branding/css/spacewalk-inputs.less
@@ -0,0 +1,15 @@
+/* Format of specific inputs */
+.input-ip-range {
+ .form-control;
+ width: 40px;
+ padding: 6px 6px;
+ display: inline-block;
+ margin-right: 5px
+}
+.dash-ip-range {
+ margin: 0 1em
+}
+.dot-ip-range {
+ vertical-align: bottom;
+ margin: 0 .2em;
+}
\ No newline at end of file
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 3afa2f0..ea5d16b 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -9,20 +9,15 @@
@import url(spacewalk-variables.less);
/* Spacewalk mixins */
@import url(spacewalk-mixins.less);
+/* Spacewalk inputs */
+@import url(spacewalk-inputs.less);
/*Import of Tables style*/
@import url(spacewalk-tables.less);
/* Import of the Theme */
@import url(spacewalk-theme.less);
-
-/* fixing margin issue in Bootstrap 3 */
-
-@media (min-width: 768px) {
- .row {
- margin-right: 0;
- margin-left: 0;
- }
-}
+/* Spacewalk fixes of TB3 */
+@import url(spacewalk-fixes.less);
// LEAVE THIS LINE AT THE END ALWAYS TO WARRANTY THE RESPONSIVE RULES REWRITE THE
EXISTING STYLES