Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1108] show the default logo if it is empty in the configuration 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@750843 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2009-03-06 10:54:06 +00:00
parent 9e03d296ed
commit adf0f01d13
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
View File

@ -40,7 +40,7 @@
</p> </p>
<h3>Organization Information</h3> <h3>Organization Information</h3>
<table> <table>
<tr> <tr>
<th>Name</th> <th>Name</th>
<td>${organisationName}</td> <td>${organisationName}</td>
@ -57,12 +57,13 @@
<code>${organisationLogo}</code> <code>${organisationLogo}</code>
</td> </td>
</tr> </tr>
<c:if test="${!empty (organisationLogo)}">
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<td> <td><img src="${organisationLogo}"
<img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/> title="${organisationName}" border="0" alt="" /></td>
</td>
</tr> </tr>
</table> </c:if>
</table>
</body> </body>
</html> </html>

12
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
View File

@ -22,9 +22,10 @@
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<div id="companyLogo"> <div id="companyLogo">
<s:if test="%{organisationLogo != null}">
<s:set name="organisationUrl" value="organisationUrl"/>
<s:set name="organisationLogo" value="organisationLogo"/> <s:set name="organisationLogo" value="organisationLogo"/>
<c:choose>
<c:when test="${!empty (organisationLogo)}">
<s:set name="organisationUrl" value="organisationUrl"/>
<c:choose> <c:choose>
<c:when test="${!empty (organisationUrl)}"> <c:when test="${!empty (organisationUrl)}">
<a href="${organisationUrl}"> <a href="${organisationUrl}">
@ -35,10 +36,11 @@
<img src="${organisationLogo}" title="${organisationName}"/> <img src="${organisationLogo}" title="${organisationName}"/>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</s:if> </c:when>
<s:else> <c:otherwise>
<my:currentWWUrl action="index" namespace="/"> <my:currentWWUrl action="index" namespace="/">
<img src="<c:url value='/images/archiva.png' />"/> <img src="<c:url value='/images/archiva.png' />"/>
</my:currentWWUrl> </my:currentWWUrl>
</s:else> </c:otherwise>
</c:choose>
</div> </div>