branding/css/spacewalk-theme.less | 9 java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java | 6 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java | 48 java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 1 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java | 8 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 124 +- java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 11 java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java | 11 java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java | 27 java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java | 4 java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 15 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp | 58 - java/code/webapp/WEB-INF/pages/kickstart/locale.jsp | 82 - java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf | 24 java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp | 13 java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 69 - java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 224 ++-- java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images-content.jspf | 2 java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp | 218 ++-- java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 497 ++++------ java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 4 java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 14 28 files changed, 765 insertions(+), 716 deletions(-)
New commits: commit 1d63dde26292d1517aa484b0ba093357f1e64cf3 Author: Tomas Kasparek tkasparek@redhat.com Date: Mon Dec 16 09:31:19 2013 +0100
fixing schedule section headers icon
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java index 88fcb9a..fd39531 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java @@ -49,7 +49,7 @@ public class IconTag extends TagSupport { icons.put("event-type-package", "fa spacewalk-icon-packages"); icons.put("event-type-preferences", "fa fa-cog"); icons.put("event-type-system", "fa fa-desktop"); - icons.put("header-action", "fa-clock-o"); + icons.put("header-action", "fa fa-clock-o"); icons.put("header-activation-key", "fa fa-key"); icons.put("header-channel", "fa spacewalk-icon-software-channels"); icons.put("header-channel-configuration",
commit a1075359ab941dc07b0a338ee21864b435b5fbae Author: Tomas Kasparek tkasparek@redhat.com Date: Mon Dec 16 09:22:13 2013 +0100
fixes in jsp
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index 65e2c4f..c0b971e 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -32,7 +32,7 @@ <li class="list-group-item"> <div class="row"> <div class="col-sm-2"> - <rhn:icon type="header-errata" title="<bean:message key="ssm.overview.errata"/>" /> + <rhn:icon type="header-errata" title='<bean:message key="ssm.overview.errata'/>" /> <bean:message key="ssm.overview.errata"/> </div> <div class="col-sm-10"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index f5efe63..f763b17 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -15,7 +15,7 @@ <div class="panel-body"> <c:choose> <c:when test="${unentitled}"> - <rhn:icon type="system-unentitled"> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> + <rhn:icon type="system-unentitled" /> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> </c:when> <c:when test="${systemInactive}"> <rhn:icon type="system-unknown" /> <bean:message key="sdc.details.overview.inactive1"/>
commit 330206627ff7d92c020aa44fa5b72641c777ec9b Author: Tomas Kasparek tkasparek@redhat.com Date: Mon Dec 16 09:04:35 2013 +0100
add default switch value + fix long lines
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 f69c637..a98fc99 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 @@ -795,6 +795,7 @@ public class ListTag extends BodyTagSupport { case RENDER: retval = doAfterBodyRenderData(); break; case AFTER_RENDER: retval = doAfterBodyRenderAfterData(); break; case TBL_FOOTER: retval = doAfterBodyRenderFooterAddons(); break; + default: break; } return retval; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index dda57d7..9ca2f20 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@ -97,17 +97,16 @@ public class AddressTagTest extends RhnBaseTestCase { "Fax: 650-555-1212<br>" + "</address>" + "<p>" + - "<a class="btn btn-primary" href="/EditAddress.do?type=M&uid=" + uid + "">" + - "Edit this address</a>" + - "</p>"; + "<a class="btn btn-primary" href="/EditAddress.do?type=M&uid=" + + uid + "">" + "Edit this address</a>" + "</p>"; }
private String getEmptyReturnValue(HttpServletRequest req, Long uid) { return "<strong>Mailing Address</strong>" + "<div class="alert alert-info">Address not filled out</div>" + "<p>" + - "<a class="btn btn-primary" href="/EditAddress.do?type=M&uid=" + uid + "">Add this address</a>" + - "</p>"; + "<a class="btn btn-primary" href="/EditAddress.do?type=M&uid=" + + uid + "">Add this address</a>" + "</p>"; }
}
commit bb817c63ca9fa7eca9c060d542e21c7b7ba69372 Author: Duncan Mac-Vicar P dmacvicar@suse.de Date: Fri Dec 13 16:44:36 2013 +0100
trailing whitespace
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 ef33e12..f69c637 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 @@ -566,7 +566,7 @@ public class ListTag extends BodyTagSupport { manip.bindPaginationInfo(); request.setAttribute("dataSize", String .valueOf(pageData.size() + 1)); - + if (pageData != null && pageData.size() > 0) { iterator = pageData.iterator(); }
commit 9777a762832b6e026b9ee0f8e531e708ce4bb29e Author: Johannes Renner jrenner@suse.de Date: Fri Dec 13 10:17:04 2013 +0100
Add missing colon after activation key description label
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf index 61d7244..8715cf6 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf @@ -13,7 +13,7 @@
<div class="form-group"> <label class="col-lg-3 control-label" for="description"> - <bean:message key="kickstart.activationkeys.jsp.description"/> + <bean:message key="kickstart.activationkeys.jsp.description"/>: </label> <div class="col-lg-6"> <html:text property="description" styleClass="form-control" styleId="description"/><br/>
commit 8c8ae8510f11d69d3beb64e6abd1dd47aedee2a6 Author: Cynthia Sanchez csanchez@suse.com Date: Thu Dec 12 18:48:23 2013 +0100
System management options have been modified to look more similar to how it looked in the later version of Spacewalk
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index 87101f1..65e2c4f 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -15,99 +15,139 @@ <ul><bean:message key="ssm.overview.summary2"/></ul> </div>
+ <div class="panel panel-default"> - <div class="panel-heading"> - <rhn:icon type="header-system" title="<bean:message key='ssm.overview.systems' />" /> - <bean:message key="ssm.overview.systems"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.systems.list"/> - </div> - <div class="panel-heading"> - <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.errata'/>" /> - <bean:message key="ssm.overview.errata"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.errata.schedule"/> - </div> - <div class="panel-heading"> - <rhn:icon type="header-package" title="<bean:message key='ssm.overview.packages' />" /> - <bean:message key="ssm.overview.packages"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.packages.upgrade"/> - </div> - <rhn:require acl="is(enable_solaris_support)"> - <div class="panel-heading"> - <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.patches' />" /> - <bean:message key="ssm.overview.patches"/> - </div> - <div class="panel-body"> - <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> - <bean:message key="ssm.overview.patches.patches"/> - </div> - <div class="panel-heading"> - <rhn:icon type="header-errata-set" title="<bean:message key='ssm.overview.patch.clusters' />" /> - <bean:message key="ssm.overview.patch.clusters"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.patch.clusters.install"/> - </div> - </rhn:require> - <rhn:require acl="user_role(org_admin)"> - <div class="panel-heading"> - <rhn:icon type="header-system-groups" title="<bean:message key='ssm.overview.groups' />" /> - <bean:message key="ssm.overview.groups"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.groups.create"/> - </div> - </rhn:require> - <div class="panel-heading"> - <rhn:icon type="header-channel" title="<bean:message key='ssm.overview.channels' />" /> - <bean:message key="ssm.overview.channels"/> - </div> - <div class="panel-body"> - <ul> - <li><bean:message key="ssm.overview.channels.memberships"/></li> - <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> - <li><bean:message key="ssm.overview.channels.subscriptions"/></li> - <li><bean:message key="ssm.overview.channels.deploy"/></li> - </rhn:require> - </ul> - </div> - <rhn:require acl="org_entitlement(rhn_provisioning);"> - <div class="panel-heading"> - <rhn:icon type="header-kickstart" title="<bean:message key='ssm.overview.provisioning' />" /> - <bean:message key="ssm.overview.provisioning"/> - </div> - <div class="panel-body"> - <ul> - <li><bean:message key="ssm.overview.provisioning.kickstart"/></li> - <li><bean:message key="ssm.overview.provisioning.rollback"/></li> - <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> - </ul> - </div> - </rhn:require> - <div class="panel-heading"> - <rhn:icon type="header-event-history" title="<bean:message key='ssm.overview.misc' />" /> - <bean:message key="ssm.overview.misc"/> - </div> - <div class="panel-body"> - <ul> - <li><bean:message key="ssm.overview.misc.updateprofiles"/></li> - <rhn:require acl="org_entitlement(rhn_provisioning)"> - <li><bean:message key="ssm.overview.misc.customvalues"/></li> - </rhn:require> - <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor)"> - <li><bean:message key="ssm.overview.misc.entitlements"/></li> - </rhn:require> - <li><bean:message key="ssm.overview.misc.delete"/></li> - <li><bean:message key="ssm.overview.misc.reboot"/></li> - <li><bean:message key="ssm.overview.misc.migrate"/></li> - <li><bean:message key="ssm.overview.misc.scap"/></li> - </ul> - </div> + <ul class="list-group"> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-system" title="<bean:message key='ssm.overview.systems' />" /> + <bean:message key="ssm.overview.systems"/> + </div> + <div class="col-sm-10"> + <bean:message key="ssm.overview.systems.list"/> + </div> + </div> + </li> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-errata" title="<bean:message key="ssm.overview.errata"/>" /> + <bean:message key="ssm.overview.errata"/> + </div> + <div class="col-sm-10"> + <bean:message key="ssm.overview.errata.schedule"/> + </div> + </div> + </li> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-package" title="<bean:message key='ssm.overview.packages' />" /> + <bean:message key="ssm.overview.packages"/> + </div> + <div class="col-sm-10"> + <bean:message key="ssm.overview.packages.upgrade"/> + </div> + </div> + </li> + <rhn:require acl="is(enable_solaris_support)"> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.patches' />" /> + <bean:message key="ssm.overview.patches"/> + </div> + <div class="col-sm-10"> + <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> + <bean:message key="ssm.overview.patches.patches"/> + </div> + </div> + </li> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-errata-set" title="<bean:message key='ssm.overview.patch.clusters' />" /> + <bean:message key="ssm.overview.patch.clusters"/> + </div> + <div class="col-sm-10"> + <bean:message key="ssm.overview.patch.clusters.install"/> + </div> + </div> + </li> + </rhn:require> + <rhn:require acl="user_role(org_admin)"> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-system-groups" title="<bean:message key='ssm.overview.groups' />" /> + <bean:message key="ssm.overview.groups"/> + </div> + <div class="col-sm-10"> + <bean:message key="ssm.overview.groups.create"/> + </div> + </div> + </li> + </rhn:require> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-channel" title="<bean:message key='ssm.overview.channels' />" /> + <bean:message key="ssm.overview.channels"/> + </div> + <div class="col-sm-10"> + <ul> + <li><bean:message key="ssm.overview.channels.memberships"/></li> + <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> + <li><bean:message key="ssm.overview.channels.subscriptions"/></li> + <li><bean:message key="ssm.overview.channels.deploy"/></li> + </rhn:require> + </ul> + </div> + </div> + </li> + <rhn:require acl="org_entitlement(rhn_provisioning);"> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-kickstart" title="<bean:message key='ssm.overview.provisioning' />" /> + <bean:message key="ssm.overview.provisioning"/> + </div> + <div class="col-sm-10"> + <ul> + <li><bean:message key="ssm.overview.provisioning.kickstart"/></li> + <li><bean:message key="ssm.overview.provisioning.rollback"/></li> + <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> + </ul> + </div> + </div> + </li> + </rhn:require> + <li class="list-group-item"> + <div class="row"> + <div class="col-sm-2"> + <rhn:icon type="header-event-history" title="<bean:message key='ssm.overview.misc' />" /> + <bean:message key="ssm.overview.misc"/> + </div> + <div class="col-sm-10"> + <ul> + <li><bean:message key="ssm.overview.misc.updateprofiles"/></li> + <rhn:require acl="org_entitlement(rhn_provisioning)"> + <li><bean:message key="ssm.overview.misc.customvalues"/></li> + </rhn:require> + <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor)"> + <li><bean:message key="ssm.overview.misc.entitlements"/></li> + </rhn:require> + <li><bean:message key="ssm.overview.misc.delete"/></li> + <li><bean:message key="ssm.overview.misc.reboot"/></li> + <li><bean:message key="ssm.overview.misc.migrate"/></li> + <li><bean:message key="ssm.overview.misc.scap"/></li> + </ul> + </div> + </div> + </li> + </ul> + </div>
</body>
commit 8627e18994a56767b77f62d347709a3617df497c Author: Johannes Renner jrenner@suse.de Date: Thu Dec 12 17:05:45 2013 +0100
Fix messed up indentation and add missing <div class="checkbox">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp index 8509f03..36b73d3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp @@ -105,108 +105,110 @@ </div> </div>
- <div class="form-group"> - <label class="col-lg-3 control-label" for="autoerrataupdate"> - <bean:message key="sdc.details.edit.autoerrataupdate"/> - </label> - <div class="col-lg-6"> - <c:choose> - <c:when test="${system.baseEntitlement == null}"> - <bean:message key="sdc.details.edit.autoupdate.unentitled"/> - </c:when> - <c:otherwise> - <label for="autoerrataupdate"> - <html:checkbox property="auto_update" styleId="autoerrataupdate"/> - <bean:message key="sdc.details.edit.autoupdate"/> - </label> - </c:otherwise> - </c:choose> - </div> - </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="autoerrataupdate"> + <bean:message key="sdc.details.edit.autoerrataupdate"/> + </label> + <div class="col-lg-6"> + <c:choose> + <c:when test="${system.baseEntitlement == null}"> + <bean:message key="sdc.details.edit.autoupdate.unentitled"/> + </c:when> + <c:otherwise> + <div class="checkbox"> + <label for="autoerrataupdate"> + <html:checkbox property="auto_update" styleId="autoerrataupdate"/> + <bean:message key="sdc.details.edit.autoupdate"/> + </label> + </div> + </c:otherwise> + </c:choose> + </div> + </div>
- <div class="form-group"> - <label for="description" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.description" /> - </label> - <div class="col-lg-6"> - <html:textarea property="description" styleClass="form-control" rows="6" styleId="description"/> - </div> - </div> + <div class="form-group"> + <label for="description" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.description" /> + </label> + <div class="col-lg-6"> + <html:textarea property="description" styleClass="form-control" rows="6" styleId="description"/> + </div> + </div>
- <div class="form-group"> - <label for="address" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.address"/> - </label> - <div class="col-lg-6"> - <html:text property="address1" maxlength="128" styleClass="form-control" styleId="address"/><br/> - <html:text property="address2" maxlength="128" styleClass="form-control" /> - </div> - </div> + <div class="form-group"> + <label for="address" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.address"/> + </label> + <div class="col-lg-6"> + <html:text property="address1" maxlength="128" styleClass="form-control" styleId="address"/><br/> + <html:text property="address2" maxlength="128" styleClass="form-control" /> + </div> + </div>
- <div class="form-group"> - <label for="city" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.city"/> - </label> - <div class="col-lg-2"> - <html:text property="city" maxlength="128" styleClass="form-control" styleId="city"/> - </div> - </div> + <div class="form-group"> + <label for="city" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.city"/> + </label> + <div class="col-lg-2"> + <html:text property="city" maxlength="128" styleClass="form-control" styleId="city"/> + </div> + </div>
- <div class="form-group"> - <label for="state" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.state"/> - </label> - <div class="col-lg-2"> - <html:text property="state" maxlength="60" styleClass="form-control" styleId="state"/> - </div> - </div> + <div class="form-group"> + <label for="state" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.state"/> + </label> + <div class="col-lg-2"> + <html:text property="state" maxlength="60" styleClass="form-control" styleId="state"/> + </div> + </div>
- <div class="form-group"> - <label for="country" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.country"/> - </label> - <div class="col-lg-2"> - <html:select property="country" styleId="country" styleClass="form-control"> - <html:options collection="countries" property="value" labelProperty="label" /> - </html:select> - </div> - </div> - - <div class="form-group"> - <label for="building" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.building"/> - </label> - <div class="col-lg-1"> - <html:text property="building" maxlength="128" styleClass="form-control" styleId="building"/> - </div> - </div> + <div class="form-group"> + <label for="country" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.country"/> + </label> + <div class="col-lg-2"> + <html:select property="country" styleId="country" styleClass="form-control"> + <html:options collection="countries" property="value" labelProperty="label" /> + </html:select> + </div> + </div>
- <div class="form-group"> - <label for="room" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.room"/> - </label> - <div class="col-lg-1"> - <html:text property="room" maxlength="32" styleClass="form-control" styleId="room"/> - </div> - </div> + <div class="form-group"> + <label for="building" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.building"/> + </label> + <div class="col-lg-1"> + <html:text property="building" maxlength="128" styleClass="form-control" styleId="building"/> + </div> + </div>
- <div class="form-group"> - <label for="rack" class="col-lg-3 control-label"> - <bean:message key="sdc.details.edit.rack"/> - </label> - <div class="col-lg-1"> - <html:text property="rack" maxlength="64" styleClass="form-control" styleId="rack"/> - </div> - </div> + <div class="form-group"> + <label for="room" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.room"/> + </label> + <div class="col-lg-1"> + <html:text property="room" maxlength="32" styleClass="form-control" styleId="room"/> + </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="sdc.details.edit.update"/> - </button> - </div> - </div> - </html:form> + <div class="form-group"> + <label for="rack" class="col-lg-3 control-label"> + <bean:message key="sdc.details.edit.rack"/> + </label> + <div class="col-lg-1"> + <html:text property="rack" maxlength="64" styleClass="form-control" styleId="rack"/> + </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="sdc.details.edit.update"/> + </button> + </div> + </div> + </html:form> </div> </div> </body>
commit 343ba46d3f31f72e081d5381ae839552c3ff08d1 Author: Johannes Renner jrenner@suse.de Date: Thu Dec 12 16:47:20 2013 +0100
Fix display of notifications checkboxes on system properties page
Indentation is still a bit messed up though.
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp index bdb832c..8509f03 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp @@ -88,18 +88,22 @@ <bean:message key="sdc.details.edit.notifications.unentitled"/> </c:when> <c:otherwise> - <label for="receive_notifications"> - <html:checkbox property="receive_notifications" styleId="receive_notifications"/> - <bean:message key="sdc.details.edit.updates"/> - </label> - <label for="summary"> - <html:checkbox property="include_in_daily_summary" styleId="summary"/> - <bean:message key="sdc.details.edit.summary"/> - </label> - </c:otherwise> - </c:choose> - </div> - </div> + <div class="checkbox"> + <label for="receive_notifications"> + <html:checkbox property="receive_notifications" styleId="receive_notifications"/> + <strong><bean:message key="sdc.details.edit.updates"/></strong> + </label> + </div> + <div class="checkbox"> + <label for="summary"> + <html:checkbox property="include_in_daily_summary" styleId="summary"/> + <strong><bean:message key="sdc.details.edit.summary"/></strong> + </label> + </div> + </c:otherwise> + </c:choose> + </div> + </div>
<div class="form-group"> <label class="col-lg-3 control-label" for="autoerrataupdate">
commit b65a06d29b3348fe9b0f939be8593b30d295f553 Author: Cynthia Sanchez csanchez@suse.com Date: Tue Dec 10 12:35:12 2013 +0100
Id added to the Language div in the section Create New User
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 90b424b..c673477 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp @@ -142,7 +142,7 @@ </div> </div> </div> - <div class="panel panel-default"> + <div class="panel panel-default" id="new-user-language"> <div class="panel-heading"> <h4><bean:message key="preferences.jsp.lang" /></h4> </div>
commit e6cfd681acc676a449ddb9fe77253254256210e6 Author: Duncan Mac-Vicar P dmacvicar@suse.de Date: Tue Dec 10 22:35:21 2013 +0100
Refactor the List tag to get rid of the complicated state handled by bools, keeping only the commands as state.
Fixes lot of bugs: - unclosed tr tags - missing tbody tag
Update the testcase so that the right states are generated. It passes now.
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java index 8942173..f0a84a8 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListCommand.java @@ -21,12 +21,14 @@ package com.redhat.rhn.frontend.taglibs.list; */
public enum ListCommand { - RENDER ("__render__"), + ENUMERATE ("__enum__"), TBL_HEADING ("__tbl_heading__"), TBL_ADDONS ("__tbl_addons__"), - TBL_FOOTER ("__tbl__footer__"), COL_HEADER ("__col_header__"), - ENUMERATE ("__enum__"); + BEFORE_RENDER ("__tbl__before_render__"), + RENDER ("__render__"), + AFTER_RENDER ("__tbl__after_render__"), + TBL_FOOTER("__tbl_footer__");
private String _cmd;
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 05c04d1..ef33e12 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 @@ -62,11 +62,6 @@ public class ListTag extends BodyTagSupport { "backward", "forward", "allForward" }; private static final String HIDDEN_TEXT = "<input type="hidden" " + "name="%s" value="%s"/>"; - private boolean haveColsEnumerated = false; - private boolean haveTblHeadingRendered = false; - private boolean haveTblAddonsRendered = false; - private boolean haveTblFootersRendered = false; - private boolean haveColHeadersRendered = false;
private int columnCount; private int pageSize = -1; @@ -430,6 +425,9 @@ public class ListTag extends BodyTagSupport { }
private void doAfterBodyRenderTopAddons() throws JspException { + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.TBL_ADDONS); + setupManipulator(); manip.sort(); pageData = manip.getPage(); @@ -568,8 +566,7 @@ public class ListTag extends BodyTagSupport { manip.bindPaginationInfo(); request.setAttribute("dataSize", String .valueOf(pageData.size() + 1)); - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.TBL_ADDONS); + if (pageData != null && pageData.size() > 0) { iterator = pageData.iterator(); } @@ -578,10 +575,13 @@ public class ListTag extends BodyTagSupport { } }
- private int doAfterBodyRenderFooter() throws JspException { + private int doAfterBodyRenderBeforeData() throws JspException { ListTagUtil.write(pageContext, "</tr>"); ListTagUtil.write(pageContext, "</thead>");
+ ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.BEFORE_RENDER); + if (manip.isListEmpty()) { renderEmptyList(); ListTagUtil.write(pageContext, "</table>"); @@ -592,8 +592,22 @@ public class ListTag extends BodyTagSupport {
return BodyTagSupport.SKIP_BODY; } + ListTagUtil.write(pageContext, "<tbody>"); + + // render first row. The rest will be rendered in subsequent + // calls to doAfterBody + return doAfterBodyRenderData(); + } + + private int doAfterBodyRenderData() throws JspException { + // if there was a previous object, close its row + if (currentObject != null) { + ListTagUtil.write(pageContext, "</tr>"); + } + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.RENDER); + if (iterator.hasNext()) { Object obj = iterator.next(); if (RhnListTagFunctions.isExpandable(obj)) { @@ -604,32 +618,43 @@ public class ListTag extends BodyTagSupport { else { currentObject = null; } - if (currentObject == null) { - ListTagUtil.write(pageContext, "</tbody>"); - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.TBL_FOOTER); - } - else { + + if (currentObject != null) { ListTagUtil.write(pageContext, "<tr"); renderRowClassAndId();
ListTagUtil.write(pageContext, ">"); pageContext.setAttribute(rowName, currentObject); } + else { + return doAfterBodyRenderAfterData(); + } + return BodyTagSupport.EVAL_BODY_AGAIN; + } + + private int doAfterBodyRenderAfterData() throws JspException { + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.AFTER_RENDER); + ListTagUtil.write(pageContext, "</tr>"); + ListTagUtil.write(pageContext, "</tbody>"); return BodyTagSupport.EVAL_BODY_AGAIN; }
private void doAfterBodyRenderColHeaders() throws JspException { startTable(); + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.COL_HEADER); + ListTagUtil.write(pageContext, "<thead>"); // open the row tag for the column header th's ListTagUtil.write(pageContext, "<tr>"); - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.COL_HEADER); }
private int doAfterBodyRenderFooterAddons() throws JspException { ListTagUtil.write(pageContext, "</table>"); + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.TBL_FOOTER); + // 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 @@ -735,6 +760,9 @@ public class ListTag extends BodyTagSupport { }
private void doAfterBodyRenderListBegin() throws JspException { + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.TBL_HEADING); + ListTagUtil.write(pageContext, "<!-- START LIST " + getUniqueName() + " -->");
String listId = (getStyleId() != null) ? getStyleId() : getUniqueName(); @@ -748,8 +776,6 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, " " + styleClass); } ListTagUtil.write(pageContext, "" id="" + listId + "">"); - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.TBL_HEADING); }
/** @@ -759,29 +785,16 @@ public class ListTag extends BodyTagSupport { public int doAfterBody() throws JspException { int retval = BodyTagSupport.EVAL_BODY_AGAIN;
- ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext); + ListCommand nextCmd = getNextCommand();
- if (cmd.equals(ListCommand.COL_HEADER)) { - ListTagUtil.write(pageContext, "</tr>"); - } - - setState(); - - if (haveColsEnumerated && !haveTblHeadingRendered) { - doAfterBodyRenderListBegin(); - } - else if (haveColsEnumerated && !haveTblAddonsRendered) { - doAfterBodyRenderTopAddons(); - } - if (haveColsEnumerated && haveTblAddonsRendered && - !haveColHeadersRendered) { - doAfterBodyRenderColHeaders(); - } - if (haveColHeadersRendered && !haveTblFootersRendered) { - retval = doAfterBodyRenderFooter(); - } - else if (haveTblFootersRendered) { - retval = doAfterBodyRenderFooterAddons(); + switch (nextCmd) { + case TBL_HEADING: doAfterBodyRenderListBegin(); break; + case TBL_ADDONS: doAfterBodyRenderTopAddons(); break; + case COL_HEADER: doAfterBodyRenderColHeaders(); break; + case BEFORE_RENDER: retval = doAfterBodyRenderBeforeData(); break; + case RENDER: retval = doAfterBodyRenderData(); break; + case AFTER_RENDER: retval = doAfterBodyRenderAfterData(); break; + case TBL_FOOTER: retval = doAfterBodyRenderFooterAddons(); break; } return retval; } @@ -930,11 +943,6 @@ public class ListTag extends BodyTagSupport { pageSize = -1; rowName = "current"; filter = null; - haveColsEnumerated = false; - haveColHeadersRendered = false; - haveTblAddonsRendered = false; - haveTblFootersRendered = false; - haveTblHeadingRendered = false; getDecorators().clear(); decorators = null; decoratorName = null; @@ -1000,22 +1008,17 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, ">"); }
- private void setState() { + private ListCommand getNextCommand() { ListCommand cmd = ListTagUtil.getCurrentCommand(this, pageContext); - if (cmd.equals(ListCommand.ENUMERATE)) { - haveColsEnumerated = true; - } - else if (cmd.equals(ListCommand.TBL_HEADING)) { - haveTblHeadingRendered = true; - } - else if (cmd.equals(ListCommand.TBL_ADDONS)) { - haveTblAddonsRendered = true; - } - else if (cmd.equals(ListCommand.COL_HEADER)) { - haveColHeadersRendered = true; - } - else if (cmd.equals(ListCommand.TBL_FOOTER)) { - haveTblFootersRendered = true; + switch (cmd) { + case ENUMERATE: return ListCommand.TBL_HEADING; + case TBL_HEADING: return ListCommand.TBL_ADDONS; + case TBL_ADDONS: return ListCommand.COL_HEADER; + case COL_HEADER: return ListCommand.BEFORE_RENDER; + case BEFORE_RENDER: return ListCommand.RENDER; + case RENDER: return ListCommand.RENDER; + case AFTER_RENDER: return ListCommand.TBL_FOOTER; + default: return null; } }
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java index 5659ffc..e45f0e6 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/SpanTag.java @@ -90,7 +90,7 @@ public class SpanTag extends TagSupport { if (cmd.equals(ListCommand.TBL_ADDONS) && role.equals("header")) { renderHeader(parent); } - else if (cmd.equals(ListCommand.TBL_FOOTER) && role.equals("footer")) { + else if (cmd.equals(ListCommand.BEFORE_RENDER) && role.equals("footer")) { renderFooter(parent); } return TagSupport.EVAL_PAGE; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java index dff15b3..8ebb30d 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/test/ListTagTest.java @@ -22,6 +22,7 @@ import com.redhat.rhn.frontend.taglibs.list.ListSetTag; import com.redhat.rhn.frontend.taglibs.list.ListTag; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.RhnMockJspWriter; +import java.io.Writer;
import org.jmock.Mock; import org.jmock.cglib.MockObjectTestCase; @@ -103,17 +104,27 @@ public class ListTagTest extends MockObjectTestCase { .with(eq("current"), isA(Object.class)); mcontext.expects(atLeastOnce()).method("getAttribute") .with(eq("current")).will(returnValue(null)); + mcontext.expects(atLeastOnce()).method("pushBody") + .with(isA(Writer.class)); + mcontext.expects(atLeastOnce()).method("popBody") + .withNoArguments(); mreq.expects(atLeastOnce()).method("getParameter") .with(stringContains("PAGE_SIZE_LABEL_SELECTED")).will(returnValue(null)); Stub[] cmdValues = { returnValue(ListCommand.ENUMERATE), // listtag asking returnValue(ListCommand.ENUMERATE), // columntag asking + returnValue(ListCommand.TBL_HEADING), // listtag asking + returnValue(ListCommand.TBL_HEADING), // columntag asking returnValue(ListCommand.TBL_ADDONS), // listtag asking returnValue(ListCommand.TBL_ADDONS), // columntag asking returnValue(ListCommand.COL_HEADER), // listtag asking returnValue(ListCommand.COL_HEADER), // columntag asking + returnValue(ListCommand.BEFORE_RENDER), // listtag asking + returnValue(ListCommand.BEFORE_RENDER), // columntag asking returnValue(ListCommand.RENDER), // listtag asking returnValue(ListCommand.RENDER), // columntag asking + returnValue(ListCommand.AFTER_RENDER), // listtag asking + returnValue(ListCommand.AFTER_RENDER), // columntag asking returnValue(ListCommand.TBL_FOOTER), // listtag asking returnValue(ListCommand.TBL_FOOTER) // columntag asking };
commit 6f8675d8c45745dacacfdd41a0c07a1f75dd05ab Author: Silvio Moioli smoioli@suse.de Date: Tue Dec 10 09:56:45 2013 +0100
channel/manage/delete.jsp: disabled attribute fixed
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 48032e1..ac17ba9 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -161,7 +161,7 @@ </html:submit> </c:when> <c:otherwise> - <html:submit property="delete_button" disabled styleClass="btn"> + <html:submit property="delete_button" disabled="true" styleClass="btn"> <bean:message key="channel.delete.jsp.channelheader"/> </html:submit> </c:otherwise>
commit 54defb3e0e0d872144cbcd5a8a4560c0be639efa Author: Silvio Moioli smoioli@suse.de Date: Mon Dec 9 18:10:03 2013 +0100
List pagination buttons: restore hover text
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 0b1d7b4..aea165b 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 @@ -587,16 +587,9 @@ public class ListTagUtil { ListTagUtil.write(pageContext, "" value=""); ListTagUtil.write(pageContext, linkData[2]); } + ListTagUtil.write(pageContext, "" title=""); + ListTagUtil.write(pageContext, linkData[3]); ListTagUtil.write(pageContext, ""></button>"); - - /* - if (linkData[1] = null) { - ListTagUtil.write(pageContext, "<input type="hidden" name=""); - ListTagUtil.write(pageContext, linkData[1]); - ListTagUtil.write(pageContext, "" value=""); - ListTagUtil.write(pageContext, linkData[2]); - ListTagUtil.write(pageContext, "" />"); - */ } ListTagUtil.write(pageContext, "</div>"); }
commit e2211619332c42354a8a39114064751d57dc77d7 Author: Bo Maryniuk bo@suse.de Date: Mon Dec 9 13:59:17 2013 +0100
TB3: Fix Edit Autoinstallable Distribution page
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf b/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf index 2df575b..efa0342 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf +++ b/java/code/webapp/WEB-INF/pages/kickstart/tree-form.jspf @@ -1,27 +1,27 @@ <html:hidden property="refreshForm" styleId="refreshForm" value="false"/> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="tree-form.jspf.label"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="label" maxlength="64" size="64" styleClass="form-control"/> </div> </div>
<div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="tree-form.jspf.location"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="basepath" maxlength="256" size="64" styleClass="form-control"/> </div> </div>
<div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="softwareedit.jsp.basechannel"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <c:if test="${requestScope.nochannels != 'true'}"> <html:select property="channelid" onchange="refresh('treeEditForm');" styleClass="form-control"> <html:options collection="channels" property="value" labelProperty="label" /> @@ -35,10 +35,10 @@
<c:if test="${requestScope.nochannels != 'true'}"> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="tree-form.jspf.installer"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <c:choose> <c:when test="${requestScope.noinstalltypes == 'true'}"> <bean:message key="tree-form.jspf.noinstalltypes" /> @@ -55,19 +55,19 @@ </div>
<div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <bean:message key="kickstartdetails.jsp.kernel_options"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="kernelopts" maxlength="256" size="64" styleClass="form-control"/> </div> </div>
<div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <bean:message key="kickstartdetails.jsp.post_kernel_options"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:text property="postkernelopts" maxlength="256" size="64" styleClass="form-control"/> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp index b8ac198..99cb196 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp @@ -4,48 +4,35 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html > - -<head> -<meta http-equiv="Pragma" content="no-cache" /> - -<script language="javascript" src="/javascript/refresh.js"></script> -</head> - -<body> -<rhn:toolbar base="h1" icon="header-kickstart" - deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}" - deletionType="deleteTree" - imgAlt="kickstarts.alt.img"> - <bean:message key="treeedit.jsp.toolbar"/> -</rhn:toolbar> - - - <rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_tree_details.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - - - - -<h2><bean:message key="treeedit.jsp.header2"/></h2> -<bean:message key="treecreate.jsp.header1"/> - - -<div> - <html:form method="post" action="/kickstart/TreeEdit.do"> - <rhn:csrf /> - <%@ include file="tree-form.jspf" %> - <hr/><table align="right"> - <c:if test="${requestScope.hidesubmit != 'true'}"> - <tr> - <td>html:submit<bean:message key="edittree.jsp.submit"/></html:submit></td> - </tr> - </c:if> - </table> - <html:hidden property="submitted" value="true"/> - <html:hidden property="kstid" value="${kstid}"/> + <head> + <meta http-equiv="Pragma" content="no-cache" /> + <script language="javascript" src="/javascript/refresh.js"></script> + </head> + <body> + <rhn:toolbar base="h1" icon="fa-rocket" + deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}" + deletionType="deleteTree" + imgAlt="kickstarts.alt.img"> + <bean:message key="treeedit.jsp.toolbar"/> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/kickstart_tree_details.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="treeedit.jsp.header2"/></h2> + <bean:message key="treecreate.jsp.header1"/> + <html:form method="post" action="/kickstart/TreeEdit.do" styleClass="form-horizontal"> + <rhn:csrf /> + <%@ include file="tree-form.jspf" %> + <c:if test="${requestScope.hidesubmit != 'true'}"> + <div class="col-md-offset-3 col-md-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="edittree.jsp.submit"/> + </html:submit> + </div> + </c:if> + <html:hidden property="submitted" value="true"/> + <html:hidden property="kstid" value="${kstid}"/> </html:form> -</div> </body> </html:html>
commit 5d72a4deab25ae661dd334d2e760a66b9ab027e2 Author: Cynthia Sanchez csanchez@suse.com Date: Mon Dec 9 17:43:43 2013 +0100
button send aligned to the center
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 0a9f29e..90b424b 100644 --- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp @@ -192,7 +192,7 @@
</c:if>
-<div class="text-right"> +<div class="text-center"> <html:submit styleClass="btn btn-success"> <bean:message key="usercreate.jsp.createlogin"/> </html:submit>
commit d6df333768030039ad8acf650a514042dc49ca09 Author: Silvio Moioli smoioli@suse.de Date: Mon Dec 9 17:23:53 2013 +0100
Disabled buttons' style fixed
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 bcdaaf3..4735276 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -78,7 +78,7 @@ </button> </c:when> <c:otherwise> - <button type="button" class="btn btn-success" disabled="disabled"> + <button type="button" class="btn" disabled> <bean:message key="button.update"/> </button> </c:otherwise> 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 1ff78a3..48032e1 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp @@ -161,7 +161,7 @@ </html:submit> </c:when> <c:otherwise> - <html:submit property="delete_button" disabled="true" styleClass="btn btn-success"> + <html:submit property="delete_button" disabled styleClass="btn"> <bean:message key="channel.delete.jsp.channelheader"/> </html:submit> </c:otherwise> 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 1aeb8a3..5e0d293 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 @@ -83,11 +83,16 @@ </rl:list>
<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> - > + <input type="submit" name="confirm" value="<bean:message key='channel.jsp.manage.package.confirmbutton'/>" + <c:choose> + <c:when test="${empty pageList}"> + class="btn" disabled + </c:when> + <c:otherwise> + class="btn btn-default" + </c:otherwise> + </c:choose> + ></input> </div> rhn:submitted/ </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp index f6ab713..53e4456 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp @@ -19,9 +19,16 @@ <%@ include file="tree-form.jspf" %> <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> - <button <c:if test="${requestScope.hidesubmit == 'true'}">disabled="disabled"</c:if> - type="submit" - class="btn btn-success"> + <button type="submit" + <c:choose> + <c:when test="${requestScope.hidesubmit == 'true'}"> + disabled class="btn" + </c:when> + <c:otherwise> + class="btn btn-success" + </c:otherwise> + </c:choose> + > <bean:message key="createtree.jsp.submit"/> </button> </div> 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 3db4dfe..440a13b 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 @@ -91,7 +91,7 @@ onclick="showImages();" value="${rhn:localize('images.jsp.cancel')}" /> <html:submit property="dispatch" - styleClass="btn btn-success" + styleClass="${(empty sessionScope.imagesList)? 'btn' : 'btn-success'}" disabled="${empty sessionScope.imagesList}"> <bean:message key="images.jsp.dispatch" /> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp index ab28bfd..80cae82 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp @@ -34,10 +34,16 @@ </div> <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" - class="btn btn-success" - value="<bean:message key='message.Update'/>" - <c:if test="${empty mailableAddress}">disabled="disabled"</c:if> > + <button type="submit" value="<bean:message key='message.Update'/>" + <c:choose> + <c:when test="${empty mailableAddress}"> + disabled class="btn" + </c:when> + <c:otherwise> + class="btn btn-success" + </c:otherwise> + </c:choose> + > <bean:message key="message.Update"/> </button> </div>
commit 0cb12564d706817b0882f22e888c0756a5ac91a6 Author: Bo Maryniuk bo@suse.de Date: Fri Dec 6 14:23:54 2013 +0100
Fixing the -lg- to -md-
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp index f7f5a0c..5dba6c9 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp @@ -15,15 +15,15 @@ <html:form method="post" styleClass="form-horizontal" action="/kickstart/KickstartPartitionEdit.do"> <rhn:csrf /> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:textarea styleClass="form-control" rows="6" cols="80" property="partitions"/> </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <html:submit styleClass="btn btn-success"> <bean:message key="kickstart.partition.jsp.update"/> </html:submit>
commit d09e1d15f57d1db178f8d9dd3c0da18348da5e95 Author: Bo Maryniuk bo@suse.de Date: Thu Dec 5 16:35:35 2013 +0100
TB3: kickstart system details partitioning
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 6be4b99..0c032ad 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 @@ -9443,7 +9443,7 @@ Please note that some manual configuration of these scripts may still be require </context-group> </trans-unit> <trans-unit id="kickstart.partition.jsp.partitiondetails"> - <source>Partition <br/>Details</source> + <source>Partition Details</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartPartitionEdit.do</context> </context-group> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp index 49acd49..f7f5a0c 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp @@ -4,40 +4,34 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html > -<body> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/kickstart_details.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="kickstart.partition.jsp.header"/></h2> + <p><bean:message key="kickstart.partition.jsp.summary"/></p>
-<h2><bean:message key="kickstart.partition.jsp.header"/></h2> - -<%-- -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> ---%> -<div> - <p> - <bean:message key="kickstart.partition.jsp.summary"/> - </p> - <html:form method="post" action="/kickstart/KickstartPartitionEdit.do"> - <rhn:csrf /> - <table class="details"> - <tr> - <th> - <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: - </th> - <td> - <html:textarea rows="6" cols="80" property="partitions"/> - </td> - </tr> - <tr> - <td align="right" colspan="2">html:submit<bean:message key="kickstart.partition.jsp.update"/></html:submit></td> - </tr> - </table> - <html:hidden property="ksid" value="${ksdata.id}"/> - <html:hidden property="submitted" value="true"/> + <html:form method="post" styleClass="form-horizontal" action="/kickstart/KickstartPartitionEdit.do"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <rhn:required-field key="kickstart.partition.jsp.partitiondetails"/>: + </label> + <div class="col-lg-6"> + <html:textarea styleClass="form-control" rows="6" cols="80" property="partitions"/> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="kickstart.partition.jsp.update"/> + </html:submit> + </div> + </div> + <html:hidden property="ksid" value="${ksdata.id}"/> + <html:hidden property="submitted" value="true"/> </html:form> -</div> </body> </html:html>
commit 4913fe6758aa876d1fdf7662b8ba8f11994bc608 Author: Bo Maryniuk bo@suse.de Date: Fri Dec 6 14:28:13 2013 +0100
Fixing -lg- style with -md-
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index 60083a3..04ae9fa 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -16,10 +16,10 @@ <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> <div class="form-group"> - <label class="col-lg-3 control-label"> + <label class="col-md-3 control-label"> <bean:message key="kickstart.locale.jsp.timezone" /> </label> - <div class="col-lg-6"> + <div class="col-md-6"> <html:select property="timezone" styleClass="form-control"> <html:options collection="timezones" property="value" @@ -28,7 +28,7 @@ </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <div class="checkbox"> <label> <html:checkbox property="use_utc"/> @@ -38,7 +38,7 @@ </div> </div> <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> + <div class="col-md-offset-3 col-md-6"> <html:submit styleClass="btn btn-success"> <bean:message key="kickstart.locale.jsp.updatekickstart"/> </html:submit>
commit c232b42c62b11e417c03ef8277e40463e609e639 Author: Bo Maryniuk bo@suse.de Date: Thu Dec 5 14:06:41 2013 +0100
TB3: Locale form in autoinstallation
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index 90b52f6..60083a3 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -4,45 +4,47 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html > -<body> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> - -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/kickstart_details.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<h2><bean:message key="kickstart.locale.jsp.header1"/></h2> - -<div> - <p> - <bean:message key="kickstart.locale.jsp.summary1"/> - </p> - <html:form method="post" action="/kickstart/LocaleEdit.do"> - <rhn:csrf /> - <html:hidden property="ksid" value="${ksdata.id}"/> - <html:hidden property="submitted" value="true"/> - <table class="details"> - - <tr> - <th><bean:message key="kickstart.locale.jsp.timezone" /></th> - <td> - <html:select property="timezone"> - <html:options collection="timezones" - property="value" - labelProperty="display" /> - </html:select> - <bean:message key="kickstart.locale.jsp.hardwareclock" />: <html:checkbox property="use_utc"/> - <br/> - </td> - </tr> - - <tr> - <td align="right" colspan="2">html:submit<bean:message key="kickstart.locale.jsp.updatekickstart"/></html:submit></td> - </tr> - </table> - </html:form> -</div> - -</body> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/kickstart_details.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <h2><bean:message key="kickstart.locale.jsp.header1"/></h2> + <p><bean:message key="kickstart.locale.jsp.summary1"/></p> + <html:form method="post" action="/kickstart/LocaleEdit.do" styleClass="form-horizontal"> + <rhn:csrf /> + <html:hidden property="ksid" value="${ksdata.id}"/> + <html:hidden property="submitted" value="true"/> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="kickstart.locale.jsp.timezone" /> + </label> + <div class="col-lg-6"> + <html:select property="timezone" styleClass="form-control"> + <html:options collection="timezones" + property="value" + labelProperty="display" /> + </html:select> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <div class="checkbox"> + <label> + <html:checkbox property="use_utc"/> + <bean:message key="kickstart.locale.jsp.hardwareclock" /> + </label> + </div> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="kickstart.locale.jsp.updatekickstart"/> + </html:submit> + </div> + </div> + </html:form> + </body> </html:html>
commit e5f759b5a9d33006867bc89b1c35b3055879b7db Author: Michael Calmer mc@suse.de Date: Thu Dec 5 17:20:04 2013 +0100
use translated text for the title
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index ba4d686..87101f1 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -24,7 +24,7 @@ <bean:message key="ssm.overview.systems.list"/> </div> <div class="panel-heading"> - <rhn:icon type="header-errata" title="Errata" /> + <rhn:icon type="header-errata" title="<bean:message key='ssm.overview.errata'/>" /> <bean:message key="ssm.overview.errata"/> </div> <div class="panel-body">
commit 0d71c1e46028bf93d56c688302331e090af55a67 Author: Silvio Moioli smoioli@suse.de Date: Thu Dec 5 12:24:40 2013 +0100
ListTag: avoid self-closing navigation button icon tags
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 8cc47d1..3287af7 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -603,6 +603,7 @@ public class ListDisplayTag extends ListDisplayTagBase { String styleClass = "btn btn-default btn-xs"; HtmlTag iconTag = new HtmlTag("i"); iconTag.setAttribute("class", "fa " + icon); + iconTag.addBody(""); ret.addBody(iconTag);
if (!active) {
commit da8b3cec0bbdaf237aae9d97e98d1f3077d8b7d3 Author: Duncan Mac-Vicar P dmacvicar@suse.de Date: Wed Dec 4 14:15:27 2013 +0100
adapt the testcase and fix a issue catched by the testcase
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index 4dd2198..5af7c6e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -212,7 +212,7 @@ public class AddressTag extends TagSupport { result.append("<p>"); result.append("<a ") .append("class="btn btn-primary"") - .append("href="") + .append(" href="") .append(getActionUrl()) .append("/EditAddress.do?type=") .append(type) diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index 6e5a1b5..dda57d7 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@ -57,6 +57,7 @@ public class AddressTagTest extends RhnBaseTestCase {
// setup mock objects MockJspWriter out = (MockJspWriter)tth.getPageContext().getOut(); + String data = getPopulatedReturnValue(sah.getRequest(), sah.getUser().getId()); out.setExpectedData( getPopulatedReturnValue(sah.getRequest(), sah.getUser().getId())); addtg.setType(Address.TYPE_MARKETING); @@ -88,20 +89,25 @@ public class AddressTagTest extends RhnBaseTestCase { }
private String getPopulatedReturnValue(HttpServletRequest req, Long uid) { - return "<div class="jumbotron"><div class="container">" + - "<h1>Mailing Address</h1>" + - "<p>444 Castro<br/>#1<br/>Mountain View, CA 94043</p>" + - "<p>Phone: 650-555-1212<br/>Fax: 650-555-1212</p><p>" + - "<a class="btn btn-success btn-lg"href="/EditAddress.do?" + - "type=M&uid=" + uid + "">Edit this address</a></p></div></div>"; + return "<strong>Mailing Address</strong>" + + "<address>444 Castro<br>" + + "#1<br>" + + "Mountain View, CA 94043<br>" + + "Phone: 650-555-1212<br>" + + "Fax: 650-555-1212<br>" + + "</address>" + + "<p>" + + "<a class="btn btn-primary" href="/EditAddress.do?type=M&uid=" + uid + "">" + + "Edit this address</a>" + + "</p>"; }
private String getEmptyReturnValue(HttpServletRequest req, Long uid) { - return "<div class="jumbotron"><div class="container">" + - "<h1>Mailing Address</h1><div class="alert alert-info">" + - "Address not filled out</div><p><a class="btn btn-success btn-lg" " + - "href="/EditAddress.do?type=M&uid=" + uid + - "">Add this address</a></p></div></div>"; + return "<strong>Mailing Address</strong>" + + "<div class="alert alert-info">Address not filled out</div>" + + "<p>" + + "<a class="btn btn-primary" href="/EditAddress.do?type=M&uid=" + uid + "">Add this address</a>" + + "</p>"; }
}
commit 20d40a632802f326cfcdcbff5098d31cfd5ec773 Author: Duncan Mac-Vicar P dmacvicar@suse.de Date: Tue Dec 3 17:23:35 2013 +0100
- There is no reason for address to be a jumbotron - Use the markup like documented at http://getbootstrap.com/css/#type-addresses
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index c186a4c..49c86c1 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -718,9 +718,6 @@ ul.nav.nav-tabs:last-child { } }
-.mail-address-border { - border: 1px solid #ccc; -} /* Links inside alert-info with darker colour and underline text */ .alert-info a{ color: darken(@brand-primary, 10%); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index 5a2bad2..4dd2198 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -23,6 +23,7 @@ import java.io.IOException; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.TagSupport; +import org.apache.commons.lang.StringUtils;
/** * <strong>AddressTag</strong> @@ -163,55 +164,54 @@ public class AddressTag extends TagSupport { StringBuilder result = new StringBuilder(); StringBuilder key = new StringBuilder("address type "); key.append(type); - result.append("<div class="mail-address-border">"); - result.append("<div class="container">"); - result.append("<h1>"); + result.append("<strong>"); result.append(ls.getMessage(key.toString())); - result.append("</h1>"); + result.append("</strong>"); if (user == null) { throw new IllegalArgumentException("User is null"); }
// If this Address is new if (address != null && - address.getCity() != null && - address.getZip() != null) { - + StringUtils.isNotBlank(address.getCity()) && + StringUtils.isNotBlank(address.getZip())) { + result.append("<address>"); // Address 1 and 2 - result.append("<p>"); result.append(address.getAddress1()); - if (address.getAddress2() != null) { - result.append("<br/>"); + result.append("<br>"); + if (StringUtils.isNotBlank(address.getAddress2())) { result.append(address.getAddress2()); + result.append("<br>"); } - result.append("<br/>");
- // Sity + // City result.append(address.getCity()); - if (address.getState() != null) { + if (StringUtils.isNotBlank(address.getState())) { result.append(", "); result.append(address.getState()); } + result.append(" "); result.append(address.getZip()); - result.append("</p>"); + result.append("<br>");
// Phones - result.append("<p>"); result.append(ls.getMessage("phone")); result.append(": "); result.append(address.getPhone()); - result.append("<br/>"); - result.append(ls.getMessage("fax")); - result.append(": "); - if (address.getFax() != null) { + result.append("<br>"); + if (StringUtils.isNotBlank(address.getFax())) { + result.append(ls.getMessage("fax")); + result.append(": "); result.append(address.getFax()); + result.append("<br>"); } - result.append("</p>"); + + result.append("</address>");
result.append("<p>"); result.append("<a ") - .append("class="btn btn-success btn-lg"") + .append("class="btn btn-primary"") .append("href="") .append(getActionUrl()) .append("/EditAddress.do?type=") @@ -229,7 +229,7 @@ public class AddressTag extends TagSupport { result.append("</div>"); result.append("<p>"); result.append("<a ") - .append("class="btn btn-success btn-lg"") + .append("class="btn btn-primary"") .append(" href="") .append(getActionUrl()) .append("/EditAddress.do?type=") @@ -241,8 +241,6 @@ public class AddressTag extends TagSupport { .append("</a>"); result.append("</p>"); } - result.append("</div>"); - result.append("</div>");
out.print(result); }
commit ca59f5f545f51761a29db1763f20145ff935887c Author: Duncan Mac-Vicar P dmacvicar@suse.de Date: Wed Dec 4 10:23:03 2013 +0100
makes the system details page to be shown in two columns, with boxes at both sides instead of each of them taking the full width.
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index 67e0719..f5efe63 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -13,99 +13,90 @@ <h4><bean:message key="sdc.details.overview.systemstatus"/></h4> </div> <div class="panel-body"> - <c:choose> - <c:when test="${unentitled}"> - <rhn:icon type="system-unentitled" /> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> - </c:when> - - <c:when test="${systemInactive}"> - <rhn:icon type="system-unknown" /> <bean:message key="sdc.details.overview.inactive1"/> - <c:if test="${documentation == 'true'}"> - <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> - </c:if> - </c:when> - <c:when test="${hasUpdates}"> - <c:choose> - <c:when test="${criticalErrataCount > 0}"> - <rhn:icon type="system-crit" /> - </c:when> - <c:otherwise> - <rhn:icon type="system-warn" /> - </c:otherwise> - </c:choose> - - <bean:message key="sdc.details.overview.updatesavailable" /> + <c:choose> + <c:when test="${unentitled}"> + <rhn:icon type="system-unentitled"> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> + </c:when> + <c:when test="${systemInactive}"> + <rhn:icon type="system-unknown" /> <bean:message key="sdc.details.overview.inactive1"/> + <c:if test="${documentation == 'true'}"> + <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> + </c:if> + </c:when> + <c:when test="${hasUpdates}"> + <c:choose> + <c:when test="${criticalErrataCount > 0}"> + <rhn:icon type="system-crit" /> + </c:when> + <c:otherwise> + <rhn:icon type="system-warn" /> + </c:otherwise> + </c:choose> + <bean:message key="sdc.details.overview.updatesavailable" />
- <c:if test="${criticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/> - </c:if> - <c:if test="${nonCriticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/> - </c:if> - <c:if test="${upgradablePackagesCount > 0}"> - <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> - </c:if> - </c:when> + <c:if test="${criticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/> + </c:if> + <c:if test="${nonCriticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/> + </c:if> + <c:if test="${upgradablePackagesCount > 0}"> + <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> + </c:if> + </c:when>
- <c:otherwise> - <rhn:icon type="system-ok" /> <bean:message key="sdc.details.overview.updated"/> - </c:otherwise> - </c:choose> + <c:otherwise> + <rhn:icon type="system-ok" /> <bean:message key="sdc.details.overview.updated"/> + </c:otherwise> + </c:choose>
- <c:if test="${rebootRequired}"> - <div class="systeminfo"> - <div class="systeminfo-full"> - <rhn:icon type="system-reboot" /><bean:message key="sdc.details.overview.requires_reboot"/> - <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> - </div> + <c:if test="${rebootRequired}"> + <div class="systeminfo"> + <div class="systeminfo-full"> + <rhn:icon type="system-reboot" /><bean:message key="sdc.details.overview.requires_reboot"/> + <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> </div> - </c:if> + </div> + </c:if>
- <c:if test="${probeListEmpty != 'true'}"> - <div class="row-0"> - <div class="col-md-6"> + <c:if test="${probeListEmpty != 'true'}"> + <div class="row-0"> + <div class="col-md-6"> + <c:choose> + <c:when test="${probeList[0].state == 'CRITICAL'}"> + <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + </c:when> + <c:otherwise> + <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + </c:otherwise> + </c:choose> + </div> + <div class="col-md-6"> + <c:forEach items="${probeList}" var="probe"> <c:choose> - <c:when test="${probeList[0].state == 'CRITICAL'}"> - <rhn:icon type="monitoring-crit" /> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <c:when test="${probe.state == 'CRITICAL'}"> + <rhn:icon type="monitoring-crit" /> </c:when> <c:otherwise> - <rhn:icon type="monitoring-warn" /> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <rhn:icon type="monitoring-warn" /> </c:otherwise> </c:choose> - </div> - <div class="col-md-6"> - <c:forEach items="${probeList}" var="probe"> - <c:choose> - <c:when test="${probe.state == 'CRITICAL'}"> - <rhn:icon type="monitoring-crit" /> - </c:when> - <c:otherwise> - <rhn:icon type="monitoring-warn" /> - </c:otherwise> - </c:choose> - <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> - </c:forEach> - </div> + <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> + </c:forEach> </div> - </c:if> - + </div> + </c:if> </div> </div>
+ <div class="row-0"> + <div class="col-md-6">
- <div class="systeminfo"> - - - - - -<div class="row-0"> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.systeminfo"/></h4> - </div> - <div class="panel-body"> + <!-- System Info box --> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.systeminfo"/></h4> + </div> <table class="table"> <tr> <td><bean:message key="sdc.details.overview.hostname"/></td> @@ -123,14 +114,14 @@ <tr> <td><bean:message key="sdc.details.overview.ipaddy"/></td> <td> - <c:choose> - <c:when test="${system.ipAddress == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.ipAddress}" /> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="${system.ipAddress == null}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${system.ipAddress}" /> + </c:otherwise> + </c:choose> </td> </tr> <tr> @@ -168,21 +159,21 @@ <tr> <td><bean:message key="sdc.details.overview.kernel"/></td> <td> - <c:choose> - <c:when test="${system.runningKernel == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.runningKernel}" /> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="${system.runningKernel == null}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${system.runningKernel}" /> + </c:otherwise> + </c:choose> </td> </tr> <tr> <td><bean:message key="sdc.details.overview.sysid"/></td> <td><c:out value="${system.id}" /></td> </tr> - <tr> + <tr> <td><bean:message key="sdc.details.overview.activationkey"/></td> <td> <c:forEach items="${activationKey}" var="key"> @@ -193,32 +184,63 @@ <tr> <td><bean:message key="sdc.details.overview.lockstatus"/></td> <td> - <c:choose> - <c:when test="${serverLock != null}"> - <rhn:icon type="system-locked" /> - <bean:message key="sdc.details.overview.locked" - arg0="${serverLock.locker.login}" - arg1="${serverLock.reason}" /><br/> - <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> - </c:when> - <c:otherwise> + <c:choose> + <c:when test="${serverLock != null}"> + <rhn:icon type="system-locked" /> + <bean:message key="sdc.details.overview.locked" + arg0="${serverLock.locker.login}" + arg1="${serverLock.reason}" /><br/> + <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> + </c:when> + <c:otherwise> <rhn:icon type="system-physical" /> <bean:message key="sdc.details.overview.unlocked"/><br/> <bean:message key="sdc.details.overview.lock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=1"/> - </c:otherwise> - </c:choose> + </c:otherwise> + </c:choose> </td> </tr> </table> </div> - </div> - </div> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.sysevents"/></h4> + + <!-- Channel subcriptions --> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.subscribedchannels" arg0="/rhn/systems/details/SystemChannels.do?sid=${system.id}"/></h4> + </div> + <div class="panel-body"> + <c:if test="${system.baseChannel != null}"> + <ul class="channel-list"> + <li> + <a href="/rhn/channels/ChannelDetail.do?cid=${baseChannel['id']}">${baseChannel['name']}</a> + <c:if test="${baseChannel['is_fve'] == 'Y'}"> + (Flex) + </c:if> + </li> + + <c:forEach items="${childChannels}" var="childChannel"> + <li class="child-channel"> + <a href="/rhn/channels/ChannelDetail.do?cid=${childChannel['id']}">${childChannel['name']}</a> + <c:if test="${childChannel['is_fve'] == 'Y'}"> + (Flex) + </c:if> + </li> + </c:forEach> + + </ul> + </c:if> + </div> </div> - <div class="panel-body"> + + </div> + + <div class="col-md-6"> + + <!-- System events box --> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.sysevents"/></h4> + </div> <table class="table"> <tr> <td><bean:message key="sdc.details.overview.checkedin"/></td> @@ -247,20 +269,19 @@ <bean:message key="sdc.details.overview.osa.status.message" arg0="${system.pushClient.state.name}"/> <c:choose> - <c:when test="${system.pushClient.lastMessageTime != null}"> - <fmt:formatDate value="${system.pushClient.lastMessageTime}" type="both" dateStyle="short" timeStyle="long"/><br/> - </c:when> - <c:otherwise> - <bean:message key="sdc.details.overview.unknown" /><br/> - </c:otherwise> + <c:when test="${system.pushClient.lastMessageTime != null}"> + <fmt:formatDate value="${system.pushClient.lastMessageTime}" type="both" dateStyle="short" timeStyle="long"/><br/> + </c:when> + <c:otherwise> + <bean:message key="sdc.details.overview.unknown" /><br/> + </c:otherwise> </c:choose> <c:if test="${system.pushClient.lastPingTime != null}"> - <bean:message key="sdc.details.overview.osa.status.lastping"/> - <fmt:formatDate value="${system.pushClient.lastPingTime}" type="both" dateStyle="short" timeStyle="long"/> - <br/> + <bean:message key="sdc.details.overview.osa.status.lastping"/> + <fmt:formatDate value="${system.pushClient.lastPingTime}" type="both" dateStyle="short" timeStyle="long"/> + <br/> </c:if> - - <a href="/rhn/systems/details/Overview.do?sid=${system.id}&ping=1"><bean:message key="sdc.details.overview.osa.status.ping"/></a> + <a href="/rhn/systems/details/Overview.do?sid=${system.id}&ping=1"><bean:message key="sdc.details.overview.osa.status.ping"/></a> </c:when> <c:otherwise> <bean:message key="sdc.details.overview.unknown" /> @@ -277,7 +298,7 @@ <c:choose> <c:when test="${system.serverUuid == null}"> <bean:message key="sdc.details.overview.applet.notactivated"/><br/> - <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.activate"/></a> + <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.activate"/></a> </c:when> <c:otherwise> <bean:message key="sdc.details.overview.applet.activated"/><br/> @@ -289,93 +310,88 @@ </rhn:require> </table> </div> - </div> - </div> -</div>
- <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.sysproperties" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/></h4> - </div> - <div class="panel-body"> - <table class="table"> - <tr> - <td><bean:message key="sdc.details.overview.entitlement"/></td> - <td> - <c:choose> - <c:when test="${unentitled}"> - <bean:message key="none.message"/> - </c:when> - <c:otherwise> - - <c:forEach items="${system.entitlements}" var="entitlement"> - [${entitlement.humanReadableLabel}] - </c:forEach> - - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.notifications"/></td> - <td> - - <c:choose> - <c:when test="${unentitled}"> - <bean:message key="none.message"/> - </c:when> - <c:otherwise> - - <c:forEach items="${prefs}" var="pref"> - <bean:message key="${pref}"/><br/> - </c:forEach> - - </c:otherwise> - </c:choose> - </td> - </tr> - <rhn:require acl="system_feature(ftr_errata_updates)" + <!-- System Properties box --> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.sysproperties" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/></h4> + </div> + <table class="table"> + <tr> + <td><bean:message key="sdc.details.overview.entitlement"/></td> + <td> + <c:choose> + <c:when test="${unentitled}"> + <bean:message key="none.message"/> + </c:when> + <c:otherwise> + <c:forEach items="${system.entitlements}" var="entitlement"> + [${entitlement.humanReadableLabel}] + </c:forEach> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.notifications"/></td> + <td> + <c:choose> + <c:when test="${unentitled}"> + <bean:message key="none.message"/> + </c:when> + <c:otherwise> + <c:forEach items="${prefs}" var="pref"> + <bean:message key="${pref}"/><br/> + </c:forEach> + </c:otherwise> + </c:choose> + </td> + </tr> + <rhn:require acl="system_feature(ftr_errata_updates)" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> - <tr> - <td><bean:message key="sdc.details.overview.errataupdate"/></td> - <td><c:choose> + <tr> + <td><bean:message key="sdc.details.overview.errataupdate"/></td> + <td> + <c:choose> <c:when test="${system.autoUpdate == 'Y'}"> - <bean:message key="yes"/> + <bean:message key="yes"/> </c:when> <c:otherwise> - <bean:message key="no"/> + <bean:message key="no"/> </c:otherwise> </c:choose> - </td> - </tr> - </rhn:require> - <tr> - <td><bean:message key="sdc.details.overview.sysname"/></td> - <td><c:out value="${system.name}"/></td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.description"/></td> - <td>${description}</td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.location"/></td> - <td> - <c:choose> - <c:when test="${not hasLocation}"> - <bean:message key="sdc.details.overview.location.none"/> - </c:when> - <c:otherwise> - <bean:message key="sdc.details.overview.location.room"/>: <c:out value="${system.location.room}"/><br/> - <bean:message key="sdc.details.overview.location.rack"/>: <c:out value="${system.location.rack}"/><br/> - <bean:message key="sdc.details.overview.location.building"/>: <c:out value="${system.location.building}"/><br/> - <c:out value="${system.location.address1}"/><br/> - <c:out value="${system.location.address2}"/><br/> - <c:out value="${system.location.city}"/> <c:out value="${system.location.state}"/> <c:out value="${system.location.country}"/> - </c:otherwise> - </c:choose> - </td> - </tr> - </table> + </td> + </tr> + </rhn:require> + <tr> + <td><bean:message key="sdc.details.overview.sysname"/></td> + <td><c:out value="${system.name}"/></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.description"/></td> + <td>${description}</td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.location"/></td> + <td> + <c:choose> + <c:when test="${not hasLocation}"> + <bean:message key="sdc.details.overview.location.none"/> + </c:when> + <c:otherwise> + <bean:message key="sdc.details.overview.location.room"/>: <c:out value="${system.location.room}"/><br/> + <bean:message key="sdc.details.overview.location.rack"/>: <c:out value="${system.location.rack}"/><br/> + <bean:message key="sdc.details.overview.location.building"/>: <c:out value="${system.location.building}"/><br/> + <c:out value="${system.location.address1}"/><br/> + <c:out value="${system.location.address2}"/><br/> + <c:out value="${system.location.city}"/> <c:out value="${system.location.state}"/> <c:out value="${system.location.country}"/> + </c:otherwise> + </c:choose> + </td> + </tr> + </table> + </div> + </div> </div>
@@ -384,58 +400,29 @@ <div class="panel-heading"> <h4><bean:message key="sdc.details.overview.crashes.application"/></h4> </div> - <div class="panel-body"> - <table class="table"> - <c:choose> - <c:when test="${system.crashCount == null}"> - <bean:message key="sdc.details.overview.crashes.nodata"/> - </c:when> - <c:otherwise> - <tr> - <td><bean:message key="sdc.details.overview.crashes.uniquecrashcount"/></td> - <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.uniqueCrashCount}"/></a></td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.crashes.totalcrashcount"/></td> - <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.totalCrashCount}"/></a></td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.crashes.lastreport"/></td> - <td><fmt:formatDate value="${system.crashCount.lastReport}" type="both" dateStyle="short" timeStyle="long"/></td> - </tr> - - </c:otherwise> - </c:choose> - </table> - </div> + <table class="table"> + <c:choose> + <c:when test="${system.crashCount == null}"> + <bean:message key="sdc.details.overview.crashes.nodata"/> + </c:when> + <c:otherwise> + <tr> + <td><bean:message key="sdc.details.overview.crashes.uniquecrashcount"/></td> + <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.uniqueCrashCount}"/></a></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.crashes.totalcrashcount"/></td> + <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.totalCrashCount}"/></a></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.crashes.lastreport"/></td> + <td><fmt:formatDate value="${system.crashCount.lastReport}" type="both" dateStyle="short" timeStyle="long"/></td> + </tr> + </c:otherwise> + </c:choose> + </table> </div> </rhn:require> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.subscribedchannels" arg0="/rhn/systems/details/SystemChannels.do?sid=${system.id}"/></h4> - </div> - <div class="panel-body"> - <c:if test="${system.baseChannel != null}"> - <ul class="channel-list"> - <li> - <a href="/rhn/channels/ChannelDetail.do?cid=${baseChannel['id']}">${baseChannel['name']}</a> - <c:if test="${baseChannel['is_fve'] == 'Y'}"> - (Flex) - </c:if> - </li> - - <c:forEach items="${childChannels}" var="childChannel"> - <li class="child-channel"> - <a href="/rhn/channels/ChannelDetail.do?cid=${childChannel['id']}">${childChannel['name']}</a> - <c:if test="${childChannel['is_fve'] == 'Y'}"> - (Flex) - </c:if> - </li> - </c:forEach>
- </ul> - </c:if> - </div> - </div> </body> </html:html>
commit a2a07055af55a03b3d5d9d22ce43f3c6896d0da0 Author: Cynthia Sanchez csanchez@suse.com Date: Wed Dec 4 18:16:20 2013 +0100
colour added to the counter in SSM
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 4da0d76..c186a4c 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -236,7 +236,8 @@ header { display: none; } #bar .spacewalk-bar .badge { - margin-right: .5em + margin-right: .5em; + background: @spacewalk-blue } }
commit 2d645a7b4287c4a173a15fecab30d8f5d1e168cc Author: Cynthia Sanchez csanchez@suse.com Date: Wed Dec 4 16:44:44 2013 +0100
Links inside a alert-info have a darker blue than the text shown and have underline. It is necessary to distinguish the link over the general text
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 9fc286c..4da0d76 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -720,3 +720,8 @@ ul.nav.nav-tabs:last-child { .mail-address-border { border: 1px solid #ccc; } +/* Links inside alert-info with darker colour and underline text */ +.alert-info a{ + color: darken(@brand-primary, 10%); + text-decoration: underline; +}
commit 515a8d55dc7ab0b15345884e336dc5ce7b3b4e76 Author: Maximilian Meister mmeister@suse.de Date: Tue Dec 3 16:31:28 2013 +0100
Fix Unit test for ProbeList
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java index 46b82bd..12d680a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java @@ -45,8 +45,7 @@ public class ProbeListTest extends RhnMockStrutsTestCase { setRequestPathInfo("/monitoring/ProbeList"); actionPerform(); verifyPageList(ServerProbeDto.class); - assertEquals("content-nav-selected", request.getAttribute("allClass")); - assertEquals("content-nav-selected-link", request.getAttribute("allLink")); + assertEquals("active", request.getAttribute("allClass"));
checkCount(ProbeList.PROBE_COUNT_ALL); checkCount(ProbeList.PROBE_COUNT_CRITICAL); @@ -58,8 +57,7 @@ public class ProbeListTest extends RhnMockStrutsTestCase { addRequestParameter(ProbeList.PROBE_STATE, MonitoringConstants.PROBE_STATE_CRITICAL); actionPerform(); - assertEquals("content-nav-selected", request.getAttribute("criticalClass")); - assertEquals("content-nav-selected-link", request.getAttribute("criticalLink")); + assertEquals("active", request.getAttribute("criticalClass")); }
private void checkCount(String name) {
commit bdb2ec665ed9efb673efd2b3516e6ac79094e209 Author: Johannes Renner jrenner@suse.de Date: Tue Dec 3 14:59:09 2013 +0100
Fix ListDisplayTagTest class after implementation changes
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java index 2b0e1e0..3aa37cf 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java @@ -81,7 +81,7 @@ public class ListDisplayTagTest extends MockObjectTestCase { mcontext.expects(atLeastOnce()).method("popBody") .withNoArguments(); mcontext.expects(atLeastOnce()).method("pushBody") - .withNoArguments(); + .withAnyArguments(); mreq.expects(atLeastOnce()).method("getParameter") .with(eq(RequestContext.LIST_DISPLAY_EXPORT)).will(returnValue(null)); mreq.stubs().method("getParameter").with(eq(RequestContext.LIST_SORT)).will( @@ -131,7 +131,7 @@ public class ListDisplayTagTest extends MockObjectTestCase { mcontext.expects(atLeastOnce()).method("popBody"). withNoArguments(); mcontext.expects(atLeastOnce()).method("pushBody"). - withNoArguments(); + withAnyArguments(); mreq.expects(atLeastOnce()).method("getAttribute"). with(eq("requestedUri")).will(returnValue("/rhn/somePage.do")); mreq.expects(atLeastOnce()).method("getQueryString").
spacewalk-commits@lists.fedorahosted.org