diff options
| author | James William Dumay <jdumay@apache.org> | 2008-10-24 04:46:32 +0000 |
|---|---|---|
| committer | James William Dumay <jdumay@apache.org> | 2008-10-24 04:46:32 +0000 |
| commit | 08d84aff96067a0e9802d951f0426760d898d9df (patch) | |
| tree | 3d1c7fd66f4de8ac17d16d9087120a31de3849dd | |
| parent | f226ac654fe0b8beaa46e64e73ed0112e37d1d61 (diff) | |
| download | archiva-08d84aff96067a0e9802d951f0426760d898d9df.tar.gz archiva-08d84aff96067a0e9802d951f0426760d898d9df.zip | |
Fixed the company logo - thanks Don!
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@707543 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 24 insertions, 18 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp index 204d47f4f..be13cc078 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp @@ -19,16 +19,26 @@ <%@ taglib uri="/struts-tags" prefix="s" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<c:if test="${!empty (organisationLogo)}"> - <s:set name="organisationUrl" value="organisationUrl"/> - <c:choose> - <c:when test="${!empty (organisationUrl)}"> - <a href="${companyUrl}"> - <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/> - </a> - </c:when> - <c:otherwise> - <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/> - </c:otherwise> - </c:choose> -</c:if> +<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> + +<div id="companyLogo"> + <s:if test="%{organisationLogo != null}"> + <s:set name="organisationUrl" value="organisationUrl"/> + <s:set name="organisationLogo" value="organisationLogo"/> + <c:choose> + <c:when test="${!empty (organisationUrl)}"> + <a href="${companyUrl}"> + <img src="${organisationLogo}" title="${organisationName}"/> + </a> + </c:when> + <c:otherwise> + <img src="${organisationLogo}" title="${organisationName}"/> + </c:otherwise> + </c:choose> + </s:if> + <s:else> + <my:currentWWUrl action="index" namespace="/"> + <img src="<c:url value='/images/archiva.png' />"/> + </my:currentWWUrl> + </s:else> +</div>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp index af4f5669f..47f1e7b1c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp @@ -57,11 +57,7 @@ <div id="leftColumn"> <div id="navcolumn"> - <div id="companyLogo"> - <my:currentWWUrl action="index" namespace="/"> - <img src="<c:url value='/images/archiva.png' />"/> - </my:currentWWUrl> - </div> + <s:action namespace="/components" name="companyInfo" executeResult="true"/> <h5>Find</h5> <ul> <li class="none"> |