Author: raintang
Date: 2009-08-13 12:48:30 +0200 (Thu, 13 Aug 2009)
New Revision: 37772
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
Log:
CMSC-1493 Task1: In the asset view of channel, it shows empty assets.
Improvement: Placeholders for empty assets ; fix creating empty attachments and
images when editing an article.
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
2009-08-13 10:48:06 UTC (rev 37771)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp
2009-08-13 10:48:30 UTC (rev 37772)
@@ -96,7 +96,13 @@
<div class="thumbnail"
onclick="addItem(this.parentNode, '<mm:field name="number"/>', '${strict}')">
<c:set var="typedef" ><mm:nodeinfo
type="type"/></c:set>
<c:if test="${typedef eq 'attachments'}">
- <%...@include
file="attachmentthumbnail.jsp" %>
+ <c:set var="filesize"><mm:field
name="size"/></c:set>
+ <c:if
test="${ filesize gt 0}">
+ <%...@include
file="../resources/attachmentthumbnail.jsp" %>
+ </c:if>
+ <c:if
test="${ filesize eq 0}">
+ <img src="../gfx/nullattachment.gif"
alt=""/>
+ </c:if>
</c:if>
</div>
<div class="assetInfo">
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
2009-08-13 10:48:06 UTC (rev 37771)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp
2009-08-13 10:48:30 UTC (rev 37772)
@@ -94,7 +94,14 @@
</div>
<div class="thumbnail"
onclick="addItem(this.parentNode, '<mm:field name="number"/>', '${strict}')">
<c:set var="thumbnail_alt"><mm:field name="url"
/></c:set>
- <img src="../gfx/url.gif" title="${thumbnail_alt}"
alt="${thumbnail_alt}"/>
+ <c:set
var="urltitle"><mm:field name="title"/></c:set>
+ <c:set
var="url"><mm:field name="url"/></c:set>
+ <c:if test="${!(empty
urltitle || empty url)}">
+ <img src="../gfx/url.gif"
alt="${thumbnail_alt}"/>
+ </c:if>
+ <c:if test="${empty
urltitle || empty url }">
+ <img src="../gfx/nullurl.gif"
alt="${thumbnail_alt}"/>
+ </c:if>
</div>
<div class="assetInfo">
<mm:field name="title" jspvar="title"
write="false"/>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
