Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv21400/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
imagesearch.jsp
Log Message:
CMSC-1126 using Assets in content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: imagesearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- imagesearch.jsp 27 Nov 2008 10:47:37 -0000 1.22
+++ imagesearch.jsp 28 Nov 2008 09:28:08 -0000 1.23
@@ -44,8 +44,8 @@
}
}
- function selectChannel(channel, path) {
- document.location =
"../../resources/ImageAction.do?action=often&contenttypes=images&offset=0&order=title&direction=1&channel="+channel;
+ function selectChannel(channelid, path) {
+ document.location =
"../../resources/ImageAction.do?action=often&contenttypes=images&offset=0&order=title&direction=1&channelid="+channelid;
}
</script>
<link rel="stylesheet" type="text/css"
href="../../editors/editwizards_new/style/extra/wizard.css">
@@ -106,16 +106,18 @@
</c:if>
</html:form>
</div>
- <div class="ruler_green"><c:choose>
- <c:when test="${empty channel}">
+ <div class="ruler_green">
+ <c:choose>
+ <c:when test="${empty channelid}">
<div>IMAGE IN ALL CHANNELS</div>
</c:when>
<c:otherwise>
- <mm:node number="${channel}">
- <div>IMAGE IN <mm:field
name="path"/></div>
+ <mm:node number="${channelid}">
+ <div>IMAGE IN <mm:field
name="number"/></div>
</mm:node>
</c:otherwise>
- </c:choose></div>
+ </c:choose>
+ ` </div>
<div class="body" style="max-height:400px;overflow-y:auto;
overflow-x:hidden">
<mm:import externid="results" jspvar="nodeList" vartype="List"/>
<mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer">0</mm:import>
@@ -148,8 +150,8 @@
<ul class="shortcuts">
<li><a href="${search_init_action_url}"> Often used
images in all channels </a></li>
<li><a onclick="openPopupWindow('selectchannel', 340,
400);" target="selectchannel" href="${select_channel_url}"> Select different
channel </a></li>
- <li><a href="ImageAction.do?action=search"> Search
image </a></li>
- <li><a
href="imageupload.jsp?uploadAction=${param.action}"> New image </a></li>
+ <li><a
href="ImageAction.do?action=search&channelid=${channelid}"> Search image
</a></li>
+ <li><a href="imageupload.jsp"> New image </a></li>
</ul>
</div>
</c:if>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
