java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 7 ++++++- java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-)
New commits: commit c6ea5409490deb6be031677ad60ecbbea9ad56e7 Author: Tomas Kasparek tkasparek@redhat.com Date: Wed Dec 18 13:27:01 2013 +0100
fix CSVTag so it uses IconTag
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java index 382f299..6d7ef13 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java @@ -19,6 +19,7 @@ import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.action.CSVDownloadAction; import com.redhat.rhn.frontend.dto.SystemSearchPartialResult; import com.redhat.rhn.frontend.dto.SystemSearchResult; +import com.redhat.rhn.frontend.taglibs.IconTag; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import java.util.HashMap; @@ -196,10 +197,15 @@ public class CSVTag extends BodyTagSupport { private void renderExport() throws JspException { StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI); page.append("?" + makeCSVRequestParams()); + IconTag i = new IconTag(); + i.setParent(getParent()); + i.setPageContext(pageContext); + i.setType("item-download-csv"); String exportLink = new String("<div class="spacewalk-csv-download"><a href="" + - page + ""><i class="spacewalk-icon-download-csv"></i>" + + page + "">" + i.renderStartTag() + LocalizationService.getInstance().getMessage( "listdisplay.csv") + "</a></div>"); + i.release(); ListTagUtil.write(pageContext, exportLink); }
commit 2723a5b89657c3aa287a526c17402d2530ca4c44 Author: Tomas Kasparek tkasparek@redhat.com Date: Wed Dec 18 13:24:44 2013 +0100
fix ListDisplayTag so it uses IconTag
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 3287af7..c7998a2 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -458,10 +458,15 @@ public class ListDisplayTag extends ListDisplayTagBase { if (request.getQueryString() != null) { page.append("&" + request.getQueryString()); } + IconTag i = new IconTag(); + i.setParent(getParent()); + i.setPageContext(pageContext); + i.setType("item-download-csv"); out.println("<div class="spacewalk-csv-download"><a href="" + page + - ""><i class="spacewalk-icon-download-csv"></i>" + + "">" + i.renderStartTag() + LocalizationService.getInstance().getMessage("listdisplay.csv") + "</a></div>"); + i.release(); }
private void renderBoundsVariables(Writer out) throws IOException {
spacewalk-commits@lists.fedorahosted.org