Fixed the company logo - thanks Don!

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@707543 13f79535-47bb-0310-9956-ffa450edef68

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 204d47f4f3a847397ed76287be031845258b1e94..be13cc078ed2dbef5a28ef2b27a3be8b35f2b01c 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
@@ -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 af4f5669fffdf034d0b980779084beec38e324a1..47f1e7b1c71cf3bf9fda5cf3691704c80b69c8a6 100644 (file)
--- 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">