Author: raintang
Date: 2009-08-13 07:47:13 +0200 (Thu, 13 Aug 2009)
New Revision: 37756
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullattachment.gif
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullimage.gif
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullurl.gif
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.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/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-08-13 05:40:31 UTC (rev 37755)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-08-13 05:47:13 UTC (rev 37756)
@@ -234,13 +234,32 @@
<a href="javascript:showInfo('<mm:nodeinfo
type="type"/>', '<mm:field name="number" />')">
<c:set var="typedef" ><mm:nodeinfo
type="type"/></c:set>
<c:if test="${typedef eq 'images'}">
- <img src="<mm:image
template="s(128x128)"/>" alt=""/>
+ <c:set
var="filesize"><mm:field name="filesize"/></c:set>
+ <c:if
test="${ filesize gt 0}">
+ <img src="<mm:image
template="s(128x128)"/>" alt=""/>
+ </c:if>
+ <c:if
test="${ filesize eq 0}">
+ <img src="../gfx/nullimage.gif" alt=""/>
+ </c:if>
</c:if>
<c:if test="${typedef eq 'attachments'}">
+ <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>
<c:if test="${typedef eq 'urls'}">
- <img src="../gfx/url.gif" 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=""/>
+ </c:if>
+ <c:if
test="${empty urltitle || empty url }">
+ <img src="../gfx/nullurl.gif" alt=""/>
+ </c:if>
</c:if>
</a>
</div>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-08-13 05:40:31 UTC (rev 37755)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-08-13 05:47:13 UTC (rev 37756)
@@ -527,13 +527,32 @@
<a href="javascript:showInfo('<mm:nodeinfo type="type"/>',
'<mm:field name="number" />')">
<c:set var="typedef" ><mm:nodeinfo type="type"/></c:set>
<c:if test="${typedef eq 'images'}">
- <img src="<mm:image template="s(128x128)"/>" alt=""/>
+ <c:set var="filesize"><mm:field
name="filesize"/></c:set>
+ <c:if test="${ filesize gt 0}">
+ <img src="<mm:image
template="s(128x128)"/>" alt=""/>
+ </c:if>
+ <c:if test="${ filesize eq 0}">
+ <img src="../gfx/nullimage.gif" alt=""/>
+ </c:if>
</c:if>
<c:if test="${typedef eq 'attachments'}">
- <%...@include
file="../resources/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>
<c:if test="${typedef eq 'urls'}">
- <img src="../gfx/url.gif" 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=""/>
+ </c:if>
+ <c:if test="${empty urltitle ||
empty url }">
+ <img src="../gfx/nullurl.gif" alt=""/>
+ </c:if>
</c:if>
</a>
</div>
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullattachment.gif
===================================================================
(Binary files differ)
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullattachment.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullimage.gif
===================================================================
(Binary files differ)
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullimage.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullurl.gif
===================================================================
(Binary files differ)
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/nullurl.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
