You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/12/05 20:18:35 UTC
svn commit: r482744 -
/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Author: evenisse
Date: Tue Dec 5 11:18:34 2006
New Revision: 482744
URL: http://svn.apache.org/viewvc?view=rev&rev=482744
Log:
Add a default icon if company informations aren't set
Modified:
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?view=diff&rev=482744&r1=482743&r2=482744
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Tue Dec 5 11:18:34 2006
@@ -1,16 +1,21 @@
<%@ taglib uri="/webwork" prefix="ww" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<ww:set name="companyLogo" value="companyLogo"/>
-<c:if test="${!empty(companyLogo)}">
- <ww:set name="companyUrl" value="companyUrl"/>
- <c:choose>
- <c:when test="${!empty(companyUrl)}">
- <a href="${companyUrl}">
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
- </a>
- </c:when>
- <c:otherwise>
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
- </c:otherwise>
- </c:choose>
-</c:if>
+<c:choose>
+ <c:when test="${!empty(companyLogo)}">
+ <ww:set name="companyUrl" value="companyUrl"/>
+ <c:choose>
+ <c:when test="${!empty(companyUrl)}">
+ <a href="${companyUrl}">
+ <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
+ </a>
+ </c:when>
+ <c:otherwise>
+ <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ <c:otherwise>
+ <img src="/images/asf_logo_wide.gif" title="Apache Software Foundation" border="0" alt="Apache Software Foundation"/>
+ </c:otherwise>
+</c:choose>
Re: svn commit: r482744 - /maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Posted by Emmanuel Venisse <em...@venisse.net>.
After some thoughts, I think it isn't good, a blank part is better. I'll revert it.
Emmanuel
Brett Porter a écrit :
> I left this out on purpose. Is it really a good idea?
>
> - Brett
>
> On 06/12/2006, at 6:18 AM, evenisse@apache.org wrote:
>
>> Author: evenisse
>> Date: Tue Dec 5 11:18:34 2006
>> New Revision: 482744
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=482744
>> Log:
>> Add a default icon if company informations aren't set
>>
>> Modified:
>>
>> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
>>
>>
>> Modified:
>> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
>>
>> URL:
>> http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?view=diff&rev=482744&r1=482743&r2=482744
>>
>> ==============================================================================
>>
>> ---
>> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
>> (original)
>> +++
>> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
>> Tue Dec 5 11:18:34 2006
>> @@ -1,16 +1,21 @@
>> <%@ taglib uri="/webwork" prefix="ww" %>
>> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
>> <ww:set name="companyLogo" value="companyLogo"/>
>> -<c:if test="${!empty(companyLogo)}">
>> - <ww:set name="companyUrl" value="companyUrl"/>
>> - <c:choose>
>> - <c:when test="${!empty(companyUrl)}">
>> - <a href="${companyUrl}">
>> - <img src="${companyLogo}" title="${companyName}" border="0"
>> alt=""/>
>> - </a>
>> - </c:when>
>> - <c:otherwise>
>> - <img src="${companyLogo}" title="${companyName}" border="0"
>> alt=""/>
>> - </c:otherwise>
>> - </c:choose>
>> -</c:if>
>> +<c:choose>
>> + <c:when test="${!empty(companyLogo)}">
>> + <ww:set name="companyUrl" value="companyUrl"/>
>> + <c:choose>
>> + <c:when test="${!empty(companyUrl)}">
>> + <a href="${companyUrl}">
>> + <img src="${companyLogo}" title="${companyName}" border="0"
>> alt="${companyName}"/>
>> + </a>
>> + </c:when>
>> + <c:otherwise>
>> + <img src="${companyLogo}" title="${companyName}" border="0"
>> alt="${companyName}"/>
>> + </c:otherwise>
>> + </c:choose>
>> + </c:when>
>> + <c:otherwise>
>> + <img src="/images/asf_logo_wide.gif" title="Apache Software
>> Foundation" border="0" alt="Apache Software Foundation"/>
>> + </c:otherwise>
>> +</c:choose>
>>
>
>
>
Re: svn commit: r482744 - /maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
Posted by Brett Porter <br...@apache.org>.
I left this out on purpose. Is it really a good idea?
- Brett
On 06/12/2006, at 6:18 AM, evenisse@apache.org wrote:
> Author: evenisse
> Date: Tue Dec 5 11:18:34 2006
> New Revision: 482744
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=482744
> Log:
> Add a default icon if company informations aren't set
>
> Modified:
> maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
> jsp/components/companyLogo.jsp
>
> Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/
> WEB-INF/jsp/components/companyLogo.jsp
> URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-
> webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?
> view=diff&rev=482744&r1=482743&r2=482744
> ======================================================================
> ========
> --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
> jsp/components/companyLogo.jsp (original)
> +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
> jsp/components/companyLogo.jsp Tue Dec 5 11:18:34 2006
> @@ -1,16 +1,21 @@
> <%@ taglib uri="/webwork" prefix="ww" %>
> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
> <ww:set name="companyLogo" value="companyLogo"/>
> -<c:if test="${!empty(companyLogo)}">
> - <ww:set name="companyUrl" value="companyUrl"/>
> - <c:choose>
> - <c:when test="${!empty(companyUrl)}">
> - <a href="${companyUrl}">
> - <img src="${companyLogo}" title="${companyName}"
> border="0" alt=""/>
> - </a>
> - </c:when>
> - <c:otherwise>
> - <img src="${companyLogo}" title="${companyName}" border="0"
> alt=""/>
> - </c:otherwise>
> - </c:choose>
> -</c:if>
> +<c:choose>
> + <c:when test="${!empty(companyLogo)}">
> + <ww:set name="companyUrl" value="companyUrl"/>
> + <c:choose>
> + <c:when test="${!empty(companyUrl)}">
> + <a href="${companyUrl}">
> + <img src="${companyLogo}" title="${companyName}"
> border="0" alt="${companyName}"/>
> + </a>
> + </c:when>
> + <c:otherwise>
> + <img src="${companyLogo}" title="${companyName}"
> border="0" alt="${companyName}"/>
> + </c:otherwise>
> + </c:choose>
> + </c:when>
> + <c:otherwise>
> + <img src="/images/asf_logo_wide.gif" title="Apache Software
> Foundation" border="0" alt="Apache Software Foundation"/>
> + </c:otherwise>
> +</c:choose>
>