archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdu...@apache.org
Subject svn commit: r707543 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp: components/companyLogo.jsp decorators/default.jsp
Date Fri, 24 Oct 2008 04:46:33 GMT
Author: jdumay
Date: Thu Oct 23 21:46:32 2008
New Revision: 707543

URL: http://svn.apache.org/viewvc?rev=707543&view=rev
Log:
Fixed the company logo - thanks Don!

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp

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=707543&r1=707542&r2=707543&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
Thu Oct 23 21:46:32 2008
@@ -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

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=707543&r1=707542&r2=707543&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Thu Oct 23 21:46:32 2008
@@ -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">



Mime
View raw message