Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv16927/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
Tag: b1_6
urlsearch.jsp imagesearch.jsp attachmentsearch.jsp
Log Message:
CMSC-1260 Content search also finds elements in Recycle bin
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1260
Index: urlsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -b -r1.24 -r1.24.2.1
--- urlsearch.jsp 19 Feb 2009 12:09:01 -0000 1.24
+++ urlsearch.jsp 2 Mar 2009 10:10:03 -0000 1.24.2.1
@@ -1,6 +1,7 @@
<%...@page language="java" contentType="text/html;charset=utf-8"
%><%...@include file="globals.jsp"
%><%...@page
import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil"
+%><%...@page import="com.finalist.cmsc.repository.RepositoryUtil"
%><mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
@@ -155,6 +156,9 @@
<c:if test="${assetShow eq 'thumbnail'}">
<div id="assetList" class="hover" style="width:100%" href="">
+ <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field id="trashnumber" name="number" write="false"/>
+ </mm:node>
<mm:listnodes referid="results">
<c:if test="${strict == 'urls'}">
<mm:import
id="url">javascript:top.opener.selectContent('<mm:field name="number" />', '',
''); top.close();</mm:import>
@@ -162,6 +166,10 @@
<c:if test="${ empty strict}">
<mm:import id="url">javascript:selectElement('<mm:field
name="number" />', '<mm:field name="title"
escape="js-single-quotes"/>','<mm:field name="url" />');</mm:import>
</c:if>
+ <mm:relatednodes role="creationrel" type="contentchannel">
+ <c:set var="creationRelNumber"><mm:field
name="number" id="creationnumber"/></c:set>
+ </mm:relatednodes>
+ <c:if test="${creationRelNumber ne trashnumber}">
<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"/>')">
<c:set var="thumbnail_alt"><mm:field name="url"
/></c:set>
@@ -188,6 +196,7 @@
</c:choose>
</div>
</div>
+ </c:if>
</mm:listnodes>
</div>
</c:if>
@@ -207,6 +216,9 @@
</tr>
</c:if>
<tbody id="assetList" class="hover" href="">
+ <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field id="trashnumber" name="number" write="false"/>
+ </mm:node>
<c:set var="useSwapStyle">true</c:set>
<mm:listnodes referid="results">
<c:if test="${strict == 'urls'}">
@@ -215,6 +227,10 @@
<c:if test="${ empty strict}">
<mm:import id="url">javascript:selectElement('<mm:field
name="number" />', '<mm:field name="title"
escape="js-single-quotes"/>','<mm:field name="url" />');</mm:import>
</c:if>
+ <mm:relatednodes role="creationrel" type="contentchannel">
+ <c:set var="creationRelNumber"><mm:field
name="number" id="creationnumber"/></c:set>
+ </mm:relatednodes>
+ <c:if test="${creationRelNumber ne trashnumber}">
<tr <c:if test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write referid="url"/>">
<td style="white-space:nowrap;">
<a href="javascript:showInfo(<mm:field name="number"
/>)">
@@ -242,6 +258,7 @@
</c:choose>
</td>
</tr>
+ </c:if>
<c:set var="useSwapStyle">${!useSwapStyle}</c:set>
</mm:listnodes>
</tbody>
Index: imagesearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -b -r1.51 -r1.51.2.1
--- imagesearch.jsp 19 Feb 2009 08:24:34 -0000 1.51
+++ imagesearch.jsp 2 Mar 2009 10:10:03 -0000 1.51.2.1
@@ -1,6 +1,7 @@
<%...@page language="java" contentType="text/html;charset=utf-8"
%><%...@include file="globals.jsp"
%><%...@page
import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil"
+%><%...@page import="com.finalist.cmsc.repository.RepositoryUtil"
%><mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
@@ -155,6 +156,9 @@
<c:if test="${assetShow eq 'thumbnail'}">
<div id="assetList" class="hover" style="width:100%" href="">
+ <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field id="trashnumber" name="number" write="false"/>
+ </mm:node>
<mm:listnodes referid="results">
<mm:field name="description" escape="js-single-quotes"
jspvar="description">
<%
@@ -166,7 +170,11 @@
<c:if test="${ empty strict}">
<mm:import
id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field
name="title" escape="js-single-quotes"/>','<mm:image />','<mm:field
name="width"/>','<mm:field name="height"/>', '<%=description%>');</mm:import>
</c:if>
+ <mm:relatednodes role="creationrel"
type="contentchannel">
+ <c:set var="creationRelNumber"><mm:field
name="number" id="creationnumber"/></c:set>
+ </mm:relatednodes>
</mm:field>
+ <c:if test="${creationRelNumber ne trashnumber}">
<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="assetInfo">
@@ -177,6 +185,7 @@
<br/><mm:field name="itype" />
</div>
</div>
+ </c:if>
</mm:listnodes>
</div>
</c:if>
@@ -198,6 +207,9 @@
</tr>
</c:if>
<tbody id="assetList" class="hover"
href="">
+ <mm:node number="<%=
RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field id="trashnumber"
name="number" write="false"/>
+ </mm:node>
<c:set
var="useSwapStyle">true</c:set>
<mm:listnodes referid="results">
<mm:field name="description" escape="js-single-quotes"
jspvar="description">
@@ -210,7 +222,11 @@
<c:if test="${ empty strict}">
<mm:import
id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field
name="title" escape="js-single-quotes"/>','<mm:image />','<mm:field
name="width"/>','<mm:field name="height"/>', '<%=description%>');</mm:import>
</c:if>
+ <mm:relatednodes role="creationrel"
type="contentchannel">
+ <c:set
var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set>
+ </mm:relatednodes>
</mm:field>
+ <c:if test="${creationRelNumber ne trashnumber}">
<tr <c:if
test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write
referid="url"/>">
<td
style="white-space: nowrap;">
@@ -231,6 +247,7 @@
<td
onMouseDown="initParentHref(this.parentNode)"><img
src="<mm:image template="s(120x100)"/>" alt="" /></td>
</tr>
+ </c:if>
<c:set
var="useSwapStyle">${!useSwapStyle}</c:set>
</mm:listnodes>
</tbody>
Index: attachmentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -b -r1.36 -r1.36.2.1
--- attachmentsearch.jsp 19 Feb 2009 08:13:51 -0000 1.36
+++ attachmentsearch.jsp 2 Mar 2009 10:10:03 -0000 1.36.2.1
@@ -1,6 +1,7 @@
<%...@page language="java" contentType="text/html;charset=utf-8"
%><%...@include file="globals.jsp"
%><%...@page
import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil"
+%><%...@page import="com.finalist.cmsc.repository.RepositoryUtil"
%><mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
@@ -154,6 +155,9 @@
<c:if test="${assetShow eq 'thumbnail'}">
<div id="assetList" class="hover" style="width:100%" href="">
+ <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field id="trashnumber" name="number" write="false"/>
+ </mm:node>
<mm:listnodes referid="results">
<mm:field name="description" escape="js-single-quotes"
jspvar="description">
<%
@@ -165,7 +169,11 @@
<c:if test="${ empty strict}">
<mm:import
id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field
name="title" escape="js-single-quotes"/>','<mm:image />','120','100',
'<%=description%>');</mm:import>
</c:if>
+ <mm:relatednodes role="creationrel"
type="contentchannel">
+ <c:set var="creationRelNumber"><mm:field
name="number" id="creationnumber"/></c:set>
+ </mm:relatednodes>
</mm:field>
+ <c:if test="${creationRelNumber ne trashnumber}">
<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"/>')">
<c:set var="typedef" ><mm:nodeinfo
type="type"/></c:set>
@@ -188,6 +196,7 @@
<br/>
</div>
</div>
+ </c:if>
</mm:listnodes>
</div>
</c:if>
@@ -209,6 +218,9 @@
</tr>
</c:if>
<tbody id="assetList" class="hover"
href="">
+ <mm:node number="<%=
RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field id="trashnumber" name="number" write="false"/>
+ </mm:node>
<c:set
var="useSwapStyle">true</c:set>
<mm:listnodes referid="results">
<mm:field
name="description" escape="js-single-quotes"
@@ -222,7 +234,11 @@
<c:if test="${ empty strict}">
<mm:import
id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field
name="title" escape="js-single-quotes"/>','<mm:image />','120','100',
'<%=description%>');</mm:import>
</c:if>
+ <mm:relatednodes role="creationrel"
type="contentchannel">
+ <c:set
var="creationRelNumber"><mm:field name="number" id="creationnumber"/></c:set>
+ </mm:relatednodes>
</mm:field>
+ <c:if
test="${creationRelNumber ne trashnumber}">
<tr <c:if
test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write
referid="url"/>">
<td
style="white-space: nowrap;">
@@ -254,6 +270,7 @@
</c:if>
</td>
</tr>
+ </c:if>
<c:set
var="useSwapStyle">${!useSwapStyle}</c:set>
</mm:listnodes>
</tbody>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
