Author: raintang
Date: 2009-08-13 07:40:31 +0200 (Thu, 13 Aug 2009)
New Revision: 37755
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/edit_urls.xml
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
CMSContainer/branches/b1_6/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/branches/b1_6/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/edit_urls.xml
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/edit_urls.xml
2009-08-13 03:34:26 UTC (rev 37754)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/edit_urls.xml
2009-08-13 05:40:31 UTC (rev 37755)
@@ -5,12 +5,12 @@
<title xml:lang="en">Url</title>
<title xml:lang="zh">Url</title>
- <field name="title">
+ <field name="title" dtrequired="true">
<prompt xml:lang="en">Title</prompt>
<prompt xml:lang="nl">Titel</prompt>
<prompt xml:lang="zh">标题</prompt>
</field>
- <field name="url" dtpattern="\://|javascript\:|mailto\:">
+ <field name="url" dtpattern="\://|javascript\:|mailto\:"
dtrequired="true">
<prompt xml:lang="en">Url</prompt>
<prompt xml:lang="nl">Url</prompt>
<prompt xml:lang="zh">Url</prompt>
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-08-13 03:34:26 UTC (rev 37754)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-08-13 05:40:31 UTC (rev 37755)
@@ -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/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-08-13 03:34:26 UTC (rev 37754)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-08-13 05:40:31 UTC (rev 37755)
@@ -497,13 +497,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>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
