dpillot 2005/09/30 19:46:31 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
bug fix
Revision Changes Path
1.15 +95 -60
jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp.diff?r1=1.14&r2=1.15&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- contentpick.jsp 30 Sep 2005 16:14:26 -0000 1.14
+++ contentpick.jsp 30 Sep 2005 17:46:31 -0000 1.15
@@ -2,19 +2,24 @@
org.jahia.data.search.JahiaSearchResult,
org.jahia.registries.ServicesRegistry,
java.util.HashMap" %>
-<%@ page import="java.util.Enumeration"%>
-<%@ page import="org.jahia.services.sites.JahiaSite"%>
-<%@ page import="java.util.Date"%>
+<%@ page import="java.util.Enumeration" %>
+<%@ page import="org.jahia.services.sites.JahiaSite" %>
+<%@ page import="java.util.Date" %>
-<%@ page import="java.util.Vector"%>
-<%@ page import="org.jahia.services.containers.ContentContainer"%>
+<%@ page import="java.util.Vector" %>
+<%@ page import="org.jahia.services.containers.ContentContainer" %>
<%@ taglib uri="/WEB-INF/etc/taglibs/pager-taglib" prefix="pg" %>
+<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%
+ /**
+ * @version $Id: contentpick.jsp,v 1.15 2005/09/30 17:46:31 dpillot Exp $
+ */
+
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
JahiaSearchResult sr = (JahiaSearchResult)
engineMap.get("searchResults");
String theScreen = (String) engineMap.get("screen");
//used to order the results
- String orderBy=(String)engineMap.get("orderby");
+ String orderBy = (String) engineMap.get("orderby");
%>
@@ -25,8 +30,8 @@
sort by <%=orderBy%><br/>
<script language="javascript">
- function orderby(param){
- document.mainForm.orderby.value=param;
+ function orderby(param) {
+ document.mainForm.orderby.value = param;
handleActionChange("contentPick");
}
//submit
@@ -63,7 +68,11 @@
document.getElementById(cid).style.display = "none"
}
-
+ // search function to preprocess and check validity of queries
+ function goSearch() {
+
+ handleActionChange("contentPick");
+ }
</script>
<style type="text/css">
@@ -79,6 +88,7 @@
background-color: #eee;
}
+
.switchcontent1 {
display: block;
margin: 3px;
@@ -95,50 +105,65 @@
<input type="hidden" name="orderby" value="score"/>
<table border=0><tr><td>
-<div id="sc1" class="switchcontent1">
-<a href="javascript:expandcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16" height="16"
border="0"></a>
-
-
- <select name="searchSite">
-
- <%
- Enumeration enum = (Enumeration)
engineMap.get("sites");
- while (enum.hasMoreElements()) {
- JahiaSite jahiaSite =
(JahiaSite) enum.nextElement();
- %><option value="<%=
jahiaSite.getID() %>"><%= jahiaSite.getSiteKey()%></option>
-
- <%
- }
- %>
- <option value="all">all</option>
- </select>
- <INPUT size=25 value="<%=engineMap.get("searchString")%>" name="search"
onKeyPress="return submitenter(this,event)"/>
-
-</div>
-
-
-<div id="sc2" class="switchcontent">
-<a href="javascript:expandcontent('sc3')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16" height="16"
border="0"></a><a href="javascript:contractcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16" height="16"
border="0"></a>
-<INPUT size=50 value="" name="P2" />
-</div>
-
-
-<div id="sc3" class="switchcontent">
-<a href="javascript:expandcontent('sc4')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16" height="16"
border="0"></a><a href="javascript:contractcontent('sc3')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16" height="16"
border="0"></a>
-<INPUT size=50 value="" name="P3" />
-</div>
-
-<div id="sc4" class="switchcontent">
-<a href="javascript:expandcontent('sc5')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16" height="16"
border="0"></a><a href="javascript:contractcontent('sc4')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16" height="16"
border="0"></a>
-<INPUT size=50 value="" name="P4" />
-</div>
+ <div id="sc1" class="switchcontent1">
+ <a href="javascript:expandcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
+ height="16"
border="0"></a>
+
+
+ <select name="searchSite">
+ <%
+ int count = 0;
+ Enumeration enum = (Enumeration) engineMap.get("sites");
+ while (enum.hasMoreElements()) {
+ JahiaSite jahiaSite = (JahiaSite) enum.nextElement();
+ count++;
+ %>
+ <option value="<%= jahiaSite.getID() %>"><%=
jahiaSite.getSiteKey()%></option>
+
+ <%
+ }
+ // all is available if needed
+ if(count>1) {
+ %>
+ <option value="all">all</option>
+ <% } %>
+ </select> <INPUT size=50
value="<%=engineMap.get("searchString")%>"
+
name="search"
+
onKeyPress="return submitenter(this,event)"/>
+
+ </div>
+
+
+ <div id="sc2" class="switchcontent">
+ <a href="javascript:expandcontent('sc3')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
+ height="16"
border="0"></a><a
+ href="javascript:contractcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16"
+ height="16"
border="0"></a>
+ <INPUT size=50 value="" name="P2"/>
+ </div>
+
+
+ <div id="sc3" class="switchcontent">
+ <a href="javascript:expandcontent('sc4')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
+ height="16"
border="0"></a><a
+ href="javascript:contractcontent('sc3')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16"
+ height="16"
border="0"></a>
+ <INPUT size=50 value="" name="P3"/>
+ </div>
+
+ <div id="sc4" class="switchcontent">
+ <a href="javascript:expandcontent('sc5')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
+ height="16"
border="0"></a><a
+ href="javascript:contractcontent('sc4')"><img
src="/jahia/jsp/jahia/engines/images/deleting.png" width="16"
+ height="16"
border="0"></a>
+ <INPUT size=50 value="" name="P4"/>
+ </div>
</td></tr>
-<tr><td><a
href="javascript:handleActionChange('contentPick')">search</a></td></tr>
+ <tr><td><a href="javascript:goSearch()">search</a></td></tr>
</table>
-
<TABLE cellSpacing=0 cellPadding=3 width="100%" border=0>
<TBODY>
@@ -161,11 +186,14 @@
<tr>
<th class="text">teaser</th>
<th class="text"><a
href="javascript:orderby('creator');">creator</a></th>
- <th class="text"><a
href="javascript:orderby('lastcontributor');">last contributor</a></th>
+ <th class="text"><a
href="javascript:orderby('lastcontributor');">last
+ contributor</a></th>
<th class="text">localisation</th>
<!--th class="text">score</th-->
- <th class="text"><a
href="javascript:orderby('creationdate');">creation date</a></th>
- <th class="text"><a
href="javascript:orderby('lastpublishdate');">last publish date</a></th>
+ <th class="text"><a
href="javascript:orderby('creationdate');">creation date</a>
+ </th>
+ <th class="text"><a
href="javascript:orderby('lastpublishdate');">last publish
+ date</a></th>
<th
class="text"><center>Copy</center></th>
<th class="text"><center>Linked
Copy</center></th>
</tr>
@@ -177,26 +205,29 @@
JahiaSearchHit thisHit =
(JahiaSearchHit) sr.results().get(i);
%>
<tr>
- <td class="text"><a
href="<%=thisHit.getURL()%>"><b><%=thisHit.getTeaser()%></b></a></td>
+ <td class="text"><a
href="<%=thisHit.getURL()%>"><b><%=thisHit.getTeaser()%></b></a>
+ </td>
<td
class="text"><%=thisHit.getParsedObject().getValue("creator")%></td>
<td
class="text"><%=thisHit.getParsedObject().getValue("lastcontributor")%></td>
- <td class="text">(container
<%=thisHit.getId()%>
usage[<%=ContentContainer.getContainer(Integer.parseInt(thisHit.getId())).getPickerObjects().size()%>]
+ <td class="text">(container
<%=thisHit.getId()%>
+
usage[<%=ContentContainer.getContainer(Integer.parseInt(thisHit.getId())).getPickerObjects().size()%>
+ ]
in
<%=ServicesRegistry.getInstance().getJahiaSitesService().getSite(thisHit.getPage().getJahiaID()).getSiteKey()%>
)</td>
<!--td class="text">score :
<%=thisHit.getScore()%></td-->
<td class="text">
- <%
if(thisHit.getParsedObject().getValue("creationdate")!=null
- &&
!thisHit.getParsedObject().getValue("creationdate").equalsIgnoreCase("")){ %>
+ <% if
(thisHit.getParsedObject().getValue("creationdate") != null
+ &&
!thisHit.getParsedObject().getValue("creationdate").equalsIgnoreCase("")) { %>
<%=new
Date(Long.parseLong(thisHit.getParsedObject().getValue("creationdate"))).toString()%>
<% } else { %>
NA
<% } %>
</td>
<td class="text">
- <%
if(thisHit.getParsedObject().getValue("lastpublishingdate")!=null
- &&
!thisHit.getParsedObject().getValue("lastpublishingdate").equalsIgnoreCase("")){
%>
+ <% if
(thisHit.getParsedObject().getValue("lastpublishingdate") != null
+ &&
!thisHit.getParsedObject().getValue("lastpublishingdate").equalsIgnoreCase(""))
{ %>
<%=new
Date(Long.parseLong(thisHit.getParsedObject().getValue("lastpublishingdate"))).toString()%>
- <% } else { %>
+ <% } else { %>
NA
<% } %>
</td>
@@ -232,10 +263,17 @@
</TABLE>
</div>
</div>
-
+<!--tools menu-->
<div class="menu">
<%@ include file="../tools.inc" %>
</div>
<div class="clearing"> </div>
-</div>
\ No newline at end of file
+</div>
+<% /**
+ * $Log: contentpick.jsp,v $
+ * Revision 1.15 2005/09/30 17:46:31 dpillot
+ * bug fix
+ *
+ */
+%>
\ No newline at end of file
