[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

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

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

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="organisationUrl" value="organisationUrl"/>
   <s:set name="organisationLogo" value="organisationLogo"/>
+  <c:choose>
+    <c:when test="${!empty (organisationLogo)}">
+      <s:set name="organisationUrl" value="organisationUrl"/>
       <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>
+    </c:when>
+    <c:otherwise>
       <my:currentWWUrl action="index" namespace="/">
         <img src="<c:url value='/images/archiva.png' />"/>
       </my:currentWWUrl>
-    </s:else>
+    </c:otherwise>
+  </c:choose>
 </div>