Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv10907
Modified Files:
asset.jsp assetsearch.jsp icons.jspf searchIconsBar.jspf
Log Message:
CMSC-681 Asset Maintenance
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- asset.jsp 2 Dec 2008 02:40:21 -0000 1.12
+++ asset.jsp 8 Dec 2008 03:56:08 -0000 1.13
@@ -157,9 +157,9 @@
<td onMouseDown="objClick(this);">
<mm:nodeinfo type="guitype"/></td>
<td onMouseDown="objClick(this);">
- <c:set var="assettype" ><mm:nodeinfo
type="guitype"/></c:set>
+ <c:set var="assettype" ><mm:nodeinfo
type="type"/></c:set>
<mm:field id="title" write="false"
name="title"/>
- <c:if test="${assettype == 'URL'}">
+ <c:if test="${assettype == 'urls'}">
<c:set var="title" ><mm:field
name="name"/></c:set>
</c:if>
<c:if test="${fn:length(title) > 50}">
@@ -235,28 +235,28 @@
</div>
<div
style="width:100%;height:100px;text-align:left;padding:0px 10px 5px
5px;vertical-align:middle;display:block;float:left;" >
<a href="javascript:showInfo(<mm:field
name="number" />)">
- <c:set var="typedef" ><mm:nodeinfo
type="guitype"/></c:set>
- <c:if test="${typedef eq 'Image'}">
+ <c:set var="typedef" ><mm:nodeinfo
type="type"/></c:set>
+ <c:if test="${typedef eq 'images'}">
<img src="<mm:image
template="s(120x100)"/>" alt=""/>
- </c:if>
- <c:if test="${typedef eq 'Attachment'}">
+ </c:if> n
+ <c:if test="${typedef eq 'attachments'}">
<img src="../gfx/alert_green_left.gif"
alt=""/>change
</c:if>
- <c:if test="${typedef eq 'URL'}">
+ <c:if test="${typedef eq 'urls'}">
need to add
</c:if>
</a>
</div>
<div
style="width:80%;text-align:center;margin:0px 0px 0px
0px;padding-top:0px;padding-right:0px;overflow-x:hidden;">
- <c:set var="typedef" ><mm:nodeinfo
type="guitype"/></c:set>
- <c:if test="${typedef eq 'Image'}">
+ <c:set var="typedef" ><mm:nodeinfo
type="type"/></c:set>
+ <c:if test="${typedef eq 'images'}">
<mm:field name="title"/><br/><mm:field
name="itype"/>
</c:if>
- <c:if test="${typedef eq 'Attachment'}">
+ <c:if test="${typedef eq 'attachments'}">
need to change
</c:if>
- <c:if test="${typedef eq 'URL'}">
+ <c:if test="${typedef eq 'urls'}">
need to add
</c:if>
</div>
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- assetsearch.jsp 2 Dec 2008 03:46:28 -0000 1.3
+++ assetsearch.jsp 8 Dec 2008 03:56:08 -0000 1.4
@@ -408,9 +408,9 @@
<mm:nodeinfo type="guitype"/>
</td>
<td style="white-space: nowrap;" onMouseDown="objClick(this);">
- <c:set var="assettype" ><mm:nodeinfo type="guitype"/></c:set>
+ <c:set var="assettype" ><mm:nodeinfo type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
- <c:if test="${assettype == 'URL'}">
+ <c:if test="${assettype == 'urls'}">
<c:set var="title" ><mm:field name="name"/></c:set>
</c:if>
<c:if test="${fn:length(title) > 50}">
@@ -523,26 +523,26 @@
</div>
<div style="width:100%;height:100px;text-align:left;padding:0px
10px 5px 5px;vertical-align:middle;display:block;float:left;" >
<a href="javascript:showInfo(<mm:field name="number" />)">
- <c:set var="typedef" ><mm:nodeinfo type="guitype"/></c:set>
- <c:if test="${typedef eq 'Image'}">
+ <c:set var="typedef" ><mm:nodeinfo type="type"/></c:set>
+ <c:if test="${typedef eq 'images'}">
<img src="<mm:image template="s(120x100)"/>" alt=""/>
</c:if>
- <c:if test="${typedef eq 'Attachment'}">
+ <c:if test="${typedef eq 'attachments'}">
<img src="../gfx/alert_green_left.gif" alt=""/>change
</c:if>
- <c:if test="${typedef eq 'URL'}">
+ <c:if test="${typedef eq 'urls'}">
need to add
</c:if>
</a>
<div style="width:80%;text-align:center;margin:0px 0px 0px
0px;padding-top:0px;padding-right:0px;overflow-x:hidden;">
- <c:set var="typedef" ><mm:nodeinfo type="guitype"/></c:set>
- <c:if test="${typedef eq 'Image'}">
+ <c:set var="typedef" ><mm:nodeinfo type="type"/></c:set>
+ <c:if test="${typedef eq 'images'}">
<mm:field name="title"/><br/><mm:field name="itype"/>
</c:if>
- <c:if test="${typedef eq 'Attachment'}">
+ <c:if test="${typedef eq 'attachments'}">
<mm:field name="title"/>
</c:if>
- <c:if test="${typedef eq 'URL'}">
+ <c:if test="${typedef eq 'urls'}">
<mm:field name="name"/>
</c:if>
</div>
Index: icons.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/icons.jspf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- icons.jspf 11 Nov 2008 05:56:54 -0000 1.2
+++ icons.jspf 8 Dec 2008 03:56:08 -0000 1.3
@@ -5,7 +5,7 @@
<a href="<cmsc:contenturl number="${number}"/>" target="_blank"><img
src="../gfx/icons/preview.png"
alt="<fmt:message key="asset.preview.title" />"
title="<fmt:message key="asset.preview.title" />"/></a>
- <a href="javascript:showInfo('<mm:nodeinfo type="guitype"/>', '<mm:field
name="number" />');">
+ <a href="javascript:showInfo('<mm:nodeinfo type="type"/>', '<mm:field
name="number" />');">
<img src="../gfx/icons/info.png"
title="<fmt:message key="asset.info"/>" alt="<fmt:message
key="asset.info"/>"/></a>
<mm:haspage page="/editors/versioning">
<c:url value="/editors/versioning/ShowVersions.do" var="showVersions">
Index: searchIconsBar.jspf
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/searchIconsBar.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- searchIconsBar.jspf 2 Dec 2008 02:40:21 -0000 1.1
+++ searchIconsBar.jspf 8 Dec 2008 03:56:08 -0000 1.2
@@ -9,7 +9,7 @@
<mm:field name="number" write="false" id="nodenumber">
<a href="<cmsc:contenturl number="${nodenumber}"/>"
target="_blank"><img src="../gfx/icons/preview.png" alt="<fmt:message
key="searchform.icon.preview.title" />" title="<fmt:message
key="searchform.icon.preview.title" />" /></a>
</mm:field>
- <a href="javascript:showInfo('<mm:nodeinfo type="guitype"/>',
'<mm:field name="number" />');">
+ <a href="javascript:showInfo('<mm:nodeinfo type="type"/>',
'<mm:field name="number" />');">
<img src="../gfx/icons/info.png" title="<fmt:message
key="asset.info"/>" alt="<fmt:message key="asset.info"/>"/></a>
<c:if test="${creationRelNumber == trashnumber && rights ==
'webmaster'}">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
