Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv18236/contentrepository/src/webapp/editors/resources
Modified Files:
imagesearch.jsp
Log Message:
CMSC-1126 (Move the ComparisonUtil.java to Container)
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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- imagesearch.jsp 2 Dec 2008 10:06:24 -0000 1.30
+++ imagesearch.jsp 3 Dec 2008 10:21:51 -0000 1.31
@@ -52,13 +52,19 @@
</cmscedit:head>
<body>
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
-<mm:import externid="action">often</mm:import><%-- either often or search --%>
+<mm:import externid="action">search</mm:import><%-- either often or search --%>
<div class="editor" style="height:555px">
<c:choose>
- <c:when test="${empty param.channelid}">
+ <c:when test="${action eq 'search'}">
+ <mm:import
id="formAction">/editors/resources/ImageAction</mm:import>
<mm:import id="channelMsg"><fmt:message
key="images.channel.title"><fmt:param>ALL
CHANNELS</fmt:param></fmt:message></mm:import>
</c:when>
<c:otherwise>
+ <mm:import
id="formAction">/editors/repository/HighFrequencyImag</mm:import>
+ <c:if test="${param.channelid eq 'all'}">
+ <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'}">
<c:if test="${param.channelid eq 'current'}">
<mm:import id="channelid" externid="creation" from="session" />
</c:if>
@@ -70,17 +76,22 @@
</fmt:message>
</mm:import>
</mm:node>
+ </c:if>
</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">
+ <div class="body" <c:if test="${action ==
'often'}">style="display:none"</c:if> >
+ <html:form action="${formAction}" method="post">
<html:hidden property="action" value="${action}"/>
- <c:if test="${!empty channelid}">
+ <html:hidden property="offset"/>
+ <c:if test="${action eq 'often'}">
<html:hidden property="channelid" value="${channelid}"/>
</c:if>
- <html:hidden property="offset"/>
+ <c:if test="${action eq 'search'}">
+ <html:hidden property="order"/>
+ <html:hidden property="direction"/>
<mm:import id="contenttypes"
jspvar="contenttypes">images</mm:import>
<[EMAIL PROTECTED] file="imageform.jsp" %>
+ </c:if>
</html:form>
</div>
<div class="ruler_green">
@@ -112,13 +123,14 @@
<[EMAIL PROTECTED] file="../repository/searchpages.jsp" %>
</c:if>
</div>
- <c:if test="${action != 'search'}">
+ <c:if test="${action == 'often'}">
<div class="body">
<mm:url page="/editors/repository/select/SelectorChannel.do"
id="select_channel_url" write="false" />
- <mm:url page="/editors/resources/ImageInitAction.do?action=search"
id="search_image_url" write="false" />
+ <mm:url page="/editors/resources/ImageInitAction.do"
id="search_image_url" write="false" />
<mm:url page="/editors/resources/imageupload.jsp?channelid=${channelid}"
id="new_image_url" write="false" />
+ <mm:url
page="/editors/repository/HighFrequencyImag.do?action=often&channelid=all"
id="often_show_images" write="false"/>
<ul class="shortcuts">
- <li><a href="#"><fmt:message
key="imageselect.link.allchannel" /></a></li>
+ <li><a href="${often_show_images}"><fmt:message
key="imageselect.link.allchannel" /></a></li>
<li><a onclick="openPopupWindow('selectchannel', 340,
400);" target="selectchannel" href="${select_channel_url}"><fmt:message
key="imageselect.link.channel" /></a></li>
<li><a href="${search_image_url}"><fmt:message
key="imageselect.link.search" /></a></li>
<li><a href="${new_image_url}"><fmt:message
key="imageselect.link.new" /></a></li>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
