Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv17417/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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- imagesearch.jsp 2 Dec 2008 08:10:51 -0000 1.29
+++ imagesearch.jsp 2 Dec 2008 10:06:24 -0000 1.30
@@ -54,22 +54,9 @@
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
<mm:import externid="action">often</mm:import><%-- either often or search --%>
<div class="editor" style="height:555px">
- <div class="body">
- <html:form action="/editors/resources/ImageAction" method="post">
- <html:hidden property="action" value="${action}"/>
- <html:hidden property="offset"/>
- <html:hidden property="order"/>
- <html:hidden property="direction"/>
- <mm:import id="contenttypes"
jspvar="contenttypes">images</mm:import>
- <c:if test="${action == 'search'}">
- <[EMAIL PROTECTED] file="imageform.jsp" %>
- </c:if>
- </html:form>
- </div>
- <div class="ruler_green">
<c:choose>
<c:when test="${empty param.channelid}">
- <div><fmt:message
key="images.channel.title"><fmt:param>ALL
CHANNELS</fmt:param></fmt:message></div>
+ <mm:import id="channelMsg"><fmt:message
key="images.channel.title"><fmt:param>ALL
CHANNELS</fmt:param></fmt:message></mm:import>
</c:when>
<c:otherwise>
<c:if test="${param.channelid eq 'current'}">
@@ -77,12 +64,27 @@
</c:if>
<mm:node number="${channelid}">
<mm:field name="pathfragment"
id="pathfragment" write="false" />
- <div><fmt:message
key="images.channel.title">
+ <mm:import id="channelMsg">
+ <fmt:message key="images.channel.title">
<fmt:param
value="${pathfragment}" />
- </fmt:message></div>
+ </fmt:message>
+ </mm:import>
</mm:node>
</c:otherwise>
</c:choose>
+ <div class="body" <c:if test="${action !=
'search'}">style="display:none"</c:if> >
+ <html:form action="/editors/resources/ImageAction" method="post">
+ <html:hidden property="action" value="${action}"/>
+ <c:if test="${!empty channelid}">
+ <html:hidden property="channelid" value="${channelid}"/>
+ </c:if>
+ <html:hidden property="offset"/>
+ <mm:import id="contenttypes"
jspvar="contenttypes">images</mm:import>
+ <[EMAIL PROTECTED] file="imageform.jsp" %>
+ </html:form>
+ </div>
+ <div class="ruler_green">
+ <div><c:out value="${channelMsg}" /></div>
` </div>
<div class="body" style="max-height:400px;overflow-y:auto;
overflow-x:hidden">
<mm:import externid="results" jspvar="nodeList" vartype="List"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
