You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/03/06 11:54:12 UTC
svn commit: r750843 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp:
admin/appearance.jsp components/companyLogo.jsp
Author: brett
Date: Fri Mar 6 10:54:06 2009
New Revision: 750843
URL: http://svn.apache.org/viewvc?rev=750843&view=rev
Log:
[MRM-1108] show the default logo if it is empty in the configuration
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=750843&r1=750842&r2=750843&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Fri Mar 6 10:54:06 2009
@@ -40,29 +40,30 @@
</p>
<h3>Organization Information</h3>
- <table>
- <tr>
- <th>Name</th>
- <td>${organisationName}</td>
- </tr>
- <tr>
- <th>URL</th>
- <td><a href="${organisationUrl}">
- <code>${organisationUrl}</code>
- </a></td>
- </tr>
- <tr>
- <th>Logo URL</th>
- <td>
- <code>${organisationLogo}</code>
- </td>
- </tr>
- <tr>
- <th> </th>
- <td>
- <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
- </td>
- </tr>
- </table>
+<table>
+ <tr>
+ <th>Name</th>
+ <td>${organisationName}</td>
+ </tr>
+ <tr>
+ <th>URL</th>
+ <td><a href="${organisationUrl}">
+ <code>${organisationUrl}</code>
+ </a></td>
+ </tr>
+ <tr>
+ <th>Logo URL</th>
+ <td>
+ <code>${organisationLogo}</code>
+ </td>
+ </tr>
+ <c:if test="${!empty (organisationLogo)}">
+ <tr>
+ <th> </th>
+ <td><img src="${organisationLogo}"
+ title="${organisationName}" border="0" alt="" /></td>
+ </tr>
+ </c:if>
+</table>
</body>
</html>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=750843&r1=750842&r2=750843&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Fri Mar 6 10:54:06 2009
@@ -22,9 +22,10 @@
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<div id="companyLogo">
- <s:if test="%{organisationLogo != null}">
+ <s:set name="organisationLogo" value="organisationLogo"/>
+ <c:choose>
+ <c:when test="${!empty (organisationLogo)}">
<s:set name="organisationUrl" value="organisationUrl"/>
- <s:set name="organisationLogo" value="organisationLogo"/>
<c:choose>
<c:when test="${!empty (organisationUrl)}">
<a href="${organisationUrl}">
@@ -35,10 +36,11 @@
<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>
+ </c:when>
+ <c:otherwise>
+ <my:currentWWUrl action="index" namespace="/">
+ <img src="<c:url value='/images/archiva.png' />"/>
+ </my:currentWWUrl>
+ </c:otherwise>
+ </c:choose>
</div>
\ No newline at end of file