Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory james.mmbase.org:/tmp/cvs-serv24483
Modified Files:
Tag: b1_6
attachmentsearch.jsp imagesearch.jsp
Log Message:
CMSC-1280 - Assets: Relate attachment to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1280
Index: attachmentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -u -b -r1.36.2.4 -r1.36.2.5
--- attachmentsearch.jsp 18 Mar 2009 03:53:37 -0000 1.36.2.4
+++ attachmentsearch.jsp 18 Mar 2009 04:26:44 -0000 1.36.2.5
@@ -105,10 +105,10 @@
</c:when>
<c:otherwise>
<mm:import
id="formAction">/editors/repository/HighFrequencyAsset</mm:import>
- <c:if test="${param.channelid eq 'all' || param.channelid eq
'siteimages'}">
+ <c:if test="${param.channelid eq 'all' || param.channelid eq
'siteassets'}">
<mm:import id="channelMsg"><fmt:message
key="attachments.channel.title"><fmt:param>ALL
CHANNELS</fmt:param></fmt:message></mm:import>
</c:if>
- <c:if test="${param.channelid ne 'all' && param.channelid ne
'siteimages'}">
+ <c:if test="${param.channelid ne 'all' && param.channelid ne
'siteassets'}">
<mm:node number="${channelid}">
<mm:field name="path" id="path" write="false" />
<mm:import id="channelMsg">
Index: imagesearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.51.2.4
retrieving revision 1.51.2.5
diff -u -b -r1.51.2.4 -r1.51.2.5
--- imagesearch.jsp 17 Mar 2009 07:15:51 -0000 1.51.2.4
+++ imagesearch.jsp 18 Mar 2009 04:26:44 -0000 1.51.2.5
@@ -106,10 +106,10 @@
</c:when>
<c:otherwise>
<mm:import
id="formAction">/editors/repository/HighFrequencyAsset</mm:import>
- <c:if test="${param.channelid eq 'all' || param.channelid eq
'siteimages'}">
+ <c:if test="${param.channelid eq 'all' || param.channelid eq
'siteassets'}">
<mm:import id="channelMsg"><fmt:message
key="images.channel.title"><fmt:param>ALL
CHANNELS</fmt:param></fmt:message></mm:import>
</c:if>
- <c:if test="${param.channelid ne 'all' && param.channelid ne
'siteimages'}">
+ <c:if test="${param.channelid ne 'all' && param.channelid ne
'siteassets'}">
<mm:node number="${channelid}">
<mm:field name="path" id="path" write="false" />
<mm:import id="channelMsg">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
