java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 6
+
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 4
-
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 8
+-
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 31
+++++++---
java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 4
-
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 4
-
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 4
-
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 4
-
java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 4
-
java/code/webapp/WEB-INF/struts-config.xml | 8
+-
11 files changed, 50 insertions(+), 29 deletions(-)
New commits:
commit 1e8370080bc2753a7bbe9fabe39a543884c7d357
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 23 16:11:13 2009 -0500
fixing a bunch of list display issues that have bugged me for a while
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 6e7d4b1..1580ba5 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -46,7 +46,11 @@
</rhn-tab>
<rhn-tab name="System Set Manager"
url="/network/systems/ssm/index.pxt"
acl="org_entitlement(sw_mgr_enterprise)">
<rhn-tab-directory>/rhn/systems/ssm</rhn-tab-directory>
- <rhn-tab name="ssm.nav.status" url="/rhn/ssm/ViewAllLog.do"
acl="org_entitlement(sw_mgr_enterprise)"/>
+ <rhn-tab-directory>/rhn/ssm</rhn-tab-directory>
+ <rhn-tab name="ssm.nav.status" url="/rhn/ssm/ViewAllLog.do"
acl="org_entitlement(sw_mgr_enterprise)">
+ <rhn-tab-url>/rhn/ssm/ViewLog.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/ssm/ViewCompletedLog.do</rhn-tab-url>
+ </rhn-tab>
</rhn-tab>
<rhn-tab name="Advanced Search" url="/rhn/systems/Search.do"
acl="org_entitlement(sw_mgr_enterprise)" />
<rhn-tab name="Activation Keys"
acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
index 7dc2508..58f3ee0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
@@ -57,7 +57,7 @@
<rl:column bound="false"
sortable="false"
- headerkey="entitlements.jsp.channel">
+ headerkey="entitlements.jsp.channel"
styleclass="first-column">
<a
href="/rhn/admin/multiorg/SoftwareEntitlementDetails.do?cfid=${current.id}"><c:out
value="${current.name}" /></a>
</rl:column>
<rl:column bound="false"
@@ -72,7 +72,7 @@
</rl:column>
<rl:column bound="false"
sortable="false"
- headerkey="orgsystemsubs.jsp.proposed_total">
+ headerkey="orgsystemsubs.jsp.proposed_total"
styleclass="last-column">
<c:choose>
<c:when test="${param.oid != 1}">
<input name="${current.id}"
value="${current.maxMembers}" type="text"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
index be173ae..50570af 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
@@ -45,9 +45,11 @@
<a href="OrgDetails.do?oid=${current.org.id}">
${current.org.name} </a>
</rl:column>
<rl:column
- bound="false"
- sortable="false"
- headerkey="org.trust.trusts">${current.numTrusted}
+ bound="false"
+ sortable="false"
+ headerkey="org.trust.trusts"
+ styleclass="last-column">
+ ${current.numTrusted}
</rl:column>
</rl:list>
<hr/>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
index 3086910..18b36de 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
@@ -5,7 +5,7 @@
<rl:decorator name="PageSizeDecorator"/>
<rl:decorator name="ElaborationDecorator"/>
- <rl:column headerkey="erratalist.jsp.type"
styleclass="text-align: left;">
+ <rl:column headerkey="erratalist.jsp.type"
styleclass="first-column text-align: left;">
<c:if test="${current.securityAdvisory}">
<img src="/img/wrh-security.gif"
alt="<bean:message
key="erratalist.jsp.securityadvisory"/>"/>
@@ -32,15 +32,30 @@
styleclass="text-align: center;">
<a
href="/rhn/errata/details/SystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a>
</rl:column>
- <rl:column headerkey="erratalist.jsp.updated"
- sortable="true"
- sortattr="updateDateObj"
- styleclass="text-align: center;">
- ${current.updateDate}
- </rl:column>
+
+ <c:if test="${displayCves}">
+ <rl:column headerkey="erratalist.jsp.updated"
+ sortable="true"
+ sortattr="updateDateObj"
+ styleclass="text-align: center;">
+ ${current.updateDate}
+ </rl:column>
+ </c:if>
+ <c:if test="${not displayCves}">
+ <rl:column headerkey="erratalist.jsp.updated"
+ sortable="true"
+ sortattr="updateDateObj"
+ styleclass="last-column text-align: center;">
+ ${current.updateDate}
+ </rl:column>
+ </c:if>
+
+
+
+
<c:if test="${displayCves}">
- <rl:column headerkey="details.jsp.cves">
+ <rl:column headerkey="details.jsp.cves"
styleclass="last-column">
<c:forEach items="${current.cves}" var="cve">
<a
href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=${cve}">
<c:out value="${cve}"/> <br />
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
index f78c75f..7bd2594 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
@@ -25,7 +25,7 @@
emptykey="channels.overview.nochannels">
<rl:column headerkey="channels.overview.name"
bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true"
styleclass="first-column last-column">
<c:choose>
<c:when test="${current.depth > 1}">
<img style="margin-left: 4px;"
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
index add170b..2b47b87 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
@@ -26,11 +26,11 @@
<rl:list dataset="pageList"
width="100%"
name="groupList"
- styleclass="list"
+ styleclass="list "
emptykey="systemlist.jsp.nosystems">
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true"
styleclass="first-column last-column">
${current.name}
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
index bc6019b..4eda77e 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
@@ -27,12 +27,12 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true"
styleclass="first-column">
${current.system_name}
</rl:column>
<rl:column headerkey="ssm.package.remove.schedule.packages"
bound="false"
- sortable="false">
+ sortable="false" styleclass="last-column">
<c:forEach begin="0" end="19"
items="${current.elaborator0}" var="item"
varStatus="status">
<c:out value="${item.nvre}"/><br/>
</c:forEach>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
index 8ac421e..139f8a5 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
@@ -32,12 +32,12 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true"
styleclass="first-column">
${current.server_name}
</rl:column>
<rl:column headerkey="ssm.package.upgrade.schedule.packages"
bound="false"
- sortable="false">
+ sortable="false" styleclass="last-column">
<c:forEach begin="0" end="19"
items="${current.elaborator0}" var="item"
varStatus="status">
<c:out value="${item.nvre}"/><br/>
</c:forEach>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
index 9d9ca72..27cd47a 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
@@ -27,12 +27,12 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:column headerkey="actions.jsp.system" bound="false"
- sortattr="name" sortable="true">
+ sortattr="name" sortable="true"
styleclass="first-column">
${current.system_name}
</rl:column>
<rl:column headerkey="ssm.package.verify.schedule.packages"
bound="false"
- sortable="false">
+ sortable="false" styleclass="last-column">
<c:forEach begin="0" end="19"
items="${current.elaborator0}" var="item"
varStatus="status">
<c:out value="${item.nvre}"/><br/>
</c:forEach>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
index ae04339..eb19833 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
@@ -35,7 +35,7 @@
<rl:decorator name="PageSizeDecorator"/>
<rl:column headerkey="ssm.operations.viewlog.description"
bound="false"
- sortattr="description" sortable="true">
+ sortattr="description" sortable="true"
styleclass="first-column">
<a
href="/rhn/ssm/ViewLogDetails.do?oid=${current.id}"><c:out
value="${current.description}"/></a>
</rl:column>
@@ -48,7 +48,7 @@
</c:if>
</rl:column>
- <rl:column headerkey="ssm.operations.viewlog.modified"
bound="false">
+ <rl:column headerkey="ssm.operations.viewlog.modified"
bound="false" styleclass="last-column">
<c:out value="${current.modified}"/>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 9ba2e2a..2c5d1db 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6596,7 +6596,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageinstallschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do" />
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<!-- SSM Package Remove Pages -->
@@ -6618,7 +6618,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageremoveschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do"/>
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<!-- SSM Package Upgrade Pages -->
@@ -6640,7 +6640,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageupgradeschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do"/>
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<!-- SSM Package Verify Pages -->
@@ -6662,7 +6662,7 @@
<forward name="default"
path="/WEB-INF/pages/ssm/packageverifyschedule.jsp" />
<forward name="confirm"
- path="/ssm/ViewLog.do"/>
+ path="/ssm/ViewLog.do" redirect="true"/>
</action>
<action path="/admin/TaskStatus"