branding/css/spacewalk.less
| 131 ++
branding/css/tables.less
| 6
branding/css/theme.less
| 20
branding/spacewalk-branding.spec
| 6
branding/templates/header.pxt
| 3
java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
| 27
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
| 6
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
| 541 ++-------
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
| 338 ++++++
java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
| 5
java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
| 322 -----
java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java
| 7
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
| 2
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
| 336 ++++-
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
| 22
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
| 62 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
| 76 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
| 18
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
| 18
java/code/webapp/WEB-INF/decorators/layout_c.jsp
| 2
java/code/webapp/WEB-INF/decorators/layout_head.jsp
| 2
java/code/webapp/WEB-INF/includes/footer.jsp
| 7
java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
| 6
java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
| 10
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
| 6
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
| 24
java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
| 26
java/code/webapp/WEB-INF/pages/admin/addresses.jsp
| 20
java/code/webapp/WEB-INF/pages/admin/catalina.jsp
| 30
java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
| 180 +--
java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
| 69 -
java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
| 51
java/code/webapp/WEB-INF/pages/admin/config/general.jsp
| 234 ++--
java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
| 96 -
java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
| 60 -
java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
| 3
java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
| 60 -
java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
| 18
java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
| 142 +-
java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
| 156 +-
java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
| 44
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
| 68 -
java/code/webapp/WEB-INF/pages/channel/all.jsp
| 4
java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
| 561 +++++-----
java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
| 362 +++---
java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
| 12
java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
| 14
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/popular.jsp
| 11
java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
| 28
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
| 5
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
| 15
java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
| 42
java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
| 96 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
| 9
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
| 352 +++---
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf
| 77 -
java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
| 86 -
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
| 16
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
| 224 ++-
java/code/webapp/WEB-INF/pages/common/login.jsp
| 5
java/code/webapp/WEB-INF/pages/common/relogin.jsp
| 5
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
| 9
java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
| 8
java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
| 11
java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
| 6
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
| 214 +--
java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
| 8
java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
| 6
java/code/webapp/WEB-INF/pages/credentials/edit.jsp
| 79 -
java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
| 78 -
java/code/webapp/WEB-INF/pages/errata/create.jsp
| 319 ++---
java/code/webapp/WEB-INF/pages/errata/edit.jsp
| 464 ++++----
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
| 99 +
java/code/webapp/WEB-INF/pages/errata/published.jsp
| 2
java/code/webapp/WEB-INF/pages/help/chatindex.jsp
| 14
java/code/webapp/WEB-INF/pages/help/docsearch.jsp
| 64 -
java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
| 36
java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
| 36
java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
| 11
java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
| 9
java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
| 2
java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
| 16
java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
| 53
java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
| 50
java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
| 44
java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
| 32
java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
| 44
java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
| 173 +--
java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
| 9
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
| 22
java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
| 54
java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
| 24
java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
| 9
java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
| 5
java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
| 6
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
| 4
java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
| 49
java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
| 5
web/html/javascript/check_all.js
| 234 ----
web/html/javascript/display.js
| 10
web/html/javascript/focus.js
| 10
web/html/javascript/images.js
| 24
web/html/javascript/spacewalk-checkall.js
| 232 ++++
web/html/javascript/spacewalk-essentials.js
| 4
web/html/javascript/spacewalk-images.js
| 24
web/html/javascript/spacewalk-login.js
| 26
web/modules/sniglets/Sniglets/ListView/Style.pm
| 1
web/modules/sniglets/Sniglets/Servers.pm
| 2
111 files changed, 4093 insertions(+), 3738 deletions(-)
New commits:
commit 6318f88adfa18558b21363f337f856585adf5bf3
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Oct 24 14:24:21 2013 +0200
Add the missing fonts directory with all its content
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index e35f77e..ada7b41 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -51,6 +51,7 @@ install -d -m 755
%{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/
install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
cp -p css/*.css %{buildroot}/%{_var}/www/html/css
+cp -pR fonts %{buildroot}/%{_var}/www/html/
cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
# one in source:
@@ -69,6 +70,8 @@ rm -rf %{buildroot}
%files
%dir %{_var}/www/html/css
%{_var}/www/html/css/*
+%dir %{_var}/www/html/fonts
+%{_var}/www/html/fonts/*
%dir /%{_var}/www/html/img
%{_var}/www/html/img/*
%{_var}/www/html/favicon.ico
commit 0924647eb16bad03b9c3479761eac1a0eff40aa9
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Oct 24 14:09:34 2013 +0200
TB3: Channels/channel details presentation form
diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
index f297317..0f24fec 100644
--- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
@@ -5,258 +5,315 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
-<html:html xhtml="true">
-<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
-<BR>
+<html:html>
+ <body>
+ <%@ include
file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
+ <html:form action="/channels/ChannelDetail"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h2><bean:message
key="channel.edit.jsp.basicchanneldetails"/></h2>
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.name"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel.name}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.label"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel.label}"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.jsp.parentchannel"/>
+ </label>
+ <div class="col-lg-6">
+ <c:if test="${empty channel.parentChannel}">
+ (none)
+ </c:if>
+ <c:if test="${!empty channel.parentChannel}">
+ <a class="btn btn-info"
href="/rhn/channels/ChannelDetail.do?cid=${channel.parentChannel.id}">
+ <c:out value="${channel.parentChannel.name}"
/> <i class="fa fa-arrow-right"></i>
+ </a>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.checksum"/>
+ </label>
+ <div class="col-lg-6">
+ <c:if test="${empty channel.checksumType}">
+ (none)
+ </c:if>
+ <c:if test="${!empty channel.checksumType}">
+ <c:out value="${channel.checksumType}" />
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="packagelist.jsp.packagearch"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel.channelArch.name}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.jsp.summary"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel.summary}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="details.jsp.description"/>
+ </label>
+ <div class="col-lg-6">
+ <c:if test="${empty channel.description}">
+ (none)
+ </c:if>
+ <c:if test="${!empty channel.description}">
+ <c:out value="${channel.description}" />
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.jsp.chanent"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel.channelFamily.name}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channelfiles.jsp.lastmod"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel_last_modified}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.jsp.repolastbuild"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${repo_last_build != null}">
+ <c:out value="${repo_last_build}" />
+ </c:when>
+ <c:otherwise>
+ (none)
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.jsp.repodata"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${repo_status == null}">
+ (none)
+ </c:when>
+ <c:when test="${repo_status == true}">
+ <bean:message
key="channel.jsp.repodata.inProgress"/>
+ </c:when>
+ <c:when test="${repo_status == false &&
repo_last_build != null}">
+ <bean:message
key="channel.jsp.repodata.completed"/>
+ </c:when>
+ <c:otherwise>
+ (none)
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="header.jsp.packages"/>
+ </label>
+ <div class="col-lg-6">
+ <a class="btn btn-info"
href="/rhn/channels/ChannelPackages.do?cid=${channel.id}">
+ ${pack_size} <i class="fa
fa-arrow-right"></i>
+ </a>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.perusersub"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
+ <label>
+ <c:choose>
+ <c:when test="${has_access}">
+ <html:radio property="global"
value="all" />
+ </c:when>
+ <c:otherwise>
+ <html:radio property="global"
value="all" disabled="true"/>
+ </c:otherwise>
+ </c:choose>
+ <bean:message
key="channel.edit.jsp.allusers"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <c:choose>
+ <c:when test="${has_access ==
true}">
+ <html:radio property="global"
value="selected" />
+ </c:when>
+ <c:otherwise>
+ <html:radio property="global"
value="selected" disabled="true"/>
+ </c:otherwise>
+ </c:choose>
+ <bean:message
key="channel.edit.jsp.selectedusers"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.jsp.systemssubsribed"/>
+ </label>
+ <div class="col-lg-6">
+ <a class="btn btn-info"
href="/rhn/channels/ChannelSubscribers.do?cid=${channel.id}">
+ ${systems_subscribed} <i class="fa
fa-arrow-right"></i>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h2><bean:message
key="channel.edit.jsp.contactsupportinfo"/></h2>
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.maintainername"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel.maintainerName}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.maintainercontactinfo"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="input-group">
+ <span class="input-group-addon">
+ <bean:message
key="channel.edit.jsp.emailaddress"/>
+ </span>
+ <div class="form-control">
+ <c:out value="${channel.maintainerEmail}"
/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="input-group">
+ <span class="input-group-addon">
+ <bean:message
key="channel.edit.jsp.phonenumber"/>
+ </span>
+ <div class="form-control">
+ <c:out value="${channel.maintainerPhone}"
/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.supportpolicy"/>
+ </label>
+ <div class="col-lg-6">
+ <c:out value="${channel.supportPolicy}" />
+ </div>
+ </div>
+ </div>
+ </div>
-<h2><bean:message
key="channel.edit.jsp.basicchanneldetails"/></h2>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h2><bean:message
key="channel.edit.jsp.security.gpg"/></h2>
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.gpgkeyurl"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${channel.GPGKeyUrl !=
null}">
+ <c:out value="${channel.GPGKeyUrl}" />
+ </c:when>
+ <c:otherwise>
+ (none entered)
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.gpgkeyid"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${channel.GPGKeyId != null}">
+ <c:out value="${channel.GPGKeyId}" />
+ </c:when>
+ <c:otherwise>
+ (none entered)
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.gpgkeyfingerprint"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${channel.GPGKeyFp != null}">
+ <c:out value="${channel.GPGKeyFp}" />
+ </c:when>
+ <c:otherwise>
+ (none entered)
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ </div>
+ </div>
-<div>
-
-<html:form action="/channels/ChannelDetail">
-
- <rhn:csrf />
-
- <table class="details" width="100%">
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.name"/>:
- </th>
- <td class="small-form">
- <c:out value="${channel.name}" />
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.label"/>:
- </th>
- <td class="small-form">
- <c:out value="${channel.label}"/>
- </td>
- </tr>
- <tr>
- <th><bean:message
key="channel.jsp.parentchannel"/>:</th>
- <td>
- <c:if test="${empty channel.parentChannel}">
- <span class="no-details">(none)</span>
- </c:if>
- <c:if test="${!empty channel.parentChannel}">
- <a
href="/rhn/channels/ChannelDetail.do?cid=${channel.parentChannel.id}">
- <c:out value="${channel.parentChannel.name}" />
- </a>
- </c:if>
- </td>
- </tr>
- <tr>
- <th><bean:message
key="channel.edit.jsp.checksum"/>:</th>
- <td>
- <c:if test="${empty channel.checksumType}">
- <span class="no-details">(none)</span>
- </c:if>
- <c:if test="${!empty channel.checksumType}">
- <c:out value="${channel.checksumType}" />
- </c:if>
- </td>
- </tr>
- <tr>
- <th><bean:message
key="packagelist.jsp.packagearch"/>:</th>
- <td><c:out value="${channel.channelArch.name}"
/></td>
- </tr>
- <tr>
- <th><bean:message key="channel.jsp.summary"/>:</th>
- <td><c:out value="${channel.summary}" /></td>
- </tr>
- <tr>
- <th><bean:message
key="details.jsp.description"/>:</th>
- <td>
- <c:if test="${empty channel.description}">
- <span class="no-details">(none)</span>
- </c:if>
- <c:if test="${!empty channel.description}">
- <c:out value="${channel.description}" />
- </c:if>
- </td>
- </tr>
- <tr>
- <th><bean:message key="channel.jsp.chanent"/>:</th>
- <td><c:out value="${channel.channelFamily.name}"
/></td>
- </tr>
- <tr>
- <th><bean:message
key="channelfiles.jsp.lastmod"/>:</th>
- <td><c:out value="${channel_last_modified}" /></td>
- </tr>
- <tr>
- <th><bean:message
key="channel.jsp.repolastbuild"/>:</th>
- <td>
- <c:choose>
- <c:when test="${repo_last_build != null}">
- <c:out value="${repo_last_build}" /></td>
- </c:when>
- <c:otherwise>
- <span class="no-details">(none)</span>
- </c:otherwise>
- </c:choose>
- </tr>
- <tr>
- <th><bean:message key="channel.jsp.repodata"/>:</th>
- <td>
- <c:choose>
- <c:when test="${repo_status == null}">
- <span class="no-details">(none)</span>
- </c:when>
- <c:when test="${repo_status == true}">
- <bean:message key="channel.jsp.repodata.inProgress"/>
- </c:when>
- <c:when test="${repo_status == false && repo_last_build !=
null}">
- <bean:message key="channel.jsp.repodata.completed"/>
- </c:when>
- <c:otherwise>
- <span class="no-details">(none)</span>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th><bean:message key="header.jsp.packages"/>:</th>
- <td><a
href="/rhn/channels/ChannelPackages.do?cid=${channel.id}">
- ${pack_size}</a></td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.perusersub"/>:
- </th>
- <td class="small-form">
- <table>
- <tr>
- <c:choose>
- <c:when test="${has_access}">
- <td><html:radio property="global"
value="all" /></td>
- </c:when>
- <c:otherwise>
- <td><html:radio property="global"
value="all" disabled="true"/></td>
- </c:otherwise>
- </c:choose>
- <td><bean:message
key="channel.edit.jsp.allusers"/></td>
- </tr><tr>
- <c:choose>
- <c:when test="${has_access == true}">
- <td><html:radio property="global"
value="selected" /></td>
- </c:when>
- <c:otherwise>
- <td><html:radio property="global"
value="selected" disabled="true"/></td>
- </c:otherwise>
- </c:choose>
- <td><bean:message
key="channel.edit.jsp.selectedusers"/></td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <th><bean:message
key="channel.jsp.systemssubsribed"/>:</th>
- <td><a
href="/rhn/channels/ChannelSubscribers.do?cid=${channel.id}">${systems_subscribed}</a></td>
- </tr>
- </table>
- <h2><bean:message
key="channel.edit.jsp.contactsupportinfo"/></h2>
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.maintainername"/>:
- </th>
- <td class="small-form">
- <c:out value="${channel.maintainerName}" />
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message
key="channel.edit.jsp.maintainercontactinfo"/>:
- </th>
- <td class="small-form">
- <table>
- <tr>
- <td><bean:message
key="channel.edit.jsp.emailaddress"/>:</td>
- <td><c:out value="${channel.maintainerEmail}"
/></td>
- </tr><tr>
- <td><bean:message
key="channel.edit.jsp.phonenumber"/>:</td>
- <td><c:out value="${channel.maintainerPhone}"
/></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.supportpolicy"/>:
- </th>
- <td class="small-form">
- <c:out value="${channel.supportPolicy}" />
- </td>
- </tr>
- </table>
- <h2><bean:message
key="channel.edit.jsp.security.gpg"/></h2>
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.gpgkeyurl"/>:
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test="${channel.GPGKeyUrl != null}">
- <c:out value="${channel.GPGKeyUrl}"
/><br><br>
- </c:when>
- <c:otherwise>
- (none entered)<br><br>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.gpgkeyid"/>:
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test="${channel.GPGKeyId != null}">
- <c:out value="${channel.GPGKeyId}" /><br><br>
- </c:when>
- <c:otherwise>
- (none entered)<br><br>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.gpgkeyfingerprint"/>:
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test="${channel.GPGKeyFp != null}">
- <c:out value="${channel.GPGKeyFp}" /><br><br>
- </c:when>
- <c:otherwise>
- (none entered)<br><br>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </table>
-
- <c:if test="${has_access}">
- <p align="right">
- <html:submit property="Update">
- <bean:message key="message.Update"/>
- </html:submit>
- </p>
- </c:if>
- <rhn:submitted/>
- <html:hidden property="cid" value="${channel.id}" />
-</html:form>
-
-
-
-</div>
-
-</body>
+ <c:if test="${has_access}">
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit property="Update" styleClass="btn
btn-success">
+ <bean:message key="message.Update"/>
+ </html:submit>
+ </div>
+ </div>
+ </c:if>
+ <rhn:submitted/>
+ <html:hidden property="cid" value="${channel.id}" />
+ </html:form>
+ </body>
</html:html>
-
commit ddf451ea922cb64b733d8f0173d88a7d29546ffe
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Oct 24 11:03:10 2013 +0200
Rename check_all.js to spacewalk-checkall.js
diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt
index 576a489..d2e3955 100644
--- a/branding/templates/header.pxt
+++ b/branding/templates/header.pxt
@@ -20,7 +20,7 @@
<script src="/javascript/jquery.js"></script>
<script src="/javascript/bootstrap.js"></script>
<script src="/javascript/spacewalk-essentials.js"></script>
- <script src="/javascript/check_all.js"></script>
+ <script src="/javascript/spacewalk-checkall.js"></script>
</head>
</pxt-passthrough>
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index b2decfe..713f219 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -41,7 +41,7 @@
<script src="/javascript/jquery.js"></script>
<script src="/javascript/bootstrap.js"></script>
<script src="/javascript/spacewalk-essentials.js"></script>
- <script src="/javascript/check_all.js"></script>
+ <script src="/javascript/spacewalk-checkall.js"></script>
<script src="/rhn/dwr/engine.js"></script>
<script src="/rhn/dwr/util.js"></script>
diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js
deleted file mode 100644
index 319fb3d..0000000
--- a/web/html/javascript/check_all.js
+++ /dev/null
@@ -1,232 +0,0 @@
-function blockEnter(evt) {
- evt = (evt) ? evt : event;
- var charCode = (evt.charCode) ? evt.charCode :((evt.which) ? evt.which :
evt.keyCode);
- if (charCode == 13) {
- return false;
- } else {
- return true;
- }
-}
-
-function create_checkall_checkbox() {
- var checkall =
document.getElementById("rhn_javascriptenabled_checkall_checkbox");
-
- if (checkall) {
- checkall.style.display = "inline";
- }
-
- var update_list_key = document.getElementById("update_list_key_id");
- if (update_list_key) {
- update_list_key.style.display = "none";
- }
-}
-
-function check_all_on_page(form, set_label) {
- var form_name = form.name;
- if (form_name == "") {
- form_name = form.id;
- }
- var flag = eval("document.forms['" + form_name +
"'].checkall.checked");
- var cboxes = eval("document.forms['" + form_name +
"'].items_selected");
- process_check_all(set_label, cboxes, flag, []);
-}
-
-function process_check_all(set_label, cbox_items, flag, ignorables_ids) {
- var ignorables = ids_to_elements(ignorables_ids);
- var cboxes = new Array();
- cboxes = cboxes.concat(ignorables);
- if (cbox_items.length) {
- for (var i = 0 ; i < cbox_items.length; i++) {
- cboxes.push(cbox_items[i]);
- }
- }
- else {
- //for a single element check box
- //push the form element
- cboxes.push(cbox_items);
- }
-
- var boxes = process_group(set_label, cboxes, flag);
- var includes = new Array();
- for (var i = 0; i < boxes.length; i++) {
- var include = true;
- for (var j = 0; j < ignorables.length; j++) {
- if (ignorables[j].value == boxes[i]) {
- include = false;
- break;
- }
- }
- if (include) {
- includes.push(boxes[i]);
- }
- }
- update_server_set("ids", set_label, flag, includes);
-}
-
-function ids_to_elements(elem_ids) {
- var elements = new Array();
- for (var i = 0; i < elem_ids.length; i++) {
- elements.push(document.getElementById(elem_ids[i]));
- }
- return elements;
-}
-
-
-function process_group(set_label, cboxes, flag) {
- var i;
- var changed = new Array();
-
- if (cboxes.length) {
- for (i = 0; i < cboxes.length; i++) {
- //check the box only if it is enabled
- if (!cboxes[i].disabled) {
- if (cboxes[i].checked != flag) {
- changed.push(cboxes[i].value);
- } //if
- cboxes[i].checked = flag;
- } //if
- } //for
- } //if
- else {
- if (cboxes.checked != flag) {
- changed.push(cboxes.value)
- }
- cboxes.checked = flag;
- }
- return changed;
-}
-
-function checkbox_clicked(thebox, set_label) {
- var form_name = thebox.form.name;
- if (form_name == "") {
- form_name = thebox.form.id;
- }
- var checkall = eval("document.forms['" + form_name +
"'].checkall");
- process_checkbox_clicked(thebox, set_label, checkall, [], [],"", true);
-}
-
-
-/**
- * This method is called when a single checkbox is clicked
- * thebox - The check box that was clicked
- * set_label - The rhnSet label of the checkbox that was clicked
- * checkall - The link to the select all box
- *
- * If this list tag is using some sort of tree/grouping structure
- *
- * children - if this is a parent node then list the children or [] otherwise
- * members - if this is a child node then list the siblings and include the child or []
otherwise
- * parent_id - if this is a child node then list the parent_id or [] otherwise
- **/
-
-function process_checkbox_clicked(thebox, set_label, checkall, children, members,
parent_id, parentIsElement) {
- var a = process_checkbox_clicked_client_side(thebox, set_label, checkall, children,
members, parent_id, parentIsElement);
- update_server_set("ids", set_label, thebox.checked, a);
-}
-
-function process_checkbox_clicked_client_side(thebox, set_label, checkall, children,
members, parent_id, parentIsElement) {
- var a = new Array();
- if (parent_id == '') {
- if(parentIsElement) {
- a.push(thebox.value);
- }
- }
- else {
- a.push(thebox.value);
- }
-
- var checkboxes = new Array();
- for (var i = 0; i < children.length; i++) {
- var checkbox = document.getElementById(children[i]);
- checkboxes.push(checkbox);
- a.push(checkbox.value);
- }
- if (checkboxes.length > 0) {
- process_group(set_label, checkboxes, thebox.checked);
- }
-
- if (parent_id) {
- var parentBox = document.getElementById(parent_id);
- var boxes = ids_to_elements(members) ;
- process_single_checkbox(boxes, parentBox);
- }
- var form_name = thebox.form.name;
- if (form_name == "") {
- form_name = thebox.form.id;
- }
- var cboxes = eval("document.forms['" + form_name + "']."
+ thebox.name);
- process_single_checkbox(cboxes, checkall);
- return a;
-}
-
-
-
-function process_single_checkbox(cboxes, checkall) {
- var i;
- var count_checked_or_disabled = 0;
- var all_checked = false;
- if (cboxes.length) {
- for (i = 0; i < cboxes.length; i++) {
- if (cboxes[i].checked || cboxes[i].disabled) {
- count_checked_or_disabled++;
- }
- }
-
- if (count_checked_or_disabled == cboxes.length) {
- all_checked = true;
- }
- }
- else {
- if (cboxes.checked) {
- all_checked = true;
- }
- }
- if (checkall) {
- checkall.checked = all_checked;
- }
-}
-
-function update_server_set(variable, set_label, checked, values) {
- DWRItemSelector.select(set_label, values, checked,pageResponse);
-}
-
-function pageResponse(data) {
- var resp = eval(data);
- if (typeof(resp['header']) != 'undefined') {
- dwr.util.setValue("header_selcount", resp.header, {escapeHtml:
false});
- }
- if (document.getElementById('pagination_selcount_top')) {
- dwr.util.setValue("pagination_selcount_top", resp.pagination);
- dwr.util.setValue("pagination_selcount_bottom", resp.pagination);
- }
- updateSsmToolbarOpacity();
-}
-
-// the function we call to read the number of systems selected and hide/show the toolbar
-function updateSsmToolbarOpacity() {
- var systemsSpan = $("#spacewalk-set-system_list-counter").text();
-
- if (systemsSpan == 0){
-
- $(".spacewalk-bar").animate({"opacity": "0"}, 300,
function() {
- /* stuff to do after animation is complete */
- $(this).hide();
- });
- }
- else{
-
- $(".spacewalk-bar").animate({"opacity":"100"}, 300,
- function(){
- /* stuff to do after animation is complete */
- $(this).show();
- });
- }
-}
-
-function sortColumn(sortByWidget, sortByValue, sortDirWidget, sortDirValue) {
- var sortBy = document.getElementById(sortByWidget);
- sortBy.value = sortByValue;
- var sortDir = document.getElementById(sortDirWidget);
- sortDir.value = sortDirValue;
- sortBy.form.submit();
-}
diff --git a/web/html/javascript/spacewalk-checkall.js
b/web/html/javascript/spacewalk-checkall.js
new file mode 100644
index 0000000..319fb3d
--- /dev/null
+++ b/web/html/javascript/spacewalk-checkall.js
@@ -0,0 +1,232 @@
+function blockEnter(evt) {
+ evt = (evt) ? evt : event;
+ var charCode = (evt.charCode) ? evt.charCode :((evt.which) ? evt.which :
evt.keyCode);
+ if (charCode == 13) {
+ return false;
+ } else {
+ return true;
+ }
+}
+
+function create_checkall_checkbox() {
+ var checkall =
document.getElementById("rhn_javascriptenabled_checkall_checkbox");
+
+ if (checkall) {
+ checkall.style.display = "inline";
+ }
+
+ var update_list_key = document.getElementById("update_list_key_id");
+ if (update_list_key) {
+ update_list_key.style.display = "none";
+ }
+}
+
+function check_all_on_page(form, set_label) {
+ var form_name = form.name;
+ if (form_name == "") {
+ form_name = form.id;
+ }
+ var flag = eval("document.forms['" + form_name +
"'].checkall.checked");
+ var cboxes = eval("document.forms['" + form_name +
"'].items_selected");
+ process_check_all(set_label, cboxes, flag, []);
+}
+
+function process_check_all(set_label, cbox_items, flag, ignorables_ids) {
+ var ignorables = ids_to_elements(ignorables_ids);
+ var cboxes = new Array();
+ cboxes = cboxes.concat(ignorables);
+ if (cbox_items.length) {
+ for (var i = 0 ; i < cbox_items.length; i++) {
+ cboxes.push(cbox_items[i]);
+ }
+ }
+ else {
+ //for a single element check box
+ //push the form element
+ cboxes.push(cbox_items);
+ }
+
+ var boxes = process_group(set_label, cboxes, flag);
+ var includes = new Array();
+ for (var i = 0; i < boxes.length; i++) {
+ var include = true;
+ for (var j = 0; j < ignorables.length; j++) {
+ if (ignorables[j].value == boxes[i]) {
+ include = false;
+ break;
+ }
+ }
+ if (include) {
+ includes.push(boxes[i]);
+ }
+ }
+ update_server_set("ids", set_label, flag, includes);
+}
+
+function ids_to_elements(elem_ids) {
+ var elements = new Array();
+ for (var i = 0; i < elem_ids.length; i++) {
+ elements.push(document.getElementById(elem_ids[i]));
+ }
+ return elements;
+}
+
+
+function process_group(set_label, cboxes, flag) {
+ var i;
+ var changed = new Array();
+
+ if (cboxes.length) {
+ for (i = 0; i < cboxes.length; i++) {
+ //check the box only if it is enabled
+ if (!cboxes[i].disabled) {
+ if (cboxes[i].checked != flag) {
+ changed.push(cboxes[i].value);
+ } //if
+ cboxes[i].checked = flag;
+ } //if
+ } //for
+ } //if
+ else {
+ if (cboxes.checked != flag) {
+ changed.push(cboxes.value)
+ }
+ cboxes.checked = flag;
+ }
+ return changed;
+}
+
+function checkbox_clicked(thebox, set_label) {
+ var form_name = thebox.form.name;
+ if (form_name == "") {
+ form_name = thebox.form.id;
+ }
+ var checkall = eval("document.forms['" + form_name +
"'].checkall");
+ process_checkbox_clicked(thebox, set_label, checkall, [], [],"", true);
+}
+
+
+/**
+ * This method is called when a single checkbox is clicked
+ * thebox - The check box that was clicked
+ * set_label - The rhnSet label of the checkbox that was clicked
+ * checkall - The link to the select all box
+ *
+ * If this list tag is using some sort of tree/grouping structure
+ *
+ * children - if this is a parent node then list the children or [] otherwise
+ * members - if this is a child node then list the siblings and include the child or []
otherwise
+ * parent_id - if this is a child node then list the parent_id or [] otherwise
+ **/
+
+function process_checkbox_clicked(thebox, set_label, checkall, children, members,
parent_id, parentIsElement) {
+ var a = process_checkbox_clicked_client_side(thebox, set_label, checkall, children,
members, parent_id, parentIsElement);
+ update_server_set("ids", set_label, thebox.checked, a);
+}
+
+function process_checkbox_clicked_client_side(thebox, set_label, checkall, children,
members, parent_id, parentIsElement) {
+ var a = new Array();
+ if (parent_id == '') {
+ if(parentIsElement) {
+ a.push(thebox.value);
+ }
+ }
+ else {
+ a.push(thebox.value);
+ }
+
+ var checkboxes = new Array();
+ for (var i = 0; i < children.length; i++) {
+ var checkbox = document.getElementById(children[i]);
+ checkboxes.push(checkbox);
+ a.push(checkbox.value);
+ }
+ if (checkboxes.length > 0) {
+ process_group(set_label, checkboxes, thebox.checked);
+ }
+
+ if (parent_id) {
+ var parentBox = document.getElementById(parent_id);
+ var boxes = ids_to_elements(members) ;
+ process_single_checkbox(boxes, parentBox);
+ }
+ var form_name = thebox.form.name;
+ if (form_name == "") {
+ form_name = thebox.form.id;
+ }
+ var cboxes = eval("document.forms['" + form_name + "']."
+ thebox.name);
+ process_single_checkbox(cboxes, checkall);
+ return a;
+}
+
+
+
+function process_single_checkbox(cboxes, checkall) {
+ var i;
+ var count_checked_or_disabled = 0;
+ var all_checked = false;
+ if (cboxes.length) {
+ for (i = 0; i < cboxes.length; i++) {
+ if (cboxes[i].checked || cboxes[i].disabled) {
+ count_checked_or_disabled++;
+ }
+ }
+
+ if (count_checked_or_disabled == cboxes.length) {
+ all_checked = true;
+ }
+ }
+ else {
+ if (cboxes.checked) {
+ all_checked = true;
+ }
+ }
+ if (checkall) {
+ checkall.checked = all_checked;
+ }
+}
+
+function update_server_set(variable, set_label, checked, values) {
+ DWRItemSelector.select(set_label, values, checked,pageResponse);
+}
+
+function pageResponse(data) {
+ var resp = eval(data);
+ if (typeof(resp['header']) != 'undefined') {
+ dwr.util.setValue("header_selcount", resp.header, {escapeHtml:
false});
+ }
+ if (document.getElementById('pagination_selcount_top')) {
+ dwr.util.setValue("pagination_selcount_top", resp.pagination);
+ dwr.util.setValue("pagination_selcount_bottom", resp.pagination);
+ }
+ updateSsmToolbarOpacity();
+}
+
+// the function we call to read the number of systems selected and hide/show the toolbar
+function updateSsmToolbarOpacity() {
+ var systemsSpan = $("#spacewalk-set-system_list-counter").text();
+
+ if (systemsSpan == 0){
+
+ $(".spacewalk-bar").animate({"opacity": "0"}, 300,
function() {
+ /* stuff to do after animation is complete */
+ $(this).hide();
+ });
+ }
+ else{
+
+ $(".spacewalk-bar").animate({"opacity":"100"}, 300,
+ function(){
+ /* stuff to do after animation is complete */
+ $(this).show();
+ });
+ }
+}
+
+function sortColumn(sortByWidget, sortByValue, sortDirWidget, sortDirValue) {
+ var sortBy = document.getElementById(sortByWidget);
+ sortBy.value = sortByValue;
+ var sortDir = document.getElementById(sortDirWidget);
+ sortDir.value = sortDirValue;
+ sortBy.form.submit();
+}
diff --git a/web/html/javascript/spacewalk-essentials.js
b/web/html/javascript/spacewalk-essentials.js
index edf2a5a..7cf0345 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -25,7 +25,7 @@ $(document).on("ready", function(){
// See if there is a system already selected as soon as the page loads
updateSsmToolbarOpacity();
- // This is in check_all.js
+ // This is a function from spacewalk-checkall.js
create_checkall_checkbox();
});
commit c79eab4ee9208cb2225cc93f69bd026ba483b1c3
Author: cyntss <csanchez(a)suse.com>
Date: Thu Oct 24 10:40:19 2013 +0200
Alphabet filter reduced to fit in small screens
diff --git a/branding/css/theme.less b/branding/css/theme.less
index 181c1ef..ba34c3e 100644
--- a/branding/css/theme.less
+++ b/branding/css/theme.less
@@ -1,8 +1,7 @@
//PAGINATOR from 0 - 9 and A - Z
.spacewalk-alphabar{
- border-bottom: 1px solid #dddddd;
- //padding: .7em;
+ padding-bottom: .3em;
&.pagination{
margin: 0
}
@@ -11,6 +10,7 @@
border-bottom: 1px solid #dddddd;
border-left: 0;
border-right: 0;
+ font-size: .9em;
}
&.pagination-sm > li:first-child > a, .pagination-sm > li:first-child >
span{
border-left: 1px solid #dddddd;
@@ -21,7 +21,7 @@
padding-right: 8px;
}
&.pagination-sm > li > a, .pagination-sm > li > span{
- padding: 4px 6px;
+ padding: 4px;
}
&.pagination-sm > li:nth-child(11) > a{
border-left: 1px solid #dddddd;
commit 7d40a175f2985269aadb4a417f79f32c5d5a23ca
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 18:30:48 2013 +0200
buttons and panel style added
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 44a10c7..3c3947a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -109,11 +109,9 @@
</rl:list>
- <div align="right">
-
- <hr />
- <html:submit property="dispatch">
- <bean:message key="Delete Selected"/>
+ <div class="text-right">
+ <html:submit styleClass="btn btn-default"
property="dispatch">
+ <bean:message key="Delete Selected"/>
</html:submit>
</div>
@@ -121,6 +119,5 @@
</rl:listset>
-
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
index e6f9e39..8daf769 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
@@ -73,10 +73,9 @@
<input type="hidden" name="key"
value="${param.key}"/>
<input type="hidden" name="key_type"
value="${param.key_type}"/>
- <div align="right">
-
+ <div class="text-right">
<hr />
- <input type="submit" name="refresh"
value="<bean:message key='Refresh Comparison'/>" />
+ <button type="submit" class="btn btn-default"
name="refresh"><i class="icon-refresh"></i>
<bean:message key='Refresh Comparison'/></button>
</div>
<rhn:submitted/>
<br/>
@@ -106,10 +105,10 @@
</c:forEach>
</tr>
<tr>
- <th colspan="${requestScope.systems.size + 1}"><bean:message
key="System Identity Properties"/>
+ <td colspan="${requestScope.systems.size + 1}"><bean:message
key="System Identity Properties"/>
<a id='sysIdHide' href="javascript:pageToggleRows('sysId',
['lastCheckinRow',
'macAddressRow','ipAddressRow','ipv6AddressRow','systemGroupsRow'])"><bean:message
key="Click Here To Hide"/> </a>
<a style="display:none" id='sysIdShow'
href="javascript:pageToggleRows('sysId', ['lastCheckinRow',
'macAddressRow','ipAddressRow','ipv6AddressRow','systemGroupsRow'])"><bean:message
key="Click Here To Show"/> </a>
- </th>
+ </td>
</tr>
<tr class="list-row-odd" id="lastCheckinRow">
<c:set var ="key" value="systemlist.jsp.last_checked_in"/>
@@ -142,10 +141,10 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf"
%>
</tr>
<tr>
- <th colspan="${requestScope.systems.size + 1}"><bean:message
key="Extended System Identity Properties"/>
+ <td colspan="${requestScope.systems.size + 1}"><bean:message
key="Extended System Identity Properties"/>
<a id='extendedSysIdHide'
href="javascript:pageToggleRows('extendedSysId',
['registrationDateRow',
'systemIdRow','activationKeysRow'])"><bean:message
key="Click Here To Hide"/> </a>
<a style="display:none" id='extendedSysIdShow'
href="javascript:pageToggleRows('sysId', ['registrationDateRow',
'systemIdRow','activationKeysRow'])"><bean:message
key="Click Here To Show"/> </a>
- </th>
+ </td>
</tr>
<tr class="list-row-odd" id = "registrationDateRow">
<c:set var ="key" value="Registration Date"/>
@@ -167,10 +166,10 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf"
%>
</tr>
<tr>
- <th colspan="${requestScope.systems.size + 1}"><bean:message
key="System Content And Monitoring"/>
+ <td colspan="${requestScope.systems.size + 1}"><bean:message
key="System Content And Monitoring"/>
<a id='sysContentIdHide'
href="javascript:pageToggleRows('sysContentId', ['baseChannelRow',
'childChannelsRow','configChannelsRow','monitoringProbesRow'])"><bean:message
key="Click Here To Hide"/> </a>
<a style="display:none" id='sysContentIdShow'
href="javascript:pageToggleRows('sysContentId', ['baseChannelRow',
'childChannelsRow','configChannelsRow','monitoringProbesRow'])"><bean:message
key="Click Here To Show"/> </a>
- </th>
+ </td>
</tr>
<tr class="list-row-odd" id = "baseChannelRow">
@@ -198,10 +197,10 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf"
%>
</tr>
<tr>
- <th colspan="${requestScope.systems.size + 1}"><bean:message
key="softwareEntitlementDetails.header.entitlementUsage"/>
+ <td colspan="${requestScope.systems.size + 1}"><bean:message
key="softwareEntitlementDetails.header.entitlementUsage"/>
<a id='sysEntUsageIdHide'
href="javascript:pageToggleRows('sysEntUsageId',
['systemEntitlementsRow',
'softwareEntitlementsRow'])"><bean:message key="Click Here To
Hide"/> </a>
<a style="display:none" id='sysEntUsageIdShow'
href="javascript:pageToggleRows('sysEntUsageId',
['systemEntitlementsRow',
'softwareEntitlementsRow'])"><bean:message key="Click Here To
Show"/> </a>
- </th>
+ </td>
</tr>
<tr class="list-row-odd" id = "systemEntitlementsRow">
<c:set var ="key" value="System Entitlements"/>
@@ -222,6 +221,5 @@
</c:choose>
</rl:listset>
-
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
index 89b8704..11a8639 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
@@ -65,24 +65,26 @@
<!-- Entitlements Section -->
<c:if test="${requestScope.showCommands}">
+ <hr/>
+ <div class="panel panel-default">
<table class="table">
<!-- Base Entitlement Section -->
<tr>
<th><bean:message
key="systementitlements.jsp.baseentitlement" /></th>
- <td align="right">
+ <td class="text-right">
<c:if test="${requestScope.showUpdateAspects}">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default"
property="dispatch">
<bean:message
key="systementitlements.jsp.set_to_update_entitled" />
</html:submit>
</c:if>
<c:if test="${requestScope.showManagementAspects}">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default"
property="dispatch">
<bean:message
key="systementitlements.jsp.set_to_manage_entitled" />
</html:submit>
</c:if>
<c:if test="${requestScope.showUnentitled}">
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default"
property="dispatch">
<bean:message
key="systementitlements.jsp.set_to_unentitled" />
</html:submit>
</c:if>
@@ -92,62 +94,70 @@
<c:if test="${requestScope.showAddOnAspects}">
<tr>
<th><bean:message
key="systementitlements.jsp.addonentitlement" /></th>
- <td align="right">
+ <td class="text-right">
<html:select property="addOnEntitlement">
<html:optionsCollection name="addOnEntitlements"/>
</html:select>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default"
property="dispatch">
<bean:message key="systementitlements.jsp.add_entitlement"
/>
</html:submit>
- <html:submit property="dispatch">
+ <html:submit styleClass="btn btn-default"
property="dispatch">
<bean:message key="systementitlements.jsp.remove_entitlement"
/>
</html:submit>
</td>
</tr>
</c:if>
</table>
+ </div>
</c:if>
<!-- Entitlement Counts Section -->
<h2><bean:message
key="systementitlements.jsp.entitlement_counts" /></h2>
<!-- Base Entitlement Counts Section -->
- <h3><bean:message
key="systementitlements.jsp.base_entitlements"/></h3>
- <table class="details">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h5><bean:message
key="systementitlements.jsp.base_entitlements"/></h5>
+ </div>
+ <table class="table">
<tr>
- <th><bean:message key="Spacewalk Update Entitled
Servers"/>:</th>
- <td>${requestScope.updateCountsMessage}</td>
+ <td><bean:message key="Spacewalk Update Entitled
Servers"/>:</td>
+ <td>${requestScope.updateCountsMessage}</td>
</tr>
-
<tr>
- <th><bean:message key="Spacewalk Management Entitled
Servers"/>:</th>
- <td>${requestScope.managementCountsMessage}</td>
+ <td><bean:message key="Spacewalk Management Entitled
Servers"/>:</td>
+ <td>${requestScope.managementCountsMessage}</td>
</tr>
</table>
-
+ </div>
<!-- Add - On Entitlement Counts Section -->
- <h3><bean:message
key="systementitlements.jsp.addonentitlement"/></h3>
- <table class="details">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h5><bean:message
key="systementitlements.jsp.addonentitlement"/></h5>
+ </div>
+ <table class="table">
<tr>
- <th><bean:message
key="provisioning_entitled"/>:</th>
+ <td><bean:message
key="provisioning_entitled"/>:</td>
<td>${requestScope.provisioningCountsMessage}</td>
</tr>
<c:if test="${requestScope.showMonitoring}">
<tr>
- <th><bean:message
key="monitoring_entitled"/>:</th>
+ <td><bean:message
key="monitoring_entitled"/>:</td>
<td>${requestScope.monitoringCountsMessage}</td>
</tr>
</c:if>
<tr>
- <th><bean:message key="virtualization_host"/>:</th>
+ <td><bean:message key="virtualization_host"/>:</td>
<td>${requestScope.virtualizationCountsMessage}</td>
</tr>
<tr>
- <th><bean:message
key="virtualization_host_platform"/>:</th>
+ <td><bean:message
key="virtualization_host_platform"/>:</td>
<td>${requestScope.virtualizationPlatformCountsMessage}</td>
</tr>
</table>
+ </div>
+
<!-- Foot Note -->
</html:form>
commit 104a3129eaea5cbf38511ee87eba2807bc94ba2d
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 18:29:59 2013 +0200
Colour added to icons in legends
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index ee81a7b..ca19615 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -593,16 +593,14 @@ ul.nav.nav-tabs:last-child{
}
}
-<<<<<<< Updated upstream
// alerts
.alert {
margin: 18px 0;
}
-=======
// icon size smaller than the ones default by Font Awesome
.icon-1-5x {
- font-size: 1.5em;
+ font-size: 1.3em;
}
.icon-1-5x.icon-border {
border-width: 2px;
@@ -610,4 +608,3 @@ ul.nav.nav-tabs:last-child{
-moz-border-radius: 4px;
border-radius: 4px;
}
->>>>>>> Stashed changes
diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
index 7675aa2..2cc92f7 100644
--- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
@@ -3,8 +3,8 @@
<div class="sideleg">
<h4><bean:message key="errata-legend.jsp.title"/></h4>
<ul>
- <li><i class="icon-shield"></i><bean:message
key="errata-legend.jsp.security"/></li>
- <li><i class="icon-bug"></i><bean:message
key="errata-legend.jsp.bugfix"/></li>
- <li><i
class="spacewalk-icon-enhancement"></i><bean:message
key="errata-legend.jsp.enhancement"/></li>
+ <li><i class="icon-shield icon-1-5x"></i><bean:message
key="errata-legend.jsp.security"/></li>
+ <li><i class="icon-bug icon-1-5x"></i><bean:message
key="errata-legend.jsp.bugfix"/></li>
+ <li><i class="spacewalk-icon-enhancement
icon-1-5x"></i><bean:message
key="errata-legend.jsp.enhancement"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
index b1c5173..53918cc 100644
--- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
@@ -3,19 +3,19 @@
<div class="sideleg">
<h4><bean:message
key="probes-list-legend.jsp.title"/></h4>
<ul>
- <li><i class="spacewalk-icon-health
spacewalk-icon-green"></i>
+ <li><i class="spacewalk-icon-health spacewalk-icon-green
icon-1-5x"></i>
<bean:message key="probes-list-legend.jsp.ok"/>
</li>
- <li><i class="spacewalk-icon-health
spacewalk-icon-yellow"></i>
+ <li><i class="spacewalk-icon-health spacewalk-icon-yellow
icon-1-5x"></i>
<bean:message key="probes-list-legend.jsp.warning"/>
</li>
- <li><i class="spacewalk-icon-health
spacewalk-icon-red"></i>
+ <li><i class="spacewalk-icon-health spacewalk-icon-red
icon-1-5x"></i>
<bean:message key="probes-list-legend.jsp.critical"/>
</li>
- <li><i class="spacewalk-icon-health-unknown"></i>
+ <li><i class="spacewalk-icon-health-unknown
icon-1-5x"></i>
<bean:message key="probes-list-legend.jsp.unknown"/>
</li>
- <li><i class="spacewalk-icon-health-pending"></i>
+ <li><i class="spacewalk-icon-health-pending
icon-1-5x"></i>
<bean:message key="probes-list-legend.jsp.pending"/>
</li>
</ul>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
index 29c1eeb..410d965 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
@@ -3,8 +3,8 @@
<div class="sideleg">
<h4><bean:message
key="system-group-legend.jsp.title"/></h4>
<ul>
- <li><i class="icon-ok-sign"></i><bean:message
key="system-group-legend.jsp.fully"/></li>
- <li><i class="icon-exclamation-sign"></i><bean:message
key="system-group-legend.jsp.updates"/></li>
- <li><i class="icon-warning-sign"></i><bean:message
key="system-group-legend.jsp.critical"/></li>
+ <li><i class="icon-ok-sign spacewalk-icon-green
icon-1-5x"></i><bean:message
key="system-group-legend.jsp.fully"/></li>
+ <li><i class="icon-exclamation-sign spacewalk-icon-yellow
icon-1-5x"></i><bean:message
key="system-group-legend.jsp.updates"/></li>
+ <li><i class="icon-warning-sign spacewalk-icon-red
icon-1-5x"></i><bean:message
key="system-group-legend.jsp.critical"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
index 1fa91aa..f416e72 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
@@ -4,23 +4,23 @@
<div class="sideleg">
<h4><bean:message key="system-legend.jsp.title"/></h4>
<ul>
- <li><i class="icon-ok-sign"></i><bean:message
key="system-legend.jsp.fully"/></li>
- <li><i class="icon-exclamation-sign"></i><bean:message
key="system-legend.jsp.critical"/></li>
- <li><i class="icon-warning-sign"></i><bean:message
key="system-legend.jsp.updates"/></li>
- <li><i
class="spacewalk-icon-unknown-system"></i><bean:message
key="system-legend.jsp.notcheckingin"/></li>
+ <li><i class="icon-ok-sign spacewalk-icon-green
icon-1-5x"></i><bean:message
key="system-legend.jsp.fully"/></li>
+ <li><i class="icon-exclamation-sign spacewalk-icon-yellow
icon-1-5x"></i><bean:message
key="system-legend.jsp.critical"/></li>
+ <li><i class="icon-warning-sign spacewalk-icon-red
icon-1-5x"></i><bean:message
key="system-legend.jsp.updates"/></li>
+ <li><i class="spacewalk-icon-unknown-system
icon-1-5x"></i><bean:message
key="system-legend.jsp.notcheckingin"/></li>
<rhn:require acl="org_entitlement(sw_mgr_enterprise)">
- <li><i
class="spacewalk-icon-locked-system"></i><bean:message
key="system-legend.jsp.locked"/></li>
+ <li><i class="spacewalk-icon-locked-system
icon-1-5x"></i><bean:message
key="system-legend.jsp.locked"/></li>
</rhn:require>
<rhn:require acl="org_entitlement(rhn_provisioning)">
- <li><i class="icon-rocket"></i><bean:message
key="system-legend.jsp.kickstarting"/></li>
+ <li><i class="icon-rocket icon-1-5x"></i><bean:message
key="system-legend.jsp.kickstarting"/></li>
</rhn:require>
- <li><i class="icon-time"></i><bean:message
key="system-legend.jsp.pending"/></li>
- <li><i
class="spacewalk-icon-Unentitled"></i><bean:message
key="system-legend.jsp.unentitled"/></li>
+ <li><i class="icon-time icon-1-5x"></i><bean:message
key="system-legend.jsp.pending"/></li>
+ <li><i class="spacewalk-icon-Unentitled
icon-1-5x"></i><bean:message
key="system-legend.jsp.unentitled"/></li>
<rhn:require acl="org_entitlement(rhn_monitor)">
- <li><i
class="spacewalk-icon-monitoring-status"></i><bean:message
key="system-legend.jsp.monitoring"/></li>
+ <li><i class="spacewalk-icon-monitoring-status
icon-1-5x"></i><bean:message
key="system-legend.jsp.monitoring"/></li>
</rhn:require>
- <li><i
class="spacewalk-icon-virtual-host"></i><bean:message
key="systemlist.jsp.virthost"/></li>
- <li><i
class="spacewalk-icon-virtual-guest"></i><bean:message
key="systemlist.jsp.virtguest"/></li>
- <li><i class="icon-laptop"></i><bean:message
key="systemlist.jsp.nonvirt"/></li>
+ <li><i class="spacewalk-icon-virtual-host
icon-1-5x"></i><bean:message
key="systemlist.jsp.virthost"/></li>
+ <li><i class="spacewalk-icon-virtual-guest
icon-1-5x"></i><bean:message
key="systemlist.jsp.virtguest"/></li>
+ <li><i class="icon-laptop icon-1-5x"></i><bean:message
key="systemlist.jsp.nonvirt"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
index b88aa79..57df068 100644
--- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
@@ -4,24 +4,24 @@
<div class="sideleg">
<h4><bean:message key="yourrhn-legend.jsp.title" /></h4>
<ul>
- <li><i class="icon-ok-sign"></i><bean:message
key="system-legend.jsp.fully" /></li>
- <li><i class="icon-exclamation-sign"></i><bean:message
key="system-legend.jsp.critical" /></li>
- <li><i class="icon-warning-sign"></i><bean:message
key="system-legend.jsp.updates" /></li>
- <li><i
class="spacewalk-icon-unknown-system"></i><bean:message
key="system-legend.jsp.notcheckingin" /></li>
+ <li><i class="icon-ok-sign icon-1-5x
spacewalk-icon-green"></i><bean:message
key="system-legend.jsp.fully" /></li>
+ <li><i class="icon-exclamation-sign icon-1-5x
spacewalk-icon-yellow"></i><bean:message
key="system-legend.jsp.critical" /></li>
+ <li><i class="icon-warning-sign icon-1-5x
spacewalk-icon-red"></i><bean:message
key="system-legend.jsp.updates" /></li>
+ <li><i class="spacewalk-icon-unknown-system
icon-1-5x"></i><bean:message
key="system-legend.jsp.notcheckingin" /></li>
<rhn:require acl="org_entitlement(sw_mgr_enterprise)">
- <li><i
class="spacewalk-icon-locked-system"></i><bean:message
key="system-legend.jsp.locked" /></li>
+ <li><i class="spacewalk-icon-locked-system
icon-1-5x"></i><bean:message key="system-legend.jsp.locked"
/></li>
</rhn:require>
<rhn:require acl="org_entitlement(rhn_provisioning)">
- <li><i class="icon-rocket"></i><bean:message
key="system-legend.jsp.kickstarting" /></li>
+ <li><i class="icon-rocket
icon-1-5x"></i><bean:message
key="system-legend.jsp.kickstarting" /></li>
</rhn:require>
- <li><i class="icon-time"></i><bean:message
key="system-legend.jsp.pending" /></li>
- <li><i class="icon-remove-circle"></i><bean:message
key="yourrhn-legend.jsp.failedactions" /></li>
- <li><i class="icon-ok-circle"></i><bean:message
key="yourrhn-legend.jsp.completedactions" /></li>
+ <li><i class="icon-time icon-1-5x"></i><bean:message
key="system-legend.jsp.pending" /></li>
+ <li><i class="icon-remove-circle
icon-1-5x"></i><bean:message
key="yourrhn-legend.jsp.failedactions" /></li>
+ <li><i class="icon-ok-circle
icon-1-5x"></i><bean:message
key="yourrhn-legend.jsp.completedactions" /></li>
<rhn:require acl="show_monitoring();"
mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler">
- <li><i
class="spacewalk-icon-monitoring-status"></i><bean:message
key="system-legend.jsp.monitoring" /></li>
+ <li><i class="spacewalk-icon-monitoring-status
icon-1-5x"></i><bean:message key="system-legend.jsp.monitoring"
/></li>
</rhn:require>
- <li><i class="icon-shield"></i><bean:message
key="errata-legend.jsp.security" /></li>
- <li><i class="icon-bug"></i><bean:message
key="errata-legend.jsp.bugfix" /></li>
- <li><i
class="spacewalk-icon-enhancement"></i><bean:message
key="errata-legend.jsp.enhancement" /></li>
+ <li><i class="icon-shield icon-1-5x"></i><bean:message
key="errata-legend.jsp.security" /></li>
+ <li><i class="icon-bug icon-1-5x"></i><bean:message
key="errata-legend.jsp.bugfix" /></li>
+ <li><i class="spacewalk-icon-enhancement
icon-1-5x"></i><bean:message
key="errata-legend.jsp.enhancement" /></li>
</ul>
</div>
commit 102fc033839d4187622f3393f07baaa58ee7e8ba
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 17:40:19 2013 +0200
Should be obsolete since we call the function on doc ready
diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm
b/web/modules/sniglets/Sniglets/ListView/Style.pm
index cce562b..580d408 100644
--- a/web/modules/sniglets/Sniglets/ListView/Style.pm
+++ b/web/modules/sniglets/Sniglets/ListView/Style.pm
@@ -79,7 +79,6 @@ sub footer {
my $ret =<<EOQ;
</table>
-<script src="/javascript/check_all.js"></script>
EOQ
return $ret;
commit 5e9de5f9037e0dfe8995f3fe3c1179a3434fc49e
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 17:17:02 2013 +0200
All *.js should be loaded from within the <head>
diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt
index 7bd0ee7..576a489 100644
--- a/branding/templates/header.pxt
+++ b/branding/templates/header.pxt
@@ -20,8 +20,7 @@
<script src="/javascript/jquery.js"></script>
<script src="/javascript/bootstrap.js"></script>
<script src="/javascript/spacewalk-essentials.js"></script>
-
+ <script src="/javascript/check_all.js"></script>
</head>
- <script src="/javascript/check_all.js"
type="text/javascript"></script>
</pxt-passthrough>
commit 59dc789bce3203e09ad449349bbba52a07b96df5
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 15:28:55 2013 +0200
Fix typo in comment
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
index 7f60a53..8ec0044 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
@@ -44,7 +44,7 @@ public class MessagesTag extends TagSupport {
try {
out = pageContext.getOut();
- // Use boostrap alert classes
+ // Use bootstrap alert classes
baseTag = new HtmlTag("div");
baseTag.setAttribute("class", "alert alert-info");
commit 8e56e9ac1d4059baaa5a85469e2a3ac4de12a319
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 16:44:45 2013 +0200
Panels added and tables well formated
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index a450a61..ee81a7b 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -593,8 +593,21 @@ ul.nav.nav-tabs:last-child{
}
}
+<<<<<<< Updated upstream
// alerts
.alert {
margin: 18px 0;
}
+=======
+// icon size smaller than the ones default by Font Awesome
+.icon-1-5x {
+ font-size: 1.5em;
+}
+.icon-1-5x.icon-border {
+ border-width: 2px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
+>>>>>>> Stashed changes
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
index 37e4fb2..9fade55 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row-0">
<div class="col-md-1">
<bean:message key="channel.jsp.manage.package.channel"/>:
</div>
@@ -25,4 +25,5 @@
<div class="col-md-7 text-left">
<input type="submit" name="view" class="btn
btn-default" value="<bean:message
key="channel.jsp.package.viewpackages"/>">
</div>
-</div>
\ No newline at end of file
+</div>
+<hr/>
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
index 498ae0d..c9d1074 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
@@ -1,47 +1,65 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<html>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message key="preferences.jsp.header"/></h4>
+ </div>
+ <div class="panel-body">
+ <p><bean:message key="preferences.jsp.leadin"/></p>
+ <div class="checkbox">
+ <html:checkbox property="emailNotif" value="1"
/><bean:message key="preferences.jsp.receivenote"/>
+ </div>
+ </div>
+</div>
-<h2><bean:message key="preferences.jsp.header"/></h2>
-<p><bean:message key="preferences.jsp.leadin"/></p>
-
-<div class="preference"><html:checkbox
property="emailNotif" value="1" /><bean:message
key="preferences.jsp.receivenote"/></div>
-<br />
-
-<h2><bean:message key="preferences.jsp.listsize"/></h2>
-<p><bean:message key="preferences.jsp.controlentry"/></p>
-<div class="preference"><bean:message
key="preferences.jsp.show"/>
-<html:select property="pagesize">
- <html:options collection="pagesizes"
- property="value"
- labelProperty="display" />
-</html:select>
-<bean:message key="preferences.jsp.entriesperpage"/></div>
-<br />
-
-<h2><bean:message
key="preferences.jsp.startpagetitle"/></h2>
-<p><bean:message key="preferences.jsp.startpagedesc"/></p>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message key="preferences.jsp.listsize"/></h4>
+ </div>
+ <div class="panel-body">
+ <p><bean:message
key="preferences.jsp.controlentry"/></p>
+ <bean:message key="preferences.jsp.show"/>
+ <html:select property="pagesize">
+ <html:options collection="pagesizes"
+ property="value"
+ labelProperty="display" />
+ </html:select>
+ <bean:message key="preferences.jsp.entriesperpage"/>
+ </div>
+</div>
-<div class="preference">
-<c:forEach items="${userPrefForm.map.possiblePanes}"
var="item">
- <html:multibox property="selectedPanes" value="${item.value}"
disabled="${item.disabled}" styleId="type_${item.value}"/>
- <label for="type_${item.value}">${item.label}</label>
- <br />
-</c:forEach>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="preferences.jsp.startpagetitle"/></h4>
+ </div>
+ <div class="panel-body">
+ <p><bean:message
key="preferences.jsp.startpagedesc"/></p>
+ <c:forEach items="${userPrefForm.map.possiblePanes}"
var="item">
+ <div class="checkbox">
+ <label for="type_${item.value}">
+ <html:multibox property="selectedPanes"
value="${item.value}" disabled="${item.disabled}"
styleId="type_${item.value}"/>
+ ${item.label}</label>
+ </div>
+ </c:forEach>
+ </div>
</div>
-<h2><bean:message key="preferences.jsp.csvtitle" /></h2>
-<p><bean:message key="preferences.jsp.csvdesc" /></p>
-<div class="preference">
- <html:radio property="csvSeparator" value=","
styleId="radio-comma" />
- <label for="radio-comma"><bean:message
key="preferences.jsp.csvcomma" /></label><br />
- <html:radio property="csvSeparator" value=";"
styleId="radio-semicolon" />
- <label for="radio-semicolon"><bean:message
key="preferences.jsp.csvsemicolon" /></label>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message key="preferences.jsp.csvtitle" /></h4>
+ </div>
+ <div class="panel-body">
+ <p><bean:message key="preferences.jsp.csvdesc" /></p>
+ <html:radio property="csvSeparator" value=","
styleId="radio-comma" />
+ <label for="radio-comma"><bean:message
key="preferences.jsp.csvcomma" /></label><br />
+ <html:radio property="csvSeparator" value=";"
styleId="radio-semicolon" />
+ <label for="radio-semicolon"><bean:message
key="preferences.jsp.csvsemicolon" /></label>
+ </div>
</div>
<input type="hidden" name="pxt:trap"
value="rhn:user_prefs_edit_cb" />
<html:hidden property="uid" />
-<div align="right">
-<hr />
+<div class="text-left">
<rhn:submit valueKey="preferences.jsp.submitvalue"/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
index 67bae47..92b9741 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
@@ -18,19 +18,13 @@
<a
href="/network/systems/groups/errata_list.pxt?sgid=${current.id}">
<c:choose>
<c:when test="${current.mostSevereErrata
== 'Security Advisory'}">
- <img src="/img/icon_crit_update.gif" border="0"
- alt="<bean:message key="grouplist.jsp.security"/>"
- title="<bean:message
key="grouplist.jsp.security"/>" />
+ <i class="icon-warning-sign icon-1-5x spacewalk-icon-red"
title="<bean:message
key="grouplist.jsp.security"/>"></i>
</c:when>
<c:when test="${current.mostSevereErrata
== 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement
Advisory'}">
- <img src="/img/icon_reg_update.gif" border="0"
- alt="<bean:message key="grouplist.jsp.updates"/>"
- title="<bean:message
key="grouplist.jsp.updates"/>" />
+ <i class="icon-exclamation-sign icon-1-5x spacewalk-icon-yellow"
title="<bean:message
key="grouplist.jsp.updates"/>"></i>
</c:when>
<c:otherwise>
- <img src="/img/icon_up2date.gif" border="0"
- alt="<bean:message
key="grouplist.jsp.noerrata"/>"
- title="<bean:message
key="grouplist.jsp.noerrata"/>" />
+ <i class="icon-ok-sign icon-1-5x spacewalk-icon-green"
title="<bean:message
key="grouplist.jsp.noerrata"/>"></i>
</c:otherwise>
</c:choose>
</a>
@@ -50,10 +44,8 @@
</rl:list>
- <span class="full-width-note-right">
<a href="/rhn/systems/SystemGroupList.do">
- <div class="btn btn-default
spacewalk-btn-margin-vertical"><bean:message
key="yourrhn.jsp.allgroups" /></div>
+ <div class="btn btn-default spacewalk-btn-margin-vertical"><i
class="spacewalk-icon-system-groups"></i><bean:message
key="yourrhn.jsp.allgroups" /></div>
</a>
- </span>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
index eb63a4c..ed25795 100644
--- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
@@ -13,42 +13,54 @@
<h2><bean:message
key="cloneerrata.jsp.cloneerrata"/></h2>
- <div class="page-summary">
- <p><bean:message
key="cloneerrata.jsp.pagesummary"/></p>
- </div>
-
- <br/>
-
+ <p><bean:message key="cloneerrata.jsp.pagesummary"/></p>
<rl:listset name="groupList" legend="errata">
<rhn:csrf />
- <p>
- <bean:message key="cloneerrata.jsp.viewapplicableerrata"/>:
- <select name="channel">
- <c:forEach items="${clonablechannels}"
var="option">
- <option value="<c:out
value="${option.value}"/>"
- <c:if test="${option.value ==
param.channel}">selected="1"</c:if>>
- <c:out value="${option.label}"/>
- </option>
- </c:forEach>
- </select>
- <html:submit>
- <bean:message key="cloneerrata.jsp.view"/>
- </html:submit>
- <br/>
-
- <c:if test="${param.showalreadycloned == 1}">
- <input type="checkbox" name="showalreadycloned"
value="1" checked>
- </c:if>
- <c:if test="${param.showalreadycloned != 1}">
- <input type="checkbox" name="showalreadycloned"
value="1">
- </c:if>
-
- <bean:message key="cloneerrata.jsp.showclonederrata"/>
-
- </p>
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="row-0">
+ <div class="col-md-3">
+ <bean:message
key="cloneerrata.jsp.viewapplicableerrata"/>:
+ </div>
+ <div class="col-md-5">
+ <select name="channel"
class="form-control">
+ <c:forEach items="${clonablechannels}"
var="option">
+ <option value="<c:out
value="${option.value}"/>"
+ <c:if test="${option.value ==
param.channel}">selected="1"</c:if>>
+ <c:out value="${option.label}"/>
+ </option>
+ </c:forEach>
+ </select>
+ </div>
+ </div>
+ <div class="row-0">
+ <div class="col-md-offset-3 col-md-5">
+ <div class="checkbox">
+ <label>
+ <c:if test="${param.showalreadycloned ==
1}">
+ <input type="checkbox"
name="showalreadycloned" value="1" checked>
+ </c:if>
+ <c:if test="${param.showalreadycloned !=
1}">
+ <input type="checkbox"
name="showalreadycloned" value="1">
+ </c:if>
+ <bean:message
key="cloneerrata.jsp.showclonederrata"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="row-0">
+ <div class="col-md-offset-3 col-md-5">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="cloneerrata.jsp.view"/>
+ </html:submit>
+ </div>
+ </div>
+
+ </div>
+ </div>
<rl:list emptykey="cloneerrata.jsp.noerrata">
@@ -90,11 +102,11 @@
</rl:list>
- <div align="right">
+ <div class="text-right">
<rhn:submitted/>
- <hr/>
<input type="submit"
name="dispatch"
+ class="btn btn-default"
value='<bean:message
key="cloneerrata.jsp.cloneerrata"/>'/>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
index c0d072d..89b8704 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
@@ -65,7 +65,7 @@
<!-- Entitlements Section -->
<c:if test="${requestScope.showCommands}">
- <table class="details">
+ <table class="table">
<!-- Base Entitlement Section -->
<tr>
<th><bean:message
key="systementitlements.jsp.baseentitlement" /></th>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
index fb42ade..a3780f1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
@@ -27,7 +27,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
@@ -56,17 +56,14 @@
</option>
</c:forEach>
</select>
- <html:submit property="show">
+ <html:submit styleClass="btn btn-default" property="show">
<bean:message key="system.errata.show"/>
</html:submit>
<br/>
-
<rl:list
styleclass="list"
- emptykey="${empty_msg}"
-
- >
+ emptykey="${empty_msg}">
<rl:decorator name="PageSizeDecorator"/>
<c:if test="${not empty requestScope.selectable && not empty
requestScope.dataset}">
<rl:decorator name="SelectableDecorator"/>
@@ -74,17 +71,12 @@
selected="${current.selected}"/>
</c:if>
-
-
-
<!-- Name Column -->
<rl:column headerkey="systemlist.jsp.system"
filterattr="name" filtermessage="${filtermessage}"
styleclass="${namestyle}"
sortattr="name"
- defaultsort="asc"
- >
-
+ defaultsort="asc">
<c:out value="<a
href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">"
escapeXml="false" />
<c:choose>
@@ -118,19 +110,15 @@
<rhn:submitted/>
<c:if test="${not empty requestScope.selectable && not empty
requestScope.dataset}">
- <div align="right">
-
- <hr />
- <html:submit property="dispatch">
+ <div class="text-right">
+ <html:submit styleClass="btn btn-default"
property="dispatch">
<bean:message key="Make Flex"/>
</html:submit>
</div>
</c:if>
-
</rl:listset>
-
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
index a6bb28f..95d7cba 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
@@ -14,16 +14,14 @@
</head>
<body>
- <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
- <p/>
<rhn:dialogmenu mindepth="0"
maxdepth="1"
definition="/WEB-INF/nav/virt_entitlements.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/>
- <div style="clear: both; width: 65%; float: left;">
<h2><bean:message key="guestlimited.jsp.header2"
/></h2>
<p>
<bean:message key="guestlimited.jsp.para1" />
@@ -37,16 +35,15 @@
dataset="pageList"
emptykey="guestlimited.jsp.nosystems"
width="100%">
- <rl:column bound="false" sortable="false"
headerkey="guestlimited.jsp.hostsystem">
+ <rl:column bound="false" sortable="false"
headerkey="guestlimited.jsp.hostsystem">
<a
href="/rhn/systems/details/Overview.do?sid=${current.hostId}">
<c:out value="${current.hostName}"
escapeXml="true" />
</a>
</rl:column>
- <rl:column bound="false" sortable="false"
headerkey="guestlimited.jsp.guest">
+ <rl:column bound="false" sortable="false"
headerkey="guestlimited.jsp.guest">
<a
href="/rhn/systems/details/Overview.do?sid=${current.hostId}">${current.numberOfGuests}</a>
</rl:column>
</rl:list>
</rl:listset>
- </div>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
index f393fb0..0d15014 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
@@ -14,16 +14,14 @@
</head>
<body>
- <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
- <p/>
<rhn:dialogmenu mindepth="0"
maxdepth="1"
definition="/WEB-INF/nav/virt_entitlements.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/>
- <div style="clear: both; width: 65%; float: left;">
<h2><bean:message key="guestunlimited.jsp.header2"
/></h2>
<p>
<bean:message key="guestunlimited.jsp.para1" />
@@ -45,6 +43,5 @@
</rl:column>
</rl:list>
</rl:listset>
- </div>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
index a63c62a..b36da7b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
@@ -13,16 +13,15 @@
</head>
<body>
- <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
- <p/>
+
<rhn:dialogmenu mindepth="0"
maxdepth="1"
definition="/WEB-INF/nav/virt_entitlements.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/>
- <div style="clear: both; width: 65%; float: left;">
<h2><bean:message key="physicalhosts.jsp.header2"
/></h2>
<p>
<bean:message key="physicalhosts.jsp.para1" />
@@ -79,6 +78,5 @@
<bean:message key="physicalhosts.jsp.nonredhatnote" />
</p>
- </div>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
index 5506fea..fe3dd6f 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
@@ -8,9 +8,8 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-preferences.gif"
- helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-prefs"
- imgAlt="preferences.jsp.alt">
+<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-configuration-files"
+
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-prefs">
<bean:message key="Your Preferences"/>
</rhn:toolbar>
<html:form action="/account/PrefSubmit">
commit b4300b08897c4e0b0f9ef67de14777cd71588938
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 14:24:50 2013 +0200
Add top and bottom margin to all alerts
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index d74fa7c..a450a61 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -593,3 +593,8 @@ ul.nav.nav-tabs:last-child{
}
}
+// alerts
+.alert {
+ margin: 18px 0;
+}
+
commit 3490c0d1acc4347eed0af7dc75aea938a113dd5b
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 14:24:30 2013 +0200
Use alert-info and alert-warning classes correctly
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
index c56c9a5..7f60a53 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/MessagesTag.java
@@ -44,10 +44,9 @@ public class MessagesTag extends TagSupport {
try {
out = pageContext.getOut();
- // For now, hard-code the site-info class. If we want to abstract
- // this later, we can.
+ // Use boostrap alert classes
baseTag = new HtmlTag("div");
- baseTag.setAttribute("class", "site-info");
+ baseTag.setAttribute("class", "alert alert-info");
out.print(baseTag.renderOpenTag());
return (EVAL_BODY_INCLUDE);
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index 217b58c..d4d07b8 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -27,7 +27,7 @@
<section id="spacewalk-content">
<!-- Alerts and messages -->
<logic:messagesPresent>
- <div class="alert alert-info">
+ <div class="alert alert-warning">
<ul>
<html:messages id="message">
<li><c:out value="${message}"/></li>
commit f0a97379943eb39168f3dc83eebddd4131614cce
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 13:36:56 2013 +0200
Bootstrapify all obsoleted site-alerts
diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp
b/java/code/webapp/WEB-INF/pages/common/login.jsp
index be0d019..fed4c61 100644
--- a/java/code/webapp/WEB-INF/pages/common/login.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/login.jsp
@@ -10,7 +10,7 @@
<body>
<c:if test="${schemaUpgradeRequired == 'true'}">
- <div class="site-alert">
+ <div class="alert alert-danger">
<bean:message key="login.jsp.schemaupgraderequired" />
</div>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index 742a5bd..a1a904f 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -9,7 +9,7 @@
<body>
<c:if test="${schemaUpgradeRequired == 'true'}">
- <div class="site-alert">
+ <div class="alert alert-danger">
<bean:message key="login.jsp.schemaupgraderequired" />
</div>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
index 0a4e8f4..d1136a7 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
@@ -10,7 +10,7 @@
<c:if test="${requestScope.pageList != null}">
- <div class="site-alert">
+ <div class="alert alert-danger">
<bean:message key="distro-delete.jsp.cantdelete"/>
</div>
</c:if>
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 2b5bc13..556c0a1 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -160,7 +160,7 @@ sub proxy_entitlement_form {
$subs{proxy_message} = "This machine is currently a licensed Red Hat Satellite
Proxy (v$version).";
} else {
- $subs{proxy_message} = "<div class=\"site-alert\">WebUI
Spacewalk Proxy installer is obsoleted since version 5.3. Please use command line
installer from package spacewalk-proxy-installer.</div>";
+ $subs{proxy_message} = "<div class=\"alert alert-danger\">WebUI
Spacewalk Proxy installer is obsoleted since version 5.3. Please use command line
installer from package spacewalk-proxy-installer.</div>";
}
$block = PXT::Utils->perform_substitutions($block, \%subs);
commit ee632698b089ef680782d52ac85e00868893b7fe
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 13:30:32 2013 +0200
Adjust column sizes
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
index 2a61800..3db4dfe 100644
---
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
+++
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
@@ -37,7 +37,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.vcpus" />
</label>
- <div class="col-lg-1">
+ <div class="col-lg-2">
<html:text property="vcpus" size="15"
value="1" styleClass="form-control" />
</div>
</div>
@@ -45,7 +45,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.memory" />
</label>
- <div class="col-lg-1">
+ <div class="col-lg-2">
<html:text property="mem_mb" size="15"
value="512" styleClass="form-control" />
</div>
</div>
@@ -53,7 +53,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.bridge" />
</label>
- <div class="col-lg-1">
+ <div class="col-lg-2">
<html:text property="bridge" size="15"
value="br0" styleClass="form-control" />
</div>
</div>
@@ -63,7 +63,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.proxyserver" />
</label>
- <div class="col-lg-3">
+ <div class="col-lg-4">
<html:text property="proxy_server" size="30"
value="" styleClass="form-control" />
</div>
</div>
@@ -71,7 +71,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.proxyuser" />
</label>
- <div class="col-lg-3">
+ <div class="col-lg-4">
<html:text property="proxy_user" size="15"
value="" styleClass="form-control" />
</div>
</div>
@@ -79,7 +79,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.proxypass" />
</label>
- <div class="col-lg-3">
+ <div class="col-lg-4">
<html:password property="proxy_pass" size="15"
value="" styleClass="form-control" />
</div>
</div>
commit ff40da3c830dc6323d82c9e6560572bdbca4b70d
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 14:07:29 2013 +0200
Panels + tables formated
diff --git
a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
index fee77d3..9c8d55b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
@@ -26,9 +26,6 @@
<bean:message key="channel.jsp.manage.package.title"/>
</rhn:toolbar>
-
-
-
<rl:listset name="packageSet">
<rhn:csrf />
<bean:message key="channel.jsp.manage.package.message"/>
@@ -83,18 +80,15 @@
${current.provider}
</rl:column>
-
-
</rl:list>
-
- <p align="right">
- <input type="submit" name="confirm"
value="<bean:message
key="channel.jsp.manage.package.confirmbutton"/>"
+ <div class="text-right">
+ <input type="submit" class="btn btn-default"
name="confirm" value="<bean:message
key="channel.jsp.manage.package.confirmbutton"/>"
<c:choose>
<c:when test="${empty pageList}">disabled</c:when>
</c:choose>
- </p>
+ </div>
<rhn:submitted/>
</rl:listset>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
index 5f99f53..077de98 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
@@ -8,17 +8,10 @@
<html:html xhtml="true">
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %>
-<BR>
-
-
-
-<div>
<h2><img src="/img/rhn-icon-packages.gif"> <bean:message
key="systemlist.jsp.packages"/></h2>
<bean:message key="package.jsp.list"/>
-
-
<rl:listset name="packageSet">
<rhn:csrf />
<rhn:submitted />
@@ -66,10 +59,5 @@
</rl:listset>
-
-
-</div>
-
</body>
-</html:html>
-
+</html:html>
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp
b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
index fe16d36..6953269 100644
--- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
<bean:message key="channel.nav.popular"/>
</rhn:toolbar>
@@ -27,11 +27,10 @@ function showFiltered() {
<bean:message key="channels.popular.jsp.header1" />
</p>
-
<form method="post" name="rhn_list"
action="/rhn/software/channels/Popular.do">
<rhn:csrf />
<rhn:submitted />
- <table class="details">
+ <table class="table">
<th>
<bean:message key="channels.popular.jsp.label0" />:
</th>
@@ -49,13 +48,11 @@ function showFiltered() {
</c:forEach>
</select>
<bean:message key="channels.popular.jsp.label2" />
- <INPUT type="submit" value="<bean:message
key="channels.popular.jsp.button" />">
+ <INPUT type="submit" class="btn btn-default"
value="<bean:message key="channels.popular.jsp.button" />">
</td>
</table>
- <BR>
+ <br/>
<%@ include
file="/WEB-INF/pages/common/fragments/channel/channel_tree_multiorg.jspf" %>
-
-
</form>
</body>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
index d1fc3e0..37e4fb2 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
@@ -1,8 +1,9 @@
-<table class="details" width="80%">
-
- <tr> <th width="10%"><bean:message
key="channel.jsp.manage.package.channel"/>:</th>
- <td width="40%">
- <select name="selected_channel">
+<div class="row">
+ <div class="col-md-1">
+ <bean:message key="channel.jsp.manage.package.channel"/>:
+ </div>
+ <div class="col-md-4">
+ <select name="selected_channel" class="form-control
input-sm">
<option value="all_managed_packages" <c:if
test="${all_selected eq true}">selected =
"selected"</c:if>><bean:message
key="channel.jsp.manage.package.allpackages"/></option>
<option value="orphan_packages" <c:if
test="${orphan_selected eq true}">selected =
"selected"</c:if>><bean:message
key="channel.jsp.manage.package.packagesnochannels"/></option>
<optgroup>
@@ -10,7 +11,7 @@
<c:choose>
<c:when test="${option.baseChannel}">
</optgroup>
- <option value="${option.id}" <c:if
test="${option.selected eq true}">selected =
"selected"</c:if> >${option.name} </option>
+ <option value="${option.id}" <c:if
test="${option.selected eq true}">selected =
"selected"</c:if> >${option.name} </option>
<optgroup>
</c:when>
<c:otherwise>
@@ -20,12 +21,8 @@
</c:forEach>
</optgroup>
</select>
- </td>
- <td>
- <input type="submit" name="view"
value="<bean:message
key="channel.jsp.package.viewpackages"/>">
- </td>
- </tr>
-
-
-
-</table>
\ No newline at end of file
+ </div>
+ <div class="col-md-7 text-left">
+ <input type="submit" name="view" class="btn
btn-default" value="<bean:message
key="channel.jsp.package.viewpackages"/>">
+ </div>
+</div>
\ No newline at end of file
commit f3fab9463d96e66406170e6dd6fbbf512b5f8229
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Oct 23 13:22:48 2013 +0200
use a panel for makeEmptyTable
diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
index 83f2a94..ce94bb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java
@@ -15,11 +15,6 @@
package com.redhat.rhn.frontend.action.renderers;
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.frontend.action.renderers.io.CachingResponseWrapper;
-import com.redhat.rhn.frontend.dto.SystemOverviewComparator;
-
import java.io.IOException;
import java.util.Arrays;
@@ -28,6 +23,11 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.frontend.action.renderers.io.CachingResponseWrapper;
+import com.redhat.rhn.frontend.dto.SystemOverviewComparator;
+
/**
* General helper for fragment rendering
*
@@ -36,21 +36,16 @@ import javax.servlet.http.HttpServletResponse;
public class RendererHelper {
private static final String FULL_TABLE_HEADER =
- "<div style=\"clear:both; padding-top: 30px;\">" +
- "<table width=\"100%\" cellspacing=\"0\"
cellpadding=\"0\" class=\"list\">" +
- "<thead><tr><th
style=\"text-align:left;\">";
+ "<div class=\"spacewalk-full-table panel
panel-default\"><div class=\"panel-heading\"><h3
class=\"panel-title\">";
- private static final String FULL_TABLE_FOOTER =
"</td></tr></thead></table></div>";
+ private static final String FULL_TABLE_FOOTER =
"</div></div>";
- private static final String HALF_TABLE_HEADER =
- "<table cellspacing=\"0\" cellpadding=\"0\"
class=\"half-table\">" +
- "<thead><tr><th
style=\"text-align:left;\">";
+ private static final String HALF_TABLE_HEADER =
+ "<div class=\"spacewalk-half-table panel
panel-default\"><div class=\"panel-heading\"><h3
class=\"panel-title\">";
- private static final String HALF_TABLE_FOOTER =
"</td></tr></thead></table>";
+ private static final String HALF_TABLE_FOOTER =
"</div></div>";
- private static final String TABLE_BODY =
- "</th></tr><tr class=\"list-row-odd\">" +
- "<td style=\"padding-bottom: 24px;\" class=\"first-column
last-column\">";
+ private static final String TABLE_BODY = "</h3></div><div
class=\"panel-body\">";
private RendererHelper() {
commit aed62fb360c77ffa39f947ed8a8bb6feb5787d74
Author: Bo Maryniuk <bo(a)suse.de>
Date: Wed Oct 23 13:37:04 2013 +0200
TB3: Errata update form
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 9ed783a..a2e7623 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -4067,6 +4067,12 @@ value for this entitlement, excluding the default
organization's consumption.</s
<context
context-type="sourcefile">/rhn/errata/manage/Create.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="errata.create.jsp.newbug">
+ <source>New Bug</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/errata/manage/Create.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="errata.create.jsp.id">
<source>ID:</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp
b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
index d0d0c2d..d4ad25f 100644
--- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
@@ -5,235 +5,255 @@
<html:xhtml/>
<html>
-<head>
- <meta name="page-decorator" content="none" />
-</head>
-<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
imgAlt="errata.common.errataAlt"
-
helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"
- deletionUrl="/rhn/errata/manage/Delete.do?eid=${param.eid}"
- deletionType="errata">
- <bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
- </rhn:toolbar>
+ <head>
+ <meta name="page-decorator" content="none" />
+ </head>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
imgAlt="errata.common.errataAlt"
+
helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"
+
deletionUrl="/rhn/errata/manage/Delete.do?eid=${param.eid}"
+ deletionType="errata">
+ <bean:message key="errata.edit.toolbar"/> <c:out
value="${advisory}" />
+ </rhn:toolbar>
- <rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/manage_errata.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"
/>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/manage_errata.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-<%-- Publish or Send notification --%>
- <html:form action="/errata/manage/Edit">
- <rhn:csrf />
- <rhn:submitted />
- <input type="hidden" name="eid" value="<c:out
value="${param.eid}"/>" />
- <c:if test="${isPublished == true}">
- <h2><bean:message
key="errata.edit.senderratamail"/></h2>
- <div class="page-summary">
- <p><bean:message key="errata.edit.youmaynotify"
/></p>
- </div>
- <div align="right">
- <html:submit property="dispatch">
- <bean:message key="errata.edit.sendnotification" />
- </html:submit>
- </div>
- </c:if>
+ <%-- Publish or Send notification --%>
+ <html:form action="/errata/manage/Edit"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <rhn:submitted />
+ <input type="hidden" name="eid" value="<c:out
value="${param.eid}"/>" />
- <c:if test="${isPublished == false}">
- <h2><bean:message
key="errata.edit.publisherrata"/></h2>
- <div class="page-summary">
- <p><bean:message key="errata.edit.youmaypublish"
/></p>
- </div>
- <div align="right">
- <html:submit property="dispatch">
- <bean:message key="errata.edit.publisherrata" />
- </html:submit>
- </div>
- </c:if>
- </html:form>
+ <c:if test="${isPublished == true}">
+ <h2><bean:message
key="errata.edit.senderratamail"/></h2>
+ <p><bean:message key="errata.edit.youmaynotify"
/></p>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit property="dispatch"
styleClass="btn btn-success">
+ <bean:message key="errata.edit.sendnotification"
/>
+ </html:submit>
+ </div>
+ </div>
+ </c:if>
- <html:form action="/errata/manage/Edit">
- <rhn:csrf />
- <rhn:submitted />
-<%-- Edit the errata details --%>
- <h2><bean:message key="errata.edit.editerrata" /></h2>
+ <c:if test="${isPublished == false}">
+ <h2><bean:message
key="errata.edit.publisherrata"/></h2>
+ <p><bean:message key="errata.edit.youmaypublish"
/></p>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit property="dispatch">
+ <bean:message key="errata.edit.publisherrata"
/>
+ </html:submit>
+ </div>
+ </div>
+ </c:if>
+ </html:form>
- <div class="page-summary">
- <p><bean:message key="errata.edit.instructions" /></p>
- </div>
-<table class="details">
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.synopsis"/>
- </th>
- <td class="small-form">
- <html:text property="synopsis" size="60"
maxlength="4000" />
- </td>
- </tr>
+ <html:form action="/errata/manage/Edit"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <rhn:submitted />
+ <%-- Edit the errata details --%>
+ <h2><bean:message key="errata.edit.editerrata"
/></h2>
+ <p><bean:message key="errata.edit.instructions"
/></p>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.synopsis"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="synopsis" size="60"
maxlength="4000" styleClass="form-control"/>
+ </div>
+ </div>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.advisory"/>
- </th>
- <td class="small-form">
- <html:text property="advisoryName" size="25"
maxlength="32" />
- </td>
- </tr>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.advisory"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="advisoryName" size="25"
maxlength="32" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.advisoryrelease"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="advisoryRelease" size="4"
maxlength="4" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.advisorytype"/>
+ </label>
+ <div class="col-lg-6">
+ <html:select property="advisoryType"
styleClass="form-control">
+ <html:options name="advisoryTypes"
labelProperty="advisoryTypeLabels"/>
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.product"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="product" size="30"
maxlength="64" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.from"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="errataFrom" size="30"
maxlength="127" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.topic"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="topic" cols="80"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.description"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="description"
cols="80" rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.solution"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="solution" cols="80"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <h3><bean:message
key="errata.create.jsp.bugs"/></h3>
+ </div>
+ </div>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.advisoryrelease"/>
- </th>
- <td class="small-form">
- <html:text property="advisoryRelease" size="4"
maxlength="4"/>
- </td>
- </tr>
+ <c:forEach items="${bugs}" var="bug">
+ <div class="form-group">
+ <div class="well well-sm">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.id"/>
+ </label>
+ <div class="col-lg-2">
+ <html:text
property="buglistId${bug.id}"
+ styleClass="form-control"
+ size="6"
value="${bug.id}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.summary"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text
property="buglistSummary${bug.id}"
+ size="60"
styleClass="form-control"
+ value="${bug.summary}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.bugurl"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text
property="buglistUrl${bug.id}" size="60"
+ styleClass="form-control"
+ value="${bug.url}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <a class="btn btn-danger"
+
href="/rhn/errata/manage/DeleteBug.do?eid=<c:out
value="${param.eid}"/>&bid=<c:out
value="${bug.id}"/>">
+ <bean:message
key="errata.edit.deletebug"/>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </c:forEach>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.advisorytype"/>
- </th>
- <td class="small-form">
- <html:select property="advisoryType">
- <html:options name="advisoryTypes"
labelProperty="advisoryTypeLabels"/>
- </html:select>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.product"/>
- </th>
- <td class="small-form">
- <html:text property="product" size="30"
maxlength="64" />
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.from"/>
- </th>
- <td class="small-form">
- <html:text property="errataFrom" size="30"
maxlength="127" />
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.topic"/>
- </th>
- <td class="small-form">
- <html:textarea property="topic" cols="80"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.description"/>
- </th>
- <td class="small-form">
- <html:textarea property="description" cols="80"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.solution"/>
- </th>
- <td class="small-form">
- <html:textarea property="solution" cols="80"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.bugs"/>
- </th>
- <td class="small-form">
-
- <c:forEach items="${bugs}" var="bug">
- <table cellpadding="3">
- <tr>
- <td><bean:message
key="errata.create.jsp.id"/></td>
- <td><html:text property="buglistId${bug.id}"
size="6"
- value="${bug.id}" /></td>
- </tr>
- <tr>
- <td><bean:message
key="errata.create.jsp.summary"/></td>
- <td><html:text property="buglistSummary${bug.id}"
size="60"
- value="${bug.summary}" /></td>
- </tr>
- <tr>
- <td><bean:message
key="errata.create.jsp.bugurl"/></td>
- <td><html:text property="buglistUrl${bug.id}"
size="60"
- value="${bug.url}" />
-
-
- <a href="/rhn/errata/manage/DeleteBug.do?eid=<c:out
value="${param.eid}"/>&bid=<c:out
value="${bug.id}"/>">
- <img src="/img/action-del.gif"
alt="<bean:message key="errata.edit.deletebug"/>" />
- </a>
- </td>
- </tr>
- </table>
- <hr />
- </c:forEach>
-
- <%-- Display an empty bug shell for input --%>
- <table>
- <tr>
- <td><bean:message
key="errata.create.jsp.id"/></td>
- <td><html:text property="buglistIdNew"
value="" size="6"/></td>
- </tr>
- <tr>
- <td><bean:message
key="errata.create.jsp.summary"/></td>
- <td><html:text property="buglistSummaryNew"
value="" size="60"/></td>
- </tr>
- <tr>
- <td><bean:message
key="errata.create.jsp.bugurl"/></td>
- <td><html:text property="buglistUrlNew"
value="" size="60"/></td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.keywords"/> <br />
- <bean:message key="errata.edit.commadelimited"/>
- </th>
- <td class="small-form">
- <html:text property="keywords" size="40"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.references"/>
- </th>
- <td class="small-form">
- <html:textarea property="refersTo" cols="40"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.notes"/>
- </th>
- <td class="small-form">
- <html:textarea property="notes" cols="40"
rows="6"/>
- </td>
- </tr>
-
- </table>
-
-
- <input type="hidden" name="eid" value="<c:out
value="${param.eid}"/>" />
- <div align="right">
- <hr />
- <html:submit property="dispatch">
- <bean:message key="errata.edit.updateerrata"/>
- </html:submit>
- </div>
-
- </html:form>
-
-</body>
+ <%-- Display an empty bug shell for input --%>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <h3><bean:message
key="errata.create.jsp.newbug"/></h3>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.id"/>
+ </label>
+ <div class="col-lg-2">
+ <html:text property="buglistIdNew"
value="" size="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.summary"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="buglistSummaryNew"
value="" size="60" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.bugurl"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="buglistUrlNew"
value="" size="60" styleClass="form-control"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.keywords"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="keywords" size="40"
styleClass="form-control"/>
+ <span class="help-block">
+ <bean:message key="errata.edit.commadelimited"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.references"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="refersTo" cols="40"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.notes"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="notes" cols="40"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <input type="hidden" name="eid" value="<c:out
value="${param.eid}"/>" />
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit property="dispatch" styleClass="btn
btn-success">
+ <bean:message key="errata.edit.updateerrata"/>
+ </html:submit>
+ </div>
+ </div>
+ </html:form>
+ </body>
</html>
commit b736f78425a6b7fc4233e7c71b308602d2d4b1d9
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Oct 23 12:59:43 2013 +0200
fix empty lists
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index ab19441..d74fa7c 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -511,48 +511,73 @@ ul.nav.nav-tabs:last-child{
// data lists
.spacewalk-list {
- .spacewalk-list-top {
- padding: 0.7em;
- .spacewalk-list-top-wrap {
- .make-row(0);
-
- .spacewalk-list-top-alphabar {
- .make-md-column(9);
- .text-left;
- }
- .spacewalk-list-top-addons {
- .make-md-column(3);
- .text-right;
- }
- .spacewalk-list-filter {
- .make-md-column(4);
- .text-left;
- }
- .spacewalk-list-top-pagination {
- .make-md-column(8);
- .text-right;
- }
+ .spacewalk-list-top-addons {
+ .make-row(0);
+ .spacewalk-list-alphabar {
+ .make-md-column(9);
+ .text-left;
+ padding-left: 0;
}
- .spacewalk-list-top-extra {
- .make-row();
+ .spacewalk-list-pagination {
+ .make-md-column(3);
+ .text-right;
+ padding-right: 0;
}
+ padding-top: 0.5em;
}
- .spacewalk-list-bottom {
- .spacewalk-list-bottom-wrap {
- .make-row(0);
- .spacewalk-list-bottom-addons {
- .make-md-column(4);
- .text-left;
- }
- .spacewalk-list-bottom-pagination {
- .make-md-column(8);
+ .spacewalk-list-head-addons {
+ padding-top: 0.7em;
+ .make-row(0);
+ .spacewalk-list-filter {
+ .make-md-column(4);
+ .text-left;
+ padding-left: 0;
+ .spacewalk-list-channel-show-hide {
+ .pull-right;
.text-right;
}
}
+ .spacewalk-list-head-addons-extra {
+ .make-md-column(8);
+ .text-right;
+ padding-right: 0;
+ }
+ }
+
+ .spacewalk-list-head-extra {
+ .make-row();
}
+
+ .spacewalk-list-footer-addons {
+ .make-row(0);
+ .spacewalk-list-footer-addons-extra {
+ .pull-left;
+ .text-left;
+ }
+ .spacewalk-list-reflinks {
+ .pull-right;
+ .text-right;
+ }
+ }
+ .spacewalk-list-footer-extra {
+ }
+
+ .spacewalk-list-bottom-addons {
+ .make-row(0);
+ .spacewalk-list-pagination {
+ .text-right;
+ .pull-right;
+ }
+ .spacewalk-list-bottom-addons-extra {
+ }
+ }
+}
+
+.spacewalk-csv-download {
+ .pull-right;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index 6908bc8..2b85f07 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -620,6 +620,11 @@ public class ListTag extends BodyTagSupport {
if (manip.isListEmpty()) {
renderEmptyList();
ListTagUtil.write(pageContext, "</table>");
+ // close panel
+ ListTagUtil.write(pageContext, "</div>");
+ // close list
+ ListTagUtil.write(pageContext, "</div>");
+
return BodyTagSupport.SKIP_BODY;
}
ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
commit 454246561b3e1155d84c8d96429421369adc9204
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Oct 23 12:39:11 2013 +0200
Port the old list and unify more code with UnpagedListDisplay
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index 41ce24c..0809ae4 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -16,6 +16,7 @@
package com.redhat.rhn.frontend.taglibs;
import java.io.IOException;
+import java.io.Writer;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -480,20 +481,30 @@ public class ListDisplayTag extends ListDisplayTagBase {
out.println(target.toString());
}
+ @Override
+ protected void renderHeadExtraAddons(Writer out) throws IOException {
+ renderSetButtons(out);
+ }
- private void renderSetButtons(JspWriter out) throws IOException {
+ private void renderSetButtons(Writer out) throws IOException {
StringBuffer buf = new StringBuffer();
- buf.append(addButtonTo(buf, RequestContext.DISPATCH, UPDATE_LIST_KEY,
- "update_list_key_id").render());
- buf.append(" ");
- buf.append(addButtonTo(buf, RequestContext.DISPATCH, SELECT_ALL_KEY).render());
-
- if (numItemsChecked > 0) {
- buf.append(" ");
- buf.append(addButtonTo(buf, RequestContext.DISPATCH, UNSELECT_ALL_KEY)
- .render());
+ if (set != null) {
+ if (showSetButtons) {
+ buf.append("<span
class=\"spacewalk-list-selection-btns\">");
+ buf.append(addButtonTo(buf, RequestContext.DISPATCH, UPDATE_LIST_KEY,
+
"update_list_key_id").render());
+ buf.append(" ");
+ buf.append(addButtonTo(buf, RequestContext.DISPATCH,
SELECT_ALL_KEY).render());
+
+ if (numItemsChecked > 0) {
+ buf.append(" ");
+ buf.append(addButtonTo(buf, RequestContext.DISPATCH,
UNSELECT_ALL_KEY)
+ .render());
+ }
+ buf.append("</span>");
+ }
}
- out.println(buf.toString());
+ out.append(buf.toString());
}
private HtmlTag addButtonTo(StringBuffer buf, String name,
@@ -862,30 +873,7 @@ public class ListDisplayTag extends ListDisplayTagBase {
out.print("<div class=\"panel panel-default\">");
- out.print("<div class=\"panel-heading\">");
-
- renderTitle(out);
-
- out.println("<div
class=\"spacewalk-list-head-addons\">");
- out.println("<div
class=\"spacewalk-list-filter\">");
- if (getPageList().hasFilter()) {
- renderFilterBox(out);
- }
- out.println("</div>");
- out.println("<div
class=\"spacewalk-list-head-addons-extra\">");
- if (set != null) {
- if (showSetButtons) {
- out.print("<span
class=\"spacewalk-list-selection-btns\">");
- renderSetButtons(out);
- out.print("</span>");
- }
- }
- out.println("</div>");
- out.println("</div>");
-
-
- // end panel heading
- out.println("</div>");
+ renderPanelHeading(out);
/* If the type is list, we must set the width explicitly. Otherwise,
* it shouldn't matter
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
index e2b4eda..444f2a6 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
@@ -2,6 +2,7 @@ package com.redhat.rhn.frontend.taglibs;
import java.io.IOException;
import java.io.StringWriter;
+import java.io.Writer;
import java.util.Iterator;
import javax.servlet.jsp.JspTagException;
@@ -227,21 +228,56 @@ public class ListDisplayTagBase extends BodyTagSupport {
iterator = pageList.iterator();
}
+ protected void renderHeadExtraAddons(Writer out) throws IOException {
+ // noop
+ }
+
+ protected void renderPanelHeading(JspWriter out) throws IOException {
+
+ StringWriter headFilterContent = new StringWriter();
+ StringWriter titleContent = new StringWriter();
+ StringWriter headAddons = new StringWriter();
+
+ renderTitle(titleContent);
+ if (getPageList().hasFilter()) {
+ headFilterContent.append("<div
class=\"spacewalk-list-filter\">");
+ renderFilterBox(headFilterContent);
+ headFilterContent.append("</div>");
+ }
+ renderHeadExtraAddons(headAddons);
+
+ int headContentLength = headFilterContent.getBuffer().length()
+ + titleContent.getBuffer().length()
+ + headAddons.getBuffer().length();
+
+ if (headContentLength > 0) {
+ out.println("<div class=\"panel-heading\">");
+ out.println(titleContent.toString());
+ out.println("<div
class=\"spacewalk-list-head-addons\">");
+ out.println(headFilterContent.toString());
+ out.println("<div
class=\"spacewalk-list-head-addons-extra\">");
+ out.println(headAddons.toString());
+ out.println("</div>");
+ out.println("</div>");
+ out.println("</div>");
+ }
+ }
+
/**
* Renders the title header if set.
* @param out JspWriter
* @throws IOException thrown if there's a problem writing to the JSP
*/
- protected void renderTitle(JspWriter out) throws IOException {
+ protected void renderTitle(Writer out) throws IOException {
if (!StringUtils.isEmpty(title)) {
HtmlTag h4 = new HtmlTag("h4");
h4.setAttribute("class", "panel-title");
h4.addBody(LocalizationService.getInstance().getMessage(title));
- out.println(h4.render());
+ out.append(h4.render());
}
}
- protected void renderFilterBox(JspWriter out) throws IOException {
+ protected void renderFilterBox(Writer out) throws IOException {
LocalizationService ls = LocalizationService.getInstance();
HtmlTag tag = new HtmlTag("div");
@@ -280,7 +316,7 @@ public class ListDisplayTagBase extends BodyTagSupport {
buf.append(btnSpan.render());
tag.addBody(buf.toString());
- out.println(tag.render());
+ out.append(tag.render());
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
index f0611b5..76b5112 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
@@ -16,6 +16,7 @@
package com.redhat.rhn.frontend.taglibs;
import java.io.IOException;
+import java.io.Writer;
import java.util.Arrays;
import java.util.Collections;
@@ -142,18 +143,17 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase {
// RENDER methods
//////////////////////////////////////////////////////////////////////////
-
@Override
- protected void renderFilterBox(JspWriter out) throws IOException {
- super.renderFilterBox(out);
+ protected void renderHeadExtraAddons(Writer out) throws IOException {
+ super.renderHeadExtraAddons(out);
LocalizationService ls = LocalizationService.getInstance();
if (getType().equals("treeview")) {
- out.print("<div style=\"text-align: right;\">"
+ out.append("<div
class=\"spacewalk-list-channel-show-hide\">"
+
- "<a href=\"javascript:showAllRows();\"
style=\"cursor: pointer;\">" +
+ "<a class=\"spacewalk-list-channel-show-all\"
href=\"javascript:showAllRows();\" style=\"cursor:
pointer;\">" +
ls.getMessage("channels.overview.showall") +
"</a> | " +
- "<a href=\"javascript:hideAllRows();\"
style=\"cursor: pointer;\">" +
+ "<a class=\"spacewalk-list-channel-hide-all\"
href=\"javascript:hideAllRows();\" style=\"cursor:
pointer;\">" +
ls.getMessage("channels.overview.hideall") +
"</a></div>");
}
}
@@ -266,10 +266,10 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase {
doSort(sortedColumn);
}
- out.print("<div
class=\"spacewalk-list-container\">");
- out.print("<div class=\"spacewalk-list panel
panel-default\">");
+ out.print("<div class=\"spacewalk-list\">");
+ out.print("<div class=\"panel panel-default\">");
- renderTitle(out);
+ renderPanelHeading(out);
/* If the type is list, we must set the width explicitly. Otherwise,
* it shouldn't matter
@@ -291,18 +291,6 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase {
out.println(">");
- out.println("<thead>");
-
- out.println("\n<tr>");
- out.println("\n<td colspan=\"" + getColumnCount() +
"\">");
- if (getPageList().hasFilter()) {
- renderFilterBox(out);
- }
- out.println("\n</td>");
- out.println("\n</tr>");
-
- out.println("\n<tr>");
-
if (getIterator() != null && getIterator().hasNext()) {
// Push a new BodyContent writer onto the stack so that
// we can buffer the body data.
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index ec107a7..6908bc8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -1046,7 +1046,6 @@ public class ListTag extends BodyTagSupport {
}
}
- ListTagUtil.write(pageContext, " ");
ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES,
manip.getPaginationLinks());
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
index 71f985e..4ead24f 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
@@ -108,6 +108,20 @@ public abstract class BaseListDecorator implements ListDecorator {
/**
* {@inheritDoc}
*/
+ public void onHeadExtraContent() throws JspException {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onFooterExtraContent() throws JspException {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void onBottomExtraContent() throws JspException {
}
@@ -115,14 +129,28 @@ public abstract class BaseListDecorator implements ListDecorator {
/**
* {@inheritDoc}
*/
- public void onTopAddons() throws JspException {
+ public void onTopExtraAddons() throws JspException {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onHeadExtraAddons() throws JspException {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onFooterExtraAddons() throws JspException {
}
/**
* {@inheritDoc}
*/
- public void onBottomAddons() throws JspException {
+ public void onBottomExtraAddons() throws JspException {
}
}
commit 895e161ee3cde2e38ff4503cae12f37268e62919
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Oct 23 11:44:25 2013 +0200
New list structure based on Cynthia's mockup.
Updated decorator and its documentation to reflect the structure.
Also updated
https://fedorahosted.org/spacewalk/wiki/UserInterface
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index 933c927..41ce24c 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -456,7 +456,7 @@ public class ListDisplayTag extends ListDisplayTagBase {
if (request.getQueryString() != null) {
page.append("&" + request.getQueryString());
}
- out.println("<div class=\"spacewalk-csv-download
text-right\"><a href=\"" + page +
+ out.println("<div class=\"spacewalk-csv-download\"><a
href=\"" + page +
"\"><i
class=\"spacewalk-icon-download-csv\"></i>" +
LocalizationService.getInstance().getMessage("listdisplay.csv")
+
"</a></div>");
@@ -610,9 +610,7 @@ public class ListDisplayTag extends ListDisplayTagBase {
return;
}
-
- out.println("<div class=\"text-right\">");
-
+ out.println("<div>");
if (getButton() != null && AclManager.hasAcl(getButtonAcl(),
(HttpServletRequest) pageContext.getRequest(), getMixins())) {
@@ -836,47 +834,45 @@ public class ListDisplayTag extends ListDisplayTagBase {
doSort(sortedColumn);
}
- out.print("<div
class=\"spacewalk-list-container\">");
- out.print("<div class=\"spacewalk-list panel
panel-default\">");
+ out.print("<div class=\"spacewalk-list\">");
- renderTitle(out);
-
- /* If the type is list, we must set the width explicitly. Otherwise,
- * it shouldn't matter
+ out.println("<div
class=\"spacewalk-list-top-addons\">");
+ out.println("<div
class=\"spacewalk-list-alphabar\">");
+ /*
+ * If pageList contains an index and pageList.size() (what we are
+ * displaying on the page) is less than pageList.getTotalSize() (the
+ * total number of items in the data result), render alphabar. This
+ * prevents the alphabar from showing up on pages that show all of
+ * the entries on a single page and is similar to how the perl code
+ * behaves.
*/
- if (type.equals("list")) {
- out.print("<table class=\"table
table-striped\"");
+ if (getPageList().getIndex().size() > 0
+ && getPageList().size() < getPageList().getTotalSize()) {
+
+ renderViewAllLink(out);
+ renderAlphabar(out);
}
- else {
- out.print("<table class=\"" + type +
"\"");
+ out.println("</div>");
+ if (isPaging()) {
+ renderPagination(out, true);
+ renderBoundsVariables(out);
}
+ out.println("</div>");
- /*if (isTransparent()) {
- out.print(" style=\"border-bottom: 1px solid #ffffff;\"
");
- }*/
-
- if (tableId != null) {
- out.print(" id=\"" + tableId + "\"");
- }
- out.println(">");
+ out.print("<div class=\"panel panel-default\">");
- // we render the pagination controls as an additional head
- out.println("<thead>");
- out.println("<tr>");
- out.println("<td colspan=\"" + getNumberOfColumns() +
"\">");
+ out.print("<div class=\"panel-heading\">");
- out.println("<div class=\"spacewalk-list-top\">");
- out.println("<div
class=\"spacewalk-list-top-wrap\">");
- out.println("<div
class=\"spacewalk-list-top-alphabar\">");
- if (getPageList().getIndex().size() > 0
- && getPageList().size() < getPageList().getTotalSize()) {
+ renderTitle(out);
- renderViewAllLink(out);
- renderAlphabar(out);
+ out.println("<div
class=\"spacewalk-list-head-addons\">");
+ out.println("<div
class=\"spacewalk-list-filter\">");
+ if (getPageList().hasFilter()) {
+ renderFilterBox(out);
}
out.println("</div>");
- out.println("<div
class=\"spacewalk-list-top-addons\">");
+ out.println("<div
class=\"spacewalk-list-head-addons-extra\">");
if (set != null) {
if (showSetButtons) {
out.print("<span
class=\"spacewalk-list-selection-btns\">");
@@ -886,32 +882,33 @@ public class ListDisplayTag extends ListDisplayTagBase {
}
out.println("</div>");
out.println("</div>");
- out.println("<div
class=\"spacewalk-list-top-wrap\">");
- out.println("<div
class=\"spacewalk-list-filter\">");
- if (getPageList().hasFilter()) {
- renderFilterBox(out);
- }
- out.println("</div>");
- out.println("<div
class=\"spacewalk-list-top-pagination\">");
- if (isPaging()) {
- renderPagination(out, true);
- renderBoundsVariables(out);
- }
- out.println("</div>");
- out.println("</div>");
+
+
+ // end panel heading
out.println("</div>");
- /* If pageList contains an index and pageList.size() (what we are
- * displaying on the page) is less than pageList.getTotalSize()
- * (the total number of items in the data result), render alphabar.
- * This prevents the alphabar from showing up on pages that show
- * all of the entries on a single page and is similar to how the
- * perl code behaves.
+
+ /* If the type is list, we must set the width explicitly. Otherwise,
+ * it shouldn't matter
*/
+ if (type.equals("list")) {
+ out.print("<table class=\"table
table-striped\"");
+ }
+ else {
+ out.print("<table class=\"" + type +
"\"");
+ }
+
+ /*if (isTransparent()) {
+ out.print(" style=\"border-bottom: 1px solid #ffffff;\"
");
+ }*/
+ if (tableId != null) {
+ out.print(" id=\"" + tableId + "\"");
+ }
- out.println("</td>");
- out.println("</tr>");
+ out.println(">");
+ // we render the pagination controls as an additional head
+ out.println("<thead>");
out.println("\n<tr>");
if (getIterator() != null && getIterator().hasNext()) {
@@ -972,22 +969,56 @@ public class ListDisplayTag extends ListDisplayTagBase {
}
out.println("</tbody>");
+ out.println("</table>");
+
/* If the type is a half-table, we must draw an extra row on the
* end of the table if the reflink has been set
*/
- out.println("<tfoot>");
- out.println("<tr>");
- out.println("<td colspan=\"" + getNumberOfColumns() +
"\">");
+ out.println("<div class=\"panel-footer\">");
+ out.println("<div
class=\"spacewalk-list-footer-addons\">");
+ out.println("<div
class=\"spacewalk-list-footer-addons-extra\">");
+ if (isPaging()) {
+ renderActionButtons(out);
+ }
+ out.println("</div>");
+ out.println("<div
class=\"spacewalk-list-reflinks\">");
+ if (reflink != null) {
+ setColumnCount(0);
+ out.println("<a href=\"" + reflink + "\"
>");
- out.println("<div
class=\"spacewalk-list-bottom\">");
- out.println("<div
class=\"spacewalk-list-bottom-wrap\">");
- out.println("<div
class=\"spacewalk-list-bottom-addons\">");
+ /*
+ * Here we render the reflink and its key. If the key hasn't
+ * been set we just display the link address itself.
+ */
+ if (reflinkkey != null) {
+ Object[] args = new Object[2];
+
+ args[0] = new Integer(getPageList().getTotalSize());
+ args[1] = reflinkkeyarg0;
+
+ String message = LocalizationService.getInstance()
+ .getMessage(reflinkkey, args);
+ out.println(message);
+ } else {
+ out.println(reflink);
+ }
+
+ out.println("</a>");
+ }
out.println("</div>");
- out.println("<div
class=\"spacewalk-list-bottom-pagination\">");
+ out.println("</div>");
+
+ // close footer
+ out.println("</div>");
+
+ // close panel
+ out.println("</div>");
+
+ out.println("<div
class=\"spacewalk-list-bottom-addons\">");
+ out.println("<div
class=\"spacewalk-list-pagination\">");
/* If paging is on, we render the pagination */
if (isPaging()) {
renderPagination(out, false);
- renderActionButtons(out);
}
/* If paging is off and we are rendering a normal list,
* we show a count of the results in the lower left corner
@@ -1006,59 +1037,18 @@ public class ListDisplayTag extends ListDisplayTagBase {
args[2] = new Integer(getPageList().getTotalSize());
args[3] = LocalizationService.getInstance().getMessage(description);
- out.print("<span class=\"text-left\">\n");
+ out.print("<span class=\"text-right\">\n");
out.print(LocalizationService.getInstance()
.getMessage("message.range.withtypedescription",
args));
out.println("</span>");
}
out.println("</div>");
out.println("</div>");
- out.println("<div
class=\"spacewalk-list-extra\">");
- out.println("</div>");
-
- out.println("</div>");
-
- out.println("</tr>");
- out.println("</td>");
- out.println("</tfoot>\n");
-
- out.println("</table>\n");
-
- if (reflink != null) {
- setColumnCount(0);
-
- out.println("<div class=\"panel-footer\">");
-
- out.println("<a href=\"" + reflink + "\"
>");
-
- /* Here we render the reflink and its key. If the key hasn't been
set
- * we just display the link address itself.
- */
- if (reflinkkey != null) {
- Object[] args = new Object[2];
-
- args[0] = new Integer(getPageList().getTotalSize());
- args[1] = reflinkkeyarg0;
-
- String message = LocalizationService.getInstance().
- getMessage(reflinkkey, args);
- out.println(message);
- }
- else {
- out.println(reflink);
- }
-
- out.println("</a>");
- out.println("</div>");
- }
-
- out.println("</div>\n");
// export button goes outside of the panel
if (getExportColumns() != null) {
renderExport(out);
}
- out.println("</div>\n");
setColumnCount(0);
setNumberOfColumns(0);
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
index 5b560cf..e2b4eda 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
@@ -234,13 +234,10 @@ public class ListDisplayTagBase extends BodyTagSupport {
*/
protected void renderTitle(JspWriter out) throws IOException {
if (!StringUtils.isEmpty(title)) {
- HtmlTag heading = new HtmlTag("div");
- heading.setAttribute("class", "panel-heading");
- HtmlTag h3 = new HtmlTag("h3");
- h3.setAttribute("class", "panel-title");
- h3.addBody(LocalizationService.getInstance().getMessage(title));
- heading.addBody(h3);
- out.println(heading.render());
+ HtmlTag h4 = new HtmlTag("h4");
+ h4.setAttribute("class", "panel-title");
+ h4.addBody(LocalizationService.getInstance().getMessage(title));
+ out.println(h4.render());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
index 0e729a7..382f299 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
@@ -196,7 +196,7 @@ public class CSVTag extends BodyTagSupport {
private void renderExport() throws JspException {
StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI);
page.append("?" + makeCSVRequestParams());
- String exportLink = new String("<div class=\"spacewalk-csv-download
text-right\"><a href=\"" +
+ String exportLink = new String("<div
class=\"spacewalk-csv-download\"><a href=\"" +
page + "\"><i
class=\"spacewalk-icon-download-csv\"></i>" +
LocalizationService.getInstance().getMessage(
"listdisplay.csv") +
"</a></div>");
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index 1a99031..ec107a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -406,8 +406,6 @@ public class ListTag extends BodyTagSupport {
*/
@Override
public int doEndTag() throws JspException {
- ListTagUtil.write(pageContext, "</div>");
-
// print the hidden fields after the list widget is printed
// but before the form of the listset is closed.
ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT,
@@ -450,128 +448,144 @@ public class ListTag extends BodyTagSupport {
if (haveColsEnumerated && !haveTblHeadingRendered) {
ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
ListCommand.TBL_HEADING);
-
- // only if there is a title, add a panel-heading
- if (!StringUtils.isBlank(title)) {
- ListTagUtil.write(pageContext, "<div
class=\"panel-heading\">");
- HtmlTag h3 = new HtmlTag("h3");
- h3.setAttribute("class", "panel-title");
- h3.addBody(title);
- ListTagUtil.write(pageContext, h3.render());
- ListTagUtil.write(pageContext, "</div>");
- }
}
else if (haveColsEnumerated && !haveTblAddonsRendered) {
- startTable();
-
- // as the header addons is populated with decorators, we don't
- // know if there will be content or not, but we want to avoid
- // writing the head tag at all if there is none, so we push a
- // buffer into the stack, and empty it later.
- StringWriter theadAlphaBarContent = new StringWriter();
- StringWriter theadAddons = new StringWriter();
- StringWriter theadBeforeTopPagDecContent = new StringWriter();
- StringWriter theadFilterContent = new StringWriter();
- StringWriter theadExtraContent = new StringWriter();
-
setupManipulator();
manip.sort();
pageData = manip.getPage();
- pageContext.pushBody(theadAlphaBarContent);
+ StringWriter topAlphaBarContent = new StringWriter();
+ StringWriter topPaginationContent = new StringWriter();
+ StringWriter topAddonsContent = new StringWriter();
+ StringWriter topExtraContent = new StringWriter();
+
+ pageContext.pushBody(topAlphaBarContent);
if (!manip.isListEmpty() && !StringUtils.isBlank(alphaBarColumn)) {
AlphaBarHelper.getInstance().writeAlphaBar(pageContext,
manip.getAlphaBarIndex(), getUniqueName());
}
pageContext.popBody();
- pageContext.pushBody(theadAddons);
+ pageContext.pushBody(topPaginationContent);
if (!isEmpty()) {
for (ListDecorator dec : getDecorators()) {
dec.setCurrentList(this);
- dec.onTopAddons();
+ dec.beforeTopPagination();
}
}
+ renderTopPaginationControls();
pageContext.popBody();
- pageContext.pushBody(theadFilterContent);
- if (filter != null && manip.getUnfilteredDataSize() != 0) {
- ListTagUtil.renderFilterUI(pageContext, filter,
- getUniqueName(), width, columnCount,
- searchParent, searchChild);
+ pageContext.pushBody(topAddonsContent);
+ if (!isEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.onTopExtraAddons();
+ }
}
pageContext.popBody();
+
+ int topContentLength = topAddonsContent.getBuffer().length() +
+ topAlphaBarContent.getBuffer().length() +
+ topPaginationContent.getBuffer().length() +
+ topExtraContent.getBuffer().length();
- pageContext.pushBody(theadBeforeTopPagDecContent);
+ if (topContentLength > 0) {
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-addons\">");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-alphabar\">");
+ ListTagUtil.write(pageContext, topAlphaBarContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-pagination\">");
+ ListTagUtil.write(pageContext, topPaginationContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-addons-extra\">");
+ ListTagUtil.write(pageContext, topAddonsContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-extra\">");
+ ListTagUtil.write(pageContext, "</div>");
+ }
+
+ ListTagUtil.write(pageContext, "<div class=\"panel
panel-default\">");
+ // as the header addons is populated with decorators, we don't
+ // know if there will be content or not, but we want to avoid
+ // writing the head tag at all if there is none, so we push a
+ // buffer into the stack, and empty it later.
+ StringWriter headAddons = new StringWriter();
+ StringWriter headFilterContent = new StringWriter();
+ StringWriter headExtraContent = new StringWriter();
+
+ pageContext.pushBody(headAddons);
if (!isEmpty()) {
for (ListDecorator dec : getDecorators()) {
dec.setCurrentList(this);
- dec.beforeTopPagination();
+ dec.onHeadExtraAddons();
}
}
pageContext.popBody();
- pageContext.pushBody(theadExtraContent);
+ pageContext.pushBody(headFilterContent);
+ if (filter != null && manip.getUnfilteredDataSize() != 0) {
+ ListTagUtil.renderFilterUI(pageContext, filter,
+ getUniqueName(), width, columnCount,
+ searchParent, searchChild);
+ }
+ pageContext.popBody();
+
+ pageContext.pushBody(headExtraContent);
if (!isEmpty()) {
for (ListDecorator dec : getDecorators()) {
dec.setCurrentList(this);
- dec.onTopExtraContent();
+ dec.onHeadExtraContent();
}
}
pageContext.popBody();
- ListTagUtil.write(pageContext, "<thead>");
+ int headContentLength = headFilterContent.getBuffer().length() +
+ headAddons.getBuffer().length() +
+ headExtraContent.getBuffer().length();
+ if (!StringUtils.isBlank(title)) {
+ headContentLength += title.length();
+ }
// this avoid render the row is there is no content at all
- if ((theadAlphaBarContent.getBuffer().length() +
- theadFilterContent.getBuffer().length() +
- theadBeforeTopPagDecContent.getBuffer().length() +
- theadAddons.getBuffer().length()) > 0) {
+ if (headContentLength > 0) {
+ ListTagUtil.write(pageContext, "<div
class=\"panel-heading\">");
+ // only if there is a title, add a panel-heading
+ if (!StringUtils.isBlank(title)) {
+ HtmlTag h3 = new HtmlTag("h3");
+ h3.setAttribute("class", "panel-title");
+ h3.addBody(title);
+ ListTagUtil.write(pageContext, h3.render());
+ }
// render the navigation and filters as a row of the header
- ListTagUtil.write(pageContext, "<tr>");
- ListTagUtil.write(pageContext, "<td colspan=\""
- + getColumnCount() + "\">");
ListTagUtil.write(pageContext,
- "<div class=\"spacewalk-list-top\">");
+ "<div
class=\"spacewalk-list-head-addons\">");
ListTagUtil.write(pageContext,
- "<div
class=\"spacewalk-list-top-wrap\">");
- ListTagUtil.write(pageContext,
- "<div
class=\"spacewalk-list-top-alphabar\">");
- ListTagUtil.write(pageContext, theadAlphaBarContent.toString());
- ListTagUtil.write(pageContext, "</div>");
- ListTagUtil.write(pageContext,
- "<div
class=\"spacewalk-list-top-addons\">");
- ListTagUtil.write(pageContext, theadAddons.toString());
- ListTagUtil.write(pageContext, "</div>");
- ListTagUtil.write(pageContext, "</div>");
-
- ListTagUtil.write(pageContext,
- "<div
class=\"spacewalk-list-top-wrap\">");
- ListTagUtil.write(pageContext,
"<div
class=\"spacewalk-list-filter\">");
- ListTagUtil.write(pageContext, theadFilterContent.toString());
+ ListTagUtil.write(pageContext, headFilterContent.toString());
ListTagUtil.write(pageContext, "</div>");
ListTagUtil.write(pageContext,
- "<div
class=\"spacewalk-list-top-pagination\">");
- ListTagUtil.write(pageContext,
- theadBeforeTopPagDecContent.toString());
- // column with the pagination controls
- renderTopPaginationControls();
+ "<div
class=\"spacewalk-list-head-addons-extra\">");
+ ListTagUtil.write(pageContext, headAddons.toString());
ListTagUtil.write(pageContext, "</div>");
+
ListTagUtil.write(pageContext, "</div>");
ListTagUtil.write(pageContext,
- "<div
class=\"spacewalk-list-top-extra\">");
- ListTagUtil.write(pageContext, theadExtraContent.toString());
+ "<div
class=\"spacewalk-list-head-extra\">");
+ ListTagUtil.write(pageContext, headExtraContent.toString());
ListTagUtil.write(pageContext, "</div>");
-
+ // close the panel heading
ListTagUtil.write(pageContext, "</div>");
-
- ListTagUtil.write(pageContext, "</td>");
- ListTagUtil.write(pageContext, "</tr>");
}
HttpServletRequest request = (HttpServletRequest) pageContext
@@ -591,6 +605,8 @@ public class ListTag extends BodyTagSupport {
if (haveColsEnumerated && haveTblAddonsRendered &&
!haveColHeadersRendered) {
+ startTable();
+ ListTagUtil.write(pageContext, "<thead>");
// open the row tag for the column header th's
ListTagUtil.write(pageContext, "<tr>");
ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
@@ -634,31 +650,36 @@ public class ListTag extends BodyTagSupport {
else if (haveTblFootersRendered) {
retval = BodyTagSupport.SKIP_BODY;
+ ListTagUtil.write(pageContext, "</table>");
// as the footer addons are populated with decorators, we don't
// know if there will be content or not, but we want to avoid
// writing the tfoot tag at all if there is none, so we push a
// buffer into the stack, and empty it later.
- StringWriter tfootAddonsContent = new StringWriter();
- pageContext.pushBody(tfootAddonsContent);
- renderFooterPaginationControls();
- pageContext.popBody();
+ StringWriter footAddonsContent = new StringWriter();
+ StringWriter footLinksContent = new StringWriter();
+ StringWriter footExtraContent = new StringWriter();
- if (tfootAddonsContent.getBuffer().length() > 0) {
- // render the pagination controls as the footer of the table
- ListTagUtil.write(pageContext, "<tfoot>");
- ListTagUtil.write(pageContext, "<tr>");
- ListTagUtil.write(pageContext, "<td colspan=\"" +
getColumnCount() + "\">");
- ListTagUtil.write(pageContext, tfootAddonsContent.toString());
- ListTagUtil.write(pageContext, "</td>");
- ListTagUtil.write(pageContext, "</tr>");
- ListTagUtil.write(pageContext, "</tfoot>");
+ pageContext.pushBody(footAddonsContent);
+ if (!manip.isListEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.onFooterExtraAddons();
+ dec.setCurrentList(null);
+ }
}
+ pageContext.popBody();
- ListTagUtil.write(pageContext, "</table>");
+ pageContext.pushBody(footExtraContent);
+ if (!manip.isListEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.onFooterExtraContent();
+ dec.setCurrentList(null);
+ }
+ }
+ pageContext.popBody();
+ pageContext.pushBody(footLinksContent);
// if there is reference links, put them as a panel footer
if ((refLink != null) && (!isEmpty())) {
- ListTagUtil.write(pageContext, "<div
class=\"panel-footer\">");
ListTagUtil.write(pageContext, "<a href=\"" + refLink +
"\" >");
/* Here we render the reflink and its key. If the key hasn't been
set
@@ -678,10 +699,59 @@ public class ListTag extends BodyTagSupport {
}
ListTagUtil.write(pageContext, "</a>");
+ }
+ pageContext.popBody();
+
+ int footerContentLength = footLinksContent.getBuffer().length()
+ + footAddonsContent.getBuffer().length()
+ + footExtraContent.getBuffer().length();
+
+ if (footerContentLength > 0) {
+ ListTagUtil.write(pageContext, "<div
class=\"panel-footer\">");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-footer-addons\">");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-reflinks\">");
+ ListTagUtil.write(pageContext, footLinksContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-footer-addons-extra\">");
+ ListTagUtil.write(pageContext, footAddonsContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-footer-extra\">");
+ ListTagUtil.write(pageContext, footExtraContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
// closes the panel footer
ListTagUtil.write(pageContext, "</div>");
}
+ // close the panel
+ ListTagUtil.write(pageContext, "</div>");
+
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-bottom-addons\">");
+ renderFooterPaginationControls();
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-bottom-addons-extra\">");
+ if (!isEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.onBottomExtraAddons();
+ }
+ }
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-bottom-addons-extra\">");
+ if (!isEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.onBottomExtraContent();;
+ }
+ }
+ ListTagUtil.write(pageContext, "</div>");
// we render the hidden fields outside of the table
if (isSortable()) {
renderSortableHiddenFields();
@@ -758,10 +828,9 @@ public class ListTag extends BodyTagSupport {
dec.beforeList();
}
- ListTagUtil.write(pageContext, "<div class=\"spacewalk-list panel
panel-default\" id=\"" + getUniqueName() + "\">");
-
+ ListTagUtil.write(pageContext, "<div class=\"spacewalk-list\"
id=\"" + getUniqueName() + "\">");
ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
- ListCommand.ENUMERATE);
+ ListCommand.ENUMERATE);
return BodyTagSupport.EVAL_BODY_INCLUDE;
}
@@ -903,12 +972,11 @@ public class ListTag extends BodyTagSupport {
}
private void startTable() throws JspException {
- ListTagUtil.write(pageContext, "<table class=\"table
table-striped\"");
+ ListTagUtil.write(pageContext, "<table class=\"table table-striped
");
if (styleClass != null) {
- ListTagUtil.write(pageContext, " class=\"");
ListTagUtil.write(pageContext, styleClass);
- ListTagUtil.write(pageContext, "\"");
}
+ ListTagUtil.write(pageContext, "\"");
ListTagUtil.write(pageContext, " id=\"");
ListTagUtil.write(pageContext, getStyleId());
@@ -947,20 +1015,8 @@ public class ListTag extends BodyTagSupport {
return;
}
- ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom\">");
-
ListTagUtil.write(pageContext,
- "<div class=\"spacewalk-list-bottom-wrap\">");
- ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom-addons\">");
- if (!manip.isListEmpty()) {
- for (ListDecorator dec : getDecorators()) {
- dec.onBottomAddons();
- dec.setCurrentList(null);
- }
- }
- ListTagUtil.write(pageContext, "</div>");
-
- ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom-pagination\">");
+ "<div class=\"spacewalk-list-pagination\">");
if (!isEmpty() && !hidePageNums) {
ListTagUtil.write(pageContext, manip.getPaginationMessage());
}
@@ -973,28 +1029,13 @@ public class ListTag extends BodyTagSupport {
}
}
- ListTagUtil.write(pageContext, " ");
ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES,
manip.getPaginationLinks());
ListTagUtil.write(pageContext, "</div>");
- ListTagUtil.write(pageContext, "</div>");
-
- ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom-extra\">");
- if (!manip.isListEmpty()) {
- for (ListDecorator dec : getDecorators()) {
- dec.setCurrentList(this);
- dec.onBottomExtraContent();
- dec.setCurrentList(null);
- }
- }
- ListTagUtil.write(pageContext, "</div>");
-
- ListTagUtil.write(pageContext, "</div>");
}
private void renderTopPaginationControls() throws JspException {
-
if (!isEmpty() && !hidePageNums) {
ListTagUtil.write(pageContext, manip.getPaginationMessage());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index f907f8b..8cff5d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -15,15 +15,6 @@
package com.redhat.rhn.frontend.taglibs.list;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.common.util.StringUtil;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.taglibs.list.decorators.ExtraButtonDecorator;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.StringEscapeUtils;
-
import java.io.IOException;
import java.io.Writer;
import java.util.Enumeration;
@@ -42,6 +33,15 @@ import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.Tag;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.util.StringUtil;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.taglibs.list.decorators.ExtraButtonDecorator;
+
/**
* Provides various utility functions for the ListTag, ColumnTag, and SpanTag
*
@@ -573,7 +573,7 @@ public class ListTagUtil {
for (int x = 0; x < linkNames.length; x++) {
String[] linkData = (String[]) links.get(linkNames[x]);
ListTagUtil.write(pageContext, "<button ");
- ListTagUtil.write(pageContext, "class=\"btn btn-default ");
+ ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs
");
ListTagUtil.write(pageContext, linkData[0]);
// if the link is disabled...
@@ -586,7 +586,7 @@ public class ListTagUtil {
ListTagUtil.write(pageContext, "\" value=\"");
ListTagUtil.write(pageContext, linkData[2]);
}
- ListTagUtil.write(pageContext, "\" />");
+ ListTagUtil.write(pageContext, "\"></button>");
/*
if (linkData[1] = null) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
index 9a6b0fd..af145f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
@@ -14,12 +14,12 @@
*/
package com.redhat.rhn.frontend.taglibs.list.decorators;
-import com.redhat.rhn.frontend.taglibs.list.ListSetTag;
-import com.redhat.rhn.frontend.taglibs.list.ListTag;
-
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import com.redhat.rhn.frontend.taglibs.list.ListSetTag;
+import com.redhat.rhn.frontend.taglibs.list.ListTag;
+
/**
* Decorator for a given list
*
@@ -76,32 +76,74 @@ public interface ListDecorator {
void setCurrentList(ListTag currentList);
/**
- * Notifies the decorator that the list is about to render the top pagination
control
- * @throws JspException exception
+ * Use this hook to insert content before the top pagination
+ *
+ * @throws JspException
+ * exception
*/
void beforeTopPagination() throws JspException;
/**
- * Notifies the decorator that the list is on the top extra content section
- * @throws JspException exception
+ * With this hook one can insert content before the list
+ *
+ * @throws JspException
+ * exception
*/
void onTopExtraContent() throws JspException;
/**
- * Notifies the decorator that the list is on the bottom extra content section
- * @throws JspException exception
+ * With this hook one can insert content in the heading
+ *
+ * @throws JspException
+ * exception
+ */
+ void onHeadExtraContent() throws JspException;
+
+ /**
+ * With this hook one can insert content in the footer
+ *
+ * @throws JspException
+ * exception
+ */
+ void onFooterExtraContent() throws JspException;
+
+ /**
+ * With this hook one can insert content after the list
+ *
+ * @throws JspException
+ * exception
*/
void onBottomExtraContent() throws JspException;
/**
- * Notifies the decorator that the list is in the addons section
- * @throws JspException something bad happened
+ * With this hook one can insert extra addons in the before the list
+ *
+ * @throws JspException
+ * something bad happened
*/
- void onTopAddons() throws JspException;
+ void onTopExtraAddons() throws JspException;
/**
- * Notifies the decorator that the list is in the addons section
- * @throws JspException something bad happened
+ * With this hook one can insert extra addons in the heading
+ *
+ * @throws JspException
+ * something bad happened
+ */
+ void onHeadExtraAddons() throws JspException;
+
+ /**
+ * With this hook one can insert extra addons in the footer
+ *
+ * @throws JspException
+ * something bad happened
+ */
+ void onFooterExtraAddons() throws JspException;
+
+ /**
+ * With this hook one can insert extra addons after the list
+ *
+ * @throws JspException
+ * something bad happened
*/
- void onBottomAddons() throws JspException;
+ void onBottomExtraAddons() throws JspException;
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
index c19bcf0..b5e6a4e 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
@@ -14,14 +14,6 @@
*/
package com.redhat.rhn.frontend.taglibs.list.decorators;
-import com.redhat.rhn.common.conf.ConfigDefaults;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.frontend.html.HtmlTag;
-import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -29,6 +21,14 @@ import java.util.List;
import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+
+import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.frontend.html.HtmlTag;
+import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
+
/**
* PageSizeDecorator
* @version $Rev$
@@ -107,7 +107,7 @@ public class PageSizeDecorator extends BaseListDecorator {
* {@inheritDoc}
*/
@Override
- public void onTopAddons() throws JspException {
+ public void onHeadExtraAddons() throws JspException {
if (!getCurrentList().isEmpty()) {
StringBuilder stringBuild = new StringBuilder();
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
index ad29244..b5b978b 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
@@ -66,7 +66,7 @@ public class SelectableDecorator extends BaseListDecorator {
}
@Override
- public void onBottomAddons() throws JspException {
+ public void onFooterExtraAddons() throws JspException {
renderSelectButtons();
}
@@ -98,7 +98,7 @@ public class SelectableDecorator extends BaseListDecorator {
pageContext.getRequest());
if (!RhnSetDecl.SYSTEMS.getLabel().equals(setName)) {
String msg = ls.getMessage("message.numselected", args);
- ListTagUtil.write(pageContext, " <strong><span
id=\"");
+ ListTagUtil.write(pageContext, "<span id=\"");
if (isHeader) {
ListTagUtil.write(pageContext, "pagination_selcount_top");
}
@@ -107,7 +107,7 @@ public class SelectableDecorator extends BaseListDecorator {
}
ListTagUtil.write(pageContext, "\">");
ListTagUtil.write(pageContext, msg);
- ListTagUtil.write(pageContext,
"</span></strong>");
+ ListTagUtil.write(pageContext, "</span>");
}
}
}
commit eee345fd7e373144d769846f60d1eba04a4c3a16
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 22 15:43:51 2013 +0200
Refactor UnpagedListDisplayTag and ListDisplayTag so that all the copy
pasted code is now common in ListDisplayTagBase.
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 728864e..ab19441 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -514,7 +514,7 @@ ul.nav.nav-tabs:last-child{
.spacewalk-list-top {
padding: 0.7em;
.spacewalk-list-top-wrap {
- .make-row();
+ .make-row(0);
.spacewalk-list-top-alphabar {
.make-md-column(9);
@@ -539,6 +539,20 @@ ul.nav.nav-tabs:last-child{
.make-row();
}
}
+
+ .spacewalk-list-bottom {
+ .spacewalk-list-bottom-wrap {
+ .make-row(0);
+ .spacewalk-list-bottom-addons {
+ .make-md-column(4);
+ .text-left;
+ }
+ .spacewalk-list-bottom-pagination {
+ .make-md-column(8);
+ .text-right;
+ }
+ }
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index a4b0bd4..933c927 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -15,28 +15,7 @@
package com.redhat.rhn.frontend.taglibs;
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.common.util.CSVWriter;
-import com.redhat.rhn.common.util.DynamicComparator;
-import com.redhat.rhn.common.util.ExportWriter;
-import com.redhat.rhn.common.util.ServletExportHandler;
-import com.redhat.rhn.common.util.StringUtil;
-import com.redhat.rhn.domain.rhnset.RhnSet;
-import com.redhat.rhn.frontend.dto.UserOverview;
-import com.redhat.rhn.frontend.html.HtmlTag;
-import com.redhat.rhn.frontend.listview.AlphaBar;
-import com.redhat.rhn.frontend.listview.PaginationUtil;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
-import com.redhat.rhn.manager.acl.AclManager;
-import com.redhat.rhn.manager.rhnset.RhnSetDecl;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
-import java.io.StringWriter;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -48,10 +27,24 @@ import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.util.DynamicComparator;
+import com.redhat.rhn.common.util.ExportWriter;
+import com.redhat.rhn.common.util.ServletExportHandler;
+import com.redhat.rhn.common.util.StringUtil;
+import com.redhat.rhn.domain.rhnset.RhnSet;
+import com.redhat.rhn.frontend.dto.UserOverview;
+import com.redhat.rhn.frontend.html.HtmlTag;
+import com.redhat.rhn.frontend.listview.AlphaBar;
+import com.redhat.rhn.frontend.listview.PaginationUtil;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.acl.AclManager;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
/**
* The ListDisplayTag defines the structure of the ListView. This tag iterates
@@ -135,8 +128,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport;
* @see com.redhat.rhn.frontend.taglibs.SetTag
* @see com.redhat.rhn.domain.rhnset.RhnSet
*/
-public class ListDisplayTag extends BodyTagSupport {
- public static final String FILTER_DISPATCH = "filter.dispatch";
+public class ListDisplayTag extends ListDisplayTagBase {
private static final String LAST = "Last";
private static final String NEXT = "Next";
private static final String PREV = "Prev";
@@ -147,21 +139,9 @@ public class ListDisplayTag extends BodyTagSupport {
private static final String FIRST_LOWER = "first_lower";
private static final Set PAGINATION_WASH_SET = buildPaginationWashSet();
- /** iterates through the page list */
- private Iterator iterator;
- /** list of data to show on page */
- private DataResult pageList;
/** row count determines whether we're an even or odd row */
protected int rowCnt = 0;
- /** How many columns are there? */
- protected int numberOfColumns = 0;
- /** Which column are we rendering now? */
- protected int columnCount = 0;
-
- private String filterBy;
private RhnSet set;
- private String hiddenvars;
- /** contains the number of items checked */
private int numItemsChecked;
/** true if we are to show the set operation buttons */
private boolean showSetButtons;
@@ -195,18 +175,13 @@ public class ListDisplayTag extends BodyTagSupport {
*/
private boolean transparent = false;
/** determines whether we should show the disabled CSS */
- private boolean renderDisabled;
- /** buttons and associated acls */
private String button;
private String buttonAcl;
private String button2;
private String button2Acl;
private String mixins;
private String domainClass;
- /** comma separated list of columns to be exported */
- private String exportColumns;
- /** optional title attribute for displaying a titled list */
- private String title;
+
/** **/
private String tableId;
@@ -333,18 +308,7 @@ public class ListDisplayTag extends BodyTagSupport {
public void setMixins(String mixinsIn) {
this.mixins = mixinsIn;
}
- /**
- * @return Returns the disabled.
- */
- public boolean renderDisabled() {
- return renderDisabled;
- }
- /**
- * @param disabled The disabled to set.
- */
- public void setRenderDisabled(String disabled) {
- renderDisabled = disabled.equals("true");
- }
+
/**
* Set the set for this listview.
* @param s The set to set.
@@ -362,44 +326,6 @@ public class ListDisplayTag extends BodyTagSupport {
}
/**
- * @return Returns the hiddenvars.
- */
- public String getHiddenvars() {
- return hiddenvars;
- }
-
- /**
- * @param hv The hiddenvars to set.
- */
- public void setHiddenvars(String hv) {
- this.hiddenvars = hv;
- }
-
- /**
- * Set the header of the filter on which to filter
- * @param filterByIn The filterBy to set.
- */
- public void setFilterBy(String filterByIn) {
- this.filterBy = filterByIn;
- }
-
- /**
- * Returns the title message key.
- * @return Returns the title.
- */
- public String getTitle() {
- return title;
- }
-
- /**
- * Sets the title message key.
- * @param titleIn The title to set.
- */
- public void setTitle(String titleIn) {
- title = titleIn;
- }
-
- /**
* Returns true if this is a paging list.
* @return true if this is a paging list.
*/
@@ -505,7 +431,7 @@ public class ListDisplayTag extends BodyTagSupport {
}
private void doSort(String sortedColumn) {
HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
- Collections.sort(pageList, new DynamicComparator(sortedColumn,
+ Collections.sort(getPageList(), new DynamicComparator(sortedColumn,
request.getParameter(RequestContext.SORT_ORDER)));
}
@@ -515,70 +441,7 @@ public class ListDisplayTag extends BodyTagSupport {
return request.getParameter(RequestContext.LIST_SORT);
}
- private void setupPageList() throws JspTagException {
- ListTag listTag = (ListTag) findAncestorWithClass(this, ListTag.class);
- if (listTag == null) {
- throw new JspTagException("Tag nesting error: " +
- "listDisplay must be nested in a list tag");
- }
- pageList = listTag.getPageList();
- iterator = pageList.iterator();
- }
-
- /**
- * Method to fetch a new ExportWriter instance. Override
- * if desired to use different instance. Currently creates
- * a new CSVWriter instance.
- * @return new instance of an ExportWriter
- */
- protected ExportWriter createExportWriter() {
- return new CSVWriter(new StringWriter());
- }
-
- /**
- * Increment the column # that is being rendered at this moment.
- **/
- public void incrColumnCount() {
- this.columnCount++;
- }
-
- /**
- * Increment the total number of columns
- **/
- public void incrNumberOfColumns() {
- this.numberOfColumns++;
- }
-
- /**
- * Get the number of the column that is being rendered at this moment.
- * (0 == The first column)
- * @return int the column number
- **/
- public int getColumnCount() {
- return this.columnCount;
- }
-
- /**
- * Get the number of columns in the list.
- * @return int the number of columns
- **/
- public int getNumberOfColumns() {
- return this.numberOfColumns;
- }
-
- /**
- * Set the column # that is being rendered at this moment
- *
- * Used when 'colspan' is used for an element to skip over the
- * intervening columns.
- *
- * @param columnCountIn The column count to set.
- **/
- public void setColumnCount(int columnCountIn) {
- this.columnCount = columnCountIn;
- }
-
- //////////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////////
// RENDER methods
//////////////////////////////////////////////////////////////////////////
@@ -599,33 +462,16 @@ public class ListDisplayTag extends BodyTagSupport {
"</a></div>");
}
- /**
- * Renders the title header if set.
- * @param out JspWriter
- * @throws IOException thrown if there's a problem writing to the JSP
- */
- private void renderTitle(JspWriter out) throws IOException {
- if (!StringUtils.isEmpty(title)) {
- HtmlTag heading = new HtmlTag("div");
- heading.setAttribute("class", "panel-heading");
- HtmlTag h3 = new HtmlTag("h3");
- h3.setAttribute("class", "panel-title");
- h3.addBody(LocalizationService.getInstance().getMessage(title));
- heading.addBody(h3);
- out.println(heading.render());
- }
- }
-
private void renderBoundsVariables(JspWriter out) throws IOException {
StringBuffer target = new StringBuffer();
// pagination formvars
- renderHidden(target, "lower", String.valueOf(pageList.getStart()));
+ renderHidden(target, "lower",
String.valueOf(getPageList().getStart()));
PaginationUtil putil = new PaginationUtil(
- pageList.getStart(),
- pageList.getEnd(),
- pageList.getEnd() - pageList.getStart() + 1,
- pageList.getTotalSize());
+ getPageList().getStart(),
+ getPageList().getEnd(),
+ getPageList().getEnd() - getPageList().getStart() +
1,
+ getPageList().getTotalSize());
renderHidden(target, FIRST_LOWER, putil.getFirstLower());
renderHidden(target, PREV_LOWER, putil.getPrevLower());
@@ -634,48 +480,6 @@ public class ListDisplayTag extends BodyTagSupport {
out.println(target.toString());
}
- private void renderFilterBox(JspWriter out) throws IOException {
- LocalizationService ls = LocalizationService.getInstance();
-
- HtmlTag tag = new HtmlTag("div");
- tag.setAttribute("class", "spacewalk-filter-input
input-group");
-
- StringBuffer buf = new StringBuffer();
-
- HtmlTag input = new HtmlTag("input");
- input.setAttribute("type", "text");
- input.setAttribute("class", "form-control");
- input.setAttribute("name", RequestContext.FILTER_STRING);
- input.setAttribute("value", pageList.getFilterData());
- String placeHolder = StringEscapeUtils.escapeHtml(
- ls.getMessage("message.filterby", ls.getMessage(filterBy)));
- input.setAttribute("placeholder", placeHolder);
-
- buf.append(input.render());
-
- input = new HtmlTag("input");
- input.setAttribute("type", "hidden");
- input.setAttribute("name", RequestContext.PREVIOUS_FILTER_STRING);
- input.setAttribute("value", pageList.getFilterData());
- buf.append(input.render());
-
- HtmlTag btnSpan = new HtmlTag("span");
- btnSpan.setAttribute("class", "input-group-btn");
-
- HtmlTag btn = new HtmlTag("button");
- btn.setAttribute("class", "btn btn-default icon-eye-open");
- btn.setAttribute("type", "submit");
- btn.setAttribute("name", FILTER_DISPATCH);
- //input.setAttribute("value",
ls.getMessage(RequestContext.FILTER_KEY));
-
- btnSpan.addBody(btn);
-
- buf.append(btnSpan.render());
-
- tag.addBody(buf.toString());
- out.println(tag.render());
- }
-
private void renderSetButtons(JspWriter out) throws IOException {
StringBuffer buf = new StringBuffer();
@@ -725,21 +529,21 @@ public class ListDisplayTag extends BodyTagSupport {
out.println(">");
out.print("<div class=\"list-infotext\">");
- int finalResult = pageList.getEnd();
- if (finalResult > pageList.getTotalSize()) {
- finalResult = pageList.getTotalSize();
+ int finalResult = getPageList().getEnd();
+ if (finalResult > getPageList().getTotalSize()) {
+ finalResult = getPageList().getTotalSize();
}
Object [] args = new Object[4];
- if (pageList.size() == 0) {
+ if (getPageList().size() == 0) {
args[0] = new Integer(0);
args[1] = args[0];
args[2] = args[0];
}
else {
- args[0] = new Integer(pageList.getStart());
+ args[0] = new Integer(getPageList().getStart());
args[1] = new Integer(finalResult);
- args[2] = new Integer(pageList.getTotalSize());
+ args[2] = new Integer(getPageList().getTotalSize());
}
out.println(LocalizationService.getInstance()
.getMessage("message.range", args));
@@ -766,8 +570,9 @@ public class ListDisplayTag extends BodyTagSupport {
private void appendButtons(JspWriter out) throws IOException {
out.println("<div class=\"list-navbuttons\">");
- boolean canGoForward = pageList.getEnd() < pageList.getTotalSize();
- boolean canGoBack = pageList.getStart() > 1;
+ boolean canGoForward = getPageList().getEnd() < getPageList()
+ .getTotalSize();
+ boolean canGoBack = getPageList().getStart() > 1;
if (canGoForward || canGoBack) {
out.println(renderPaginationButton(FIRST,
@@ -797,7 +602,7 @@ public class ListDisplayTag extends BodyTagSupport {
}
private void renderActionButtons(JspWriter out) throws IOException {
- if (pageList.size() == 0 || getButton() == null) {
+ if (getPageList().size() == 0 || getButton() == null) {
return;
}
@@ -949,7 +754,7 @@ public class ListDisplayTag extends BodyTagSupport {
enabled.append("\">{0}</a><li>");
AlphaBar ab = new AlphaBar(enabled.toString(),
"<li
class=\"disabled\"><span>{0}</span></li>");
- target.append(ab.getAlphaList(pageList.getIndex()));
+ target.append(ab.getAlphaList(getPageList().getIndex()));
target.append("</ul>");
target.append("</div>");
@@ -978,21 +783,7 @@ public class ListDisplayTag extends BodyTagSupport {
public boolean isExport() {
RequestContext ctx = new RequestContext((HttpServletRequest)
pageContext.getRequest());
- return (ctx.isRequestedExport() && this.exportColumns != null);
- }
-
- /**
- * @return Returns the exportColumns.
- */
- public String getExportColumns() {
- return exportColumns;
- }
-
- /**
- * @param exportIn The export to set.
- */
- public void setExportColumns(String exportIn) {
- this.exportColumns = exportIn;
+ return (ctx.isRequestedExport() && this.getExportColumns() != null);
}
/**
@@ -1026,7 +817,6 @@ public class ListDisplayTag extends BodyTagSupport {
public int doStartTag() throws JspException {
rowCnt = 0;
numItemsChecked = 0;
- numberOfColumns = 0;
JspWriter out = null;
showSetButtons = false;
@@ -1079,8 +869,8 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("<div class=\"spacewalk-list-top\">");
out.println("<div
class=\"spacewalk-list-top-wrap\">");
out.println("<div
class=\"spacewalk-list-top-alphabar\">");
- if (pageList.getIndex().size() > 0 &&
- pageList.size() < pageList.getTotalSize()) {
+ if (getPageList().getIndex().size() > 0
+ && getPageList().size() < getPageList().getTotalSize()) {
renderViewAllLink(out);
renderAlphabar(out);
@@ -1098,7 +888,7 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("</div>");
out.println("<div
class=\"spacewalk-list-top-wrap\">");
out.println("<div
class=\"spacewalk-list-filter\">");
- if (pageList.hasFilter()) {
+ if (getPageList().hasFilter()) {
renderFilterBox(out);
}
out.println("</div>");
@@ -1124,7 +914,7 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("\n<tr>");
- if (iterator != null && iterator.hasNext()) {
+ if (getIterator() != null && getIterator().hasNext()) {
// Push a new BodyContent writer onto the stack so that
// we can buffer the body data.
bodyContent = pageContext.pushBody();
@@ -1142,13 +932,14 @@ public class ListDisplayTag extends BodyTagSupport {
public int doEndTag() throws JspException {
JspWriter out = null;
try {
- if (pageList.isEmpty()) {
+ if (getPageList().isEmpty()) {
return EVAL_PAGE;
}
if (isExport()) {
ExportWriter eh = createExportWriter();
- String[] columns = StringUtils.split(this.exportColumns, ',');
+ String[] columns = StringUtils.split(this.getExportColumns(),
+ ',');
eh.setColumns(Arrays.asList(columns));
ServletExportHandler seh = new ServletExportHandler(eh);
pageContext.getOut().clear();
@@ -1156,7 +947,7 @@ public class ListDisplayTag extends BodyTagSupport {
pageContext.getResponse().reset();
seh.writeExporterToOutput(
(HttpServletResponse) pageContext.getResponse(),
- pageList);
+ getPageList());
return SKIP_PAGE;
}
@@ -1170,7 +961,7 @@ public class ListDisplayTag extends BodyTagSupport {
String bodyString = body.getString();
// The toReplace string is kind of odd, but it is because
// HtmlTag doesn't understand adding a property to be replaced.
- if (numItemsChecked == pageList.size()) {
+ if (numItemsChecked == getPageList().size()) {
bodyString =
bodyString.replaceFirst("@@CHECKED@@=\"\"",
"checked=\"1\"");
}
@@ -1204,15 +995,15 @@ public class ListDisplayTag extends BodyTagSupport {
*/
else if (type.equals("list")) {
- int finalResult = pageList.getEnd();
- if (finalResult > pageList.getTotalSize()) {
- finalResult = pageList.getTotalSize();
+ int finalResult = getPageList().getEnd();
+ if (finalResult > getPageList().getTotalSize()) {
+ finalResult = getPageList().getTotalSize();
}
Object [] args = new Object[4];
- args[0] = new Integer(pageList.getStart());
+ args[0] = new Integer(getPageList().getStart());
args[1] = new Integer(finalResult);
- args[2] = new Integer(pageList.getTotalSize());
+ args[2] = new Integer(getPageList().getTotalSize());
args[3] = LocalizationService.getInstance().getMessage(description);
out.print("<span class=\"text-left\">\n");
@@ -1234,7 +1025,7 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("</table>\n");
if (reflink != null) {
- columnCount = 0;
+ setColumnCount(0);
out.println("<div class=\"panel-footer\">");
@@ -1246,7 +1037,7 @@ public class ListDisplayTag extends BodyTagSupport {
if (reflinkkey != null) {
Object[] args = new Object[2];
- args[0] = new Integer(pageList.getTotalSize());
+ args[0] = new Integer(getPageList().getTotalSize());
args[1] = reflinkkeyarg0;
String message = LocalizationService.getInstance().
@@ -1264,13 +1055,13 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("</div>\n");
// export button goes outside of the panel
- if (exportColumns != null) {
+ if (getExportColumns() != null) {
renderExport(out);
}
out.println("</div>\n");
setColumnCount(0);
- numberOfColumns = 0;
+ setNumberOfColumns(0);
}
catch (IOException e) {
throw new JspException("IO error" + e.getMessage());
@@ -1298,9 +1089,9 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("</tr>");
}
- if (iterator.hasNext()) {
- columnCount = 0;
- Object next = iterator.next();
+ if (getIterator().hasNext()) {
+ setColumnCount(0);
+ Object next = getIterator().next();
out.println(getTrElement(next));
pageContext.setAttribute("current", next);
return EVAL_BODY_AGAIN;
@@ -1319,27 +1110,18 @@ public class ListDisplayTag extends BodyTagSupport {
@Override
public void release() {
// reset the state of the tag
- iterator = null;
- pageList = null;
rowCnt = 0;
- filterBy = null;
set = null;
- hiddenvars = null;
numItemsChecked = 0;
showSetButtons = false;
paging = true;
type = "list";
- renderDisabled = false;
button = null;
buttonAcl = null;
button2 = null;
button2Acl = null;
mixins = null;
domainClass = null;
- exportColumns = null;
- title = null;
- columnCount = 0;
- numberOfColumns = 0;
buttonsAttrName = null;
buttonsAttrValue = null;
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
new file mode 100644
index 0000000..5b560cf
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
@@ -0,0 +1,305 @@
+package com.redhat.rhn.frontend.taglibs;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Iterator;
+
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.util.CSVWriter;
+import com.redhat.rhn.common.util.ExportWriter;
+import com.redhat.rhn.frontend.html.HtmlTag;
+import com.redhat.rhn.frontend.struts.RequestContext;
+
+public class ListDisplayTagBase extends BodyTagSupport {
+ public static final String FILTER_DISPATCH = "filter.dispatch";
+
+ /** iterates through the page list */
+ private Iterator iterator;
+ /** list of data to show on page */
+ private DataResult pageList;
+ /** How many columns are there? */
+ private int numberOfColumns = 0;
+ /** Which column are we rendering now? */
+ private int columnCount = 0;
+ private String filterBy;
+ /** type of table we are using. default is list" */
+ private String type = "list";
+ /** determines whether we should show the disabled CSS */
+ private boolean renderDisabled;
+ /** comma separated list of columns to be exported */
+ private String exportColumns;
+ /** optional title attribute for displaying a titled list */
+ private String title;
+ private String hiddenvars;
+
+ /** Public constructor */
+ public ListDisplayTagBase() {
+
+ }
+
+ /**
+ * @return returns the iterator of the data for this list
+ */
+ protected Iterator getIterator() {
+ return iterator;
+ }
+
+ /**
+ * @return returns the page list
+ */
+ protected DataResult getPageList() {
+ return pageList;
+ }
+
+ /**
+ * @return Returns the disabled.
+ */
+ public boolean renderDisabled() {
+ return renderDisabled;
+ }
+
+ /**
+ * @param disabled
+ * The disabled to set.
+ */
+ public void setRenderDisabled(String disabled) {
+ renderDisabled = disabled.equals("true");
+ }
+
+ /**
+ * Returns the title message key.
+ *
+ * @return Returns the title.
+ */
+ public String getTitle() {
+ return title;
+ }
+
+ /**
+ * Sets the title message key.
+ *
+ * @param titleIn
+ * The title to set.
+ */
+ public void setTitle(String titleIn) {
+ title = titleIn;
+ }
+
+ /**
+ * Sets the type of the list
+ *
+ * @param stringIn
+ * desired alignment for the list
+ */
+ public void setType(String stringIn) {
+ type = stringIn;
+ }
+
+ /**
+ * Gets the type of the list
+ *
+ * @return String alignment of the list
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Set the header of the filter on which to filter
+ *
+ * @param filterByIn
+ * The filterBy to set.
+ */
+ public void setFilterBy(String filterByIn) {
+ this.filterBy = filterByIn;
+ }
+
+ /**
+ * @return Returns the hiddenvars.
+ */
+ public String getHiddenvars() {
+ return hiddenvars;
+ }
+
+ /**
+ * @param hv
+ * The hiddenvars to set.
+ */
+ public void setHiddenvars(String hv) {
+ this.hiddenvars = hv;
+ }
+
+ /**
+ * Method to fetch a new ExportWriter instance. Override if desired to use
+ * different instance. Currently creates a new CSVWriter instance.
+ *
+ * @return new instance of an ExportWriter
+ */
+ protected ExportWriter createExportWriter() {
+ return new CSVWriter(new StringWriter());
+ }
+
+ /**
+ * Increment the column # that is being rendered at this moment.
+ **/
+ public void incrColumnCount() {
+ this.columnCount++;
+ }
+
+ /**
+ * Increment the total number of columns
+ **/
+ public void incrNumberOfColumns() {
+ this.numberOfColumns++;
+ }
+
+ /**
+ * Get the number of the column that is being rendered at this moment. (0 ==
+ * The first column)
+ *
+ * @return int the column number
+ **/
+ public int getColumnCount() {
+ return this.columnCount;
+ }
+
+ /**
+ * Get the number of columns in the list.
+ *
+ * @return int the number of columns
+ **/
+ public int getNumberOfColumns() {
+ return this.numberOfColumns;
+ }
+
+ /**
+ * Set the number of columns in the list.
+ *
+ * @param num
+ * number of columns i nthe list
+ **/
+ public void setNumberOfColumns(int num) {
+ this.numberOfColumns = num;
+ }
+
+ /**
+ * Set the column # that is being rendered at this moment
+ *
+ * Used when 'colspan' is used for an element to skip over the intervening
+ * columns.
+ *
+ * @param columnCountIn
+ * The column count to set.
+ **/
+ public void setColumnCount(int columnCountIn) {
+ this.columnCount = columnCountIn;
+ }
+
+ /**
+ * @return Returns the exportColumns.
+ */
+ public String getExportColumns() {
+ return exportColumns;
+ }
+
+ /**
+ * @param exportIn The export to set.
+ */
+ public void setExportColumns(String exportIn) {
+ this.exportColumns = exportIn;
+ }
+
+ protected void setupPageList() throws JspTagException {
+ ListTag listTag = (ListTag) findAncestorWithClass(this, ListTag.class);
+ if (listTag == null) {
+ throw new JspTagException("Tag nesting error: "
+ + "listDisplay must be nested in a list tag");
+ }
+ pageList = listTag.getPageList();
+ iterator = pageList.iterator();
+ }
+
+ /**
+ * Renders the title header if set.
+ * @param out JspWriter
+ * @throws IOException thrown if there's a problem writing to the JSP
+ */
+ protected void renderTitle(JspWriter out) throws IOException {
+ if (!StringUtils.isEmpty(title)) {
+ HtmlTag heading = new HtmlTag("div");
+ heading.setAttribute("class", "panel-heading");
+ HtmlTag h3 = new HtmlTag("h3");
+ h3.setAttribute("class", "panel-title");
+ h3.addBody(LocalizationService.getInstance().getMessage(title));
+ heading.addBody(h3);
+ out.println(heading.render());
+ }
+ }
+
+ protected void renderFilterBox(JspWriter out) throws IOException {
+ LocalizationService ls = LocalizationService.getInstance();
+
+ HtmlTag tag = new HtmlTag("div");
+ tag.setAttribute("class", "spacewalk-filter-input
input-group");
+
+ StringBuffer buf = new StringBuffer();
+
+ HtmlTag input = new HtmlTag("input");
+ input.setAttribute("type", "text");
+ input.setAttribute("class", "form-control");
+ input.setAttribute("name", RequestContext.FILTER_STRING);
+ input.setAttribute("value", pageList.getFilterData());
+ String placeHolder = StringEscapeUtils.escapeHtml(
+ ls.getMessage("message.filterby", ls.getMessage(filterBy)));
+ input.setAttribute("placeholder", placeHolder);
+
+ buf.append(input.render());
+
+ input = new HtmlTag("input");
+ input.setAttribute("type", "hidden");
+ input.setAttribute("name", RequestContext.PREVIOUS_FILTER_STRING);
+ input.setAttribute("value", pageList.getFilterData());
+ buf.append(input.render());
+
+ HtmlTag btnSpan = new HtmlTag("span");
+ btnSpan.setAttribute("class", "input-group-btn");
+
+ HtmlTag btn = new HtmlTag("button");
+ btn.setAttribute("class", "btn btn-default icon-eye-open");
+ btn.setAttribute("type", "submit");
+ btn.setAttribute("name", FILTER_DISPATCH);
+ btn.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY));
+
+ btnSpan.addBody(btn);
+
+ buf.append(btnSpan.render());
+
+ tag.addBody(buf.toString());
+ out.println(tag.render());
+ }
+
+ /** {@inheritDoc} */
+ public void release() {
+ iterator = null;
+ filterBy = null;
+ renderDisabled = false;
+ exportColumns = null;
+ title = null;
+ columnCount = 0;
+ numberOfColumns = 0;
+ hiddenvars = null;
+ pageList = null;
+ type = "list";
+ // now release our super classes
+ super.release();
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
index b50d77f..f0611b5 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
@@ -15,24 +15,9 @@
package com.redhat.rhn.frontend.taglibs;
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.common.util.CSVWriter;
-import com.redhat.rhn.common.util.DynamicComparator;
-import com.redhat.rhn.common.util.ExportWriter;
-import com.redhat.rhn.common.util.ServletExportHandler;
-import com.redhat.rhn.frontend.dto.BaseListDto;
-import com.redhat.rhn.frontend.dto.UserOverview;
-import com.redhat.rhn.frontend.html.HtmlTag;
-import com.redhat.rhn.frontend.struts.RequestContext;
-
-import org.apache.commons.lang.StringUtils;
-
import java.io.IOException;
-import java.io.StringWriter;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Iterator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -40,7 +25,16 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyContent;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.util.DynamicComparator;
+import com.redhat.rhn.common.util.ExportWriter;
+import com.redhat.rhn.common.util.ServletExportHandler;
+import com.redhat.rhn.frontend.dto.BaseListDto;
+import com.redhat.rhn.frontend.dto.UserOverview;
+import com.redhat.rhn.frontend.struts.RequestContext;
/**
* The UnpagedListDisplayTag defines the structure of the ListView. This tag iterates
@@ -96,35 +90,17 @@ import javax.servlet.jsp.tagext.BodyTagSupport;
* @see com.redhat.rhn.frontend.taglibs.ColumnTag
* @see com.redhat.rhn.frontend.taglibs.ListTag
*/
-public class UnpagedListDisplayTag extends BodyTagSupport {
+public class UnpagedListDisplayTag extends ListDisplayTagBase {
- /** iterates through the page list */
- private Iterator iterator;
- /** list of data to show on page */
- private DataResult pageList;
/** row count determines whether we're an even or odd row */
private int rowCnt = 0;
- /** How many columns are there? */
- protected int numberOfColumns = 0;
- /** Which column are we rendering now? */
- protected int columnCount = 0;
- /** Which row are we on now? */
protected int currRow = 0;
- private String filterBy;
- /** type of table we are using. default is list" */
- private String type = "list";
/** determines whether or not we should show the borders
* of the list and if the rows should all be white
*/
private boolean transparent = false;
/** determines whether we should show the disabled CSS */
- private boolean renderDisabled;
- /** comma separated list of columns to be exported */
- private String exportColumns;
- /** optional title attribute for displaying a titled list */
- private String title;
- private String hiddenvars;
private String nodeIdString = null;
/** Public constructor */
@@ -132,60 +108,6 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
}
/**
- * @return Returns the disabled.
- */
- public boolean renderDisabled() {
- return renderDisabled;
- }
- /**
- * @param disabled The disabled to set.
- */
- public void setRenderDisabled(String disabled) {
- renderDisabled = disabled.equals("true");
- }
-
- /**
- * Set the header of the filter on which to filter
- * @param filterByIn The filterBy to set.
- */
- public void setFilterBy(String filterByIn) {
- this.filterBy = filterByIn;
- }
-
- /**
- * Returns the title message key.
- * @return Returns the title.
- */
- public String getTitle() {
- return title;
- }
-
- /**
- * Sets the title message key.
- * @param titleIn The title to set.
- */
- public void setTitle(String titleIn) {
- title = titleIn;
- }
-
-
- /**
- * Sets the type of the list
- * @param stringIn desired alignment for the list
- */
- public void setType(String stringIn) {
- type = stringIn;
- }
-
- /**
- * Gets the type of the list
- * @return String alignment of the list
- */
- public String getType() {
- return type;
- }
-
- /**
* @return returns whether or not the table is transparent
*/
public boolean isTransparent() {
@@ -198,168 +120,42 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
public void setTransparent(boolean booleanIn) {
transparent = booleanIn;
}
+
private void doSort(String sortedColumn) {
HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
- Collections.sort(pageList, new DynamicComparator(sortedColumn,
+ Collections.sort(getPageList(), new DynamicComparator(sortedColumn,
request.getParameter(RequestContext.SORT_ORDER)));
}
- /**
- * @return Returns the hiddenvars.
- */
- public String getHiddenvars() {
- return hiddenvars;
- }
-
- /**
- * @param hv The hiddenvars to set.
- */
- public void setHiddenvars(String hv) {
- this.hiddenvars = hv;
- }
-
private String getSortedColumn() {
HttpServletRequest request =
(HttpServletRequest) pageContext.getRequest();
return request.getParameter(RequestContext.LIST_SORT);
}
- private void setupPageList() throws JspTagException {
- ListTag listTag = (ListTag) findAncestorWithClass(this, ListTag.class);
- if (listTag == null) {
- throw new JspTagException("Tag nesting error: " +
- "listDisplay must be nested in a list tag");
- }
- pageList = listTag.getPageList();
- iterator = pageList.iterator();
+ protected void setupPageList() throws JspTagException {
+ super.setupPageList();
currRow = 0;
}
- /**
- * Method to fetch a new ExportWriter instance. Override
- * if desired to use different instance. Currently creates
- * a new CSVWriter instance.
- * @return new instance of an ExportWriter
- */
- protected ExportWriter createExportWriter() {
- return new CSVWriter(new StringWriter());
- }
-
- /**
- * Increment the column # that is being rendered at this moment.
- **/
- public void incrColumnCount() {
- this.columnCount++;
- }
-
- /**
- * Increment the total number of columns
- **/
- public void incrNumberOfColumns() {
- this.numberOfColumns++;
- }
-
- /**
- * Get the number of the column that is being rendered at this moment.
- * (0 == The first column)
- * @return int the column number
- **/
- public int getColumnCount() {
- return this.columnCount;
- }
-
- /**
- * Get the number of columns in the list.
- * @return int the number of columns
- **/
- public int getNumberOfColumns() {
- return this.numberOfColumns;
- }
-
- /**
- * Set the number of columns in the list.
- * @param num number of columns i nthe list
- **/
- public void setNumberOfColumns(int num) {
- this.numberOfColumns = num;
- }
-
- /**
- * Set the column # that is being rendered at this moment
- *
- * Used when 'colspan' is used for an element to skip over the
- * intervening columns.
- *
- * @param columnCountIn The column count to set.
- **/
- public void setColumnCount(int columnCountIn) {
- this.columnCount = columnCountIn;
- }
-
//////////////////////////////////////////////////////////////////////////
// RENDER methods
//////////////////////////////////////////////////////////////////////////
- /**
- * Renders the title header if set.
- * @param out JspWriter
- * @throws IOException thrown if there's a problem writing to the JSP
- */
- private void renderTitle(JspWriter out) throws IOException {
- if (!StringUtils.isEmpty(title)) {
- HtmlTag tr = new HtmlTag("tr");
- HtmlTag th = new HtmlTag("th");
- th.addBody(LocalizationService.getInstance().getMessage(title));
- tr.addBody(th);
- out.println(tr.render());
- }
- }
- private void renderFilterBox(JspWriter out) throws IOException {
+ @Override
+ protected void renderFilterBox(JspWriter out) throws IOException {
+ super.renderFilterBox(out);
LocalizationService ls = LocalizationService.getInstance();
- HtmlTag tagFilterInput = new HtmlTag("div");
- tagFilterInput.setAttribute("class", "filter-input");
- HtmlTag tagInputGroup = new HtmlTag("div");
- tagInputGroup.setAttribute("class", "input-group
input-group-sm");
-
- StringBuffer buf = new StringBuffer();
- HtmlTag input = new HtmlTag("input");
- input.setAttribute("type", "text");
- input.setAttribute("size", "12");
- input.setAttribute("name", RequestContext.FILTER_STRING);
- input.setAttribute("value", pageList.getFilterData());
- buf.append(input.render());
-
- input = new HtmlTag("input");
- input.setAttribute("type", "hidden");
- input.setAttribute("name", "prev_filter_value");
- input.setAttribute("value", pageList.getFilterData());
- buf.append(input.render());
-
- input = new HtmlTag("input");
- input.setAttribute("type", "submit");
- input.setAttribute("name", ListDisplayTag.FILTER_DISPATCH);
- input.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY));
- buf.append(input.render());
-
- /*
- * TODO: This is BAD. Makes the code specific to the Chanel Tree view
- * Should be fixed in future versions
- */
- tagInputGroup.addBody(ls.getMessage("message.filterby",
ls.getMessage(filterBy)) +
- buf.toString());
- tagFilterInput.addBody(tagInputGroup);
-
- if (type.equals("treeview")) {
- tagFilterInput.addBody("<div style=\"text-align:
right;\">" +
+ if (getType().equals("treeview")) {
+ out.print("<div style=\"text-align: right;\">"
+ +
"<a href=\"javascript:showAllRows();\"
style=\"cursor: pointer;\">" +
ls.getMessage("channels.overview.showall") +
"</a> | " +
"<a href=\"javascript:hideAllRows();\"
style=\"cursor: pointer;\">" +
ls.getMessage("channels.overview.hideall") +
"</a></div>");
}
-
- out.println(tagFilterInput.render());
}
private String getTrElement(Object o, int row) {
@@ -443,24 +239,9 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
public boolean isExport() {
RequestContext ctx = new RequestContext((HttpServletRequest)
pageContext.getRequest());
- return (ctx.isRequestedExport() && this.exportColumns != null);
- }
-
- /**
- * @return Returns the exportColumns.
- */
- public String getExportColumns() {
- return exportColumns;
- }
-
- /**
- * @param exportIn The export to set.
- */
- public void setExportColumns(String exportIn) {
- this.exportColumns = exportIn;
+ return (ctx.isRequestedExport() && getExportColumns() != null);
}
-
//////////////////////////////////////////////////////////////////////////
// JSP Tag lifecycle methods
//////////////////////////////////////////////////////////////////////////
@@ -485,24 +266,22 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
doSort(sortedColumn);
}
- if (pageList.hasFilter()) {
- renderFilterBox(out);
- }
+ out.print("<div
class=\"spacewalk-list-container\">");
+ out.print("<div class=\"spacewalk-list panel
panel-default\">");
+
+ renderTitle(out);
/* If the type is list, we must set the width explicitly. Otherwise,
* it shouldn't matter
*/
- if (type.equals("list")) {
- out.print("<table width=\"100%\"
cellspacing=\"0\"" +
- " cellpadding=\"0\" " +
"class=\"list\"");
+ if (getType().equals("list")) {
+ out.print("<table class=\"table
table-striped\"");
}
- else if (type.equals("treeview")) {
- out.print("<table width=\"100%\"
cellspacing=\"0\"" +
- " cellpadding=\"0\" " +
"class=\"list\" id=\"channel-list\"");
+ else if (getType().equals("treeview")) {
+ out.print("<table class=\"table table-striped\"
id=\"channel-list\"");
}
else {
- out.print("<table cellspacing=\"0\" " + "
cellpadding=\"0\" " +
- "class=\"" + type + "\"");
+ out.print("<table class=\"" + getType() +
"\"");
}
/*if (isTransparent()) {
@@ -513,11 +292,18 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
out.println(">");
out.println("<thead>");
- renderTitle(out);
+
+ out.println("\n<tr>");
+ out.println("\n<td colspan=\"" + getColumnCount() +
"\">");
+ if (getPageList().hasFilter()) {
+ renderFilterBox(out);
+ }
+ out.println("\n</td>");
+ out.println("\n</tr>");
out.println("\n<tr>");
- if (iterator != null && iterator.hasNext()) {
+ if (getIterator() != null && getIterator().hasNext()) {
// Push a new BodyContent writer onto the stack so that
// we can buffer the body data.
bodyContent = pageContext.pushBody();
@@ -534,13 +320,14 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
public int doEndTag() throws JspException {
JspWriter out = null;
try {
- if (pageList.isEmpty()) {
+ if (getPageList().isEmpty()) {
return EVAL_PAGE;
}
if (isExport()) {
ExportWriter eh = createExportWriter();
- String[] columns = StringUtils.split(this.exportColumns, ',');
+ String[] columns = StringUtils.split(this.getExportColumns(),
+ ',');
eh.setColumns(Arrays.asList(columns));
ServletExportHandler seh = new ServletExportHandler(eh);
pageContext.getOut().clear();
@@ -548,7 +335,7 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
pageContext.getResponse().reset();
seh.writeExporterToOutput(
(HttpServletResponse) pageContext.getResponse(),
- pageList);
+ getPageList());
return SKIP_PAGE;
}
@@ -565,6 +352,8 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
// Rely on content to have emitted a tbody tag somewhere
out.println("</tbody>");
out.println("</table>\n");
+ out.println("</div>\n");
+ out.println("</div>\n");
setNumberOfColumns(0);
setColumnCount(0);
setCurrRow(0);
@@ -595,9 +384,9 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
out.println("</tr>");
}
- if (iterator.hasNext()) {
- columnCount = 0;
- Object next = iterator.next();
+ if (getIterator().hasNext()) {
+ setColumnCount(0);
+ Object next = getIterator().next();
out.println(getTrElement(next, currRow++));
pageContext.setAttribute("current", next);
return EVAL_BODY_AGAIN;
@@ -612,21 +401,12 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
}
/** {@inheritDoc} */
+ @Override
public void release() {
// reset the state of the tag
- iterator = null;
currRow = 0;
- pageList = null;
rowCnt = 0;
- filterBy = null;
- type = "list";
- renderDisabled = false;
- exportColumns = null;
- title = null;
- hiddenvars = null;
nodeIdString = null;
- columnCount = 0;
- numberOfColumns = 0;
// now release our super classes
super.release();
}
commit 547d054b1880ac65fdeeac68ca0561be28729133
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 22 13:29:37 2013 +0200
port the old list tag to the new structure
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
index 7e602ee..a4b0bd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -718,41 +718,13 @@ public class ListDisplayTag extends BodyTagSupport {
private void renderPagination(JspWriter out, boolean top)
throws IOException {
- if (type.equals("list")) {
- out.println("<div
class=\"spacewalk-list-pagination\"");
- }
- else {
- out.println("<div
class=\"spacewalk-list-pagination\"");
- }
-
+ out.println("<div class=\"spacewalk-list-pagination\"");
if (tableId != null) {
out.print("id=\"" + tableId + "\" ");
}
-
out.println(">");
- out.println("<div class=\"row\">");
- // if (!showSetButtons) {
- out.println("<div class=\"col-md-10\">");
- //}
- //else {
- // out.println("<td valign=\"middle\">");
- //}
-
- if (top && pageList.hasFilter()) {
- renderFilterBox(out);
- }
- if (!top && set != null) {
- if (showSetButtons) {
- out.print("<span
class=\"spacewalk-list-selection-btns\">");
- renderSetButtons(out);
- out.print("</span>");
- }
- }
-
- out.println("</div>");
-
- out.print("<div class=\"col-md-2\"
class=\"list-infotext\">");
+ out.print("<div class=\"list-infotext\">");
int finalResult = pageList.getEnd();
if (finalResult > pageList.getTotalSize()) {
finalResult = pageList.getTotalSize();
@@ -789,7 +761,6 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("</div>");
appendButtons(out);
out.println(" </div>\n");
- out.println("</div>");
}
private void appendButtons(JspWriter out) throws IOException {
@@ -1105,30 +1076,52 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("<tr>");
out.println("<td colspan=\"" + getNumberOfColumns() +
"\">");
- /* If pageList contains an index and pageList.size() (what we are
- * displaying on the page) is less than pageList.getTotalSize()
- * (the total number of items in the data result), render alphabar.
- * This prevents the alphabar from showing up on pages that show
- * all of the entries on a single page and is similar to how the
- * perl code behaves.
- */
+ out.println("<div class=\"spacewalk-list-top\">");
+ out.println("<div
class=\"spacewalk-list-top-wrap\">");
+ out.println("<div
class=\"spacewalk-list-top-alphabar\">");
if (pageList.getIndex().size() > 0 &&
pageList.size() < pageList.getTotalSize()) {
renderViewAllLink(out);
renderAlphabar(out);
}
-
+ out.println("</div>");
+ out.println("<div
class=\"spacewalk-list-top-addons\">");
+ if (set != null) {
+ if (showSetButtons) {
+ out.print("<span
class=\"spacewalk-list-selection-btns\">");
+ renderSetButtons(out);
+ out.print("</span>");
+ }
+ }
+ out.println("</div>");
+ out.println("</div>");
+ out.println("<div
class=\"spacewalk-list-top-wrap\">");
+ out.println("<div
class=\"spacewalk-list-filter\">");
+ if (pageList.hasFilter()) {
+ renderFilterBox(out);
+ }
+ out.println("</div>");
+ out.println("<div
class=\"spacewalk-list-top-pagination\">");
if (isPaging()) {
renderPagination(out, true);
renderBoundsVariables(out);
}
+ out.println("</div>");
+ out.println("</div>");
+ out.println("</div>");
+ /* If pageList contains an index and pageList.size() (what we are
+ * displaying on the page) is less than pageList.getTotalSize()
+ * (the total number of items in the data result), render alphabar.
+ * This prevents the alphabar from showing up on pages that show
+ * all of the entries on a single page and is similar to how the
+ * perl code behaves.
+ */
+
+
out.println("</td>");
out.println("</tr>");
- // Now print the column headings
- out.println("<thead>");
-
out.println("\n<tr>");
if (iterator != null && iterator.hasNext()) {
@@ -1195,6 +1188,11 @@ public class ListDisplayTag extends BodyTagSupport {
out.println("<tr>");
out.println("<td colspan=\"" + getNumberOfColumns() +
"\">");
+ out.println("<div
class=\"spacewalk-list-bottom\">");
+ out.println("<div
class=\"spacewalk-list-bottom-wrap\">");
+ out.println("<div
class=\"spacewalk-list-bottom-addons\">");
+ out.println("</div>");
+ out.println("<div
class=\"spacewalk-list-bottom-pagination\">");
/* If paging is on, we render the pagination */
if (isPaging()) {
renderPagination(out, false);
@@ -1222,6 +1220,13 @@ public class ListDisplayTag extends BodyTagSupport {
.getMessage("message.range.withtypedescription",
args));
out.println("</span>");
}
+ out.println("</div>");
+ out.println("</div>");
+ out.println("<div
class=\"spacewalk-list-extra\">");
+ out.println("</div>");
+
+ out.println("</div>");
+
out.println("</tr>");
out.println("</td>");
out.println("</tfoot>\n");
commit bd511adceb2119e1ac7a74346c7e7a77ba018f8e
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 12:24:30 2013 +0200
Buttons and icons in the title fixed
diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp
b/java/code/webapp/WEB-INF/pages/channel/all.jsp
index 26cd8c1..0ea8ce7 100644
--- a/java/code/webapp/WEB-INF/pages/channel/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(4); showFiltered();">
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp"
>
<bean:message key="channels.all.jsp.toolbar"/>
</rhn:toolbar>
@@ -28,7 +28,7 @@ function showFiltered() {
<bean:message key="channels.all.jsp.header1" />
</p>
-<form method="post" name="rhn_list"
action="/rhn/software/channels/All.do">
+<form method="post" role="form" name="rhn_list"
action="/rhn/software/channels/All.do">
<rhn:csrf />
<rhn:submitted />
<%@ include
file="/WEB-INF/pages/common/fragments/channel/channel_tree_multiorg.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index 16760eb..9e65133 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -9,7 +9,7 @@
<script type="text/javascript"
src="/javascript/highlander.js"></script>
</head>
<body>
- <rhn:toolbar base="h1" icon="icon-search"
imgAlt="packagesearch.jsp.imgAlt"
+ <rhn:toolbar base="h1" icon="icon-search"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
<bean:message key="packagesearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
index 21866fa..cc759fa 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
@@ -40,12 +40,13 @@
</rl:list>
- <div align="right">
+ <div class="pull-right">
<rhn:submitted/>
- <hr/>
- <input type="submit"
+ <button type="submit"
name="dispatch"
- value='<bean:message
key="erratalist.jsp.deleteerrata"/>'/>
+ class="btn btn-default">
+ <i class="icon-trash"></i> <bean:message
key="erratalist.jsp.deleteerrata"/>
+ </button>
</div>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp
b/java/code/webapp/WEB-INF/pages/errata/published.jsp
index 6363e1a..2a22f4d 100644
--- a/java/code/webapp/WEB-INF/pages/errata/published.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
imgAlt="errata.common.errataAlt"
+<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp#channel-mgmt-Manage_Errata-Published_Errata"
creationUrl="/rhn/errata/manage/Create.do"
creationType="erratum">
commit a3900a3ef65d5ff153578c97d2406512d00c6f38
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 12:22:21 2013 +0200
P bottom-margin redused
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 0321658..728864e 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -99,7 +99,7 @@ h2 {
font-size: 1.7em;
}
p {
- margin-bottom: 2em;
+ margin-bottom: 1em;
}
.spacewalk-main-column-layout {
/* override the grid row margin */
commit 7428f83480f7181964e1ae4cb608ac5e5dabaaab
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 12:10:03 2013 +0200
Panel, form and table style applied
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index cc84742..d181eeb 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -32,74 +32,81 @@
<p><bean:message key="erratasearch.jsp.summary"/></p>
- <p><bean:message key="erratasearch.jsp.instructions"/></p>
-
- <html:form action="/errata/Search.do">
+ <html:form styleClass="form-horizontal"
action="/errata/Search.do">
<rhn:csrf />
<!-- Search Box -->
- <div class="search-choices">
-
- <div class="search-choices-group">
- <table class="details">
- <tr><th><bean:message
key="erratasearch.jsp.searchfor"/></th>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="erratasearch.jsp.instructions"/></h4>
+ </div>
+ <div class="panel-body">
+ <table class="table">
+ <tr>
+ <td><bean:message
key="erratasearch.jsp.searchfor"/></td>
<td>
- <html:text property="search_string"
name="search_string"
+ <div class="row-0">
+ <div class="col-md-5">
+ <html:text property="search_string"
styleClass="form-control input-sm" name="search_string"
value="${search_string}" maxlength="36"
accesskey="4"/>
- <button type="submit" class="btn btn-default
btn-sm">
- <i class="icon-search"></i>
- <bean:message key="button.search"/>
- </button>
- <br />
- <span class="small-text">
- <strong><bean:message key="Examples" />:
</strong> <bean:message key="erratasearch.jsp.search.tip" />
+ </div>
+ <span class="col-md-7">
+ <strong><bean:message key="Examples" />:
</strong> <bean:message key="erratasearch.jsp.search.tip" />
</span>
+ </div>
</td>
</tr>
- <tr><th><bean:message
key="erratasearch.jsp.whatsearch"/></th>
+ <tr><td><bean:message
key="erratasearch.jsp.whatsearch"/></td>
<td>
- <html:select property="view_mode">
- <html:options collection="searchOptions"
- property="value"
- labelProperty="display" />
- </html:select>
- <br />
- <span class="small-text">
+ <div class="row-0">
+ <div class="col-md-5">
+ <html:select property="view_mode"
styleClass="form-control input-sm">
+ <html:options collection="searchOptions"
+ property="value"
+ labelProperty="display" />
+ </html:select>
+ </div>
+ <span class="col-md-7">
<strong><bean:message key="Tip"
/>:</strong> <bean:message key="erratasearch.jsp.whatsearch.tip"
/>
- </span>
+ </span>
+ </div>
</td>
</tr>
- <tr><th><bean:message
key="erratasearch.jsp.types_to_search"/></th>
+ <tr><td><bean:message
key="erratasearch.jsp.types_to_search"/></td>
<td>
- <html:checkbox property="errata_type_bug">
+ <div class="checkbox">
+ <html:checkbox property="errata_type_bug">
<img src="/img/wrh-bug.gif"
title="<bean:message
key="erratalist.jsp.bugadvisory"/>" />
<bean:message key="erratalist.jsp.bugadvisory"/>
- </html:checkbox>
- <br />
+ </html:checkbox>
+ </div>
+ <div class="checkbox">
<html:checkbox property="errata_type_security">
<img src="/img/wrh-security.gif"
title="<bean:message
key="erratalist.jsp.securityadvisory"/>" />
<bean:message
key="erratalist.jsp.securityadvisory"/>
</html:checkbox>
- <br />
+ </div>
+ <div class="checkbox">
<html:checkbox property="errata_type_enhancement">
<img src="/img/wrh-product.gif"
title="<bean:message
key="erratalist.jsp.productenhancementadvisory"/>" />
<bean:message
key="erratalist.jsp.productenhancementadvisory"/>
</html:checkbox>
- <br />
+ </div>
</td>
</tr>
<tr>
- <th><bean:message
key="erratasearch.jsp.issue_date"/></th>
+ <td><bean:message
key="erratasearch.jsp.issue_date"/></td>
<td>
+ <div class="checkbox">
<html:checkbox styleId="issueDateOptionsCheckBox"
property="optionIssueDateSearch"
onclick="javascript:issueDateSearchOptions()" >
<bean:message
key="erratasearch.jsp.search_by_issue_dates"/>
</html:checkbox>
- <br />
- <div id="issueDateOptions" class="indent">
- <table>
+ </div>
+ <div id="issueDateOptions">
+ <table class="table">
<tr>
<td>
<bean:message
key="erratasearch.jsp.start_date" />
@@ -125,13 +132,24 @@
</td>
</tr>
<tr>
- <th><label for="fineGrainedlabel"><bean:message
key="systemsearch.jsp.finegrainedlabel"/></label></th>
+ <td><label for="fineGrainedlabel"><bean:message
key="systemsearch.jsp.finegrainedlabel"/></label></td>
<td>
- <div style="text-align: left">
- <html:checkbox property="fineGrained"
styleId="fineGrainedlabel"><label
for="fineGrainedlabel"><bean:message
key="systemsearch.jsp.finegrained"/></label></html:checkbox>
- </div>
+ <div class="checkbox">
+ <html:checkbox property="fineGrained"
styleId="fineGrainedlabel"> <label
for="fineGrainedlabel"><bean:message
key="systemsearch.jsp.finegrained"/></label></html:checkbox>
+ </div>
</td>
</tr>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+ <button type="submit" class="btn btn-success
btn-sm">
+ <i class="icon-search"></i>
+ <bean:message key="button.search"/>
+ </button>
+ </td>
+ </tr>
</table>
</div> <!-- search choices group -->
</div> <!-- search choices -->
commit 040189c1d9d3036621aaf504304830d0a939d81c
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 10:49:36 2013 +0200
Tables into Panels and <i> tag fixed
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index 51e52c7..5e7322a 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -23,52 +23,61 @@
<body>
-<rhn:toolbar base="h1" icon="icon-search"
imgAlt="search.alt.img">
+<rhn:toolbar base="h1" icon="icon-search">
<bean:message key="scapsearch.jsp.toolbar"/>
</rhn:toolbar>
<p><bean:message key="scapsearch.jsp.summary"/></p>
-<p><bean:message key="scapsearch.jsp.instructions"/></p>
-
-<html:form action="/audit/scap/Search.do">
- <rhn:csrf/>
- <div class="search-choises">
- <div class="search-choices-group">
- <table class="details">
- <tr><th><bean:message
key="scapsearch.jsp.searchfor"/>:</th>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="scapsearch.jsp.instructions"/></h4>
+ </div>
+ <div class="panel-body">
+ <html:form styleClass="form-inline"
action="/audit/scap/Search.do">
+ <rhn:csrf/>
+ <table class="table">
+ <tr>
+ <td><bean:message
key="scapsearch.jsp.searchfor"/>:</td>
<td>
- <html:text property="search_string"
name="search_string"
+ <div class="form-group">
+ <html:text property="search_string"
styleClass="form-control" name="search_string"
value="${search_string}" maxlength="100"
accesskey="4"/>
- <button type="submit" class="btn btn-default
btn-sm">
- <i class="icon-search" />
+ </div>
+ <div class="form-group">
+ <button type="submit" class="btn btn-default
btn-sm">
+ <i class="icon-search"></i>
<bean:message key="button.search"/>
- </button>
+ </button>
+ </div>
<br/>
<span class="small-text">
<bean:message key="scapsearch.jsp.whatsearch.tip"/>
</span>
</td>
</tr>
- <tr><th><bean:message
key="scapsearch.jsp.withresult"/>:</th>
+ <tr>
+ <td><bean:message
key="scapsearch.jsp.withresult"/>:</td>
<td>
- <html:select property="result_filter">
- <html:options collection="allResults"
property="label" labelProperty="label"/>
- </html:select>
+ <div class="form-group">
+ <html:select styleClass="form-control"
property="result_filter">
+ <html:options collection="allResults"
property="label" labelProperty="label"/>
+ </html:select>
+ </div>
</td>
</tr>
- <tr><th><bean:message
key="systemsearch.jsp.wheretosearch"/></th>
+ <tr><td><bean:message
key="systemsearch.jsp.wheretosearch"/></td>
<td>
- <div style="text-align: left">
+ <div class="text-left">
<html:radio property="whereToSearch" value="all"
styleId="whereToSearch-all"/>
<label for="whereToSearch-all"><bean:message
key="systemsearch.jsp.searchallsystems"/></label>
</div>
- <div style="text-align: left">
+ <div class="text-left">
<html:radio property="whereToSearch"
value="system_list" styleId="whereToSearch-system_list"/>
<label for="whereToSearch-system_list"><bean:message
key="systemsearch.jsp.searchSSM"/></label>
</div>
</td>
</tr>
- <tr><th><bean:message
key="scapsearch.jsp.scan_date"/>:</th>
+ <tr><td><bean:message
key="scapsearch.jsp.scan_date"/>:</td>
<td>
<html:checkbox styleId="scanDateOptionsCheckBox"
property="optionScanDateSearch"
onclick="javascript:scanDateSearchOptions()">
<label for="scanDateOptionsCheckBox">
@@ -94,23 +103,26 @@
</div>
</td>
</tr>
- <tr><th><bean:message
key="scapsearch.jsp.show_as"/>:</th>
+ <tr><td><bean:message
key="scapsearch.jsp.show_as"/>:</td>
<td>
- <div style="text-align: left">
+ <div class="text-left">
<html:radio property="show_as" value="rr"
styleId="show_as-rr"/>
<label for="show_as-rr"><bean:message
key="scapsearch.jsp.list_rr"/></label>
</div>
- <div style="text-align: left">
+ <div class="text-left">
<html:radio property="show_as" value="tr"
styleId="show_as-tr"/>
<label for="show_as-tr"><bean:message
key="scapsearch.jsp.list_tr"/></label>
</div>
</td>
</tr>
</table>
- </div> <!-- search-choices-group -->
- </div> <!-- search-choices -->
- <input type="hidden" name="submitted"
value="true"/>
-</html:form>
+ <input type="hidden" name="submitted"
value="true"/>
+ </html:form>
+ </div>
+</div>
+
+
+
<c:if test="${(search_string != null && search_string !=
'')}">
<c:set var="pageList" value="${requestScope.pageList}"/>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 9c4efc2..cc84742 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -26,8 +26,7 @@
<body>
<rhn:toolbar base="h1" icon="icon-search"
-
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search"
- imgAlt="search.alt.img">
+
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search">
<bean:message key="erratasearch.jsp.toolbar"/>
</rhn:toolbar>
@@ -48,7 +47,7 @@
<html:text property="search_string"
name="search_string"
value="${search_string}" maxlength="36"
accesskey="4"/>
<button type="submit" class="btn btn-default
btn-sm">
- <i class="icon-search" />
+ <i class="icon-search"></i>
<bean:message key="button.search"/>
</button>
<br />
commit c8d6d463397461efbf6bcccbdb1b422975e8fa3f
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 10:47:47 2013 +0200
the first row of a table within a panel will not have border-top
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 9281324..0321658 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -548,4 +548,9 @@ ul.nav.nav-tabs:last-child{
margin: 0;
}
}
+.panel-body tr:first-child{
+ td, th{
+ border-top: 0;
+ }
+}
commit fd2e4e65e936a8078681c9b619b95766f8135e35
Author: cyntss <csanchez(a)suse.com>
Date: Wed Oct 23 10:46:45 2013 +0200
All page formated with panels and tables from Bootstrap
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
index 993a49a..2727ddc 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
@@ -8,14 +8,10 @@
<html>
<head>
<meta name="page-decorator" content="none" />
-
- <style type="text/css">
- .fixedwidth { font-family: Courier, Monospace; }
- </style>
</head>
<body>
-<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="icon-desktop"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="auditsearch.jsp.header"/>
</rhn:toolbar>
@@ -80,24 +76,28 @@
<c:out escapeXml="false" value="//]]>" />
</script>
-
-<html:form action="/audit/Search.do">
-<rhn:csrf />
-<rhn:submitted />
-
-<div class="search-choices">
- <div class="search-choices-group">
- <table class="details">
- <tr>
- <th colspan="3">Machine / Time range</th>
- </tr>
- <tr style="text-align: center;">
- <td style="text-align: center; vertical-align: middle;">
+<div class="panel panel-default">
+ <div class="panel-body">
+ <html:form action="/audit/Search.do">
+ <rhn:csrf />
+ <rhn:submitted />
+ <div class="text-right form-group">
+ <button type="submit" class="btn btn-success">
+ <i class="icon-search"></i>
+ <bean:message key="button.search"/>
+ </button>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>Machine / Time range</h4>
+ </div>
+ <div class="panel-body">
+ <div class="col-md-4">
<html:select property="machine">
<html:options collection="machines"
property="name" />
</html:select>
- </td>
- <td colspan="2">
+ </div>
+ <div class="col-md-8">
<c:choose>
<c:when test="${startDisp == '<<' ||
endDisp == '>>'}">
<jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
@@ -120,64 +120,66 @@
<html:hidden property="startMilli" />
<html:hidden property="endMilli" />
- </td>
- </tr>
- <tr>
- <th colspan="3">Audit Types</th>
- </tr>
- <tr>
- <td id="checkboxControls" colspan="3">
- <button type="button"
id="check_all_button">Check all</button>
- <button type="button"
id="uncheck_all_button">Uncheck all</button>
- </td>
- </tr>
- <tr>
- <td>
- <ul style="list-style-type: none; padding-left: 0;
margin-top: 0;">
- <c:forEach var="autype" items="${types}"
begin="0" step="3">
- <li>
- <html:multibox property="autypes"
value="${autype}" styleId="type_${autype}" />
- <label for="type_${autype}"><c:out
value="${autype}" /></label>
- </li>
- </c:forEach>
- </ul>
- </td>
- <td>
- <ul style="list-style-type: none; padding-left: 0;
margin-top: 0;">
- <c:forEach var="autype" items="${types}"
begin="1" step="3">
- <li>
- <html:multibox property="autypes"
value="${autype}" styleId="type_${autype}" />
- <label for="type_${autype}"><c:out
value="${autype}" /></label>
- </li>
- </c:forEach>
- </ul>
- </td>
- <td>
- <ul style="list-style-type: none; padding-left: 0;
margin-top: 0;">
- <c:forEach var="autype" items="${types}"
begin="2" step="3">
- <li>
- <html:multibox property="autypes"
value="${autype}" styleId="type_${autype}" />
- <label for="type_${autype}"><c:out
value="${autype}" /></label>
- </li>
- </c:forEach>
- </ul>
- </td>
- </tr>
- <tr>
- <td> </td><td> </td>
- <td style="text-align: right;">
- <button type="submit" class="btn btn-default
btn-sm">
- <i class="icon-search" />
- <bean:message key="button.search"/>
- </button>
- </td>
- </tr>
- </table>
- </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>Audit Types</h4>
+ </div>
+ <div class="panel-body">
+<table class="table">
+ <tr>
+ <td id="checkboxControls" colspan="3">
+ <button type="button" class="btn
btn-default" id="check_all_button">Check all</button>
+ <button type="button" class="btn
btn-default" id="uncheck_all_button">Uncheck all</button>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <ul style="list-style-type: none; padding-left: 0;
margin-top: 0;">
+ <c:forEach var="autype"
items="${types}" begin="0" step="3">
+ <li>
+ <html:multibox property="autypes"
value="${autype}" styleId="type_${autype}" />
+ <label
for="type_${autype}"><c:out value="${autype}"
/></label>
+ </li>
+ </c:forEach>
+ </ul>
+ </td>
+ <td>
+ <ul style="list-style-type: none; padding-left: 0;
margin-top: 0;">
+ <c:forEach var="autype"
items="${types}" begin="1" step="3">
+ <li>
+ <html:multibox property="autypes"
value="${autype}" styleId="type_${autype}" />
+ <label
for="type_${autype}"><c:out value="${autype}"
/></label>
+ </li>
+ </c:forEach>
+ </ul>
+ </td>
+ <td>
+ <ul style="list-style-type: none; padding-left: 0;
margin-top: 0;">
+ <c:forEach var="autype"
items="${types}" begin="2" step="3">
+ <li>
+ <html:multibox property="autypes"
value="${autype}" styleId="type_${autype}" />
+ <label
for="type_${autype}"><c:out value="${autype}"
/></label>
+ </li>
+ </c:forEach>
+ </ul>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <div class="text-right">
+ <button type="submit" class="btn btn-success">
+ <i class="icon-search"></i>
+ <bean:message key="button.search"/>
+ </button>
+ </div>
+ </html:form>
+ </div>
</div>
-
-</html:form>
-
</body>
</html>
commit 5063e6fb296ce895966575b26e5a5045cddd07d3
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 23 10:01:32 2013 +0200
Rewrote spacewalk-login.js to make focus.js obsolete
diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp
b/java/code/webapp/WEB-INF/pages/common/login.jsp
index f850de8..be0d019 100644
--- a/java/code/webapp/WEB-INF/pages/common/login.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/login.jsp
@@ -5,10 +5,9 @@
<html>
<head>
<meta name="decorator" content="layout_c" />
- <script src="/javascript/focus.js"></script>
<script src="/javascript/spacewalk-login.js"></script>
</head>
-<body onLoad="formFocus('loginForm', 'username');">
+<body>
<c:if test="${schemaUpgradeRequired == 'true'}">
<div class="site-alert">
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index a3d0131..742a5bd 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -4,10 +4,9 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<html>
<head>
- <script src="/javascript/focus.js"></script>
<script src="/javascript/spacewalk-login.js"></script>
</head>
-<body onLoad="formFocus('loginForm', 'username');">
+<body>
<c:if test="${schemaUpgradeRequired == 'true'}">
<div class="site-alert">
diff --git a/web/html/javascript/focus.js b/web/html/javascript/focus.js
deleted file mode 100644
index c4c4129..0000000
--- a/web/html/javascript/focus.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Puts focus on an element in a form.
- */
-function formFocus(form, name) {
- var focusControl = document.forms[form].elements[name];
-
- if (focusControl.type != "hidden" && !focusControl.disabled) {
- focusControl.focus();
- }
-}
diff --git a/web/html/javascript/spacewalk-login.js
b/web/html/javascript/spacewalk-login.js
index 56083d5..9593d63 100644
--- a/web/html/javascript/spacewalk-login.js
+++ b/web/html/javascript/spacewalk-login.js
@@ -1,9 +1,17 @@
-$(document).on("ready", function(){
- $("aside").remove();
- $(document).ready(function() {
- var me = $("section");
- var newMe = $("<div class='login-page'>");
- newMe.html(me.html());
- me.replaceWith(newMe);
- });
-});
\ No newline at end of file
+$(document).on("ready", function() {
+ $("aside").remove();
+ var me = $("section");
+ var newMe = $("<div class='login-page'>");
+ newMe.html(me.html());
+ me.replaceWith(newMe);
+ formFocus('loginForm', 'username');
+});
+
+// Put focus on a form element
+function formFocus(form, name) {
+ var focusControl = document.forms[form].elements[name];
+ if (focusControl.type != "hidden" && !focusControl.disabled) {
+ focusControl.focus();
+ }
+}
+
commit 758feca34b1f8ee1074841b35eda79ca7d119d0a
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 22 17:51:11 2013 +0200
Adjust the column sizes
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
index c06eb88..2a61800 100644
---
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
+++
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
@@ -37,7 +37,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.vcpus" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-1">
<html:text property="vcpus" size="15"
value="1" styleClass="form-control" />
</div>
</div>
@@ -45,7 +45,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.memory" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-1">
<html:text property="mem_mb" size="15"
value="512" styleClass="form-control" />
</div>
</div>
@@ -53,7 +53,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.bridge" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-1">
<html:text property="bridge" size="15"
value="br0" styleClass="form-control" />
</div>
</div>
@@ -63,7 +63,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.proxyserver" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-3">
<html:text property="proxy_server" size="30"
value="" styleClass="form-control" />
</div>
</div>
@@ -71,7 +71,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.proxyuser" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-3">
<html:text property="proxy_user" size="15"
value="" styleClass="form-control" />
</div>
</div>
@@ -79,7 +79,7 @@
<label class="col-lg-3 control-label">
<bean:message key="images.jsp.proxypass" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-3">
<html:password property="proxy_pass" size="15"
value="" styleClass="form-control" />
</div>
</div>
commit 42f4da19be3b1c268b4df723d6b2c40e03a74d98
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 22 17:29:52 2013 +0200
Add the form-control class to all text inputs
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
index 936b0b0..c06eb88 100644
---
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
+++
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
@@ -38,7 +38,7 @@
<bean:message key="images.jsp.vcpus" />
</label>
<div class="col-lg-6">
- <html:text property="vcpus" size="15"
value="1" />
+ <html:text property="vcpus" size="15"
value="1" styleClass="form-control" />
</div>
</div>
<div class="form-group">
@@ -46,7 +46,7 @@
<bean:message key="images.jsp.memory" />
</label>
<div class="col-lg-6">
- <html:text property="mem_mb" size="15"
value="512" />
+ <html:text property="mem_mb" size="15"
value="512" styleClass="form-control" />
</div>
</div>
<div class="form-group">
@@ -54,7 +54,7 @@
<bean:message key="images.jsp.bridge" />
</label>
<div class="col-lg-6">
- <html:text property="bridge" size="15"
value="br0" />
+ <html:text property="bridge" size="15"
value="br0" styleClass="form-control" />
</div>
</div>
@@ -64,7 +64,7 @@
<bean:message key="images.jsp.proxyserver" />
</label>
<div class="col-lg-6">
- <html:text property="proxy_server" size="30"
value="" />
+ <html:text property="proxy_server" size="30"
value="" styleClass="form-control" />
</div>
</div>
<div class="form-group">
@@ -72,7 +72,7 @@
<bean:message key="images.jsp.proxyuser" />
</label>
<div class="col-lg-6">
- <html:text property="proxy_user" size="15"
value="" />
+ <html:text property="proxy_user" size="15"
value="" styleClass="form-control" />
</div>
</div>
<div class="form-group">
@@ -80,7 +80,7 @@
<bean:message key="images.jsp.proxypass" />
</label>
<div class="col-lg-6">
- <html:password property="proxy_pass" size="15"
value="" />
+ <html:password property="proxy_pass" size="15"
value="" styleClass="form-control" />
</div>
</div>
<div class="form-group">
commit d197a9972b2d1ba2faa15bbc5fa55201aa1f8231
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 22 17:28:55 2013 +0200
Add missing <div id="images-table">
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
index 5cc3eb1..936b0b0 100644
---
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
+++
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
@@ -4,26 +4,29 @@
<rl:listset name="groupSet">
<rhn:csrf />
<html:hidden property="sid" value="${param.sid}" />
- <h2><bean:message key="images.jsp.select.title" /></h2>
- <p><bean:message key="images.jsp.select.summary" /></p>
- <rl:list dataset="imagesList"
emptykey="images.jsp.noimages">
- <rl:column headerkey="images.jsp.name"
filterattr="name">
- <c:set var="nameJS"
value="${fn:escapeXml(rhn:escapeJS(current.name))}" />
- <a href="javascript:void(0);"
-
onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');">
- <c:out value="${current.name}" />
- </a>
- </rl:column>
- <rl:column headerkey="images.jsp.version">
- <c:out value="${current.version}" />
- </rl:column>
- <rl:column headerkey="images.jsp.arch">
- <c:out value="${current.arch}" />
- </rl:column>
- <rl:column headerkey="images.jsp.type">
- <c:out value="${current.imageType}" />
- </rl:column>
- </rl:list>
+
+ <div id="images-table">
+ <h2><bean:message key="images.jsp.select.title"
/></h2>
+ <p><bean:message key="images.jsp.select.summary"
/></p>
+ <rl:list dataset="imagesList"
emptykey="images.jsp.noimages">
+ <rl:column headerkey="images.jsp.name"
filterattr="name">
+ <c:set var="nameJS"
value="${fn:escapeXml(rhn:escapeJS(current.name))}" />
+ <a href="javascript:void(0);"
+
onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');">
+ <c:out value="${current.name}" />
+ </a>
+ </rl:column>
+ <rl:column headerkey="images.jsp.version">
+ <c:out value="${current.version}" />
+ </rl:column>
+ <rl:column headerkey="images.jsp.arch">
+ <c:out value="${current.arch}" />
+ </rl:column>
+ <rl:column headerkey="images.jsp.type">
+ <c:out value="${current.imageType}" />
+ </rl:column>
+ </rl:list>
+ </div>
<div id="deployment-form" style="display:none"
class="form-horizontal">
<h2><bean:message key="images.jsp.deploy.title" /><a
id="edit-link" href=""
target="_blank"></a></h2>
commit 07e18ef460907b6f9937b27f2130e8af60d9b566
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 17:25:13 2013 +0200
Table replaced to Panel. Form classes applied
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
index 01fbdeb..2608214 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
@@ -10,28 +10,44 @@
</head>
<body>
-<rhn:toolbar base="h1" icon="icon-search"
imgAlt="search.alt.img">
+<rhn:toolbar base="h1" icon="icon-search">
<bean:message key="scapdiff.jsp.toolbar"/>
</rhn:toolbar>
<p><bean:message key="scapdiff.jsp.summary"/></p>
-<p><bean:message key="scapdiff.jsp.instructions"/></p>
<html:form method="get" action="/audit/scap/DiffSubmit.do">
<rhn:csrf/>
-
- <table class="details">
- <tr>
- <th><bean:message key="xccdfdiff.firstscan"/>:</th>
- <td><html:text property="first"/></td>
- </tr>
- <tr>
- <th><bean:message key="xccdfdiff.secondscan"/>:</th>
- <td><html:text property="second"/>
- <html:submit><bean:message
key="xccdfdiff.schedulescan"/></html:submit>
- </td>
- </table>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <bean:message key="scapdiff.jsp.instructions"/>
+ </div>
+ <div class="panel-body">
+ <div class="form-group row">
+ <div class="col-md-2 text-right">
+ <bean:message key="xccdfdiff.firstscan"/>:
+ </div>
+ <div class="col-md-4">
+ <html:text styleClass="form-control"
property="first"/>
+ </div>
+ </div>
+ <div class="form-group row">
+ <div class="col-md-2 text-right">
+ <bean:message key="xccdfdiff.secondscan"/>:
+ </div>
+ <div class="col-md-4">
+ <html:text property="second"
styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group row">
+ <div class="col-md-offset-2 col-md-4">
+ <html:submit styleClass="btn btn-success"><bean:message
key="xccdfdiff.schedulescan"/></html:submit>
+ </div>
+ </div>
+ </div>
+ </div>
</html:form>
+
</body>
</html>
commit 17f21437c4d1ecbd68354f3396274a82c00a9f29
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Oct 22 17:01:49 2013 +0200
TB3: Virtualization images form
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
index e8888ca..5cc3eb1 100644
---
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
+++
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf
@@ -2,93 +2,97 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
<rl:listset name="groupSet">
- <rhn:csrf />
- <html:hidden property="sid" value="${param.sid}" />
-
- <div id="images-table">
+ <rhn:csrf />
+ <html:hidden property="sid" value="${param.sid}" />
<h2><bean:message key="images.jsp.select.title" /></h2>
- <div class="page-summary">
- <p>
- <bean:message key="images.jsp.select.summary" />
- </p>
- </div>
+ <p><bean:message key="images.jsp.select.summary" /></p>
<rl:list dataset="imagesList"
emptykey="images.jsp.noimages">
- <rl:column headerkey="images.jsp.name"
filterattr="name">
- <c:set var="nameJS"
value="${fn:escapeXml(rhn:escapeJS(current.name))}" />
- <a href="javascript:void(0);"
onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');">
- <c:out value="${current.name}" />
- </a>
- </rl:column>
- <rl:column headerkey="images.jsp.version">
- <c:out value="${current.version}" />
- </rl:column>
- <rl:column headerkey="images.jsp.arch">
- <c:out value="${current.arch}" />
- </rl:column>
- <rl:column headerkey="images.jsp.type">
- <c:out value="${current.imageType}" />
- </rl:column>
+ <rl:column headerkey="images.jsp.name"
filterattr="name">
+ <c:set var="nameJS"
value="${fn:escapeXml(rhn:escapeJS(current.name))}" />
+ <a href="javascript:void(0);"
+
onclick="showForm('${current.id}','${nameJS}','${current.version}','${current.arch}','${current.imageType}','${current.editUrl}');">
+ <c:out value="${current.name}" />
+ </a>
+ </rl:column>
+ <rl:column headerkey="images.jsp.version">
+ <c:out value="${current.version}" />
+ </rl:column>
+ <rl:column headerkey="images.jsp.arch">
+ <c:out value="${current.arch}" />
+ </rl:column>
+ <rl:column headerkey="images.jsp.type">
+ <c:out value="${current.imageType}" />
+ </rl:column>
</rl:list>
- </div>
- <div id="deployment-form" style="display:none">
- <h2><bean:message key="images.jsp.deploy.title" /><a
id="edit-link" href=""
target="_blank"></a></h2>
- <div class="page-summary">
- <p><bean:message key="images.jsp.deploy.summary"
/></p>
- </div>
+ <div id="deployment-form" style="display:none"
class="form-horizontal">
+ <h2><bean:message key="images.jsp.deploy.title" /><a
id="edit-link" href=""
target="_blank"></a></h2>
+ <p><bean:message key="images.jsp.deploy.summary"
/></p>
- <table class="details-2-columns" width="100%">
- <tbody>
- <tr>
- <td width="50%">
- <h2><bean:message key="images.jsp.vmsetup"
/></h2>
- <table class="details">
- <tr>
- <th><bean:message key="images.jsp.vcpus"
/></th>
- <td><html:text property="vcpus" size="15"
value="1" /></td>
- </tr>
- <tr>
- <th><bean:message key="images.jsp.memory"
/></th>
- <td><html:text property="mem_mb" size="15"
value="512" /></td>
- </tr>
- <tr>
- <th><bean:message key="images.jsp.bridge"
/></th>
- <td><html:text property="bridge" size="15"
value="br0" /></td>
- </tr>
- </table>
- </td>
- <td width="50%">
- <h2><bean:message key="images.jsp.proxyconfig"
/></h2>
- <table class="details">
- <tr>
- <th><bean:message key="images.jsp.proxyserver"
/></th>
- <td><html:text property="proxy_server"
size="30" value="" /></td>
- </tr>
- <tr>
- <th><bean:message key="images.jsp.proxyuser"
/></th>
- <td><html:text property="proxy_user"
size="15" value="" /></td>
- </tr>
- <tr>
- <th><bean:message key="images.jsp.proxypass"
/></th>
- <td><html:password property="proxy_pass"
size="15" value="" /></td>
- </tr>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
+ <h3><bean:message key="images.jsp.vmsetup" /></h3>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="images.jsp.vcpus" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="vcpus" size="15"
value="1" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="images.jsp.memory" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="mem_mb" size="15"
value="512" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="images.jsp.bridge" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="bridge" size="15"
value="br0" />
+ </div>
+ </div>
- <div align="right">
- <rhn:submitted />
- <html:hidden styleId="image-id" property="image_id"
value="" />
- <hr />
- <input type="button"
- onclick="showImages();"
- value="${rhn:localize('images.jsp.cancel')}" />
- <html:submit property="dispatch"
- disabled="${empty sessionScope.imagesList}">
- <bean:message key="images.jsp.dispatch" />
- </html:submit>
+ <h3><bean:message key="images.jsp.proxyconfig"
/></h3>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="images.jsp.proxyserver" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="proxy_server" size="30"
value="" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="images.jsp.proxyuser" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="proxy_user" size="15"
value="" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="images.jsp.proxypass" />
+ </label>
+ <div class="col-lg-6">
+ <html:password property="proxy_pass" size="15"
value="" />
+ </div>
+ </div>
+ <div class="form-group">
+ <rhn:submitted />
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:hidden styleId="image-id" property="image_id"
value="" />
+ <input type="button" class="btn btn-default"
+ onclick="showImages();"
+ value="${rhn:localize('images.jsp.cancel')}"
/>
+ <html:submit property="dispatch"
+ styleClass="btn btn-success"
+ disabled="${empty sessionScope.imagesList}">
+ <bean:message key="images.jsp.dispatch" />
+ </html:submit>
+ </div>
+ </div>
</div>
- </div>
</rl:listset>
commit a46162040026da8cda7afd0a569cba244fd4df78
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 16:49:00 2013 +0200
Panels included. empty div tags deleted. Icons included. obsolete classes removed
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
index 85c5c09..516cecc 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
@@ -5,8 +5,7 @@
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
- <img alt="<bean:message key='system.common.systemAlt' />"
- src="/img/rhn-listicon-system.gif" />
+ <i class="icon-desktop"></i>
${fn:escapeXml(current.name)}
</rhn:column>
@@ -22,7 +21,7 @@
<rhn:column header="targetsystems.jsp.action">
<rhn:require acl="not user_role(org_admin)">
<c:if test="${not current.provisioning}">
- <font color="red"><strong><bean:message
key="targetsystems.jsp.orgadmin"/></strong></font><br />
+ <p class="text-danger"><strong><bean:message
key="targetsystems.jsp.orgadmin"/></strong></p><br />
</c:if>
</rhn:require>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
index 6de4dbe..0be135d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
@@ -1,23 +1,31 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-<table cellspacing="0" cellpadding="0"
class="half-table">
- <thead><th><bean:message
key="configoverview.jsp.configlinks"/></th></thead>
- <tr class="list-row-odd"><td class="last-column
first-column"><a
href="/rhn/configuration/system/ManagedSystems.do">
+<div class="panel-heading">
+ <h4><bean:message
key="configoverview.jsp.configlinks"/></h4>
+</div>
+<ul class="list-group">
+ <li class="list-group-item">
+ <a href="/rhn/configuration/system/ManagedSystems.do">
<bean:message key="configoverview.jsp.viewsystems"/>
- </a></td></tr>
-
- <tr class="list-row-even"><td class="last-column
first-column"><a
href="/rhn/configuration/file/GlobalConfigFileList.do">
+ </a>
+ </li>
+ <li class="list-group-item">
+ <a href="/rhn/configuration/file/GlobalConfigFileList.do">
<bean:message key="configoverview.jsp.viewfiles"/>
- </a></td></tr>
-
- <tr class="list-row-odd"><td class="last-column
first-column"><a
href="/rhn/configuration/GlobalConfigChannelList.do">
+ </a>
+ </li>
+ <li class="list-group-item">
+ <a href="/rhn/configuration/GlobalConfigChannelList.do">
<bean:message key="configoverview.jsp.viewchannels"/>
- </a></td></tr>
-
- <tr class="list-row-even"><td class="last-column
first-column"><a
href="/rhn/configuration/ChannelCreate.do?editing=true">
+ </a>
+ </li>
+ <li class="list-group-item">
+ <a href="/rhn/configuration/ChannelCreate.do?editing=true">
<bean:message key="configoverview.jsp.createchannel"/>
- </a></td></tr>
-
- <tr class="list-row-odd"><td class="last-column
first-column"><a
href="/rhn/configuration/system/TargetSystems.do">
+ </a>
+ </li>
+ <li class="list-group-item">
+ <a href="/rhn/configuration/system/TargetSystems.do">
<bean:message key="configoverview.jsp.enableconfig"/>
- </a></td></tr>
-</table>
\ No newline at end of file
+ </a>
+ </li>
+</ul>
\ No newline at end of file
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
index 2514349..e7df79d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
@@ -1,49 +1,51 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-<table cellspacing="0" cellpadding="0"
class="half-table">
- <thead><th><bean:message
key="configoverview.jsp.configsummary"/></th>
<th></th></thead>
- <tr class="list-row-odd">
- <td><bean:message
key="configoverview.jsp.systemsmanaged"/></td>
- <td><a href="/rhn/configuration/system/ManagedSystems.do">
- <c:if test="${summary.systems == 1}">
- <bean:message key="system.common.onesystem" />
- </c:if>
- <c:if test="${summary.systems != 1}">
- <bean:message key="system.common.numsystems"
arg0="${summary.systems}"/>
- </c:if>
- </a></td>
- </tr>
- <tr class="list-row-even">
- <td><bean:message
key="configoverview.jsp.configchannels"/></td>
- <td><a href="/rhn/configuration/GlobalConfigChannelList.do">
- <c:if test="${summary.channels == 1}">
- <bean:message key="configoverview.jsp.onechannel" />
- </c:if>
- <c:if test="${summary.channels != 1}">
- <bean:message key="configoverview.jsp.numchannels"
arg0="${summary.channels}"/>
- </c:if>
- </a></td>
- </tr>
- <tr class="list-row-odd">
- <td><bean:message
key="configoverview.jsp.centralfiles"/></td>
- <td><a
href="/rhn/configuration/file/GlobalConfigFileList.do">
- <c:if test="${summary.global_files == 1}">
- <bean:message key="config.common.onefile" />
- </c:if>
- <c:if test="${summary.global_files != 1}">
- <bean:message key="config.common.numfiles"
arg0="${summary.global_files}"/>
- </c:if>
- </a></td>
- </tr>
- <tr class="list-row-even">
- <td><bean:message
key="configoverview.jsp.localfiles"/></td>
- <td><a
href="/rhn/configuration/file/LocalConfigFileList.do">
- <c:if test="${summary.local_files == 1}">
- <bean:message key="config.common.onefile" />
- </c:if>
- <c:if test="${summary.local_files != 1}">
- <bean:message key="config.common.numfiles"
arg0="${summary.local_files}"/>
- </c:if>
- </a></td>
- </tr>
-</table>
+<div class="panel-heading">
+ <h4><bean:message
key="configoverview.jsp.configsummary"/></h4>
+</div>
+<ul class="list-group">
+ <li class="list-group-item">
+ <bean:message key="configoverview.jsp.systemsmanaged"/>
+ <a href="/rhn/configuration/system/ManagedSystems.do">
+ <c:if test="${summary.systems == 1}">
+ <bean:message key="system.common.onesystem" />
+ </c:if>
+ <c:if test="${summary.systems != 1}">
+ <bean:message key="system.common.numsystems"
arg0="${summary.systems}"/>
+ </c:if>
+ </a>
+ </li>
+ <li class="list-group-item">
+ <bean:message key="configoverview.jsp.configchannels"/>
+ <a href="/rhn/configuration/GlobalConfigChannelList.do">
+ <c:if test="${summary.channels == 1}">
+ <bean:message key="configoverview.jsp.onechannel" />
+ </c:if>
+ <c:if test="${summary.channels != 1}">
+ <bean:message key="configoverview.jsp.numchannels"
arg0="${summary.channels}"/>
+ </c:if>
+ </a>
+ </li>
+ <li class="list-group-item">
+ <bean:message key="configoverview.jsp.centralfiles"/>
+ <a href="/rhn/configuration/file/GlobalConfigFileList.do">
+ <c:if test="${summary.global_files == 1}">
+ <bean:message key="config.common.onefile" />
+ </c:if>
+ <c:if test="${summary.global_files != 1}">
+ <bean:message key="config.common.numfiles"
arg0="${summary.global_files}"/>
+ </c:if>
+ </a>
+ </li>
+ <li class="list-group-item">
+ <bean:message key="configoverview.jsp.localfiles"/>
+ <a href="/rhn/configuration/file/LocalConfigFileList.do">
+ <c:if test="${summary.local_files == 1}">
+ <bean:message key="config.common.onefile" />
+ </c:if>
+ <c:if test="${summary.local_files != 1}">
+ <bean:message key="config.common.numfiles"
arg0="${summary.local_files}"/>
+ </c:if>
+ </a>
+ </li>
+</ul>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
index 7b07e22..4d9b7c3 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-Software-Channel-Management"
imgAlt="config.jsp.imgAlt"
+<rhn:toolbar base="h1"
icon="spacewalk-icon-Software-Channel-Management"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central"
creationUrl="/rhn/configuration/ChannelCreate.do?editing=true"
creationType="configchannel"
@@ -17,13 +17,11 @@
<bean:message key="globalconfiglist.jsp.toolbar"/>
</rhn:toolbar>
- <div class="page-summary">
<p>
<bean:message key="globalconfiglist.jsp.summary"/>
</p>
- </div>
-<form method="post" name="rhn_list"
action="/rhn/configuration/GlobalConfigChannelList.do">
+<form method="post" role="form" name="rhn_list"
action="/rhn/configuration/GlobalConfigChannelList.do">
<rhn:csrf />
<rhn:submitted />
@@ -31,8 +29,7 @@
<rhn:listdisplay filterBy="globalconfiglist.jsp.name">
<rhn:column header="globalconfiglist.jsp.name"
url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}">
- <img alt='<bean:message key="config.common.globalAlt"
/>'
- src="/img/rhn-listicon-channel.gif" />
+ <i class="spacewalk-icon-software-channels"
title="<bean:message key="config.common.globalAlt"
/>"></i>
${current.name}
</rhn:column>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
index c5701b0..db1b2b8 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
@@ -8,16 +8,16 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-config_files.gif"
imgAlt="config.common.filesAlt"
+<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-configuration-file"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central">
<bean:message key="globalfilelist.jsp.toolbar"/>
</rhn:toolbar>
-<div class="page-summary">
+<p>
<bean:message key="globalfilelist.jsp.summary"/>
-</div> <br />
+</p>
-<form method="post" name="rhn_list"
action="/rhn/configuration/file/GlobalConfigFileList.do">
+<form method="post" role="form" name="rhn_list"
action="/rhn/configuration/file/GlobalConfigFileList.do">
<rhn:csrf />
<rhn:submitted />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
index 9f4db16..bed42c8 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
@@ -7,16 +7,14 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-config_files.gif"
imgAlt="config.common.filesAlt"
+<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-configuration-file"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local">
<bean:message key="localfilelist.jsp.toolbar"/>
</rhn:toolbar>
-<div class="page-summary">
- <bean:message key="localfilelist.jsp.summary"/>
-</div> <br />
+ <p><bean:message key="localfilelist.jsp.summary"/></p>
-<form method="post" name="rhn_list"
action="/rhn/configuration/file/LocalConfigFileList.do">
+<form method="post" role="form" name="rhn_list"
action="/rhn/configuration/file/LocalConfigFileList.do">
<rhn:csrf />
<rhn:submitted />
@@ -30,8 +28,7 @@
<rhn:column header="localfilelist.jsp.system"
url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}">
- <img src="/img/rhn-listicon-system.gif"
- alt="<bean:message key='system.common.systemAlt' />"
/>
+ <i class="icon-desktop" title="<bean:message
key='system.common.systemAlt' />"></i>
${current.serverName}
</rhn:column>
</rhn:listdisplay>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
index b0dc83a..811576b 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
@@ -9,19 +9,17 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems"
>
<bean:message key="managedsystems.jsp.toolbar"/>
</rhn:toolbar>
<!-- no create button (these have to be created according to specific systems)-->
- <div class="page-summary">
<p>
<bean:message key="managedsystems.jsp.summary"/>
</p>
- </div>
-<form method="post" name="rhn_list"
action="/rhn/configuration/system/ManagedSystems.do">
+<form method="post" role="form" name="rhn_list"
action="/rhn/configuration/system/ManagedSystems.do">
<rhn:csrf />
<rhn:submitted />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
index 222fa73..e7264bb 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
@@ -16,120 +16,126 @@
<bean:message key="configoverview.jsp.toolbar"/>
</rhn:toolbar>
- <div class="page-summary">
<p>
<bean:message key="configoverview.jsp.summary"/>
</p>
- </div>
<!-- TODO: fix these first two tables when the new list constructs come out. -->
<!-- simple summary table -->
- <div class="half-table half-table-left">
- <%@ include
file="/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf"
%>
+ <div class="row-0">
+ <div class="col-md-6">
+ <div class="panel panel-default">
+ <%@ include
file="/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf"
%>
+ </div>
+ </div>
+
+ <!-- simple link table -->
+ <div class="col-md-6">
+ <div class="panel panel-default">
+ <%@ include
file="/WEB-INF/pages/common/fragments/configuration/overview/links.jspf" %>
+ </div>
+ </div>
</div>
- <!-- simple link table -->
- <div class="half-table half-table-right">
- <%@ include
file="/WEB-INF/pages/common/fragments/configuration/overview/links.jspf" %>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="configoverview.jsp.modconfig"/></h4>
+ </div>
+ <div class="panel-body">
+
+ <rhn:list pageList="${requestScope.recentFiles}"
noDataText="configoverview.jsp.noFiles">
+ <rhn:listdisplay>
+ <rhn:column header="configoverview.jsp.filename"
+
url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}">
+ <c:choose>
+ <c:when test="${current.type == 'file'}">
+ <i class="icon-file-text-alt"></i>
+ ${fn:escapeXml(current.path)}
+ </c:when>
+ <c:when test="${current.type == 'directory'}">
+ <i class="icon-folder-close"></i>
+ ${fn:escapeXml(current.path)}
+ </c:when>
+ <c:otherwise>
+ <i class="icon-list-alt"></i>
+ ${fn:escapeXml(current.path)}
+ </c:otherwise>
+ </c:choose>
+ </rhn:column>
+
+ <rhn:column header="config.common.configChannel"
+
url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}">
+
+ <c:if test="${current.configChannelType ==
'normal'}">
+ <i class="spacewalk-icon-software-channels"></i>
+ ${current.channelNameDisplay}
+ </c:if>
+
+ <c:if test="${current.configChannelType ==
'local_override'}">
+ <i class="icon-desktop"></i>
+ ${current.channelNameDisplay}
+ </c:if>
+
+ <c:if test="${current.configChannelType ==
'server_import'}">
+ <i class="icon-beaker"></i>
+ ${current.channelNameDisplay}
+ </c:if>
+
+ </rhn:column>
+
+ <rhn:column header="configoverview.jsp.modified">
+ ${current.modifiedDisplay}
+ </rhn:column>
+
+ </rhn:listdisplay>
+ </rhn:list>
+ </div>
+ </div>
+
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="configoverview.jsp.schedconfig"/></h4>
+ </div>
+ <div class="panel-body">
+ <rhn:list pageList="${requestScope.recentActions}"
noDataText="configoverview.jsp.noActions">
+ <rhn:listdisplay>
+ <rhn:column header="configoverview.jsp.system"
+
url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}">
+ <i class="icon-desktop"></i>
+ ${fn:escapeXml(current.serverName)}
+ </rhn:column>
+
+ <rhn:column header="configoverview.jsp.files">
+ <c:if test="${current.fileCount == 1}">
+ <bean:message key="config.common.onefile" />
+ </c:if>
+ <c:if test="${current.fileCount != 1}">
+ <bean:message key="config.common.numfiles"
arg0="${current.fileCount}"/>
+ </c:if>
+ </rhn:column>
+
+ <rhn:column header="configoverview.jsp.scheduledBy"
+
url="/rhn/users/UserDetails.do?uid=${current.scheduledById}"
+ renderUrl="${requestScope.is_admin}">
+ <img alt='<bean:message key="user.common.userAlt"
/>'
+ src="/img/rhn-listicon-user.gif" />
+ ${fn:escapeXml(current.scheduledByName)}
+ </rhn:column>
+
+ <rhn:column header="configoverview.jsp.scheduledFor">
+ ${current.earliestDisplay}
+ </rhn:column>
+
+ <rhn:column header="configoverview.jsp.status"
+
url="/rhn/schedule/ActionDetails.do?aid=${current.id}">
+ ${current.status}
+ </rhn:column>
+
+ </rhn:listdisplay>
+ </rhn:list>
+ </div>
</div>
- <div style="clear: both; padding-top: 10px;" />
-
- <h2><bean:message
key="configoverview.jsp.modconfig"/></h2>
-
- <rhn:list pageList="${requestScope.recentFiles}"
noDataText="configoverview.jsp.noFiles">
- <rhn:listdisplay>
- <rhn:column header="configoverview.jsp.filename"
-
url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}">
- <c:choose>
- <c:when test="${current.type == 'file'}">
- <img alt='<bean:message key="config.common.fileAlt"
/>'
- src="/img/rhn-listicon-cfg_file.gif" />
- ${fn:escapeXml(current.path)}
- </c:when>
- <c:when test="${current.type == 'directory'}">
- <img alt='<bean:message key="config.common.dirAlt"
/>'
- src="/img/rhn-listicon-cfg_folder.gif" />
- ${fn:escapeXml(current.path)}
- </c:when>
- <c:otherwise>
- <img alt='<bean:message key="config.common.symlinkAlt"
/>'
- src="/img/rhn-listicon-cfg_symlink.gif" />
- ${fn:escapeXml(current.path)}
- </c:otherwise>
- </c:choose>
- </rhn:column>
-
- <rhn:column header="config.common.configChannel"
-
url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}">
-
- <c:if test="${current.configChannelType == 'normal'}">
- <img alt='<bean:message key="config.common.globalAlt"
/>'
- src="/img/rhn-listicon-channel.gif" />
- ${current.channelNameDisplay}
- </c:if>
-
- <c:if test="${current.configChannelType ==
'local_override'}">
- <img alt='<bean:message key="config.common.localAlt"
/>'
- src="/img/rhn-listicon-system.gif" />
- ${current.channelNameDisplay}
- </c:if>
-
- <c:if test="${current.configChannelType ==
'server_import'}">
- <img alt='<bean:message key="config.common.sandboxAlt"
/>'
- src="/img/rhn-listicon-sandbox.gif" />
- ${current.channelNameDisplay}
- </c:if>
-
- </rhn:column>
-
- <rhn:column header="configoverview.jsp.modified">
- ${current.modifiedDisplay}
- </rhn:column>
-
- </rhn:listdisplay>
- </rhn:list>
-
- <h2><bean:message
key="configoverview.jsp.schedconfig"/></h2>
-
- <rhn:list pageList="${requestScope.recentActions}"
noDataText="configoverview.jsp.noActions">
- <rhn:listdisplay>
- <rhn:column header="configoverview.jsp.system"
-
url="/rhn/systems/details/configuration/Overview.do?sid=${current.serverId}">
- <img alt='<bean:message key="system.common.systemAlt"
/>'
- src="/img/rhn-listicon-system.gif" />
- ${fn:escapeXml(current.serverName)}
- </rhn:column>
-
- <rhn:column header="configoverview.jsp.files">
- <c:if test="${current.fileCount == 1}">
- <bean:message key="config.common.onefile" />
- </c:if>
- <c:if test="${current.fileCount != 1}">
- <bean:message key="config.common.numfiles"
arg0="${current.fileCount}"/>
- </c:if>
- </rhn:column>
-
- <rhn:column header="configoverview.jsp.scheduledBy"
- url="/rhn/users/UserDetails.do?uid=${current.scheduledById}"
- renderUrl="${requestScope.is_admin}">
- <img alt='<bean:message key="user.common.userAlt" />'
- src="/img/rhn-listicon-user.gif" />
- ${fn:escapeXml(current.scheduledByName)}
- </rhn:column>
-
- <rhn:column header="configoverview.jsp.scheduledFor">
- ${current.earliestDisplay}
- </rhn:column>
-
- <rhn:column header="configoverview.jsp.status"
- url="/rhn/schedule/ActionDetails.do?aid=${current.id}">
- ${current.status}
- </rhn:column>
-
- </rhn:listdisplay>
- </rhn:list>
-
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
index 4efe5cc..9bafb8a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
@@ -8,21 +8,18 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems">
<bean:message key="targetsystems.jsp.toolbar" />
</rhn:toolbar>
-<div class="page-summary">
<p>
<bean:message key="targetsystems.jsp.summary"
arg0="${channel.displayName}"
arg1="/rhn/configuration/ChannelOverview.do?ccid=${ccid}"
arg2="/img/folder-config-sm.png" />
</p>
-</div>
-<div>
<html:form method="POST"
action="/configuration/system/TargetSystemsSubmit">
<rhn:csrf />
<rhn:list pageList="${requestScope.pageList}"
@@ -37,7 +34,6 @@
<%@ include
file="/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf" %>
<html:hidden property="submitted" value="true"/>
</html:form>
-</div>
</body>
</html>
commit 3f1b701eee0042c6efe1f26f0b90774dc09c2eb6
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 16:46:59 2013 +0200
th sintax error fixed. Icon added. Font tag changed to P
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
index d2506a4..34adc36 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
@@ -6,11 +6,10 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-config_system.gif">
+<rhn:toolbar base="h1" icon="icon-cogs">
<bean:message key="summary.jsp.toolbar"/>
</rhn:toolbar>
-<div class="page-summary">
<p>
<bean:message key="summary.jsp.summary" />
<ol>
@@ -18,16 +17,13 @@
<li><bean:message key="summary.jsp.steptwo" />
</ol>
</p>
-</div>
-<div>
-<form method="post" name="rhn_list"
+<form method="post" role="form" name="rhn_list"
action="/rhn/configuration/system/Summary.do">
<rhn:csrf />
<rhn:submitted />
<%@ include
file="/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf" %>
</form>
-</div>
</body>
</html>
commit a1a758d3bdcd06e1f24bdbffc1f27a508020a936
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 16:39:01 2013 +0200
th sintax error fixed. Icon added. Font tag changed to P
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
index e9c6177..476e67a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
@@ -5,19 +5,19 @@
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="targetsystems.jsp.widgetsummary"
/></p>
-<table class="schedule-action-interface" align="center">
+<table class="table">
<tr>
<td><html:radio property="use_date" value="false"
/></td>
- <th><bean:message key="targetsystems.jsp.now"/></th>
+ <td><bean:message key="targetsystems.jsp.now"/></td>
</tr>
<tr>
<td><html:radio property="use_date" value="true"
/></td>
- <th><bean:message
key="targetsystems.jsp.usedate"/></th>
+ <td><bean:message
key="targetsystems.jsp.usedate"/></td>
</tr>
<tr>
- <th><img src="/img/rhn-icon-schedule.gif"
alt="<bean:message key="syncprofile.jsp.selection"/>"
- title="<bean:message
key="syncprofile.jsp.selection"/>"/>
- </th>
+ <td>
+ <i class="icon-desktop"></i>
+ </td>
<td>
<jsp:include
page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="date"/>
@@ -26,8 +26,7 @@
</tr>
</table>
-<div align="right">
- <hr />
+<div class="pull-right">
<html:submit property="dispatch">
<bean:message key="targetsystems.jsp.enable" />
</html:submit>
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index 6147c49..064b881 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -27,12 +27,14 @@
<div class="search-choices-group panel-body">
<div class="form-group row">
<div class="col-md-2 text-right">
- <label><bean:message
key="docsearch.jsp.searchfor"/></label>
+ <label for="searchform"><bean:message
key="docsearch.jsp.searchfor"/></label>
</div>
- <div class="col-md-10">
+ <div class="col-md-4">
<html:text property="search_string"
name="search_string"
+ styleId="searchform"
value="${search_string}"
+ styleClass="form-control"
accesskey="4"/>
</div>
</div>
@@ -40,8 +42,8 @@
<div class="col-md-2 text-right">
<label><bean:message
key="docsearch.jsp.whatsearch"/></label>
</div>
- <div class="col-md-10">
- <html:select property="view_mode" value="${view_mode}"
>
+ <div class="col-md-4">
+ <html:select property="view_mode"
styleClass="form-control" value="${view_mode}" >
<html:options collection="searchOptions"
property="value"
labelProperty="display" />
commit 8d57358e876eccc5bca0b79a5736adcac972d4f1
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 22 16:20:14 2013 +0200
Make display.js obsolete by calling jquery directly
No need for a separate js file just to toggle visibility of asterisks.
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
index ae17a41..d5db766 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
@@ -5,7 +5,6 @@
<html>
<body>
- <script language="javascript"
src="/javascript/display.js"></script>
<rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="orgcreate.jsp.title"/>
</rhn:toolbar>
@@ -82,7 +81,7 @@
<c:choose>
<c:when test="${displaypamcheckbox ==
'true'}">
<label for="pam">
- <html:checkbox property="usepam"
onclick="toggleVisibilityByName('password-asterisk')"
styleId="pam"/>
+ <html:checkbox property="usepam"
onclick="$(\"[name='password-asterisk']\").toggle()"
styleId="pam"/>
<bean:message
key="usercreate.jsp.pam.instructions"/>
</label>
<span class="help-block">
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 31d1a84..ea17341 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -5,8 +5,6 @@
<html:xhtml/>
<html>
<body>
-<script language="javascript"
src="/javascript/display.js"></script>
-
<%@ include
file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>
<!-- Setup the account_type variable, which is used throughout this page -->
@@ -63,7 +61,7 @@
<td>
<c:choose>
<c:when test="${displaypamcheckbox == 'true'}">
- <html:checkbox property="usepam"
onclick="toggleVisibilityByName('password-asterisk')"
styleId="pam"/>
+ <html:checkbox property="usepam"
onclick="$(\"[name='password-asterisk']\").toggle()"
styleId="pam"/>
<label for="pam"><bean:message
key="usercreate.jsp.pam.instructions"/></label> <br/>
<strong><span style="font-size: 10px">
<bean:message
key="usercreate.jsp.pam.instructions.note"/>
diff --git a/web/html/javascript/display.js b/web/html/javascript/display.js
deleted file mode 100644
index 90c7d81..0000000
--- a/web/html/javascript/display.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Toggles display attribute between '' and 'none' for all
- * elements on a page matching the name passed in.
- */
-function toggleVisibilityByName(name) {
- var items = document.getElementsByName(name);
- for (var i = 0; i < items.length; i++) {
- items[i].style.display = items[i].style.display? "":"none";
- }
-}
commit 4b680d7c282ee3b0f3ba4e9bd94417428a240b55
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 22 13:57:28 2013 +0200
Refactor images.js to spacewalk-images.js
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
index ca0377e..a7c593e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp
@@ -8,7 +8,7 @@
<head>
<script type="text/javascript"
src="/rhn/dwr/interface/ImagesRenderer.js"></script>
<script type="text/javascript"
src="/rhn/dwr/engine.js"></script>
- <script type="text/javascript"
src="/javascript/images.js"></script>
+ <script src="/javascript/spacewalk-images.js"></script>
</head>
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
diff --git a/web/html/javascript/images.js b/web/html/javascript/images.js
deleted file mode 100644
index 5e94b7a..0000000
--- a/web/html/javascript/images.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Show form and hide the images table
-function showForm(id, name, version, arch, type, editUrl) {
- // Setup link for editing image
- $('#edit-link').text(name);
- $('#edit-link').prop('href', editUrl);
- // Create string representation
- var imgString = "\"" + name + "\", Version " + version +
" (" + arch + ", " + type + ")";
- $('#image-string').text(imgString);
- $('#image-id').val(id);
- // Show form fields and hide table
- $('#deployment-form').show();
- $('#images-table').hide();
-}
-// Show table and hide form fields
-function showImages() {
- $('#images-table').show();
- $('#deployment-form').hide();
- // Reset elements
- $('#image-id').val('');
- $('#image-string').empty();
- $('#edit-link').prop('href', '');
- $('#edit-link').empty();
-}
-
diff --git a/web/html/javascript/spacewalk-images.js
b/web/html/javascript/spacewalk-images.js
new file mode 100644
index 0000000..5e94b7a
--- /dev/null
+++ b/web/html/javascript/spacewalk-images.js
@@ -0,0 +1,24 @@
+// Show form and hide the images table
+function showForm(id, name, version, arch, type, editUrl) {
+ // Setup link for editing image
+ $('#edit-link').text(name);
+ $('#edit-link').prop('href', editUrl);
+ // Create string representation
+ var imgString = "\"" + name + "\", Version " + version +
" (" + arch + ", " + type + ")";
+ $('#image-string').text(imgString);
+ $('#image-id').val(id);
+ // Show form fields and hide table
+ $('#deployment-form').show();
+ $('#images-table').hide();
+}
+// Show table and hide form fields
+function showImages() {
+ $('#images-table').show();
+ $('#deployment-form').hide();
+ // Reset elements
+ $('#image-id').val('');
+ $('#image-string').empty();
+ $('#edit-link').prop('href', '');
+ $('#edit-link').empty();
+}
+
commit 2ffad5d3bb5f67f07bf6160db082c0343f9be206
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 16:36:35 2013 +0200
tables inside panels have no bottom margin. thead bg colour changed
diff --git a/branding/css/tables.less b/branding/css/tables.less
index 6d6134a..ff9cde5 100644
--- a/branding/css/tables.less
+++ b/branding/css/tables.less
@@ -12,8 +12,7 @@
}
.table-rounded thead th{
padding: .7em 0 .7em 1em;
- color: #fff;
- background: #ccc;
+ background: #e7e7e7;
border-bottom: 0px solid @gray-light;
border-right: 0px solid @gray-light;
}
@@ -83,3 +82,6 @@ thead tr{
tfoot{
background: #f3f3f3
}
+.panel .table{
+ margin-bottom: 0;
+}
\ No newline at end of file
commit eeac129a2517c15d97afb29fa525786ac6d53103
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 16:35:43 2013 +0200
class .row-0 makes the first and last child have no paddings in the left and right
side. P now has 2em margin-bottom
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index d3277a8..9281324 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -14,7 +14,15 @@
/* Import of the Theme */
@import url(theme.less);
/* basic layout */
-
+.row-0 {
+ .make-row();
+ &:first-child {
+ padding-left:0;
+ }
+ &:last-child {
+ padding-right: 0
+ }
+}
.spacewalk-header-container {
.make-row(0);
.spacewalk-logo {
@@ -90,7 +98,9 @@ h1 {
h2 {
font-size: 1.7em;
}
-
+p {
+ margin-bottom: 2em;
+}
.spacewalk-main-column-layout {
/* override the grid row margin */
margin-right: 0;
@@ -154,7 +164,7 @@ i[class^="spacewalk-icon"] {
margin-right: .5em;
}
/* if the icon is inside a H tag we wont use a margin*/
-h1, h2, h3, h4, h5, h6{
+h1, h2, h3, h4, h5, h6 {
i[class^="icon-"],
i[class*=" icon-"],
i[class*="spacewalk-icon"],
@@ -177,30 +187,24 @@ h1, h2, h3, h4, h5, h6{
}
header {
-
.spacewalk-header-container {
margin: 0 1em;
}
-
/* undo the padding the grid columns give */
&#spacewalk-header {
padding-right: 0;
padding-left: 0
}
-
.spacewalk-logo {
padding-top: 1.4em;
}
-
.spacewalk-logo {
padding-top: 1.4em;
}
-
.nav-pills {
display: inline-block;
border-radius: 0 0 4px 4px
}
-
.nav-pills li > a {
padding: .3em 1em;
font-size: .85em;
@@ -208,12 +212,10 @@ header {
font-weight: normal;
letter-spacing: normal;
}
-
.nav-pills li > a:hover {
background: none;
text-decoration: underline;
}
-
ul.nav-pills:nth-child(1) {
background: #000;
}
@@ -464,7 +466,7 @@ h1 .icon-stack {
}
/* spacewalk toolbar */
-.spacewalk-toolbar-h1{
+.spacewalk-toolbar-h1 {
margin-bottom: 1.5em;
.spacewalk-toolbar {
.pull-right;
commit 77464c3290186371fe54ecb612b0ff3f5490865f
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Oct 22 16:13:22 2013 +0200
TB3: Create new erratum form
diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp
b/java/code/webapp/WEB-INF/pages/errata/create.jsp
index 5071e86..2dd440c 100644
--- a/java/code/webapp/WEB-INF/pages/errata/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/create.jsp
@@ -3,169 +3,160 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-<html:xhtml/>
<html>
-<head>
- <meta name="page-decorator" content="none" />
-</head>
-<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
imgAlt="errata.common.errataAlt"
-
helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Creating_and_Editing_Errata.jsp">
- <bean:message key="erratalist.jsp.erratamgmt"/>
- </rhn:toolbar>
-
- <h2><bean:message key="errata.create.jsp.createerrata"
/></h2>
-
- <div class="page-summary">
- <p><bean:message key="errata.create.jsp.instructions"
/></p>
- </div>
-<html:form action="/errata/manage/CreateSubmit">
- <rhn:csrf />
-
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.synopsis"/>
- </th>
- <td class="small-form">
- <html:text property="synopsis" size="60"
maxlength="4000" />
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.advisory"/>
- </th>
- <td class="small-form">
- <html:text property="advisoryName" size="25"
maxlength="32" />
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.advisoryrelease"/>
- </th>
- <td class="small-form">
- <html:text property="advisoryRelease" size="4"
maxlength="4"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.advisorytype"/>
- </th>
- <td class="small-form">
- <html:select property="advisoryType">
- <html:options name="advisoryTypes"
labelProperty="advisoryTypeLabels"/>
- </html:select>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.product"/>
- </th>
- <td class="small-form">
- <html:text property="product" size="30"
maxlength="64" />
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.from"/>
- </th>
- <td class="small-form">
- <html:text property="errataFrom" size="30"
maxlength="127" />
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.topic"/>
- </th>
- <td class="small-form">
- <html:textarea property="topic" cols="80"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.description"/>
- </th>
- <td class="small-form">
- <html:textarea property="description" cols="80"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.solution"/>
- </th>
- <td class="small-form">
- <html:textarea property="solution" cols="80"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.bugs"/>
- </th>
- <td class="small-form">
- <table cellpadding="3">
- <tr>
- <td><bean:message
key="errata.create.jsp.id"/></td>
- <td><html:text property="buglistId" size="6"
/></td>
- </tr><tr>
- <td><bean:message
key="errata.create.jsp.summary"/></td>
- <td><html:text property="buglistSummary"
size="60" /></td>
- </tr><tr>
- <td><bean:message
key="errata.create.jsp.bugurl"/></td>
- <td><html:text property="buglistUrl" size="60"
/></td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.keywords"/> <br />
- <bean:message key="errata.edit.commadelimited"/>
- </th>
- <td class="small-form">
- <html:text property="keywords" size="40"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.references"/>
- </th>
- <td class="small-form">
- <html:textarea property="refersTo" cols="40"
rows="6"/>
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">
- <bean:message key="errata.create.jsp.notes"/>
- </th>
- <td class="small-form">
- <html:textarea property="notes" cols="40"
rows="6"/>
- </td>
- </tr>
-
- </table>
-
-
- <input type="hidden" name="eid" value="0" />
- <div align="right">
- <hr />
- <html:submit>
- <bean:message key="errata.create.jsp.createerrata"/>
- </html:submit>
- </div>
-
- </html:form>
-
-</body>
+ <head>
+ <meta name="page-decorator" content="none" />
+ </head>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif"
imgAlt="errata.common.errataAlt"
+
helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Creating_and_Editing_Errata.jsp">
+ <bean:message key="erratalist.jsp.erratamgmt"/>
+ </rhn:toolbar>
+
+ <h2><bean:message key="errata.create.jsp.createerrata"
/></h2>
+ <p><bean:message key="errata.create.jsp.instructions"
/></p>
+ <html:form action="/errata/manage/CreateSubmit"
+ styleClass="form-horizontal">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.synopsis"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="synopsis" size="60"
+ styleClass="form-control"
maxlength="4000" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.advisory"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="advisoryName"
styleClass="form-control"
+ size="25" maxlength="32" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="errata.create.jsp.advisoryrelease"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="advisoryRelease"
styleClass="form-control" size="4" maxlength="4"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.advisorytype"/>
+ </label>
+ <div class="col-lg-6">
+ <html:select property="advisoryType"
styleClass="form-control">
+ <html:options name="advisoryTypes"
labelProperty="advisoryTypeLabels"/>
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.product"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="product" size="30"
maxlength="64" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.from"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="errataFrom" size="30"
maxlength="127" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.topic"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="topic" cols="80"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.description"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="description"
cols="80" rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.solution"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="solution" cols="80"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <h3><bean:message
key="errata.create.jsp.bugs"/></h3>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.id"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="buglistId" size="6"
styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.summary"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="buglistSummary" size="60"
styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.bugurl"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="buglistUrl" size="60"
styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.keywords"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="keywords" size="40"
styleClass="form-control"/>
+ <span class="help-block"><bean:message
key="errata.edit.commadelimited"/></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.references"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="refersTo" cols="40"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="errata.create.jsp.notes"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="notes" cols="40"
rows="6" styleClass="form-control"/>
+ </div>
+ </div>
+ <input type="hidden" name="eid" value="0"
/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <bean:message
key="errata.create.jsp.createerrata"/>
+ </html:submit>
+ </div>
+ </div>
+ </html:form>
+ </body>
</html>
commit 4c14a5304dd453dbeaa79094da65b13f1a3ef09a
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Oct 22 15:49:54 2013 +0200
TB3: Delete software channel form
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
index ac6c85f..002eb5d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
@@ -4,197 +4,175 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html>
-<body>
-<rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
- <bean:message key="channel.delete.jsp.toolbar"
arg0="${channel.name}"/>
-</rhn:toolbar>
-
-<rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/manage_channel.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/>
-
-<div>
- <html:form action="/channels/manage/Delete">
- <rhn:csrf />
-
- <!--
- Channel Details
- -->
-
- <h2><bean:message
key="channel.delete.jsp.channelheader"/></h2>
-
- <div class="page-summary">
- <p><bean:message
key="channel.delete.jsp.introparagraph"/></p>
- </div>
-
- <table class="details">
- <!-- Channel Name -->
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.name"/>:
- </th>
- <td class="small-form">
- <strong><c:out
value="${channel.name}"/></strong> (<c:out
value="${channel.label}"/>)
- </td>
- </tr>
-
- <!-- Parent Channel -->
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.parent"/>:
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test="${channel.parentChannel eq null}">
- <span class="no-details"><bean:message
key="none.message"/></span>
- </c:when>
- <c:otherwise>
- <c:out
value="${channel.parentChannel.name}"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
-
- <!-- Architecture -->
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.delete.jsp.arch"/>
- </th>
- <td class="small-form">
- <c:out value="${channel.channelArch.name}"/>
- </td>
- </tr>
-
- <!-- Total Packages -->
- <tr>
- <th nowrap="nowrap">
- <bean:message
key="channel.delete.jsp.totalpackages"/>
- </th>
- <td class="small-form">
- <c:out value="${channel.packageCount}"/>
- </td>
- </tr>
-
- <!-- Subscribed Systems -->
- <tr>
- <th nowrap="nowrap">
- <bean:message
key="channel.delete.jsp.systemssubscribed"/>
- </th>
- <td class="small-form">
- <c:out value="${subscribedSystemsCount}"/>
- </td>
- </tr>
-
- <!-- Summary -->
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.summary"/>:
- </th>
- <td class="small-form">
- <c:out value="${channel.summary}"/>
- </td>
- </tr>
-
- <!-- Description -->
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.description"/>:
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test="${channel.description eq null}">
- <span class="no-details"><bean:message
key="none.message"/></span>
- </c:when>
- <c:otherwise>
- <c:out value="${channel.description}"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
-
- </table>
-
- <!--
- Trusted Organizations
- -->
-
- <h2><bean:message
key="channel.delete.jsp.orgsheader"/></h2>
-
- <div class="page-summary">
- <p><bean:message key="channel.delete.jsp.orgsparagraph"
arg0="<strong>${channel.name}</strong>"/></p>
- </div>
-
- <table class="details">
-
- <!-- Organizations Affected -->
- <tr>
- <th nowrap="nowrap">
- <bean:message
key="channel.delete.jsp.orgsaffected"/>
- </th>
- <td class="small-form">
- <c:out value="${channel.trustedOrgsCount}"/>
- </td>
- </tr>
-
- <!-- Trusted Systems Affected -->
- <tr>
- <th nowrap="nowrap">
- <bean:message
key="channel.delete.jsp.systemssubscribed"/>
- </th>
- <td class="small-form">
- <c:out value="${trustedSystemsCount}"/>
- </td>
- </tr>
-
- </table>
-
- <!--
- Unsubscribe Option
- -->
-
- <h2><bean:message
key="channel.delete.jsp.unsubheader"/></h2>
-
- <div class="page-summary">
- <p><bean:message key="channel.delete.jsp.unsubparagraph"
arg0="<strong>${channel.name}</strong>"/></p>
- </div>
-
- <table class="details">
-
- <!-- Unsubscribe option -->
- <tr>
- <th nowrap="nowrap">
- <bean:message
key="channel.delete.jsp.unsubheader"/>:
- </th>
- <td class="small-form">
- <input type="checkbox"
name="unsubscribeSystems"/>
- </td>
- </tr>
-
- </table>
-
- <div align="right">
- <hr/>
- <c:choose>
- <c:when test="${empty requestScope.disableDelete}">
- <html:submit property="delete_button">
- <bean:message key="channel.delete.jsp.channelheader"/>
- </html:submit>
- </c:when>
- <c:otherwise>
- <html:submit property="delete_button"
disabled="true">
- <bean:message key="channel.delete.jsp.channelheader"/>
- </html:submit>
- </c:otherwise>
- </c:choose>
-
- </div>
- <html:hidden property="submitted" value="true"/>
- <c:if test='${not empty param.cid}'>
- <html:hidden property="cid" value="${param.cid}"/>
- </c:if>
- </html:form>
-</div>
-
-</body>
+ <body>
+ <rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
+ <bean:message key="channel.delete.jsp.toolbar"
arg0="${channel.name}"/>
+ </rhn:toolbar>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/manage_channel.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer"/>
+ <html:form action="/channels/manage/Delete"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <h2><bean:message
key="channel.delete.jsp.channelheader"/></h2>
+ <p><bean:message
key="channel.delete.jsp.introparagraph"/></p>
+
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.name"/>:
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <strong><c:out
value="${channel.name}"/></strong> (<c:out
value="${channel.label}"/>)
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.parent"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${channel.parentChannel eq
null}">
+ <span
class="no-details"><bean:message
key="none.message"/></span>
+ </c:when>
+ <c:otherwise>
+ <c:out
value="${channel.parentChannel.name}"/>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+
+ <!-- Architecture -->
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.delete.jsp.arch"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <c:out value="${channel.channelArch.name}"/>
+ </div>
+ </div>
+ </div>
+
+ <!-- Total Packages -->
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.delete.jsp.totalpackages"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <c:out value="${channel.packageCount}"/>
+ </div>
+ </div>
+ </div>
+
+ <!-- Subscribed Systems -->
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.delete.jsp.systemssubscribed"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <c:out value="${subscribedSystemsCount}"/>
+ </div>
+ </div>
+ </div>
+
+ <!-- Summary -->
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.summary"/>:
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <c:out value="${channel.summary}"/>
+ </div>
+ </div>
+ </div>
+
+ <!-- Description -->
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.description"/>:
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <c:choose>
+ <c:when test="${channel.description eq
null}">
+ <span class="no-details"><bean:message
key="none.message"/></span>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${channel.description}"/>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ </div>
+
+ <!-- Trusted Organizations -->
+ <h2><bean:message
key="channel.delete.jsp.orgsheader"/></h2>
+ <p><bean:message
key="channel.delete.jsp.orgsparagraph"
arg0="<strong>${channel.name}</strong>"/></p>
+
+ <!-- Organizations Affected -->
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.delete.jsp.orgsaffected"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <c:out value="${channel.trustedOrgsCount}"/>
+ </div>
+ </div>
+ </div>
+
+ <!-- Trusted Systems Affected -->
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.delete.jsp.systemssubscribed"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="well well-sm">
+ <c:out value="${trustedSystemsCount}"/>
+ </div>
+ </div>
+ </div>
+
+ <!-- Unsubscribe Option -->
+ <h2><bean:message
key="channel.delete.jsp.unsubheader"/></h2>
+ <p><bean:message
key="channel.delete.jsp.unsubparagraph"
arg0="<strong>${channel.name}</strong>"/></p>
+
+ <!-- Unsubscribe option -->
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox"
name="unsubscribeSystems"/>
+ <bean:message
key="channel.delete.jsp.unsubheader"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:choose>
+ <c:when test="${empty
requestScope.disableDelete}">
+ <html:submit property="delete_button"
styleClass="btn btn-success">
+ <bean:message
key="channel.delete.jsp.channelheader"/>
+ </html:submit>
+ </c:when>
+ <c:otherwise>
+ <html:submit property="delete_button"
disabled="true" styleClass="btn btn-success">
+ <bean:message
key="channel.delete.jsp.channelheader"/>
+ </html:submit>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <html:hidden property="submitted"
value="true"/>
+ <c:if test='${not empty param.cid}'>
+ <html:hidden property="cid"
value="${param.cid}"/>
+ </c:if>
+ </html:form>
+ </body>
</html>
commit 5bbaa332a884c98e8a70781084e9dbabb8a12524
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Oct 22 14:34:23 2013 +0200
TB3: Systems/Kickstart/Profiles/ new or upload forms
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
index a3bf1e4..59afaad 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
@@ -3,162 +3,200 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %>
- <c:choose>
- <c:when test="${empty requestScope.invalid}">
- <html:form method="post"
- action="${param.url}?csrf_token=${csrfToken}"
- enctype="multipart/form-data">
-<div class="page-summary">
- <rhn:csrf />
- <h2><bean:message key="${param.title_key}"/></h2>
- <p><bean:message key="${param.summary_key}"/></p>
- <table class="details">
- <tr>
- <th><rhn:required-field
key="kickstart.jsp.create.wizard.kickstart.profile.label"/>:</th>
- <td><html:text property="kickstartLabel"
size="40" maxlength="80" /></td>
- </tr>
- <tr>
- <th><rhn:required-field
key="kickstart.jsp.create.wizard.kstree.label"/>:</th>
- <td>
- <c:choose>
- <c:when test="${notrees == null}">
- <html:select property="kstreeId">
- <html:optionsCollection property="kstrees"
label="label" value="id" />
- </html:select>
- <br />
- <input type="checkbox" name="updateRedHat"
id="updateRedHat" value="0"
- onclick="clickNewestRHTree(this)"
- <c:if test="${param.usingUpdateRedHat ==
true}">checked=1</c:if> />
- <bean:message
key="kickstart.jsp.create.wizard.kstree.always_new_RH"/>
- <br />
- <input type="checkbox" name="updateAll"
id="updateAll" value="0"
- onclick="clickNewestTree(this)"
- <c:if test="${param.usingUpdateAll ==
true}">checked=1</c:if> />
- <bean:message
key="kickstart.jsp.create.wizard.kstree.always_new"/>
+<c:choose>
+ <c:when test="${empty requestScope.invalid}">
+ <html:form method="post"
+ styleClass="form-horizontal"
+ action="${param.url}?csrf_token=${csrfToken}"
+ enctype="multipart/form-data">
+ <rhn:csrf />
+ <h2><bean:message
key="${param.title_key}"/></h2>
+ <p><bean:message
key="${param.summary_key}"/></p>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <rhn:required-field
key="kickstart.jsp.create.wizard.kickstart.profile.label"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="kickstartLabel"
styleClass="form-control" size="40" maxlength="80" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <rhn:required-field
key="kickstart.jsp.create.wizard.kstree.label"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${notrees == null}">
+ <html:select property="kstreeId"
styleClass="form-control">
+ <html:optionsCollection property="kstrees"
label="label" value="id" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox"
name="updateRedHat" id="updateRedHat" value="0"
+ onclick="clickNewestRHTree(this)"
+ <c:if test="${param.usingUpdateRedHat
== true}">checked=1</c:if> />
+ <bean:message
key="kickstart.jsp.create.wizard.kstree.always_new_RH"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox"
name="updateAll" id="updateAll" value="0"
+ onclick="clickNewestTree(this)"
+ <c:if test="${param.usingUpdateAll ==
true}">checked=1</c:if> />
+ <bean:message
key="kickstart.jsp.create.wizard.kstree.always_new"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <div class="alert alert-warning">
+ <strong><bean:message
key="kickstart.edit.software.notrees.jsp" /></strong>
+ </div>
+ </div>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ <%@ include
file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %>
- </c:when>
- <c:otherwise>
- <b><bean:message
key="kickstart.edit.software.notrees.jsp" /></b>
- </c:otherwise>
- </c:choose>
-
- </td>
- </tr>
- <%@ include
file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %>
-
-
-
- <c:if test="${empty requestScope.create}">
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.active"/></th>
- <td>
- <table>
- <tr>
- <td>
- <html:checkbox property="active" />
- </td>
- <td>
- <span class="small-text"><bean:message
key="kickstartdetails.jsp.activeDescription"/></span>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.kernel_options"/></th>
- <td><html:text property="kernel_options"
maxlength="1024" size="32" /></td>
- </tr>
-
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.post_kernel_options"/></th>
- <td><html:text property="post_kernel_options"
maxlength="1024" size="32" /></td>
- </tr>
-
- <tr>
- <th><bean:message key="kickstartdetails.jsp.org_default"
/></th>
- <td><table><tr><td><html:checkbox
property="org_default" /></td><td><bean:message
key="kickstartdetails.jsp.summary2" arg0="${param.ksurl}"
/></td></tr></table></td>
- </tr>
- </c:if>
- <tr>
- <th><bean:message key="addfiles.create.jspf.content-name"
/></th>
- <td>
- <html:textarea property="contents" rows="20"
cols="80" styleId="contents" /><br/>
- <rhn:tooltip><bean:message
key="kickstart.advanced.filedetails.jsp.tip.edit"
- arg0 = "${rhn:localize('kickstart.advanced.jsp.uploadtab')}"
- arg1 = "${rhn:localize(requestScope.uploadKey)}"
- /></rhn:tooltip>
- <rhn:tooltip><bean:message
key="kickstart.advanced.filedetails.jsp.tip.copypaste"/></rhn:tooltip>
- </td>
- </tr>
- </table>
- <div align="right">
- <hr />
- <html:submit property="dispatch">
- <bean:message key="${param.action_key}"/>
- </html:submit>
- </div>
-
- <table class="details">
- <tr>
- <th><bean:message
key="kickstart.advanced.jsp.uploadtab"/></th>
- <td>
- <html:file property="fileUpload" size="30"/><br
/>
- </td>
- </tr>
- </table>
- <div align="right">
- <hr />
- <html:submit property="dispatch">
- <bean:message key="${requestScope.uploadKey}"/>
- </html:submit>
- </div>
- <rhn:submitted/>
- <c:if test="${not empty param.ksid}">
- <input type="hidden" name="ksid"
value="${param.ksid}"/>
- </c:if>
- </div>
- </html:form>
- </c:when>
- <c:when test="${empty requestScope.create}">
- <p><bean:message
key="kickstartdetails.invalid.jsp.summary"/>
- <bean:message key="kickstartdetails.invalid.jsp.summary-option1"
- arg0="${ksdata.tree.label}"
- arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/></p>
- <p><bean:message
key="kickstartdetails.advanced.invalid.jsp.summary-option2"
- arg0="${rhn:localize(param.action_key)}"/></p>
-
- <html:form method="post" action="${param.url}">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th><rhn:required-field
key="kickstart.jsp.create.wizard.kstree.label"/>:</th>
- <td>
- <c:choose>
- <c:when test="${empty notrees}">
- <html:select property="kstreeId">
- <html:optionsCollection property="kstrees"
label="label" value="id" />
- </html:select>
- </c:when>
- <c:otherwise>
- <b><bean:message
key="kickstart.edit.software.notrees.jsp" /></b>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </table>
+ <c:if test="${empty requestScope.create}">
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="active" />
+ <bean:message
key="kickstartdetails.jsp.active"/>
+ </label>
+ </div>
+ <span class="help-block"><bean:message
key="kickstartdetails.jsp.activeDescription"/></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="kickstartdetails.jsp.kernel_options"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="kernel_options"
styleClass="form-control" maxlength="1024" size="32" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="kickstartdetails.jsp.post_kernel_options"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="post_kernel_options"
styleClass="form-control" maxlength="1024" size="32" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="org_default" />
+ <bean:message key="kickstartdetails.jsp.org_default"
/>
+ </label>
+ </div>
+ <span class="help-block">
+ <bean:message key="kickstartdetails.jsp.summary2"
arg0="${param.ksurl}" />
+ </span>
+ </div>
+ </div>
+ </c:if>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="addfiles.create.jspf.content-name" />
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="contents"
styleClass="form-control" rows="20" cols="80"
styleId="contents" /><br/>
+ <span class="help-block">
+ <bean:message
key="kickstart.advanced.filedetails.jsp.tip.edit"
+ arg0 =
"${rhn:localize('kickstart.advanced.jsp.uploadtab')}"
+ arg1 =
"${rhn:localize(requestScope.uploadKey)}"/>
+ </span>
+ <span class="help-block">
+ <bean:message
key="kickstart.advanced.filedetails.jsp.tip.copypaste"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="kickstart.advanced.jsp.uploadtab"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="input-group">
+ <html:file property="fileUpload" size="30"
styleClass="form-control"/>
+ <span class="input-group-btn">
+ <html:submit property="dispatch" styleClass="btn
btn-success">
+ <bean:message key="${requestScope.uploadKey}"/>
+ </html:submit>
+ </span>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit property="dispatch" styleClass="btn
btn-success">
+ <bean:message key="${param.action_key}"/>
+ </html:submit>
+ </div>
+ </div>
+ <rhn:submitted/>
+ <c:if test="${not empty param.ksid}">
+ <input type="hidden" name="ksid"
value="${param.ksid}"/>
+ </c:if>
+</html:form>
+</c:when>
+<c:when test="${empty requestScope.create}">
+ <p>
+ <bean:message key="kickstartdetails.invalid.jsp.summary"/>
+ <bean:message key="kickstartdetails.invalid.jsp.summary-option1"
+ arg0="${ksdata.tree.label}"
+
arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/>
+ </p>
+ <p>
+ <bean:message
key="kickstartdetails.advanced.invalid.jsp.summary-option2"
+ arg0="${rhn:localize(param.action_key)}"/>
+ </p>
+ <html:form method="post" action="${param.url}"
+ styleClass="form-horizontal">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <rhn:required-field
key="kickstart.jsp.create.wizard.kstree.label"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${empty notrees}">
+ <html:select property="kstreeId"
styleClass="form-control">
+ <html:optionsCollection property="kstrees"
label="label" value="id" />
+ </html:select>
+ </c:when>
+ <c:otherwise>
+ <div class="alert alert-warning">
+ <strong><bean:message
key="kickstart.edit.software.notrees.jsp" /></strong>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
<c:if test="${empty notrees}">
- <div align="right">
- <hr />
-
- <html:submit property="dispatch">
- <bean:message key="${param.action_key}"/>
- </html:submit>
-
- </div>
- <rhn:submitted/>
- <input type="hidden" name="ksid"
value="${param.ksid}"/>
- </c:if>
- </html:form>
- </c:when>
- </c:choose>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit property="dispatch" styleClass="btn
btn-success">
+ <bean:message key="${param.action_key}"/>
+ </html:submit>
+ </div>
+ </div>
+ <rhn:submitted/>
+ <input type="hidden" name="ksid"
value="${param.ksid}"/>
+ </c:if>
+ </html:form>
+</c:when>
+</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf
index 67373d0..2557986 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf
@@ -1,32 +1,49 @@
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.virtualization_type" /></th>
- <td colspan="2" align="left">
- <html:select property="virtualizationTypeLabel"
onchange="this.form.submit();return true;">
- <html:optionsCollection property="virtualizationTypes"
label="formattedName" value="label"/>
- </html:select><br/>
- <c:if test="${not ksdata.rawData and not empty ksdata.id}">
- <span class="small-text"><bean:message
key="kickstartdetails.jsp.virtTypeChangeWarning"
arg0="${ksdata.id}"/></span>
- </c:if>
- </td>
- </tr>
+<div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="kickstartdetails.jsp.virtualization_type" />
+ </label>
+ <div class="col-lg-6">
+ <html:select property="virtualizationTypeLabel"
+ styleClass="form-control"
+ onchange="this.form.submit();return true;">
+ <html:optionsCollection property="virtualizationTypes"
label="formattedName" value="label"/>
+ </html:select>
+ <c:if test="${not ksdata.rawData and not empty ksdata.id}">
+ <span class="help-block"><bean:message
key="kickstartdetails.jsp.virtTypeChangeWarning"
arg0="${ksdata.id}"/></span>
+ </c:if>
+ </div>
+</div>
<c:if test="${not empty requestScope.is_virt}">
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.virt_mem_mb"/>:</th>
- <td><html:text property="virt_mem_mb" size="10"
/></td>
- </tr>
-
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.virt_cpus"/>:</th>
- <td><html:text property="virt_cpus" size="10"
/></td>
- </tr>
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.virt_disk_size"/>:</th>
- <td><html:text property="virt_disk_size"
size="10" /></td>
- </tr>
-
- <tr>
- <th><bean:message
key="kickstartdetails.jsp.virt_bridge"/>:</th>
- <td><html:text property="virt_bridge" size="10"
/></td>
- </tr>
-
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="kickstartdetails.jsp.virt_mem_mb"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="virt_mem_mb" size="10"
styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="kickstartdetails.jsp.virt_cpus"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="virt_cpus" size="10"
styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="kickstartdetails.jsp.virt_disk_size"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="virt_disk_size" size="10"
styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="kickstartdetails.jsp.virt_bridge"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="virt_bridge" size="10"
styleClass="form-control" />
+ </div>
+ </div>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
index 2125033..51175ef 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
@@ -2,10 +2,10 @@
<%@ 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"
%>
-<html:html xhtml="true">
-<head>
-<meta http-equiv="Pragma" content="no-cache" />
-<script language="javascript" type="text/javascript">
+<html:html>
+ <head>
+ <meta http-equiv="Pragma" content="no-cache" />
+ <script language="javascript" type="text/javascript">
function clickNewestRHTree(obj) {
if (obj.checked == true) {
document.getElementById("updateAll").checked = false;
@@ -17,18 +17,18 @@ function clickNewestTree(obj) {
document.getElementById("updateRedHat").checked = false;
}
}
-</script>
-</head>
-<body>
-<rhn:toolbar base="h1" icon="icon-rocket"
- imgAlt="system.common.kickstartAlt">
- <bean:message key ="kickstart.advanced.jsp.create"/>
-</rhn:toolbar>
-<c:import
url="/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf">
- <c:param name = "title_key" value="Kickstart Details"/>
- <c:param name = "summary_key"
value="kickstart.advanced.jsp.para1"/>
- <c:param name = "action_key" value="message.Create"/>
- <c:param name = "url"
value="/kickstart/AdvancedModeCreate.do"/>
-</c:import>
-</body>
+ </script>
+ </head>
+ <body>
+ <rhn:toolbar base="h1" icon="icon-rocket"
+ imgAlt="system.common.kickstartAlt">
+ <bean:message key ="kickstart.advanced.jsp.create"/>
+ </rhn:toolbar>
+ <c:import
url="/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf">
+ <c:param name = "title_key" value="Kickstart
Details"/>
+ <c:param name = "summary_key"
value="kickstart.advanced.jsp.para1"/>
+ <c:param name = "action_key"
value="message.Create"/>
+ <c:param name = "url"
value="/kickstart/AdvancedModeCreate.do"/>
+ </c:import>
+ </body>
</html:html>
commit dc68f5ef37281d9f683f6f3d0f062fd72a663174
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 14:02:12 2013 +0200
Schedule section (all pages) have been correctly formated. Divs have been deleted,
tables well formated and buttons classes applied
diff --git a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
index 4029a86..fd5d778 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
@@ -10,23 +10,25 @@
<h2><bean:message key="actiondetails.jsp.heading2"/></h2>
- <table class="details">
- <tr>
- <th><bean:message
key="actiondetails.jsp.actiontype"/>:</th>
- <td>${requestScope.actiontype}</td>
- </tr>
- <tr>
- <th><bean:message
key="actiondetails.jsp.scheduler"/>:</th>
- <td>${requestScope.scheduler}</td>
- </tr>
- <tr>
- <th><bean:message
key="actiondetails.jsp.earliestexecution"/>:</th>
- <td>${requestScope.earliestaction}</td>
- </tr>
- <tr>
- <th><bean:message
key="actiondetails.jsp.notes"/>:</th>
- <td>${requestScope.actionnotes}</td>
- </tr>
+ <table class="table">
+ <tbody>
+ <tr>
+ <td><bean:message
key="actiondetails.jsp.actiontype"/>:</td>
+ <td>${requestScope.actiontype}</td>
+ </tr>
+ <tr>
+ <td><bean:message
key="actiondetails.jsp.scheduler"/>:</td>
+ <td>${requestScope.scheduler}</td>
+ </tr>
+ <tr>
+ <td><bean:message
key="actiondetails.jsp.earliestexecution"/>:</td>
+ <td>${requestScope.earliestaction}</td>
+ </tr>
+ <tr>
+ <td><bean:message
key="actiondetails.jsp.notes"/>:</td>
+ <td>${requestScope.actionnotes}</td>
+ </tr>
+ </tbody>
</table>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
index f68d583..23788f4 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
@@ -9,38 +9,31 @@
<html>
<body>
- <rhn:toolbar base="h1"
img="/img/rhn-icon-schedule_computer.gif"
+ <rhn:toolbar base="h1" icon="icon-time"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-arch">
<bean:message key="archivedactions.jsp.archived_actions"/>
</rhn:toolbar>
- <div class="page-summary">
<p>
<bean:message key="archivedactions.jsp.summary"/>
</p>
- </div>
-
- <br/>
<rl:listset name="failedList">
<rhn:csrf />
<rl:list emptykey="archivedactions.jsp.nogroups"
styleclass="list">
-
<%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf"
%>
-
</rl:list>
<rhn:submitted/>
<div align="right">
<input type="submit"
name="dispatch"
+ class="btn btn-default"
value='<bean:message
key="actions.jsp.deleteactions"/>'/>
</div>
</rl:listset>
-
-
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
index ee5e037..64c310c 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
@@ -8,33 +8,28 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif"
+<rhn:toolbar base="h1" icon="icon-time"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-comp">
<bean:message key="completedactions.jsp.completed_actions"/>
</rhn:toolbar>
- <div class="page-summary">
<p>
<bean:message key="completedactions.jsp.summary"/>
</p>
- </div>
-
- <br/>
<rl:listset name="failedList">
<rhn:csrf />
<rl:list emptykey="completedactions.jsp.nogroups"
styleclass="list">
-
<%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf"
%>
-
</rl:list>
<rhn:submitted/>
<div align="right">
<input type="submit"
name="dispatch"
+ class="btn btn-default"
value='<bean:message
key="actions.jsp.archiveactions"/>'/>
</div>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
index 0935475..ec629ea 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
@@ -11,7 +11,7 @@
<h2><bean:message
key="completedsystems.jsp.completedsystems"/></h2>
-<form method="POST" name="rhn_list"
action="/rhn/schedule/CompletedSystemsSubmit.do">
+<form method="POST" role="form" name="rhn_list"
action="/rhn/schedule/CompletedSystemsSubmit.do">
<rhn:csrf />
<rhn:list pageList="${requestScope.pageList}"
diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
index 599667f..7377f33 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
@@ -4,43 +4,31 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
-
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif"
+<rhn:toolbar base="h1" icon="icon-time"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-fail">
<bean:message key="failedactions.jsp.failed_actions"/>
</rhn:toolbar>
-
- <div class="page-summary">
<p>
<bean:message key="failedactions.jsp.summary"/>
</p>
- </div>
-
- <br/>
-
-
<rl:listset name="failedList">
<rhn:csrf />
<rl:list emptykey="failedactions.jsp.nogroups"
styleclass="list">
-
<%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf"
%>
-
</rl:list>
<rhn:submitted/>
<div align="right">
<input type="submit"
name="dispatch"
+ class="btn btn-default"
value='<bean:message
key="actions.jsp.archiveactions"/>'/>
</div>
</rl:listset>
-
-
-
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
index 3ef5efa..2f27024 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
@@ -7,41 +7,38 @@
<html>
<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf"
%>
+ <%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf"
%>
-<h2><bean:message
key="failedsystems.jsp.failedsystems"/></h2>
+ <h2><bean:message
key="failedsystems.jsp.failedsystems"/></h2>
- <div class="page-summary">
- <p><bean:message key="failedsystems.jsp.summary"/></p>
- </div>
+ <p><bean:message key="failedsystems.jsp.summary"/></p>
+ <form method="POST" role="form" name="rhn_list"
action="/rhn/schedule/FailedSystemsSubmit.do">
+ <rhn:csrf />
-<form method="POST" name="rhn_list"
action="/rhn/schedule/FailedSystemsSubmit.do">
-<rhn:csrf />
+ <rhn:list pageList="${requestScope.pageList}"
+ noDataText="failedsystems.jsp.nosystems">
+ <rhn:listdisplay button="failedsystems.jsp.rescheduleactions"
+ buttonsAttr="canEdit:true">
+ <rhn:column header="actions.jsp.system"
+
url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}">
+ <c:out value="${current.serverName}" escapeXml="true"
/>
+ </rhn:column>
-<rhn:list pageList="${requestScope.pageList}"
- noDataText="failedsystems.jsp.nosystems">
- <rhn:listdisplay button="failedsystems.jsp.rescheduleactions"
- buttonsAttr="canEdit:true">
- <rhn:column header="actions.jsp.system"
-
url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}">
- <c:out value="${current.serverName}" escapeXml="true"
/>
- </rhn:column>
+ <rhn:column header="failedsystems.jsp.failed">
+ ${current.displayDate}
+ </rhn:column>
- <rhn:column header="failedsystems.jsp.failed">
- ${current.displayDate}
- </rhn:column>
+ <rhn:column header="failedsystems.jsp.message">
+ ${current.message}
+ </rhn:column>
+ </rhn:listdisplay>
- <rhn:column header="failedsystems.jsp.message">
- ${current.message}
- </rhn:column>
- </rhn:listdisplay>
+ <input type="hidden" name="aid"
value="${action.id}" />
+ <input type="hidden" name="formvars" value="aid"
/>
- <input type="hidden" name="aid" value="${action.id}"
/>
- <input type="hidden" name="formvars" value="aid"
/>
-
-</rhn:list>
-
-</form>
+ </rhn:list>
+
+ </form>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
index 7f53d3a..7bc29de 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
@@ -6,39 +6,39 @@
<html:xhtml/>
<html>
<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf"
%>
+ <%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf"
%>
-<h2><bean:message
key="inprogresssystems.jsp.inprogresssystems"/></h2>
+ <h2><bean:message
key="inprogresssystems.jsp.inprogresssystems"/></h2>
-<form method="POST" name="rhn_list"
action="/rhn/schedule/InProgressSystemsSubmit.do">
-<rhn:csrf />
+ <form method="POST" role="form" name="rhn_list"
action="/rhn/schedule/InProgressSystemsSubmit.do">
+ <rhn:csrf />
-<rhn:list pageList="${requestScope.pageList}"
- noDataText="inprogresssystems.jsp.nogroups">
+ <rhn:list pageList="${requestScope.pageList}"
+ noDataText="inprogresssystems.jsp.nogroups">
- <rhn:listdisplay set="${requestScope.set}"
hiddenvars="${requestScope.newset}"
- button="actions.jsp.unscheduleaction"
- buttonsAttr="canEdit:true">
- <rhn:set value="${current.id}" />
- <rhn:column header="actions.jsp.system"
-
url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}">
- <c:out value="${current.serverName}" escapeXml="true"
/>
- </rhn:column>
+ <rhn:listdisplay set="${requestScope.set}"
hiddenvars="${requestScope.newset}"
+ button="actions.jsp.unscheduleaction"
+ buttonsAttr="canEdit:true">
+ <rhn:set value="${current.id}" />
+ <rhn:column header="actions.jsp.system"
+
url="/network/systems/details/history/event.pxt?sid=${current.id}&hid=${action.id}">
+ <c:out value="${current.serverName}" escapeXml="true"
/>
+ </rhn:column>
- <rhn:column header="actiondetails.jsp.earliestexecution">
- ${current.displayDate}
- </rhn:column>
+ <rhn:column header="actiondetails.jsp.earliestexecution">
+ ${current.displayDate}
+ </rhn:column>
- <rhn:column header="actions.jsp.basechannel">
- ${current.channelLabels}
- </rhn:column>
- </rhn:listdisplay>
+ <rhn:column header="actions.jsp.basechannel">
+ ${current.channelLabels}
+ </rhn:column>
+ </rhn:listdisplay>
- <input type="hidden" name="aid" value="${action.id}"
/>
- <input type="hidden" name="formvars" value="aid"
/>
+ <input type="hidden" name="aid"
value="${action.id}" />
+ <input type="hidden" name="formvars" value="aid"
/>
-</rhn:list>
-</form>
+ </rhn:list>
+ </form>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
index a68a537..7f247f3 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
@@ -9,40 +9,34 @@
<html>
<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf"
%>
+ <%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf"
%>
- <h2><bean:message
key="packagelist.jsp.header.${type}"/></h2>
+ <h2><bean:message
key="packagelist.jsp.header.${type}"/></h2>
- <div class="page-summary">
- <p>
- <bean:message key="packagelist.jsp.summary.${type}"/>
- </p>
- </div>
+ <p>
+ <bean:message key="packagelist.jsp.summary.${type}"/>
+ </p>
+ <rl:listset name="packset">
+ <rhn:csrf />
+ <rl:list emptykey="packagelist.jsp.nopackages">
-<rl:listset name="packset">
+ <rl:decorator name="ElaborationDecorator"/>
-<rhn:csrf />
-<rl:list emptykey="packagelist.jsp.nopackages">
+ <rl:column sortable="true"
+ bound="false"
+ headerkey="packagelist.jsp.name.${type}"
+ sortattr="nvre"
+ defaultsort="asc" >
+ ${current.nvre}
+ </rl:column>
- <rl:decorator name="ElaborationDecorator"/>
+ </rl:list>
+ <input type="hidden" name="aid" value="${aid}">
- <rl:column sortable="true"
- bound="false"
- headerkey="packagelist.jsp.name.${type}"
- sortattr="nvre"
- defaultsort="asc" >
- ${current.nvre}
- </rl:column>
-
-</rl:list>
-
-<input type="hidden" name="aid" value="${aid}">
-
-</rl:listset>
-
+ </rl:listset>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
index 2f85388..8ada4e0 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
@@ -7,39 +7,29 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif"
+<rhn:toolbar base="h1" icon="icon-time"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-pend">
<bean:message key="pendingactions.jsp.pending_actions"/>
</rhn:toolbar>
- <div class="page-summary">
- <p>
+ <p>
<bean:message key="pendingactions.jsp.summary"/>
- </p>
- </div>
-
-<br/>
+ </p>
<rl:listset name="pendingList">
- <rhn:csrf />
-
- <rl:list emptykey="pendingactions.jsp.nogroups"
styleclass="list">
-
-
- <%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf"
%>
+ <rhn:csrf />
-
- </rl:list>
+ <rl:list emptykey="pendingactions.jsp.nogroups"
styleclass="list">
+ <%@ include
file="/WEB-INF/pages/common/fragments/scheduledactions/listdisplay-new.jspf"
%>
+ </rl:list>
<rhn:submitted/>
- <div align="right">
- <input type="submit"
+ <div class="pull-right">
+ <input type="submit"
name="dispatch"
+ class="btn btn-default"
value='<bean:message
key="actions.jsp.cancelactions"/>'/>
- </div>
+ </div>
</rl:listset>
-
-
-
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
index 0b3681b..6742106 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
@@ -4,53 +4,44 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
-
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif"
+<rhn:toolbar base="h1" icon="icon-time"
imgAlt="actions.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp#s2-sm-action-pend">
<bean:message key="pendingactions.jsp.confirm_cancel_actions"/>
</rhn:toolbar>
- <div class="page-summary">
<p>
<bean:message
key="pendingactions.jsp.confirm_cancel_actions_summary"/>
</p>
- </div>
-
- <br>
-
<rl:listset name="pendingList">
- <rhn:csrf />
+ <rhn:csrf />
<rl:list emptykey="pendingactions.jsp.nogroups"
styleclass="list">
- <rl:decorator name="ElaborationDecorator"/>
-
+ <rl:decorator name="ElaborationDecorator"/>
<rl:column sortable="true"
- bound="false"
- headerkey="actions.jsp.action"
- sortattr="actionName"
- defaultsort="asc"
- filterattr="actionName">
+ bound="false"
+ headerkey="actions.jsp.action"
+ sortattr="actionName"
+ defaultsort="asc"
+ filterattr="actionName">
<a
href="/rhn/schedule/CompletedSystems.do?aid=${current.id}"><c:out
value="${current.actionName}" /></a>
</rl:column>
-
<rl:column sortable="true"
- bound="false"
+ bound="false"
headerkey="actions.jsp.earliest"
sortattr="earliest" >
<c:out value="${current.earliest}" />
</rl:column>
-
<rl:column sortable="false"
- bound="false"
+ bound="false"
headerkey="actions.jsp.succeeded"
<c:if
test="${current.completed != 0}">
@@ -61,9 +52,8 @@
</c:if>
</rl:column>
-
<rl:column sortable="false"
- bound="false"
+ bound="false"
headerkey="actions.jsp.failed"
<c:if
test="${current.failed != 0}">
@@ -74,10 +64,8 @@
</c:if>
</rl:column>
-
-
<rl:column sortable="false"
- bound="false"
+ bound="false"
headerkey="actions.jsp.inprogress"
<c:if
test="${current.inProgress != 0}">
@@ -95,20 +83,16 @@
${current.tally}
</rl:column>
-
</rl:list>
<rhn:submitted/>
- <div align="right">
+ <div class="pull-right">
<input type="submit"
name="dispatch"
+ class="btn btn-default"
value='<bean:message
key="actions.jsp.confirmcancelactions"/>'/>
</div>
</rl:listset>
-
-
-
-
</body>
</html>
commit bde94d5bdcdc4071b571fae3c9c8517c568869e1
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Oct 22 12:53:28 2013 +0200
copy files matched by glob to /%{_var}/www/html/css instead of /%{_var}/www/html
cp -pR css %{buildroot}/%{_var}/www/html/ copied whole css directory to
/%{_var}/www/html efectively making it /%{_var}/www/html/css
cp -p css/*.css %{buildroot}/%{_var}/www/html/ takes matched files and copies them
into /%{_var}/www/html/ throwing away the fact they were placed in css directory
Signed-off-by: Johannes Renner <jrenner(a)suse.de>
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index f666818..e35f77e 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -42,6 +42,7 @@ lessc css/spacewalk.less > css/spacewalk.css
%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{_var}/www/html
+install -d -m 755 %{buildroot}%{_var}/www/html/css
install -d -m 755 %{buildroot}%{_datadir}/spacewalk
install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web
install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web/nav
@@ -49,7 +50,7 @@ install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/
install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/
install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
-cp -p css/*.css %{buildroot}/%{_var}/www/html/
+cp -p css/*.css %{buildroot}/%{_var}/www/html/css
cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
# one in source:
commit f85fa0bebeca05ddab7f78f351eeddb844c09d77
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 13:31:34 2013 +0200
nav-tabs style added by me now is removed, we dont need it and we will use the
original from Bootstrap
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index bd4e69f..d3277a8 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -496,10 +496,6 @@ h1 .icon-stack {
border-radius: 0 0 4px 4px;
}
-/* tab nav */
-.spacewalk-content-nav .nav.nav-tabs li.active a {
- background: #dddddd;
-}
/* btn with margin top and bottom */
.btn.spacewalk-btn-margin-vertical{
margin: 1em 0
commit ba16ef1c2925131a316aaed91bc8557200a8c988
Author: cyntss <csanchez(a)suse.com>
Date: Tue Oct 22 13:29:39 2013 +0200
buttons and panels added. Tables correctly formated
diff --git a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp
b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp
index a1cfede..f8b3475 100644
--- a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp
@@ -22,22 +22,18 @@ editAreaLoader.init({
<body>
<rhn:require acl="user_role(satellite_admin)"/>
-
- <div>
- <form action="/rhn/admin/Catalina.do">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th>
- <bean:message key="catalina.jsp.show"/>
- </th>
- <td>
- <textarea name="contents" rows="24"
cols="80" id="contents">${contents}</textarea>
- </td>
- </tr>
- </table>
- <rhn:submitted/>
- </form>
- </div>
+ <h1><i class="icon-list"></i> Tomcat</h1>
+ <form action="/rhn/admin/Catalina.do">
+ <rhn:csrf />
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <bean:message key="catalina.jsp.show"/>
+ </div>
+ <div class="panel-body">
+ <textarea name="contents" rows="24"
class="form-control" id="contents">${contents}</textarea>
+ </div>
+ </div>
+ <rhn:submitted/>
+ </form>
</body>
</html>
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 836d0f5..9239b59 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
@@ -25,19 +25,16 @@
</div>
<div class="panel-body">
<form action="/rhn/admin/config/Cobbler.do"
method="POST">
- <rhn:csrf />
- <table class="table">
- <tr>
- <th>
+ <div class="row">
+ <div class="col-md-2 text-right">
<bean:message key="cobbler.jsp.sync"/>
- </th>
- <td>
- <input type="submit" class="btn
btn-success" name="cobbler_sync"
value="${rhn:localize('update')}" />
- </td>
- </tr>
- </table>
- <hr/>
- <rhn:submitted/>
+ </div>
+ <div class="col-md-10">
+ <input type="submit" class="btn
btn-default" name="cobbler_sync"
value="${rhn:localize('update')}" />
+ <rhn:csrf />
+ <rhn:submitted/>
+ </div>
+ </div>
</form>
</div>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
index 716b8c3..8ecfc7c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
@@ -26,19 +26,20 @@
<div class="panel-body">
<html:form action="/admin/config/Restart">
<rhn:csrf />
- <table class="table">
- <tr>
- <th>
+ <div class="row">
+ <div class="col-md-2 text-right">
<label for="restart"><bean:message
key="restart.jsp.restart_satellite"/></label>
- </th>
- <td>
+ </div>
+ <div class="col-md-10">
<html:checkbox property="restart"
styleId="restart" />
- </td>
- </tr>
-
- </table>
- <hr/>
- <div class="pull-right"><html:submit
styleClass="btn btn-success"><bean:message
key="restart.jsp.restart"/></html:submit></div>
+ </div>
+ </div>
+ <hr />
+ <div class="row">
+ <div class="col-md-offset-2 col-md-10">
+ <html:submit styleClass="btn
btn-success"><bean:message
key="restart.jsp.restart"/></html:submit>
+ </div>
+ </div>
<rhn:submitted/>
</html:form>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
index 488710f..348788b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
@@ -11,42 +11,38 @@
<bean:message key="task.status.title"/>
</rhn:toolbar>
-<div>
<p>
<bean:message key="task.status.message"/>
</p>
-</div>
-
- <rhn:require acl="user_role(satellite_admin)"/>
-
- <table class="details">
- <tr>
- <th>
- <bean:message key="task.status.taskomatic.on"/>:
- </th>
- <td>
- <c:out value="${taskomatic_on}"/>
- </td>
- </tr>
- <tr>
- <td colspan="3" style="font-weight: bold;text-align:
center"><bean:message
key="task.status.last.execution"/></td>
- </tr>
-
+ <rhn:require acl="user_role(satellite_admin)"/>
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <bean:message key="task.status.taskomatic.on"/>: <c:out
value="${taskomatic_on}"/>
+ </div>
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <bean:message key="task.status.last.execution"/>
+ </div>
+ <div class="panel-body">
+ <table class="table table-striped">
+ <tbody>
<c:forEach items="${list}" var="item">
- <tr>
- <th>
- <bean:message key="${item.name}"/>:
- </th>
- <td>
- <c:out value="${item.start_time}"/>
- </td>
- <td>
- <c:out value="${item.status}"/>
- </td>
- </tr>
- </c:forEach>
-
+ <tr>
+ <td>
+ <bean:message key="${item.name}"/>:
+ </td>
+ <td>
+ <c:out value="${item.start_time}"/>
+ </td>
+ <td>
+ <c:out value="${item.status}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
</table>
-
+ </div>
+ </div>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
index d870e07..65bda1f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
@@ -58,14 +58,16 @@
sortattr="changeDate"/>
</rl:list>
- <rl:csv dataset="pageList"
- name="disabledUserList"
- exportColumns="userLogin,userLastName,userFirstName,email,roleNames,lastLoggedIn,changedByFirstName,changedByLastName,changeDate"/>
-
- <div align="right">
- <hr />
- <input type="submit" name="dispatch"
value="<bean:message key="disabledlist.jsp.reactivate"/>" />
- </div>
+ <div class="row">
+ <div class="col-md-6 text-left">
+ <input type="submit" class="btn btn-success"
name="dispatch" value="<bean:message
key="disabledlist.jsp.reactivate"/>" />
+ </div>
+ <div class="col-md-6 text-right">
+ <rl:csv dataset="pageList"
+ name="disabledUserList"
+ exportColumns="userLogin,userLastName,userFirstName,email,roleNames,lastLoggedIn,changedByFirstName,changedByLastName,changeDate"/>
+ </div>
+ </div>
</rl:listset>
diff --git a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
index f74437c..2edceeb 100644
--- a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
@@ -9,16 +9,8 @@
<script type="text/javascript"
src="/javascript/highlander.js"></script>
</head>
<body>
-
- <h1><img src="/img/rhn-icon-help-h1.gif" alt="help"
/><bean:message key="help.jsp.chat"/></h1>
-
- <ul>
-
- <div><bean:message key="help.jsp.chatinfo"/></div>
- <br/><br/>
- <div><bean:message key="help.jsp.chatlink"/></div>
-
- </ul>
-
+ <h1><i class="icon-question-sign"
title="Help"></i><bean:message
key="help.jsp.chat"/></h1>
+ <p><bean:message key="help.jsp.chatinfo"/></p>
+ <p><bean:message key="help.jsp.chatlink"/></p>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index b924ffd..6147c49 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -23,34 +23,42 @@
<rhn:csrf />
<!-- Search Box -->
- <div class="search-choices">
-
- <div class="search-choices-group">
- <table class="details">
- <tr><th><bean:message
key="docsearch.jsp.searchfor"/></th>
- <td>
- <html:text property="search_string"
name="search_string" value="${search_string}"
accesskey="4"/>
- <button type="submit" class="btn btn-default
btn-sm">
- <i class="icon-search" />
- <bean:message key="button.search"/>
- </button>
- </td>
- </tr>
- <tr><th><bean:message
key="docsearch.jsp.whatsearch"/></th>
- <td>
- <div style="text-align: left">
- <html:select property="view_mode"
value="${view_mode}" >
- <html:options collection="searchOptions"
- property="value"
- labelProperty="display" />
- </html:select>
- </div>
- </td>
- </tr>
- </table>
- </div>
-
+ <div class="search-choices panel panel-default">
+ <div class="search-choices-group panel-body">
+ <div class="form-group row">
+ <div class="col-md-2 text-right">
+ <label><bean:message
key="docsearch.jsp.searchfor"/></label>
+ </div>
+ <div class="col-md-10">
+ <html:text property="search_string"
+ name="search_string"
+ value="${search_string}"
+ accesskey="4"/>
+ </div>
+ </div>
+ <div class="form-group row">
+ <div class="col-md-2 text-right">
+ <label><bean:message
key="docsearch.jsp.whatsearch"/></label>
+ </div>
+ <div class="col-md-10">
+ <html:select property="view_mode" value="${view_mode}"
>
+ <html:options collection="searchOptions"
+ property="value"
+ labelProperty="display" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-md-offset-2 col-md-10">
+ <button type="submit" class="btn btn-success
btn-sm">
+ <i class="icon-search"></i>
+ <bean:message key="button.search"/>
+ </button>
+ </div>
+ </div>
+ </div>
</div>
+
<input type="hidden" name="submitted" value="true"
/>
</html:form>
commit d99c4b24eccc7a9edc021c137cbde9fb9ac67d2b
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 22 12:03:20 2013 +0200
Call create_checkall_checkbox() when document is ready
diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp
b/java/code/webapp/WEB-INF/includes/footer.jsp
index bf7a7ed..8a130ac 100644
--- a/java/code/webapp/WEB-INF/includes/footer.jsp
+++ b/java/code/webapp/WEB-INF/includes/footer.jsp
@@ -19,10 +19,3 @@
<div>
<img src="/img/logo_vendor.png" />
</div>
-
-<%--
- Render Javascript here so we can be sure that all of
- the form elements we may need have been rendered.
---%>
-<!-- Javascript -->
-<script src="/javascript/check_all.js"></script>
diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js
index c40c74e..319fb3d 100644
--- a/web/html/javascript/check_all.js
+++ b/web/html/javascript/check_all.js
@@ -1,5 +1,3 @@
-create_checkall_checkbox();
-
function blockEnter(evt) {
evt = (evt) ? evt : event;
var charCode = (evt.charCode) ? evt.charCode :((evt.which) ? evt.which :
evt.keyCode);
diff --git a/web/html/javascript/spacewalk-essentials.js
b/web/html/javascript/spacewalk-essentials.js
index 61d61f8..edf2a5a 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -24,7 +24,11 @@ $(document).on("ready", function(){
}
// See if there is a system already selected as soon as the page loads
updateSsmToolbarOpacity();
+
+ // This is in check_all.js
+ create_checkall_checkbox();
});
+
/* Getting the screen size to create a fixed padding-bottom in the Section tag to make
both columns the same size */
// On window load
$(window).load(function () {
commit 486c9d3e611369ccafa94696e77bb6978aee3580
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 22 00:21:45 2013 +0200
put the decorators in the right hooks
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index 6ddd90f..1a99031 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -947,17 +947,27 @@ public class ListTag extends BodyTagSupport {
return;
}
- ListTagUtil.write(pageContext, "<div
class=\"pull-left\">");
- // Here were the afterList decorators
+ ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom\">");
+
+ ListTagUtil.write(pageContext,
+ "<div class=\"spacewalk-list-bottom-wrap\">");
+ ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom-addons\">");
+ if (!manip.isListEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.onBottomAddons();
+ dec.setCurrentList(null);
+ }
+ }
ListTagUtil.write(pageContext, "</div>");
- ListTagUtil.write(pageContext, "<div
class=\"pull-right\">");
+ ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom-pagination\">");
if (!isEmpty() && !hidePageNums) {
ListTagUtil.write(pageContext, manip.getPaginationMessage());
}
if (!manip.isListEmpty()) {
for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
dec.afterBottomPagination();
dec.setCurrentList(null);
}
@@ -966,6 +976,18 @@ public class ListTag extends BodyTagSupport {
ListTagUtil.write(pageContext, " ");
ListTagUtil.renderPaginationLinks(pageContext, PAGINATION_NAMES,
manip.getPaginationLinks());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext, "</div>");
+
+ ListTagUtil.write(pageContext, "<div
class=\"spacewalk-list-bottom-extra\">");
+ if (!manip.isListEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.onBottomExtraContent();
+ dec.setCurrentList(null);
+ }
+ }
+ ListTagUtil.write(pageContext, "</div>");
ListTagUtil.write(pageContext, "</div>");
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
index f62ad76..71f985e 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
@@ -14,12 +14,12 @@
*/
package com.redhat.rhn.frontend.taglibs.list.decorators;
-import com.redhat.rhn.frontend.taglibs.list.ListSetTag;
-import com.redhat.rhn.frontend.taglibs.list.ListTag;
-
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import com.redhat.rhn.frontend.taglibs.list.ListSetTag;
+import com.redhat.rhn.frontend.taglibs.list.ListTag;
+
/**
* General-use base class for writing decorators
*
@@ -118,4 +118,11 @@ public abstract class BaseListDecorator implements ListDecorator {
public void onTopAddons() throws JspException {
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onBottomAddons() throws JspException {
+
+ }
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
index 7b94e17..9a6b0fd 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
@@ -98,4 +98,10 @@ public interface ListDecorator {
* @throws JspException something bad happened
*/
void onTopAddons() throws JspException;
+
+ /**
+ * Notifies the decorator that the list is in the addons section
+ * @throws JspException something bad happened
+ */
+ void onBottomAddons() throws JspException;
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
index 24276b4..ad29244 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
@@ -14,6 +14,10 @@
*/
package com.redhat.rhn.frontend.taglibs.list.decorators;
+import javax.servlet.jsp.JspException;
+
+import org.apache.commons.lang.StringUtils;
+
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.html.HtmlTag;
import com.redhat.rhn.frontend.taglibs.ListDisplayTag;
@@ -22,10 +26,6 @@ import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
import com.redhat.rhn.frontend.taglibs.list.SelectableColumnTag;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
-import org.apache.commons.lang.StringUtils;
-
-import javax.servlet.jsp.JspException;
-
/**
* Handles selectable lists, such as lists backed by RhnSet
*
@@ -65,12 +65,16 @@ public class SelectableDecorator extends BaseListDecorator {
renderSelectedCaption(false);
}
+ @Override
+ public void onBottomAddons() throws JspException {
+ renderSelectButtons();
+ }
+
/**
* {@inheritDoc}
*/
@Override
public void afterList() throws JspException {
- renderSelectButtons();
String script = SelectableColumnTag.
getPostScript(listName, pageContext.getRequest());
if (!StringUtils.isBlank(script)) {
commit 904b605b83027c777dd4016219390e49ffca463b
Author: cyntss <csanchez(a)suse.com>
Date: Mon Oct 21 16:59:34 2013 +0200
buttons with class success
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 fcd3fa0..836d0f5 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
@@ -32,7 +32,7 @@
<bean:message key="cobbler.jsp.sync"/>
</th>
<td>
- <input type="submit" name="cobbler_sync"
value="${rhn:localize('update')}" />
+ <input type="submit" class="btn
btn-success" name="cobbler_sync"
value="${rhn:localize('update')}" />
</td>
</tr>
</table>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
index 518468b..716b8c3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
@@ -38,7 +38,7 @@
</table>
<hr/>
- <div align="right"><html:submit><bean:message
key="restart.jsp.restart"/></html:submit></div>
+ <div class="pull-right"><html:submit
styleClass="btn btn-success"><bean:message
key="restart.jsp.restart"/></html:submit></div>
<rhn:submitted/>
</html:form>
</div>
commit 571968b47527b69fd78beda777e32bfe1969d47f
Author: cyntss <csanchez(a)suse.com>
Date: Mon Oct 21 16:54:56 2013 +0200
less error fixed
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 05b0905..bd4e69f 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -509,7 +509,6 @@ h1 .icon-stack {
ul.nav.nav-tabs:last-child{
margin-bottom: 1.5em
}
-<<<<<<< Updated upstream
// data lists
@@ -544,11 +543,11 @@ ul.nav.nav-tabs:last-child{
}
}
-=======
+
.panel .panel-heading{
h1, h2, h3, h4, h5, h6{
padding: 0;
margin: 0;
}
}
->>>>>>> Stashed changes
+
commit fd3c1be80fc9da743b46101f4ba63918595ee0a3
Author: cyntss <csanchez(a)suse.com>
Date: Mon Oct 21 16:52:12 2013 +0200
Panels added in Admin Configuration. Less: removed margin in h tags in panel-heading
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 8ccf9b6..05b0905 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -509,6 +509,7 @@ h1 .icon-stack {
ul.nav.nav-tabs:last-child{
margin-bottom: 1.5em
}
+<<<<<<< Updated upstream
// data lists
@@ -543,3 +544,11 @@ ul.nav.nav-tabs:last-child{
}
}
+=======
+.panel .panel-heading{
+ h1, h2, h3, h4, h5, h6{
+ padding: 0;
+ margin: 0;
+ }
+}
+>>>>>>> Stashed changes
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 4ed8222..3bc27e7 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
@@ -8,105 +8,109 @@
<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="bootstrap.jsp.toolbar"/>
</rhn:toolbar>
- <div class="page-summary">
- <p><bean:message
key="bootstrap.jsp.summary"/></p>
- </div>
+ <p><bean:message key="bootstrap.jsp.summary"/></p>
<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><bean:message key="bootstrap.jsp.header2"/></h2>
- <html:form
action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}"
- styleClass="form-horizontal"
- enctype="multipart/form-data">
- <rhn:csrf />
- <div class="form-group">
- <label for="hostname" class="col-lg-3
control-label">
- <rhn:required-field key="bootstrap.jsp.hostname"/>:
- </label>
- <div class="col-lg-6">
- <html:text size="32" property="hostname"
styleId="hostname" styleClass="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label"
for="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 class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="bootstrap.jsp.header2"/></h4>
</div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <div class="checkbox">
- <label>
- <html:checkbox property="ssl"
styleId="ssl" />
- <bean:message key="bootstrap.jsp.ssl"/>
+ <div class="panel-body">
+ <html:form
action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}"
+ styleClass="form-horizontal"
+ enctype="multipart/form-data">
+ <rhn:csrf />
+ <div class="form-group">
+ <label for="hostname" class="col-lg-3
control-label">
+ <rhn:required-field
key="bootstrap.jsp.hostname"/>:
</label>
+ <div class="col-lg-6">
+ <html:text size="32"
property="hostname" styleId="hostname"
styleClass="form-control" />
+ </div>
</div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <div class="checkbox">
- <label>
- <html:checkbox property="gpg"
styleId="gpg" />
- <bean:message key="bootstrap.jsp.gpg"/>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="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>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 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"/>
+ <div class="form-group">
+ <div class="col-lg-offset-3 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">
+ <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">
+ <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">
+ <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>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="http-proxy">
+ <bean:message
key="bootstrap.jsp.http-proxy"/>
</label>
+ <div class="col-lg-6">
+ <html:text size="32"
property="http-proxy" styleId="http-proxy"
styleClass="form-control" />
+ </div>
</div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 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"/>
+ <div class="form-group">
+ <label for="http-proxy-username"
class="col-lg-3 control-label">
+ <bean:message
key="bootstrap.jsp.http-proxy-username"/>
</label>
+ <div class="col-lg-6">
+ <html:text size="32"
property="http-proxy-username" styleClass="form-control"
styleId="http-proxy-username" />
+ </div>
</div>
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label"
for="http-proxy">
- <bean:message key="bootstrap.jsp.http-proxy"/>
- </label>
- <div class="col-lg-6">
- <html:text size="32" property="http-proxy"
styleId="http-proxy" styleClass="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label for="http-proxy-username" class="col-lg-3
control-label">
- <bean:message
key="bootstrap.jsp.http-proxy-username"/>
- </label>
- <div class="col-lg-6">
- <html:text size="32"
property="http-proxy-username" styleClass="form-control"
styleId="http-proxy-username" />
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label"
for="http-proxy-password">
- <bean:message
key="bootstrap.jsp.http-proxy-password"/>
- </label>
- <div class="col-lg-6">
- <html:text size="32"
property="http-proxy-password" styleId="http-proxy-password"
styleClass="form-control" />
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <html:submit styleClass="btn btn-success">
- <bean:message key="config.update"/>
- </html:submit>
- </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="http-proxy-password">
+ <bean:message
key="bootstrap.jsp.http-proxy-password"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text size="32"
property="http-proxy-password" styleId="http-proxy-password"
styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="config.update"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="suite_id"
value="${probeSuite.id}"/>
+ <html:hidden property="submitted"
value="true"/>
+ </html:form>
</div>
- <html:hidden property="suite_id"
value="${probeSuite.id}"/>
- <html:hidden property="submitted" value="true"/>
- </html:form>
+ </div>
</body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
index 9d66555..c022893 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
@@ -8,42 +8,45 @@
<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="certificate.jsp.toolbar"/>
</rhn:toolbar>
-
- <div class="page-summary">
- <p><bean:message
key="certificate.jsp.summary"/></p>
- </div>
+ <p><bean:message key="certificate.jsp.summary"/></p>
<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><bean:message
key="certificate.jsp.header2"/></h2>
- <html:form
action="/admin/config/CertificateConfig?csrf_token=${csrfToken}"
- styleClass="form-horizontal"
- enctype="multipart/form-data">
- <rhn:csrf />
- <div class="form-group">
- <label class="col-lg-3 control-label"
for="certfile">
- <rhn:required-field
key="certificate.jsp.cert_file"/>
- </label>
- <div class="col-lg-6">
- <html:file property="cert_file"
styleId="certfile" styleClass="form-control"/>
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label"
for="certtext">
- <rhn:required-field
key="certificate.jsp.cert_text"/>
- </label>
- <div class="col-lg-6">
- <html:textarea cols="80" rows="24"
property="cert_text" styleClass="form-control"/>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="certificate.jsp.header2"/></h4>
</div>
+ <div class="panel-body">
+ <html:form
action="/admin/config/CertificateConfig?csrf_token=${csrfToken}"
+ styleClass="form-horizontal"
+ enctype="multipart/form-data">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="certfile">
+ <rhn:required-field
key="certificate.jsp.cert_file"/>
+ </label>
+ <div class="col-lg-6">
+ <html:file property="cert_file"
styleId="certfile" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="certtext">
+ <rhn:required-field
key="certificate.jsp.cert_text"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea cols="80" rows="24"
property="cert_text" styleClass="form-control"/>
+ </div>
+ </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <html:submit styleClass="btn btn-success">
- <bean:message key="config.update"/>
- </html:submit>
- </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="config.update"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="suite_id"
value="${probeSuite.id}"/>
+ <html:hidden property="submitted"
value="true"/>
+ </html:form>
</div>
- <html:hidden property="suite_id"
value="${probeSuite.id}"/>
- <html:hidden property="submitted" value="true"/>
- </html:form>
+ </div>
</body>
</html:html>
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 21f7b26..fcd3fa0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
@@ -6,11 +6,9 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
- <bean:message key="cobbler.jsp.toolbar"/>
-</rhn:toolbar>
-
-<div class="page-summary">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
+ <bean:message key="cobbler.jsp.toolbar"/>
+ </rhn:toolbar>
<p>
<bean:message key="cobbler.jsp.summary1"/>
</p>
@@ -20,29 +18,29 @@
<p>
<bean:message key="cobbler.jsp.summary3"/>
</p>
-</div>
-<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
-<h2><bean:message key="cobbler.jsp.header2"/></h2>
-
-<div>
-<form action="/rhn/admin/config/Cobbler.do" method="POST">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th>
- <bean:message key="cobbler.jsp.sync"/>
- </th>
- <td>
- <input type="submit" name="cobbler_sync"
value="${rhn:localize('update')}" />
- </td>
- </tr>
- </table>
- <hr/>
-<rhn:submitted/>
-</form>
-</div>
-
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="cobbler.jsp.header2"/></h4>
+ </div>
+ <div class="panel-body">
+ <form action="/rhn/admin/config/Cobbler.do"
method="POST">
+ <rhn:csrf />
+ <table class="table">
+ <tr>
+ <th>
+ <bean:message key="cobbler.jsp.sync"/>
+ </th>
+ <td>
+ <input type="submit" name="cobbler_sync"
value="${rhn:localize('update')}" />
+ </td>
+ </tr>
+ </table>
+ <hr/>
+ <rhn:submitted/>
+ </form>
+ </div>
+ </div>
</body>
</html:html>
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 fc57501..ecc9212 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
@@ -10,123 +10,129 @@
</rhn:toolbar>
<p><bean:message key="general.jsp.summary"/></p>
<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <h2><bean:message key="general.jsp.header2"/></h2>
- <html:form action="/admin/config/GeneralConfig"
- styleClass="form-horizontal"
- method="post">
- <rhn:csrf />
- <div class="form-group">
- <label for="admin_email" class="col-lg-3
control-label">
- <rhn:required-field key="general.jsp.admin_email"/>:
- </label>
- <div class="col-lg-6">
- <html:text property="traceback_mail"
- styleClass="form-control"
- size="32" styleId="admin_email" />
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="general.jsp.header2"/></h4>
</div>
- <div class="form-group">
- <label for="hostname" class="col-lg-3
control-label">
- <rhn:required-field key="general.jsp.hostname"/>:
- </label>
- <div class="col-lg-6">
- <html:text property="server|jabber_server"
- styleClass="form-control"
- size="32" styleId="hostname" />
- </div>
- </div>
- <div class="form-group">
- <label for="proxy" class="col-lg-3
control-label">
- <bean:message key="general.jsp.proxy"/>:
- </label>
- <div class="col-lg-6">
- <html:text property="server|satellite|http_proxy"
- styleClass="form-control"
- size="32" styleId="proxy" />
- </div>
- </div>
- <div class="form-group">
- <label for="proxy_user" class="col-lg-3
control-label">
- <bean:message key="general.jsp.proxy_username"/>:
- </label>
- <div class="col-lg-6">
- <html:text
property="server|satellite|http_proxy_username"
- styleClass="form-control"
- size="32" styleId="proxy_user" />
- </div>
- </div>
- <div class="form-group">
- <label for="proxy_password" class="col-lg-3
control-label">
- <bean:message key="general.jsp.proxy_password"/>:
- </label>
- <div class="col-lg-6">
- <html:password
property="server|satellite|http_proxy_password"
- styleClass="form-control"
- size="32" styleId="proxy_password"
/>
- </div>
- </div>
- <div class="form-group">
- <label for="proxy_password_confirm" class="col-lg-3
control-label">
- <bean:message
key="general.jsp.proxy_password_confirm"/>:
- </label>
- <div class="col-lg-6">
- <html:password
property="server|satellite|http_proxy_password_confirm"
+ <div class="panel-body">
+ <html:form action="/admin/config/GeneralConfig"
+ styleClass="form-horizontal"
+ method="post">
+ <rhn:csrf />
+ <div class="form-group">
+ <label for="admin_email" class="col-lg-3
control-label">
+ <rhn:required-field
key="general.jsp.admin_email"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="traceback_mail"
+ styleClass="form-control"
+ size="32"
styleId="admin_email" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="hostname" class="col-lg-3
control-label">
+ <rhn:required-field
key="general.jsp.hostname"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="server|jabber_server"
+ styleClass="form-control"
+ size="32" styleId="hostname"
/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="proxy" class="col-lg-3
control-label">
+ <bean:message key="general.jsp.proxy"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text
property="server|satellite|http_proxy"
+ styleClass="form-control"
+ size="32" styleId="proxy"
/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="proxy_user" class="col-lg-3
control-label">
+ <bean:message
key="general.jsp.proxy_username"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text
property="server|satellite|http_proxy_username"
+ styleClass="form-control"
+ size="32" styleId="proxy_user"
/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="proxy_password" class="col-lg-3
control-label">
+ <bean:message
key="general.jsp.proxy_password"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:password
property="server|satellite|http_proxy_password"
styleClass="form-control"
- size="32"
styleId="proxy_password_confirm" />
- </div>
- </div>
- <div class="form-group">
- <label for="mount_point" class="col-lg-3
control-label">
- <bean:message key="general.jsp.mount_point"/>:
- </label>
- <div class="col-lg-6">
- <html:text property="mount_point" size="32"
- styleClass="form-control"
- styleId="mount_point" />
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="ssl_available">
- <html:checkbox property="web|ssl_available"
styleId="ssl_available" />
- <bean:message key="general.jsp.defaultTo_ssl"/>
- </label>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="solaris">
- <html:checkbox property="web|enable_solaris_support"
styleId="solaris" />
- <bean:message key="general.jsp.solaris"/>
- </label>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="disconnected">
- <html:checkbox property="disconnected"
styleId="disconnected" />
- <bean:message key="general.jsp.disconnected"/>
- </label>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label for="is_monitoring_backend">
- <html:checkbox property="web|is_monitoring_backend"
styleId="is_monitoring_backend" />
- <bean:message
key="general.jsp.monitoring_backend"/>
- </label>
- </div>
- </div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <html:submit styleClass="btn btn-success">
- <bean:message key="config.update"/>
- </html:submit>
- </div>
+ size="32"
styleId="proxy_password" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="proxy_password_confirm"
class="col-lg-3 control-label">
+ <bean:message
key="general.jsp.proxy_password_confirm"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:password
property="server|satellite|http_proxy_password_confirm"
+ styleClass="form-control"
+ size="32"
styleId="proxy_password_confirm" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="mount_point" class="col-lg-3
control-label">
+ <bean:message
key="general.jsp.mount_point"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="mount_point"
size="32"
+ styleClass="form-control"
+ styleId="mount_point" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <label for="ssl_available">
+ <html:checkbox property="web|ssl_available"
styleId="ssl_available" />
+ <bean:message
key="general.jsp.defaultTo_ssl"/>
+ </label>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <label for="solaris">
+ <html:checkbox
property="web|enable_solaris_support" styleId="solaris" />
+ <bean:message
key="general.jsp.solaris"/>
+ </label>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <label for="disconnected">
+ <html:checkbox property="disconnected"
styleId="disconnected" />
+ <bean:message
key="general.jsp.disconnected"/>
+ </label>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <label for="is_monitoring_backend">
+ <html:checkbox
property="web|is_monitoring_backend" styleId="is_monitoring_backend"
/>
+ <bean:message
key="general.jsp.monitoring_backend"/>
+ </label>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="config.update"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="suite_id"
value="${probeSuite.id}"/>
+ <html:hidden property="submitted"
value="true"/>
+ </html:form>
</div>
- <html:hidden property="suite_id"
value="${probeSuite.id}"/>
- <html:hidden property="submitted" value="true"/>
- </html:form>
+ </div>
</body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
index 80d643c..ed06f73 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
@@ -9,57 +9,61 @@
<bean:message key="general.jsp.org.toolbar"/>
</rhn:toolbar>
-<div class="page-summary">
<p><bean:message
key="general.jsp.org.summary1"/></p>
<p><bean:message
key="general.jsp.org.summary2"/></p>
-</div>
<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message key="general.jsp.org.header"/></h4>
+ </div>
+ <div class="panel-body">
+ <p><bean:message key="general.jsp.org.summary3"/></p>
+ <table class="table">
+ <tr>
+ <td><img src="/img/rhn-icon-org.gif"/></td>
+ <td><bean:message
key="general.jsp.org.tbl.header1"/>:</td>
+ <td>
+ <p>
+ <bean:message key="general.jsp.org.tbl.description1"/>
+ </p>
+ <p>
+ <a href="/rhn/admin/multiorg/Organizations.do"><bean:message
key="general.jsp.org.tbl.link1"/></a>.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td><img src="/img/rhn-icon-channels.gif"/></td>
+ <td><bean:message
key="general.jsp.org.tbl.header2"/>:</td>
+ <td>
+ <p>
+ <bean:message key="general.jsp.org.tbl.description2"/>
+ </p>
+ <p>
+ <a
href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message
key="general.jsp.org.tbl.link2"/></a>.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td><img src="/img/rhn-icon-users.gif"/></td>
+ <td><bean:message
key="general.jsp.org.tbl.header3"/>:</td>
+ <td>
+ <p>
+ <bean:message key="general.jsp.org.tbl.description3"/>
+ </p>
+ <p>
+ <a href="/rhn/admin/multiorg/Users.do"><bean:message
key="general.jsp.org.tbl.link3"/></a>.
+ </p>
+ </td>
+ </tr>
+ </table>
+ <hr>
+ <p>
+ <bean:message key="general.jsp.org.summary4"/><a
href="/rhn/help/reference/index.jsp">
+ <bean:message key="general.jsp.org.tbl.link4"/></a>.
+ </p>
-<h2><bean:message key="general.jsp.org.header"/></h2>
-<div>
-<p><bean:message key="general.jsp.org.summary3"/></p>
-
-<table class="ssm-overview">
- <tr>
- <td><img src="/img/rhn-icon-org.gif"/></td>
- <th><bean:message
key="general.jsp.org.tbl.header1"/>:</th>
- <td>
- <p>
- <bean:message key="general.jsp.org.tbl.description1"/>
- <br>
- <a
href="/rhn/admin/multiorg/Organizations.do"><bean:message
key="general.jsp.org.tbl.link1"/></a>.
- </p>
- </td>
- </tr>
- <tr>
- <td><img src="/img/rhn-icon-channels.gif"/></td>
- <th><bean:message
key="general.jsp.org.tbl.header2"/>:</th>
- <td>
- <p>
- <bean:message key="general.jsp.org.tbl.description2"/>
- <br>
- <a
href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message
key="general.jsp.org.tbl.link2"/></a>.
- </p>
- </td>
- </tr>
- <tr>
- <td><img src="/img/rhn-icon-users.gif"/></td>
- <th><bean:message
key="general.jsp.org.tbl.header3"/>:</th>
- <td>
- <p>
- <bean:message key="general.jsp.org.tbl.description3"/>
- <br>
- <a href="/rhn/admin/multiorg/Users.do"><bean:message
key="general.jsp.org.tbl.link3"/></a>.
- </p>
- </td>
- </tr>
-</table>
-
-<p><bean:message key="general.jsp.org.summary4"/><a
href="/rhn/help/reference/index.jsp">
- <bean:message key="general.jsp.org.tbl.link4"/></a>.
-</p>
-
+ </div>
</div>
</body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
index f4023aa..518468b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
@@ -11,39 +11,38 @@
</c:if>
</head>
<body <c:if test="${requestScope.restart ==
'true'}">onload="checkConnection(${requestScope.restartDelay})"</c:if>
>
-<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
- <bean:message key="restart.jsp.toolbar"/>
-</rhn:toolbar>
-
-<div class="page-summary">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
+ <bean:message key="restart.jsp.toolbar"/>
+ </rhn:toolbar>
<p>
<bean:message key="restart.jsp.summary"/>
</p>
-</div>
-<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
-<h2><bean:message key="restart.jsp.header2"/></h2>
-
-<div>
-<html:form action="/admin/config/Restart">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th>
- <label for="restart"><bean:message
key="restart.jsp.restart_satellite"/></label>
- </th>
- <td>
- <html:checkbox property="restart" styleId="restart"
/>
- </td>
- </tr>
-
- </table>
- <hr/>
- <div align="right"><html:submit><bean:message
key="restart.jsp.restart"/></html:submit></div>
-<rhn:submitted/>
-</html:form>
-</div>
-
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message
key="restart.jsp.header2"/></h4>
+ </div>
+
+ <div class="panel-body">
+ <html:form action="/admin/config/Restart">
+ <rhn:csrf />
+ <table class="table">
+ <tr>
+ <th>
+ <label for="restart"><bean:message
key="restart.jsp.restart_satellite"/></label>
+ </th>
+ <td>
+ <html:checkbox property="restart"
styleId="restart" />
+ </td>
+ </tr>
+
+ </table>
+ <hr/>
+ <div align="right"><html:submit><bean:message
key="restart.jsp.restart"/></html:submit></div>
+ <rhn:submitted/>
+ </html:form>
+ </div>
+ </div>
</body>
</html:html>
commit 6e3f6d63530640e1ec0858fc000ff102f7b25fca
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Mon Oct 21 15:50:17 2013 +0200
- Use pushBody() to avoid creating tags without content.
- define the areas for the components of the list:
.spacewalk-list-top
.spacewalk-list-top-wrap
.spacewalk-list-top-alphabar
.spacewalk-alphabar
.spacewalk-list-top-addons
.spacewalk-list-top-wrap
.spacewalk-filter
.spacewalk-list-top-pagination
.spacewalk-list-top-extra
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index c739c2a..8ccf9b6 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -509,3 +509,37 @@ h1 .icon-stack {
ul.nav.nav-tabs:last-child{
margin-bottom: 1.5em
}
+
+// data lists
+
+.spacewalk-list {
+ .spacewalk-list-top {
+ padding: 0.7em;
+ .spacewalk-list-top-wrap {
+ .make-row();
+
+ .spacewalk-list-top-alphabar {
+ .make-md-column(9);
+ .text-left;
+ }
+ .spacewalk-list-top-addons {
+ .make-md-column(3);
+ .text-right;
+ }
+
+ .spacewalk-list-filter {
+ .make-md-column(4);
+ .text-left;
+ }
+ .spacewalk-list-top-pagination {
+ .make-md-column(8);
+ .text-right;
+ }
+ }
+
+ .spacewalk-list-top-extra {
+ .make-row();
+ }
+ }
+}
+
diff --git a/branding/css/theme.less b/branding/css/theme.less
index 1890e5c..181c1ef 100644
--- a/branding/css/theme.less
+++ b/branding/css/theme.less
@@ -2,32 +2,32 @@
.spacewalk-alphabar{
border-bottom: 1px solid #dddddd;
- padding: .7em;
- .pagination{
+ //padding: .7em;
+ &.pagination{
margin: 0
}
- .pagination > li > a, .pagination > li > span{
+ &.pagination > li > a, .pagination > li > span{
border-top: 1px solid #dddddd;
border-bottom: 1px solid #dddddd;
border-left: 0;
border-right: 0;
}
- .pagination-sm > li:first-child > a, .pagination-sm > li:first-child >
span{
+ &.pagination-sm > li:first-child > a, .pagination-sm > li:first-child >
span{
border-left: 1px solid #dddddd;
padding-left: 8px;
}
- .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{
+ &.pagination-sm > li:last-child > a, .pagination-sm > li:last-child >
span{
border-right: 1px solid #dddddd;
padding-right: 8px;
}
- .pagination-sm > li > a, .pagination-sm > li > span{
+ &.pagination-sm > li > a, .pagination-sm > li > span{
padding: 4px 6px;
}
- .pagination-sm > li:nth-child(11) > a{
+ &.pagination-sm > li:nth-child(11) > a{
border-left: 1px solid #dddddd;
padding-left: 10px;
}
- .pagination-sm > li:nth-child(10) > a{
+ &.pagination-sm > li:nth-child(10) > a{
padding-right: 10px;
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java
index 6606059..cb5099c 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java
@@ -83,11 +83,9 @@ public class AlphaBarHelper {
*/
public void writeAlphaBar(PageContext pageContext,
Set<Character> activeChars, String listName) throws JspException {
-
- ListTagUtil.write(pageContext,
- "<div
class=\"spacewalk-alphabar\">");
+
ListTagUtil.write(pageContext,
- "<ul class=\"pagination pagination-sm\">");
+ "<ul class=\"spacewalk-alphabar pagination
pagination-sm\">");
List<String> alphabet = LocalizationService.getInstance().getAlphabet();
List<String> numbers = LocalizationService.getInstance().getDigits();
@@ -115,7 +113,6 @@ public class AlphaBarHelper {
}
ListTagUtil.write(pageContext, "</ul>");
- ListTagUtil.write(pageContext, "</div>");
}
private String renderEnabledAlpha(char alpha,
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
index be4a0c5..6ddd90f 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
@@ -16,19 +16,7 @@
package com.redhat.rhn.frontend.taglibs.list;
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.context.Context;
-import com.redhat.rhn.frontend.html.HtmlTag;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.taglibs.RhnListTagFunctions;
-import com.redhat.rhn.frontend.taglibs.list.decorators.ListDecorator;
-import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator;
-import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
-import com.redhat.rhn.frontend.taglibs.list.row.RowRenderer;
-
-import org.apache.commons.lang.StringUtils;
-
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -40,6 +28,19 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
+import org.apache.commons.lang.StringUtils;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.context.Context;
+import com.redhat.rhn.frontend.html.HtmlTag;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.taglibs.RhnListTagFunctions;
+import com.redhat.rhn.frontend.taglibs.list.decorators.ListDecorator;
+import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.row.RowRenderer;
+
/**
* Renders a list of data bean in a page
*
@@ -66,6 +67,7 @@ public class ListTag extends BodyTagSupport {
private boolean haveTblAddonsRendered = false;
private boolean haveTblFootersRendered = false;
private boolean haveColHeadersRendered = false;
+
private int columnCount;
private int pageSize = -1;
private String dataSetName = ListHelper.DATA_SET;
@@ -405,6 +407,26 @@ public class ListTag extends BodyTagSupport {
@Override
public int doEndTag() throws JspException {
ListTagUtil.write(pageContext, "</div>");
+
+ // print the hidden fields after the list widget is printed
+ // but before the form of the listset is closed.
+ ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT,
+ ListTagUtil.makeFilterSearchParentLabel(uniqueName),
+ searchParent));
+ ListTagUtil.write(pageContext,
+ String.format(HIDDEN_TEXT,
+ ListTagUtil.makeFilterSearchChildLabel(uniqueName),
+ searchChild));
+ ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT,
+ ListTagUtil.makeParentIsAnElementLabel(uniqueName),
+ parentIsElement));
+
+ // here decorators should insert other e.g hidden input fields
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.afterList();
+ }
+
ListTagUtil.write(pageContext, "<!-- END " + getUniqueName() +
" -->");
release();
return BodyTagSupport.EVAL_PAGE;
@@ -419,18 +441,6 @@ public class ListTag extends BodyTagSupport {
ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext);
- // close the panel-heading div
- if (cmd.equals(ListCommand.TBL_HEADING)) {
- //ListTagUtil.write(pageContext, "<!-- END heading (panel-heading)
-->");
- //ListTagUtil.write(pageContext, "</div>");
- }
-
- // close the panel-body div
- if (cmd.equals(ListCommand.TBL_ADDONS)) {
- //ListTagUtil.write(pageContext, "<!-- END addons (panel-body)
-->");
- //ListTagUtil.write(pageContext, "</div>");
- }
-
if (cmd.equals(ListCommand.COL_HEADER)) {
ListTagUtil.write(pageContext, "</tr>");
}
@@ -455,55 +465,114 @@ public class ListTag extends BodyTagSupport {
startTable();
- ListTagUtil.write(pageContext, "<thead>");
-
- // render the navigation and filters as a row of the header
- ListTagUtil.write(pageContext, "<tr>");
- ListTagUtil.write(pageContext, "<td colspan=\"" +
getColumnCount() + "\">");
+ // as the header addons is populated with decorators, we don't
+ // know if there will be content or not, but we want to avoid
+ // writing the head tag at all if there is none, so we push a
+ // buffer into the stack, and empty it later.
+ StringWriter theadAlphaBarContent = new StringWriter();
+ StringWriter theadAddons = new StringWriter();
+ StringWriter theadBeforeTopPagDecContent = new StringWriter();
+ StringWriter theadFilterContent = new StringWriter();
+ StringWriter theadExtraContent = new StringWriter();
setupManipulator();
manip.sort();
pageData = manip.getPage();
+ pageContext.pushBody(theadAlphaBarContent);
if (!manip.isListEmpty() && !StringUtils.isBlank(alphaBarColumn)) {
AlphaBarHelper.getInstance().writeAlphaBar(pageContext,
manip.getAlphaBarIndex(), getUniqueName());
}
+ pageContext.popBody();
- for (ListDecorator dec : getDecorators()) {
- dec.setCurrentList(this);
- dec.beforeList();
+ pageContext.pushBody(theadAddons);
+ if (!isEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.onTopAddons();
+ }
}
- ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT,
- ListTagUtil.makeFilterSearchParentLabel(uniqueName), searchParent));
- ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT,
- ListTagUtil.makeFilterSearchChildLabel(uniqueName), searchChild));
- ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT,
- ListTagUtil.makeParentIsAnElementLabel(uniqueName),
parentIsElement));
-
- ListTagUtil.write(pageContext, "<div class=\"filter-input
row\">");
- // column with the filter
- ListTagUtil.write(pageContext, "<div class=\"col-md-3
text-left\">");
+ pageContext.popBody();
+
+ pageContext.pushBody(theadFilterContent);
if (filter != null && manip.getUnfilteredDataSize() != 0) {
ListTagUtil.renderFilterUI(pageContext, filter,
getUniqueName(), width, columnCount,
searchParent, searchChild);
}
- ListTagUtil.write(pageContext, "</div>");
- ListTagUtil.write(pageContext, "<div class=\"col-md-9
text-right\">");
+ pageContext.popBody();
+
+ pageContext.pushBody(theadBeforeTopPagDecContent);
if (!isEmpty()) {
for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
dec.beforeTopPagination();
}
}
+ pageContext.popBody();
- // column with the pagination controls
- renderTopPaginationControls();
- ListTagUtil.write(pageContext, "</div>");
+ pageContext.pushBody(theadExtraContent);
+ if (!isEmpty()) {
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.onTopExtraContent();
+ }
+ }
+ pageContext.popBody();
- ListTagUtil.write(pageContext, "</div>");
- ListTagUtil.write(pageContext, "</td>");
- ListTagUtil.write(pageContext, "</tr>");
+ ListTagUtil.write(pageContext, "<thead>");
+
+ // this avoid render the row is there is no content at all
+ if ((theadAlphaBarContent.getBuffer().length() +
+ theadFilterContent.getBuffer().length() +
+ theadBeforeTopPagDecContent.getBuffer().length() +
+ theadAddons.getBuffer().length()) > 0) {
+ // render the navigation and filters as a row of the header
+ ListTagUtil.write(pageContext, "<tr>");
+ ListTagUtil.write(pageContext, "<td colspan=\""
+ + getColumnCount() + "\">");
+
+ ListTagUtil.write(pageContext,
+ "<div class=\"spacewalk-list-top\">");
+
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-wrap\">");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-alphabar\">");
+ ListTagUtil.write(pageContext, theadAlphaBarContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-addons\">");
+ ListTagUtil.write(pageContext, theadAddons.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext, "</div>");
+
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-wrap\">");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-filter\">");
+ ListTagUtil.write(pageContext, theadFilterContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-pagination\">");
+ ListTagUtil.write(pageContext,
+ theadBeforeTopPagDecContent.toString());
+ // column with the pagination controls
+ renderTopPaginationControls();
+ ListTagUtil.write(pageContext, "</div>");
+ ListTagUtil.write(pageContext, "</div>");
+
+ ListTagUtil.write(pageContext,
+ "<div
class=\"spacewalk-list-top-extra\">");
+ ListTagUtil.write(pageContext, theadExtraContent.toString());
+ ListTagUtil.write(pageContext, "</div>");
+
+ ListTagUtil.write(pageContext, "</div>");
+
+ ListTagUtil.write(pageContext, "</td>");
+ ListTagUtil.write(pageContext, "</tr>");
+ }
HttpServletRequest request = (HttpServletRequest) pageContext
.getRequest();
@@ -529,7 +598,6 @@ public class ListTag extends BodyTagSupport {
}
if (haveColHeadersRendered && !haveTblFootersRendered) {
-
ListTagUtil.write(pageContext, "</tr>");
ListTagUtil.write(pageContext, "</thead>");
@@ -566,14 +634,26 @@ public class ListTag extends BodyTagSupport {
else if (haveTblFootersRendered) {
retval = BodyTagSupport.SKIP_BODY;
- // render the pagination controls as the footer of the table
- ListTagUtil.write(pageContext, "<tfoot>");
- ListTagUtil.write(pageContext, "<tr>");
- ListTagUtil.write(pageContext, "<td colspan=\"" +
getColumnCount() + "\">");
+ // as the footer addons are populated with decorators, we don't
+ // know if there will be content or not, but we want to avoid
+ // writing the tfoot tag at all if there is none, so we push a
+ // buffer into the stack, and empty it later.
+ StringWriter tfootAddonsContent = new StringWriter();
+ pageContext.pushBody(tfootAddonsContent);
renderFooterPaginationControls();
- ListTagUtil.write(pageContext, "</td>");
- ListTagUtil.write(pageContext, "</tr>");
- ListTagUtil.write(pageContext, "</tfoot>");
+ pageContext.popBody();
+
+ if (tfootAddonsContent.getBuffer().length() > 0) {
+ // render the pagination controls as the footer of the table
+ ListTagUtil.write(pageContext, "<tfoot>");
+ ListTagUtil.write(pageContext, "<tr>");
+ ListTagUtil.write(pageContext, "<td colspan=\"" +
getColumnCount() + "\">");
+ ListTagUtil.write(pageContext, tfootAddonsContent.toString());
+ ListTagUtil.write(pageContext, "</td>");
+ ListTagUtil.write(pageContext, "</tr>");
+ ListTagUtil.write(pageContext, "</tfoot>");
+ }
+
ListTagUtil.write(pageContext, "</table>");
// if there is reference links, put them as a panel footer
@@ -672,6 +752,12 @@ public class ListTag extends BodyTagSupport {
getUniqueName(), isParentAnElement(), searchParent, searchChild);
ListTagUtil.write(pageContext, "<!-- START LIST " + getUniqueName()
+ " -->");
+
+ for (ListDecorator dec : getDecorators()) {
+ dec.setCurrentList(this);
+ dec.beforeList();
+ }
+
ListTagUtil.write(pageContext, "<div class=\"spacewalk-list panel
panel-default\" id=\"" + getUniqueName() + "\">");
ListTagUtil.setCurrentCommand(pageContext, getUniqueName(),
@@ -862,10 +948,7 @@ public class ListTag extends BodyTagSupport {
}
ListTagUtil.write(pageContext, "<div
class=\"pull-left\">");
- for (ListDecorator dec : getDecorators()) {
- dec.setCurrentList(this);
- dec.afterList();
- }
+ // Here were the afterList decorators
ListTagUtil.write(pageContext, "</div>");
ListTagUtil.write(pageContext, "<div
class=\"pull-right\">");
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
index a48cbc2..f62ad76 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/BaseListDecorator.java
@@ -92,11 +92,30 @@ public abstract class BaseListDecorator implements ListDecorator {
}
/**
- *
* {@inheritDoc}
*/
public void beforeTopPagination() throws JspException {
}
+ /**
+ * {@inheritDoc}
+ */
+ public void onTopExtraContent() throws JspException {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onBottomExtraContent() throws JspException {
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onTopAddons() throws JspException {
+
+ }
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
index d56de56..7b94e17 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java
@@ -80,4 +80,22 @@ public interface ListDecorator {
* @throws JspException exception
*/
void beforeTopPagination() throws JspException;
+
+ /**
+ * Notifies the decorator that the list is on the top extra content section
+ * @throws JspException exception
+ */
+ void onTopExtraContent() throws JspException;
+
+ /**
+ * Notifies the decorator that the list is on the bottom extra content section
+ * @throws JspException exception
+ */
+ void onBottomExtraContent() throws JspException;
+
+ /**
+ * Notifies the decorator that the list is in the addons section
+ * @throws JspException something bad happened
+ */
+ void onTopAddons() throws JspException;
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
index 0bf6ee2..c19bcf0 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
@@ -107,7 +107,7 @@ public class PageSizeDecorator extends BaseListDecorator {
* {@inheritDoc}
*/
@Override
- public void beforeTopPagination() throws JspException {
+ public void onTopAddons() throws JspException {
if (!getCurrentList().isEmpty()) {
StringBuilder stringBuild = new StringBuilder();
commit 459ea630c3b3d1de7253e31911b4be29fa5c9758
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Mon Oct 21 08:02:23 2013 +0200
convert the tasks section of the overview in a panel
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
index 7a7ca38..99a01ac 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
@@ -1,102 +1,126 @@
-<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib prefix="c"
uri="http://java.sun.com/jsp/jstl/core"
%>
+<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
+<%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
+<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
+<%@ taglib prefix="c"
uri="http://java.sun.com/jsp/jstl/core"%>
<form method="post" name="rhn_list"
action="/YourRhn.do">
-<table cellspacing="0" cellpadding="0"
class="half-table">
-
-<thead>
-<tr>
- <th style="text-align: left;"><bean:message
key="yourrhn.jsp.task.title" /></th></tr>
-</thead>
-
-<rhn:require acl="not user_role(satellite_admin)">
-<rhn:require acl="user_role(org_admin)">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/systems/SystemEntitlements.do">
- <bean:message key="yourrhn.jsp.tasks.subscriptions" />
- </a></td></tr>
-</rhn:require>
-</rhn:require>
-
-<rhn:require acl="user_role(satellite_admin)">
-<rhn:require acl="user_role(org_admin)">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <bean:message key="yourrhn.jsp.task.manage_subscriptions" />
- <br>    <a
href="/rhn/systems/SystemEntitlements.do">
- <bean:message key="header.jsp.my_organization" /></a>
<strong>|</strong> <a
href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message
key="header.jsp.satellite_wide" />
- </a></td></tr>
-</rhn:require>
-</rhn:require>
-
-<rhn:require acl="user_role(satellite_admin)">
-<rhn:require acl="not user_role(org_admin)">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/admin/multiorg/SoftwareEntitlements.do">
- <bean:message key="yourrhn.jsp.tasks.subscriptions" />
- </a></td></tr>
-</rhn:require>
-</rhn:require>
-
-<c:if test="${documentation == 'true'}">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/help/client-config/en-US/index.jsp">
- <bean:message key="yourrhn.jsp.tasks.registersystem" />
- </a></td></tr>
-</c:if>
-
-<rhn:require acl="org_entitlement(sw_mgr_enterprise);
user_role(activation_key_admin)">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" />
<a href="/rhn/activationkeys/List.do">
- <bean:message key="yourrhn.jsp.tasks.activationkeys" />
- </a></td></tr>
-
-</rhn:require>
-
-<rhn:require acl="org_entitlement(rhn_provisioning);
user_role(config_admin)">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/kickstart/KickstartOverview.do">
- <bean:message key="yourrhn.jsp.tasks.kickstart" />
- </a></td></tr>
-
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/configuration/file/GlobalConfigFileList.do">
- <bean:message key="yourrhn.jsp.tasks.configuration" />
- </a></td></tr>
-
-<rhn:require acl="show_monitoring();"
- mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/monitoring/ProbeList.do">
- <bean:message key="yourrhn.jsp.tasks.monitoring" />
- </a></td></tr>
-</rhn:require>
-
-<rhn:require acl="user_role(satellite_admin)">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/admin/multiorg/Organizations.do">
- <bean:message key="yourrhn.jsp.tasks.manage_sat_orgs" />
- </a></td></tr>
-</rhn:require>
-
-</rhn:require>
-
-<rhn:require acl="user_role(satellite_admin)">
-<tr class="list-row-odd">
-<td style="text-align: left;"><img style="margin-left: 4px;"
src="/img/parent_node.gif"
- alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>"
/> <a href="/rhn/admin/config/GeneralConfig.do">
- <bean:message key="yourrhn.jsp.tasks.config_sat" />
- </a></td></tr>
-</rhn:require>
-
-</table>
+
+
+ <div class="panel panel-default">
+
+ <div class="panel-heading">
+ <h3 class="panel-title">
+ <bean:message key="yourrhn.jsp.task.title" />
+ </h3>
+ </div>
+
+ <ul class="list-group">
+
+ <rhn:require acl="not user_role(satellite_admin)">
+ <rhn:require acl="user_role(org_admin)">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/systems/SystemEntitlements.do"> <bean:message
+ key="yourrhn.jsp.tasks.subscriptions" />
+ </a>
+ </li>
+ </rhn:require>
+ </rhn:require>
+
+ <rhn:require acl="user_role(satellite_admin)">
+ <rhn:require acl="user_role(org_admin)">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <bean:message
+ key="yourrhn.jsp.task.manage_subscriptions" /> <br>
+    <a
href="/rhn/systems/SystemEntitlements.do">
+ <bean:message key="header.jsp.my_organization" />
+ </a> <strong>|</strong> <a
+
href="/rhn/admin/multiorg/SoftwareEntitlements.do"><bean:message
+ key="header.jsp.satellite_wide" /> </a>
+ </li>
+ </rhn:require>
+ </rhn:require>
+
+ <rhn:require acl="user_role(satellite_admin)">
+ <rhn:require acl="not user_role(org_admin)">
+ <li class="list-group-item"><i
class="icon-caret-right"></i> <a
+ href="/rhn/admin/multiorg/SoftwareEntitlements.do">
<bean:message
+ key="yourrhn.jsp.tasks.subscriptions" />
+ </a>
+ </li>
+ </rhn:require>
+ </rhn:require>
+
+ <c:if test="${documentation == 'true'}">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/help/client-config/en-US/index.jsp">
<bean:message
+ key="yourrhn.jsp.tasks.registersystem" />
+ </a>
+ </li>
+ </c:if>
+
+ <rhn:require
+ acl="org_entitlement(sw_mgr_enterprise);
user_role(activation_key_admin)">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/activationkeys/List.do"> <bean:message
+ key="yourrhn.jsp.tasks.activationkeys" />
+ </a>
+ </li>
+
+ </rhn:require>
+
+ <rhn:require
+ acl="org_entitlement(rhn_provisioning); user_role(config_admin)">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/kickstart/KickstartOverview.do"> <bean:message
+ key="yourrhn.jsp.tasks.kickstart" />
+ </a>
+ </li>
+
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/configuration/file/GlobalConfigFileList.do">
+ <bean:message key="yourrhn.jsp.tasks.configuration" />
+ </a>
+ </li>
+
+ <rhn:require acl="show_monitoring();"
+ mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/monitoring/ProbeList.do"> <bean:message
+ key="yourrhn.jsp.tasks.monitoring" />
+ </a>
+ </li>
+ </rhn:require>
+
+ <rhn:require acl="user_role(satellite_admin)">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/admin/multiorg/Organizations.do"> <bean:message
+ key="yourrhn.jsp.tasks.manage_sat_orgs" />
+ </a>
+ </li>
+ </rhn:require>
+
+ </rhn:require>
+
+ <rhn:require acl="user_role(satellite_admin)">
+ <li class="list-group-item">
+ <i class="icon-caret-right"></i> <a
+ href="/rhn/admin/config/GeneralConfig.do"> <bean:message
+ key="yourrhn.jsp.tasks.config_sat" />
+ </a>
+ </li>
+ </rhn:require>
+
+
+ </ul>
+
+
+ <div class="panel-footer"></div>
+ </div>
+
</form>
commit a9517e732f735a8197a4f5e9e53a2c8071e0d405
Author: cyntss <csanchez(a)suse.com>
Date: Mon Oct 21 15:53:42 2013 +0200
panels added for forms
diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
index 7401e8f..0a5d80d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
@@ -15,14 +15,16 @@
<bean:message key="Addresses" />
</rhn:toolbar>
-<div class="page-summary">
-<p>
- <bean:message key="addresses.summary" />
-</p>
-</div>
-
- <table class="details">
- <rhn:address type="M" action="my"
user="${requestScope.targetuser}"
address="${requestScope.addressMarketing}"/>
- </table>
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>
+ <bean:message key="addresses.summary" />
+ </h4>
+ </div>
+ <div class="panel-body">
+ <table class="table">
+ <rhn:address type="M" action="my"
user="${requestScope.targetuser}"
address="${requestScope.addressMarketing}"/>
+ </table>
+ </div>
</body>
</html>
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 fd37766..88282b0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
@@ -7,79 +7,85 @@
<html:html xhtml="true">
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %>
- <html:form action="/users/UserDetailsSubmit?uid=${user.id}"
styleClass="form-horizontal">
- <rhn:csrf />
- <h2><bean:message
key="userdetails.jsp.header"/></h2>
- <p class="lead"><bean:message
key="userdetails.jsp.summary"/></p>
- <%@ include
file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%>
- <div class="form-group">
- <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>
- </c:forEach>
+ <div class="panel panel-default">
+ <html:form action="/users/UserDetailsSubmit?uid=${user.id}"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <div class="panel-heading">
+ <h4><bean:message
key="userdetails.jsp.header"/></h4>
+ <p><bean:message
key="userdetails.jsp.summary"/></p>
</div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <bean:message key="userdetails.jsp.roles"/>:
- </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}
+ <div class="panel-body">
+ <%@ include
file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%>
+ <div class="form-group">
+ <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>
+ </c:forEach>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="userdetails.jsp.roles"/>:
</label>
- </c:forEach>
- <c:if test="${orgAdmin}">
- <p/>
- <bean:message
key="userdetails.jsp.grantedByOrgAdmin"/>
- </c:if>
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <bean:message key="created.displayname"/>
- </label>
- <label class="col-lg-6">
- ${created}
- </label>
- </div>
+ <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>
+ </c:forEach>
+ <c:if test="${orgAdmin}">
+ <p/>
+ <bean:message
key="userdetails.jsp.grantedByOrgAdmin"/>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="created.displayname"/>
+ </label>
+ <label class="col-lg-6">
+ ${created}
+ </label>
+ </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>
+ <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>
- <input type="hidden" name="disabledRoles"
value="${disabledRoles}"/>
+ <input type="hidden" name="disabledRoles"
value="${disabledRoles}"/>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <c:choose>
- <c:when test="${!empty mailableAddress}">
- <button type="submit" class="btn
btn-success">
- <bean:message key="button.update"/>
- </button>
- </c:when>
- <c:otherwise>
- <button type="button" class="btn
btn-success" disabled="disabled">
- <bean:message key="button.update"/>
- </button>
- </c:otherwise>
- </c:choose>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:choose>
+ <c:when test="${!empty
mailableAddress}">
+ <button type="submit" class="btn
btn-success">
+ <bean:message
key="button.update"/>
+ </button>
+ </c:when>
+ <c:otherwise>
+ <button type="button" class="btn
btn-success" disabled="disabled">
+ <bean:message
key="button.update"/>
+ </button>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
</div>
- </div>
- </html:form>
+ </html:form>
+ </div>
</body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
index 0164c09..69d3713 100644
--- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
@@ -12,46 +12,51 @@
deletionType="credentials">
<bean:message key="Credentials"/>
</rhn:toolbar>
- <p class="lead">
+ <p>
<bean:message key="credentials.jsp.edit.summary" />
</p>
- <h2><bean:message key="credentials.jsp.susestudio"
/></h2>
-
- <form method="post" action="/rhn/account/Credentials.do"
- class="form-horizontal" role="form">
- <rhn:csrf />
- <rhn:submitted />
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <bean:message key="credentials.jsp.username" />
- </label>
- <div class="col-lg-6">
- <html:text property="studio_user"
styleClass="form-control" value="${creds.username}" />
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <bean:message key="credentials.jsp.apikey" />
- </label>
- <div class="col-lg-6">
- <html:text property="studio_key"
styleClass="form-control" value="${creds.password}" />
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <bean:message key="credentials.jsp.url" />
- </label>
- <div class="col-lg-6">
- <html:text property="studio_url"
styleClass="form-control" value="${creds.url}" />
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message key="credentials.jsp.susestudio"
/></h4>
</div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <button type="submit" class="btn
btn-success">
- <bean:message key="credentials.jsp.edit.dispatch"
/>
- </button>
- </div>
+ <div class="panel-body">
+ <form method="post"
action="/rhn/account/Credentials.do"
+ class="form-horizontal" role="form">
+ <rhn:csrf />
+ <rhn:submitted />
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="credentials.jsp.username"
/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="studio_user"
styleClass="form-control" value="${creds.username}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="credentials.jsp.apikey"
/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="studio_key"
styleClass="form-control" value="${creds.password}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="credentials.jsp.url" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="studio_url"
styleClass="form-control" value="${creds.url}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <button type="submit" class="btn
btn-success">
+ <bean:message
key="credentials.jsp.edit.dispatch" />
+ </button>
+ </div>
+ </div>
+ </form>
</div>
- </form>
+ </div>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
index b764a3d..9a0f118 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
@@ -10,27 +10,34 @@
<rhn:toolbar base="h1" icon="icon-user"
imgAlt="user.common.userAlt">
<bean:message key="Addresses"/>
</rhn:toolbar>
- <h2>
- ${editAddressForm.map.typedisplay}
- <bean:message key="your_edit_address_record.displayname"/>
- </h2>
- <p class="lead">
- <bean:message key="your_edit_address.jsp.summary" />
- </p>
- <html:form action="/account/EditAddressSubmit"
styleClass="form-horizontal">
- <rhn:csrf />
- <%@ include
file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <button type="submit"
- class="btn btn-success"
- value="<bean:message
key="button.update"/>">
- <bean:message key="button.update"/>
- </button>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>
+ ${editAddressForm.map.typedisplay}
+ <bean:message
key="your_edit_address_record.displayname"/>
+ </h4>
</div>
- <html:hidden property="uid" value="${param.uid}"/>
- <html:hidden property="type"/>
- </html:form>
+ <div class="panel-body">
+ <p>
+ <bean:message key="your_edit_address.jsp.summary" />
+ </p>
+ <hr>
+ <html:form action="/account/EditAddressSubmit"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <%@ include
file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <button type="submit"
+ class="btn btn-success"
+ value="<bean:message
key="button.update"/>">
+ <bean:message key="button.update"/>
+ </button>
+ </div>
+ </div>
+ <html:hidden property="uid"
value="${param.uid}"/>
+ <html:hidden property="type"/>
+ </html:form>
+ </div>
+ </div>
</body>
</html>