Author: raintang Date: 2009-08-13 12:39:49 +0200 (Thu, 13 Aug 2009) New Revision: 37770
Modified: CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/css/assetsearch.css CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.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/css/assetsearch.css =================================================================== --- CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/css/assetsearch.css 2009-08-13 10:39:24 UTC (rev 37769) +++ CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/css/assetsearch.css 2009-08-13 10:39:49 UTC (rev 37770) @@ -14,7 +14,7 @@ div.editor div.body #assetList div.grid, div.editor div.body #assetList div.selected { width: 138px; - height: 198px; + height: 208px; float: left; text-align: center } @@ -34,17 +34,20 @@ top:-3px; left:-2px; height:20px; - width: 95%; + width: 120px; background-color: white; } div.editor div.body #assetList div.grid div.thumbnail, div.editor div.body #assetList div.selected div.thumbnail { - width: 100%; + width: 128px; height:128px; text-align: center; vertical-align: middle; padding: 0; + border:solid; + border-width: 1px; + border-color: #D8D8D8; } div.editor div.body #assetList div.grid div.assetInfo, @@ -52,7 +55,7 @@ width: 100%; height: 30px; text-align: center; - padding: 0px; + padding: 10px; } div.buttonscontent { Modified: CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp =================================================================== --- CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp 2009-08-13 10:39:24 UTC (rev 37769) +++ CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp 2009-08-13 10:39:49 UTC (rev 37770) @@ -93,7 +93,15 @@ <a href="javascript:showInfo(<mm:field name="number" />)"> <img src="../gfx/icons/info.png" alt="<fmt:message key="imagesearch.icon.info" />" title="<fmt:message key="imagesearch.icon.info" />"/></a> </div> - <div class="thumbnail" onclick="addItem(this.parentNode, '<mm:field name="number"/>', '${strict}')"><mm:image mode="img" template="s(128x128)"/></div> + <div class="thumbnail" onclick="addItem(this.parentNode, '<mm:field name="number"/>', '${strict}')"> + <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> + </div> <div class="assetInfo"> <mm:field id="title" write="false" name="title"/> <c:if test="${fn:length(title) > 15}"> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs