java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 57
+++-------
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java | 2
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 38
++++++
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 22
+--
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java | 6 -
java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 23
+---
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java | 8 -
java/spacewalk-java.spec | 6 -
rel-eng/packages/spacewalk-java | 2
10 files changed, 81 insertions(+), 85 deletions(-)
New commits:
commit 7dfe4825d362f3ce0123274ad031abb49c22f57a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 31 10:42:20 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.138-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fc43375..a2f9e79 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.137
+Version: 2.1.138
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 31 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.138-1
+- reuse IconTag for help links, item search and pagination icons
+- re-style kickstart creation wizard, 1st form
+
* Thu Jan 30 2014 Stephen Herr <sherr(a)redhat.com> 2.1.137-1
- 1059910 - create api for channel errata syncing, have clone-by-date call it
- fix style on kickstart profile creation wizard + use rhn:toolbar
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bf1e5c2..f87e58b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.137-1 java/
+2.1.138-1 java/
commit 6f9b196626cc91ed455ee02c905d8c9f3e272551
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 13:59:27 2014 +0100
no need to set parent and context for icons
diff --git
a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
index 09729a3..ea9cf61 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
@@ -116,8 +116,6 @@ public class ConfigChannelTag extends TagSupport {
private String writeIcon() throws JspException {
IconTag i = new IconTag();
- i.setParent(getParent());
- i.setPageContext(pageContext);
if (type.equals("central") || type.equals("global")) {
i.setType("header-channel-configuration");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
index 2207c16..7cc95dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
@@ -134,8 +134,6 @@ public class ConfigFileTag extends TagSupport {
private String writeIcon() throws JspException {
IconTag i = new IconTag();
- i.setParent(getParent());
- i.setPageContext(pageContext);
if ("dir".equalsIgnoreCase(type) ||
"directory".equalsIgnoreCase(type) ||
"folder".equalsIgnoreCase(type)) {
i.setType("file-directory");
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 927e472..c4dfb25 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -458,15 +458,11 @@ 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");
+ IconTag i = new IconTag("item-download-csv");
out.println("<div class=\"spacewalk-csv-download\"><a
href=\"" + page +
- "\">" + i.renderStartTag() +
+ "\">" + i.render() +
LocalizationService.getInstance().getMessage("listdisplay.csv")
+
"</a></div>");
- i.release();
}
private void renderBoundsVariables(Writer out) throws IOException {
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
index c73d7a4..b8afaee 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -575,12 +575,8 @@ public class ToolbarTag extends TagSupport {
private String renderIcon() {
if (assertNotEmpty(getIcon())) {
- IconTag i = new IconTag();
- i.setPageContext(pageContext);
- i.setParent(getParent());
- i.setType(getIcon());
- String result = i.renderStartTag();
- i.release();
+ IconTag i = new IconTag(getIcon());
+ String result = i.render();
return result;
}
return "";
@@ -664,13 +660,8 @@ public class ToolbarTag extends TagSupport {
}
if (assertNotEmpty(iconName)) {
- IconTag i = new IconTag();
- i.setPageContext(pageContext);
- i.setParent(getParent());
- i.setType(iconName);
- i.setTitle(alt);
- a.addBody(i.renderStartTag());
- i.release();
+ IconTag i = new IconTag(iconName, alt);
+ a.addBody(i.render());
}
a.addBody(text);
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 6d7ef13..ccc04a8 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
@@ -197,15 +197,11 @@ 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");
+ IconTag i = new IconTag("item-download-csv");
String exportLink = new String("<div
class=\"spacewalk-csv-download\"><a href=\"" +
- page + "\">" + i.renderStartTag() +
+ page + "\">" + i.render() +
LocalizationService.getInstance().getMessage(
"listdisplay.csv") +
"</a></div>");
- i.release();
ListTagUtil.write(pageContext, exportLink);
}
commit ab6f0342eca1dfd00f6c8a5a0f8f83fd6e45728b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:54:09 2014 +0100
reuse IconTag for help links
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
index 3eb21ec..c73d7a4 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -551,11 +551,9 @@ public class ToolbarTag extends TagSupport {
tag.setAttribute("href", getHelpUrl());
tag.setAttribute("target", "_blank");
- HtmlTag help = new HtmlTag("i");
- help.setAttribute("class", "fa fa-question-circle");
+ IconTag help = new IconTag("header-help");
- tag.addBody(help.renderOpenTag());
- tag.addBody(help.renderCloseTag());
+ tag.addBody(help.render());
return tag.render();
}
return "";
commit 10c6e8385704a17dc64b34dd473aa438dc2899f9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:52:21 2014 +0100
reuse IconTag for item search
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 712aca8..c73b4d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -116,6 +116,7 @@ public class IconTag extends TagSupport {
icons.put("item-download", "fa fa-download");
icons.put("item-download-csv", "fa
spacewalk-icon-download-csv");
icons.put("item-enabled", "fa fa-check text-success");
+ icons.put("item-search", "fa fa-eye");
icons.put("item-ssm-add", "fa fa-plus-circle");
icons.put("item-ssm-del", "fa fa-minus-circle");
icons.put("item-upload", "fa fa-upload");
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
index d164204..b1bd702 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java
@@ -331,10 +331,8 @@ public class ListDisplayTagBase extends BodyTagSupport {
btn.setAttribute("name", FILTER_DISPATCH);
btn.setAttribute("value", ls.getMessage(RequestContext.FILTER_KEY));
- HtmlTag icon = new HtmlTag("i");
- icon.setAttribute("class", "fa fa-eye");
- icon.addBody(" ");
- btn.addBody(icon);
+ IconTag icon = new IconTag("item-search");
+ btn.addBody(icon.render());
btnSpan.addBody(btn);
commit 4210f72a0673bb3648439a80ad8735e9bfcb305e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:44:28 2014 +0100
reuse IconTag for pagination icons
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 06a113b..712aca8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -128,6 +128,10 @@ public class IconTag extends TagSupport {
icons.put("monitoring-warn",
"fa fa-1-5x spacewalk-icon-monitoring-warning
text-warning");
icons.put("nav-bullet", "fa fa-caret-right");
+ icons.put("nav-page-first", "fa fa-angle-double-left");
+ icons.put("nav-page-last", "fa fa-angle-double-right");
+ icons.put("nav-page-next", "fa fa-angle-right");
+ icons.put("nav-page-prev", "fa fa-angle-left");
icons.put("nav-right", "fa fa-arrow-right");
icons.put("nav-up", "fa fa-caret-up");
icons.put("sort-down", "fa fa-arrow-circle-down");
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 c7998a2..927e472 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -590,13 +590,13 @@ public class ListDisplayTag extends ListDisplayTagBase {
if (canGoForward || canGoBack) {
out.append(renderPaginationButton(FIRST,
- "fa-angle-double-left", " |< ",
canGoBack));
- out.append(renderPaginationButton(PREV, "fa-angle-left",
+ "nav-page-first", " |< ", canGoBack));
+ out.append(renderPaginationButton(PREV, "nav-page-prev",
" < ", canGoBack));
- out.append(renderPaginationButton(NEXT, "fa-angle-right",
+ out.append(renderPaginationButton(NEXT, "nav-page-next",
" > ", canGoForward));
out.append(renderPaginationButton(LAST,
- "fa-angle-double-right", " >| ",
canGoForward));
+ "nav-page-last", " >| ", canGoForward));
}
out.append("</div>\n");
}
@@ -606,10 +606,8 @@ public class ListDisplayTag extends ListDisplayTagBase {
HtmlTag ret = new HtmlTag("button");
ret.setAttribute("name", name);
String styleClass = "btn btn-default btn-xs";
- HtmlTag iconTag = new HtmlTag("i");
- iconTag.setAttribute("class", "fa " + icon);
- iconTag.addBody("");
- ret.addBody(iconTag);
+ IconTag iconTag = new IconTag(icon);
+ ret.addBody(iconTag.render());
if (!active) {
styleClass += " disabled";
commit 118d0217d84cd41523ea271f7c0c0b5eceedd428
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 30 15:36:27 2014 +0100
reuse IconTag to render icons
fixing
self-closing i-tags are not allowed
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
index c26a84a..17262bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.SystemCurrency;
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.html.HtmlTag;
+import com.redhat.rhn.frontend.taglibs.IconTag;
import com.redhat.rhn.manager.system.SystemManager;
/**
@@ -55,16 +56,14 @@ public class SystemListHelper {
*/
public static void setSystemStatusDisplay(User user, SystemOverview next,
boolean makeLinks) {
-
- String message;
HtmlTag url = new HtmlTag("a");
- HtmlTag i = new HtmlTag("i");
+ IconTag i = new IconTag();
+
LocalizationService ls = LocalizationService.getInstance();
if (next.getEntitlement() == null ||
next.getEntitlement().isEmpty()) {
- message = ls.getMessage("systemlist.jsp.unentitled");
- i.setAttribute("class",
"spacewalk-icon-unknown-system");
- i.setAttribute("title", message);
+ i.setType("system-unknown");
+ i.setTitle("systemlist.jsp.unentitled");
if (user.hasRole(RoleFactory.ORG_ADMIN)) {
url.setAttribute("href",
"/rhn/systems/details/Edit.do?sid=" +
next.getId());
@@ -74,9 +73,8 @@ public class SystemListHelper {
//status = "awol";
url.setAttribute("href",
"/rhn/help/reference/en-US/s1-sm-systems.jsp");
- message = ls.getMessage("systemlist.jsp.notcheckingin");
- i.setAttribute("class",
"spacewalk-icon-unknown-system");
- i.setAttribute("title", message);
+ i.setType("system-unknown");
+ i.setTitle("systemlist.jsp.notcheckingin");
if (makeLinks) {
makeLinks = ConfigDefaults.get().isDocAvailable();
}
@@ -87,9 +85,8 @@ public class SystemListHelper {
url.setAttribute("href",
"/rhn/systems/details/kickstart/SessionStatus.do?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.kickstart");
- i.setAttribute("class", "fa fa-rocket");
- i.setAttribute("title", message);
+ i.setType("system-kickstarting");
+ i.setTitle("systemlist.jsp.kickstart");
}
else if (next.getEnhancementErrata() + next.getBugErrata() +
next.getSecurityErrata() > 0 &&
@@ -99,18 +96,16 @@ public class SystemListHelper {
url.setAttribute("href",
"/network/systems/details/history/pending.pxt?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.updatesscheduled");
- i.setAttribute("class", "fa fa-clock-o");
- i.setAttribute("title", message);
+ i.setType("action-pending");
+ i.setTitle("systemlist.jsp.updatesscheduled");
}
else if (SystemManager.countActions(new Long(next.getId().longValue())) > 0)
{
//status = "actions scheduled";
url.setAttribute("href",
"/network/systems/details/history/pending.pxt?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.actionsscheduled");
- i.setAttribute("class", "fa fa-clock-o");
- i.setAttribute("title", message);
+ i.setType("action-pending");
+ i.setTitle("systemlist.jsp.actionsscheduled");
}
else if ((next.getEnhancementErrata() + next.getBugErrata() +
next.getSecurityErrata()) == 0 &&
@@ -119,10 +114,8 @@ public class SystemListHelper {
new Long(next.getId().longValue())) == 0) {
//status = "up2date";
- message = ls.getMessage("systemlist.jsp.up2date");
- i.setAttribute("class", "fa fa-check-circle fa-1-5x
text-success");
- i.setAttribute("title", message);
- //i.setAttribute("alt", message);
+ i.setType("system-ok");
+ i.setTitle("systemlist.jsp.up2date");
}
else if (next.getSecurityErrata().intValue() > 0) {
//status = "critical";
@@ -130,25 +123,22 @@ public class SystemListHelper {
"/rhn/systems/details/ErrataList.do?sid=" +
next.getId() + "&type=" +
LocalizationService.getInstance().getMessage(ErrataSetupAction.SECUR));
- message = ls.getMessage("systemlist.jsp.critical");
- i.setAttribute("class", "fa fa-exclamation-circle fa-1-5x
text-danger");
- i.setAttribute("title", message);
+ i.setType("system-crit");
+ i.setTitle("systemlist.jsp.critical");
}
else if (next.getOutdatedPackages().intValue() > 0) {
//status = "updates";
url.setAttribute("href",
"/rhn/systems/details/packages/UpgradableList.do?sid=" +
next.getId());
- message = ls.getMessage("systemlist.jsp.updates");
- i.setAttribute("class", "fa fa-exclamation-triangle fa-1-5x
text-warning");
- i.setAttribute("title", message);
+ i.setType("system-warn");
+ i.setTitle("systemlist.jsp.updates");
}
- url.addBody(i.renderOpenTag());
- url.addBody(i.renderCloseTag());
String statusDisplay;
if (makeLinks) {
+ url.addBody(i.render());
statusDisplay = url.render();
}
else {
@@ -157,19 +147,16 @@ public class SystemListHelper {
if (next.getLocked().intValue() == 1) {
HtmlTag lockedUrl = new HtmlTag("a");
- HtmlTag lockedIcon = new HtmlTag("i");
//status = "locked";
lockedUrl.setAttribute("href",
"/rhn/help/reference/en-US/s1-sm-systems.jsp");
- message = ls.getMessage("systemlist.jsp.locked");
- lockedIcon.setAttribute("class", "fa
spacewalk-icon-locked-system");
- lockedIcon.setAttribute("title", message);
+ IconTag lockedIcon = new IconTag("system-locked",
"systemlist.jsp.locked");
if (makeLinks) {
makeLinks = ConfigDefaults.get().isDocAvailable();
}
if (makeLinks) {
- lockedUrl.addBody(lockedIcon);
+ lockedUrl.addBody(lockedIcon.render());
statusDisplay = statusDisplay + lockedUrl.render();
}
else {
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 f3a8c69..06a113b 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -147,11 +147,28 @@ public class IconTag extends TagSupport {
/**
* Constructor for Icon tag.
+ * @param typeIn the type of the icon
+ * @param titleIn the title of the icon
*/
- public IconTag() {
+ public IconTag(String typeIn, String titleIn) {
super();
- type = null;
- title = null;
+ type = typeIn;
+ title = titleIn;
+ }
+
+ /**
+ * Constructor for Icon tag.
+ * @param typeIn the type of the icon
+ */
+ public IconTag(String typeIn) {
+ this(typeIn, (String) null);
+ }
+
+ /**
+ * Constructor for Icon tag.
+ */
+ public IconTag() {
+ this((String) null, (String) null);
}
/**
@@ -190,6 +207,16 @@ public class IconTag extends TagSupport {
* Return just the HTML
* @return String that contains generated HTML
*/
+ public String render() {
+ String result = renderStartTag();
+ release();
+ return result;
+ }
+
+ /**
+ * Return just the HTML
+ * @return String that contains generated HTML
+ */
public String renderStartTag() {
if (!icons.containsKey(type)) {
throw new IllegalArgumentException("Unknown icon type: \"" +
type + "\".");