You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by de...@apache.org on 2010/02/22 15:52:34 UTC
svn commit: r912597 - in
/continuum/branches/continuum-1.3.x/continuum-webapp: ./
src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Author: dennisl
Date: Mon Feb 22 14:52:34 2010
New Revision: 912597
URL: http://svn.apache.org/viewvc?rev=912597&view=rev
Log:
[CONTINUUM-2469] The Company Name isn't shown when you hover over the Company Logo
Merge from trunk.
Modified:
continuum/branches/continuum-1.3.x/continuum-webapp/ (props changed)
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Propchange: continuum/branches/continuum-1.3.x/continuum-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 22 14:52:34 2010
@@ -1,4 +1,4 @@
/continuum/branches/continuum-1.2.x/continuum-webapp:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462
/continuum/branches/continuum-distributed-builds/continuum-webapp:713270-734307
/continuum/tags/continuum-1.2.3/continuum-webapp:733253
-/continuum/trunk/continuum-webapp:769703,911599,912584
+/continuum/trunk/continuum-webapp:769703,911599,912584,912594
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=912597&r1=912596&r2=912597&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Mon Feb 22 14:52:34 2010
@@ -21,15 +21,16 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<s:set name="companyLogo" value="companyLogo"/>
<c:if test="${!empty (companyLogo)}">
+ <s:set name="companyName" value="companyName"/>
<s:set name="companyUrl" value="companyUrl"/>
<c:choose>
<c:when test="${!empty (companyUrl)}">
<a href="${companyUrl}">
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
</a>
</c:when>
<c:otherwise>
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
</c:otherwise>
</c:choose>
</c:if>