branding/img/link-config.png |binary java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java | 14 +++++++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 4 ++ 3 files changed, 15 insertions(+), 3 deletions(-)
New commits: commit 012eb0eaa080957f2700dd4983c9fc77e9dc12d8 Author: Partha Aji paji@redhat.com Date: Tue Sep 14 18:33:03 2010 -0400
627920 - Added a larger config file icon for symlinks. Thanks to Joshua Roys
diff --git a/branding/img/link-config.png b/branding/img/link-config.png new file mode 100644 index 0000000..a44db7f Binary files /dev/null and b/branding/img/link-config.png differ 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 42ae84d..2dc8c7c 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 @@ -50,6 +50,7 @@ public class ConfigFileTag extends TagSupport {
public static final String DIR_HEADER_ICON = "/img/folder-config.png"; public static final String FILE_HEADER_ICON = "/img/file-config.png"; + public static final String SYMLINK_HEADER_ICON = "/img/link-config.png";
public static final String FILE_URL = "/rhn/configuration/file/FileDetails.do"; @@ -68,7 +69,8 @@ public class ConfigFileTag extends TagSupport { /** * {@inheritDoc} */ - public int doEndTag() throws JspException { + @Override + public int doEndTag() throws JspException { if (nolink || id == null) { writeIcon(); ConfigTagHelper.write(StringEscapeUtils.escapeXml(path), pageContext); @@ -92,7 +94,8 @@ public class ConfigFileTag extends TagSupport { /** * {@inheritDoc} */ - public void release() { + @Override + public void release() { id = null; path = null; type = null; @@ -105,7 +108,8 @@ public class ConfigFileTag extends TagSupport { /** * @param val the id to set */ - public void setId(String val) { + @Override + public void setId(String val) { this.id = val; }
@@ -240,6 +244,10 @@ public class ConfigFileTag extends TagSupport { "folder".equalsIgnoreCase(type)) { return DIR_HEADER_ICON; } + else if ("symlink".equalsIgnoreCase(type) || + "link".equalsIgnoreCase(type)) { + return SYMLINK_HEADER_ICON; + } return FILE_HEADER_ICON; }
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf index b43b6a6..178295f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf @@ -25,6 +25,10 @@ arg3="/rhn/configuration/ChannelOverview.do?ccid=${channel.id}" /> </c:set>
+<c:if test="${revision.symlink}"> + <c:set var="fileImg" scope="request" value="/img/link-config.png" /> + <c:set var="fileAlt" scope="request" value="config.common.symlinkAlt" /> +</c:if>
<c:choose> <c:when test="${!revision.directory}">