java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml |
14 ++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |
29 +++++-----
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java |
12 ++--
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf |
4 -
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp |
3 -
5 files changed, 40 insertions(+), 22 deletions(-)
New commits:
commit 852c28959db6f71eeb9a7d649e943f292f15a29d
Author: Partha Aji <paji(a)redhat.com>
Date: Tue May 4 12:16:35 2010 -0400
More list tag enhancements
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 68eeefe..9a35c57 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -1645,6 +1645,20 @@
http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd&q...
</context>
</context-group>
</trans-unit>
+
+ <trans-unit id="show.all">
+<source>Show All</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="hide.all">
+<source>Hide All</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="bad-class">
<source>Class does not implement AclHandler: {0}</source>
<context-group name="ctx">
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 2817450..ce2bcdd 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
@@ -76,6 +76,21 @@
</group>
+ <trans-unit id="manysystems.message">
+<source>{0} systems</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/configuration/ChannelOverview.do</context>
+ <context context-type="paramnotes">"6
systems"</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="onesystem.message">
+<source>1 system</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/configuration/ChannelOverview.do</context>
+ <context context-type="paramnotes">"1
system"</context>
+ </context-group>
+ </trans-unit>
+
<trans-unit id="nosystems.message">
<source>No systems.</source>
<context-group name="ctx">
@@ -12853,20 +12868,6 @@ the <strong>Red Hat Enterprise Linux System
Administration Guide.</stro
<context context-type="paramnotes">"38
total"</context>
</context-group>
</trans-unit>
- <trans-unit id="channelOverview.jsp.systems">
-<source>{0} systems</source>
- <context-group name="ctx">
- <context
context-type="sourcefile">/rhn/configuration/ChannelOverview.do</context>
- <context context-type="paramnotes">"6
systems"</context>
- </context-group>
- </trans-unit>
- <trans-unit id="channelOverview.jsp.system">
-<source>{0} system</source>
- <context-group name="ctx">
- <context
context-type="sourcefile">/rhn/configuration/ChannelOverview.do</context>
- <context context-type="paramnotes">"1
system"</context>
- </context-group>
- </trans-unit>
<trans-unit id="channelOverview.jsp.systems-subscribed">
<source>subscribed</source>
<context-group name="ctx">
diff --git
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
index fa413b9..838f82f 100644
---
a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
+++
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.taglibs.list.decorators;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.taglibs.list.ListTag;
import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
@@ -28,9 +29,9 @@ public class ExpansionDecorator extends BaseListDecorator {
private static final String SHOW_ALL_SCRIPT =
"<a href=\"javascript:showAllRows(rowHash%s);\"" +
- " style=\"cursor: pointer;\">Show
All</a> | " +
+ " style=\"cursor:
pointer;\">%s</a> | " +
"<a href=\"javascript:hideAllRows(rowHash%s);\" " +
- "style=\"cursor: pointer;\">Hide All</a>";
+ "style=\"cursor: pointer;\">%s</a>";
private static final String NEW_VAR_SCRIPT = "<script
type=\"text/javascript\">var " +
"rowHash%s = new
Array();</script>";
@@ -52,8 +53,11 @@ public class ExpansionDecorator extends BaseListDecorator {
*/
@Override
public void beforeTopPagination() throws JspException {
- ListTagUtil.write(pageContext, String.format(SHOW_ALL_SCRIPT,
- listName, listName));
+ LocalizationService ls = LocalizationService.getInstance();
+ ListTagUtil.write(pageContext, "<td
class=\"list-sizeselector\">");
+ ListTagUtil.write(pageContext, String.format(SHOW_ALL_SCRIPT, listName,
+ ls.getMessage("show.all"), listName,
ls.getMessage("hide.all")));
+ ListTagUtil.write(pageContext, "</td>");
}
/**
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
index 06dbe47..a9f5a01 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf
@@ -25,12 +25,12 @@
<c:choose>
<c:when test="${summary.numSystems == 1}">
<td><a
href="/rhn/configuration/channel/ChannelSystems.do?ccid=${channel.id}"><bean:message
- key="channelOverview.jsp.system" arg0="${summary.numSystems}"
/></a>
+ key="onesystem.message"/></a>
<bean:message key="channelOverview.jsp.systems-subscribed"
/></td>
</c:when>
<c:when test="${summary.numSystems > 1}">
<td><a
href="/rhn/configuration/channel/ChannelSystems.do?ccid=${channel.id}"><bean:message
- key="channelOverview.jsp.systems" arg0="${summary.numSystems}"
/></a>
+ key="manysystems.message" arg0="${summary.numSystems}"
/></a>
<bean:message key="channelOverview.jsp.systems-subscribed"
/></td>
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp
index 7ac9b2f..c32011d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp
@@ -23,7 +23,6 @@
<rl:list
emptykey="nosystems.message"
parentiselement = "false"
- searchparent="true"
searchchild="false"
@@ -47,7 +46,7 @@
<!-- Name Column -->
<rl:column headerkey="systemlist.jsp.system"
filterattr="key">
- <rl:expandable rendericon="true">${current.key}
<em>(${rl:countChildren(current)} systems)</em> </rl:expandable>
+ <rl:expandable rendericon="true">${current.key}
<em>(<bean:message key="manysystems.message"
arg0="${rl:countChildren(current)}"/>)</em> </rl:expandable>
<rl:non-expandable
rendericon="true">${current.id}</rl:non-expandable>
</rl:column>