[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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
index 2ca2fe8db23a8c72325ed95d6900bf21dae500db..281e10fa898dc801a09067425f78f82a7f2c1e21 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
@@ -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>&nbsp;</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>&nbsp;</th>
+      <td><img src="${organisationLogo}"
+        title="${organisationName}" border="0" alt="" /></td>
+    </tr>
+  </c:if>
+</table>
 </body>
 </html>

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 9a07ebe68888452141cca2cb38c928fc5e16fa57..216a282dfbfcc2b147a71c317ff523d4228a93e2 100644 (file)
--- 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
@@ -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