Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory james.mmbase.org:/tmp/cvs-serv608/resources
Modified Files:
imagesearch.jsp imageupload.jsp
Log Message:
CMSC-1209 Text thumbnail view assets with long names CMSC-1211 Users CAN
upload assets in channels in which they do not have sufficient rights
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1209
See also: http://www.mmbase.org/jira/browse/CMSC-1211
Index: imagesearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- imagesearch.jsp 25 Dec 2008 08:43:59 -0000 1.41
+++ imagesearch.jsp 31 Dec 2008 09:03:28 -0000 1.42
@@ -151,7 +151,17 @@
</mm:field>
<div class="grid" href="<mm:write referid="url"/>"
onclick="initParentHref(this)" title="double click to show the info">
<div class="thumbnail" ondblclick="showInfo('<mm:field
name="number"/>')"><mm:image mode="img" template="s(120x100)"/></div>
- <div class="imgInfo"><mm:field
name="title"/><br/><mm:field name="itype"/></div>
+ <div class="imgInfo">
+ <c:set var="assettype" ><mm:nodeinfo
type="type"/></c:set>
+ <mm:field id="title" write="false" name="title"/>
+ <c:if test="${assettype == 'urls'}">
+ <c:set var="title" ><mm:field
name="name"/></c:set>
+ </c:if>
+ <c:if test="${fn:length(title) > 15}">
+ <c:set
var="title">${fn:substring(title,0,14)}...</c:set>
+ </c:if>${title}
+ <br/><mm:field name="itype" />
+ </div>
</div>
</mm:listnodes>
</div>
@@ -190,8 +200,20 @@
<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>
</td>
- <td onMouseDown="objClick(this);"><mm:field
name="title" /></td>
- <td
onMouseDown="objClick(this);"><mm:field name="filename" /></td>
+ <td onMouseDown="objClick(this);">
+ <c:set var="assettype" ><mm:nodeinfo
type="type"/></c:set>
+ <mm:field id="title" write="false" name="title"/>
+ <c:if test="${assettype == 'urls'}">
+ <c:set var="title" ><mm:field
name="name"/></c:set>
+ </c:if>
+ <c:if test="${fn:length(title) > 50}">
+ <c:set
var="title">${fn:substring(title,0,49)}...</c:set>
+ </c:if>
+ ${title}
+ </td>
+ <td onMouseDown="objClick(this);">
+ ${title}
+ </td>
<td
onMouseDown="objClick(this);"><mm:field name="itype" /></td>
<td
onMouseDown="objClick(this);"><a
href="javascript:showInfo(<mm:field name="number" />)"><img
@@ -207,6 +229,7 @@
<c:if test="${resultCount == 0 && (param.action == 'often' ||
param.title != null)}">
<fmt:message key="imagesearch.noresult" />
</c:if>
+ <div style="clear:both" ></div>
<c:if test="${resultCount > 0}">
<%...@include file="../repository/searchpages.jsp" %>
</c:if>
Index: imageupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- imageupload.jsp 25 Dec 2008 03:28:36 -0000 1.17
+++ imageupload.jsp 31 Dec 2008 09:03:28 -0000 1.18
@@ -121,8 +121,18 @@
alt="<fmt:message key="asset.delete" />"/>
</a>
</td>
- <td onMouseDown="objClick(this);"><mm:field name="title"/></td>
- <td onMouseDown="objClick(this);"><mm:field
name="filename"/></td>
+ <td onMouseDown="objClick(this);">
+ <c:set var="assettype" ><mm:nodeinfo type="type"/></c:set>
+ <mm:field id="title" write="false" name="title"/>
+ <c:if test="${assettype == 'urls'}">
+ <c:set var="title" ><mm:field name="name"/></c:set>
+ </c:if>
+ <c:if test="${fn:length(title) > 50}">
+ <c:set var="title">${fn:substring(title,0,49)}...</c:set>
+ </c:if>
+ ${title}
+ </td>
+ <td onMouseDown="objClick(this);">${title}</td>
<td onMouseDown="objClick(this);"><mm:field name="itype"/></td>
<td onMouseDown="objClick(this);"><img src="<mm:image
template="s(100x100)"/>" alt="" /></td>
</tr>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
