dpillot 2005/11/09 13:41:09 CET
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
better visualization
Revision Changes Path
1.36 +216 -183
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.35&r2=1.36&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- contentpick.jsp 8 Nov 2005 17:36:54 -0000 1.35
+++ contentpick.jsp 9 Nov 2005 12:41:09 -0000 1.36
@@ -1,21 +1,17 @@
-<%@ page import="org.jahia.data.search.JahiaSearchHit,
- 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="org.jahia.data.JahiaData,
+ org.jahia.data.search.JahiaSearchHit,
+ org.jahia.data.search.JahiaSearchHitInterface,
+ org.jahia.data.search.JahiaSearchResult" %>
<%@ page import="org.jahia.engines.selectpage.SelectPage_Engine" %>
-<%@ page import="org.jahia.services.containers.ContentContainer" %>
<%@ page import="org.jahia.exceptions.JahiaException" %>
+<%@ page import="org.jahia.gui.HTMLToolBox" %>
+<%@ page import="org.jahia.params.ParamBean" %>
+<%@ page import="org.jahia.registries.ServicesRegistry" %>
+<%@ page import="org.jahia.services.containers.ContentContainer" %>
+<%@ page import="org.jahia.services.sites.JahiaSite" %>
<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.*" %>
-<%@ page import="org.jahia.data.JahiaData" %>
-<%@ page import="org.jahia.data.fields.JahiaField" %>
-<%@ page import="org.jahia.params.ParamBean" %>
-<%@ page import="org.jahia.gui.HTMLToolBox" %>
-<%@ page import="org.jahia.resourcebundle.JahiaResourceBundle"%>
-<%@ page import="org.jahia.data.search.JahiaSearchHitInterface"%>
+<%@ page import="java.util.*" %>
<%@ taglib uri="/WEB-INF/etc/taglibs/pager-taglib" prefix="pg" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%!
@@ -82,7 +78,7 @@
%>
<%
/**
- * @version $Id: contentpick.jsp,v 1.35 2005/11/08 17:36:54 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.36 2005/11/09 12:41:09 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -92,8 +88,8 @@
final ParamBean jParams = (ParamBean)
request.getAttribute("org.jahia.params.ParamBean");
// to bundle html labels
- ResourceBundle
bundle=ResourceBundle.getBundle("JahiaEnginesResources",jParams.getLocale());
- String bundle_prefix="org.jahia.engines.importexport.contentpick";
+ ResourceBundle bundle =
ResourceBundle.getBundle("JahiaEnginesResources", jParams.getLocale());
+ String bundle_prefix = "org.jahia.engines.importexport.contentpick";
//parameter to order the results (def:score)
String orderBy = (String) engineMap.get("orderby");
@@ -196,11 +192,13 @@
background-color: #eee;
}
+
/* invisible */
.contvis {
display: none;
width: 100%;
}
+
/* visible */
.contvis1 {
display: block;
@@ -208,11 +206,11 @@
}
/* add & remove criteria*/
- .command {
- float:right;
- display: block;
- text-align: right;
- }
+ .command {
+ float: right;
+ display: block;
+ text-align: right;
+ }
</style>
@@ -232,8 +230,14 @@
<script type="text/javascript">
var expand = 1;//number of queries non-empty
-function displayPickers(id){
- fenetre =
window.open("/jahia/jsp/jahia/engines/importexport/dispPickers.jsp?id="+id,"jwin","width=300,height=400");
+
+function hello() {
+ alert("coucou");
+}
+
+
+function displayPickers(id) {
+ fenetre =
window.open("/jahia/jsp/jahia/engines/importexport/dispPickers.jsp?id=" + id,
"jwin", "width=300,height=400");
}
//used to call the pagelink select
@@ -505,39 +509,51 @@
<div id="sc0" class="switchcontent" style="background-color: #ffffff;">
<select name="concat" id="cond0" onchange="goSearch(this.name)">
<% if (((String) engineMap.get("concat")).equalsIgnoreCase("or")) {%>
- <option value="or" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition0.or.label"/></option>
+ <option value="or" selected="selected"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition0.or.label"/></option>
<% } else { %>
- <option value="or"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition0.or.label"/></option>
+ <option value="or"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition0.or.label"/></option>
<% } %>
<% if (((String) engineMap.get("concat")).equalsIgnoreCase("and"))
{%>
- <option value="and" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition0.and.label"/></option>
+ <option value="and" selected="selected"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition0.and.label"/></option>
<% } else { %>
- <option value="and"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition0.and.label"/></option>
+ <option value="and"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition0.and.label"/></option>
<% } %>
</select>
<br/><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.prefix.and.label"/>
</div>
<div id="sc1" class="switchcontent1">
- <span class="command">
+ <span class="command">
<a href="javascript:expandcontent('sc2')"
title="<%=bundle.getString(bundle_prefix+".criteria.add.label")%>">
- <img src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
height="16" border="0"
alt="<%=bundle.getString(bundle_prefix+".criteria.add.label")%>"></a>
+ <img src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
height="16" border="0"
+
alt="<%=bundle.getString(bundle_prefix+".criteria.add.label")%>"></a>
</span>
<select name="condition1" id="cond1" onchange="goSearch(this.name)">
<% if (((String) engineMap.get("smode")).equalsIgnoreCase("or")) {%>
- <option value="or" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.or.label"/></option>
+ <option value="or" selected="selected"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition1.or.label"/></option>
<% } else { %>
- <option value="or"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.or.label"/></option>
+ <option value="or"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition1.or.label"/></option>
<% } %>
<% if (((String) engineMap.get("smode")).equalsIgnoreCase("and")) {%>
- <option value="and" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.and.label"/></option>
+ <option value="and" selected="selected"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition1.and.label"/></option>
<% } else { %>
- <option value="and"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.and.label"/></option>
+ <option value="and"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition1.and.label"/></option>
<% } %>
<% if (((String) engineMap.get("smode")).equalsIgnoreCase("exact"))
{%>
- <option value="exact"
selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.exact.label"/>la
phrase exacte</option>
+ <option value="exact" selected="selected"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition1.exact.label"/>la
phrase
+ exacte</option>
<% } else { %>
- <option value="exact"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.exact.label"/></option>
+ <option value="exact"><jahia:engineResourceBundle
+
resourceName="org.jahia.engines.importexport.contentpick.condition1.exact.label"/></option>
<% } %>
</select>
<!-- main query -->
@@ -550,7 +566,7 @@
if (sitecount > 1) {
// looping on all sites
%>
-
<br/><%=bundle.getString(bundle_prefix+".searchsite.allpos.label")%>
+ <br/><%=bundle.getString(bundle_prefix +
".searchsite.allpos.label")%>
<select name="searchSite" onchange="goSearch(this.name)">
<%
sb = new StringBuffer();
@@ -573,7 +589,7 @@
sb.append("<option value=\"all\" ");
if (searchsite.equalsIgnoreCase("all"))
sb.append("selected=\"selected\"");
sb.append(" >");
-
sb.append(bundle.getString(bundle_prefix+".searchsite.all.label"));
+ sb.append(bundle.getString(bundle_prefix +
".searchsite.all.label"));
sb.append("</option>");
%>
<%=sb.toString()%>
@@ -583,7 +599,7 @@
// one site only
JahiaSite jahiaSite = (JahiaSite) enum.nextElement();
%>
- <br/><%=bundle.getString(bundle_prefix+".searchsite.onesite.label")%>
<b><%=jahiaSite.getSiteKey() %></b>
+ <br/><%=bundle.getString(bundle_prefix + ".searchsite.onesite.label")%>
<b><%=jahiaSite.getSiteKey() %></b>
<input type="hidden" name="searchSite" value="<%=jahiaSite.getID() %>"/>
<% } %>
@@ -600,18 +616,18 @@
if (z == 2 && !query2.equalsIgnoreCase("")) sb.append(1);
//visibility
if (z == 3 && !query3.equalsIgnoreCase("")) sb.append(1);
if (z == 4 && !query4.equalsIgnoreCase("")) sb.append(1);
- sb.append("\">");
+ sb.append("\">");
sb.append("<span class=\"command\">");
if (z != 4) {
sb.append("<a href=\"javascript:expandcontent('sc");
sb.append((z + 1));
- sb.append("')\"
title=\""+bundle.getString(bundle_prefix+".criteria.add.label")+"\"><img
src=\"/jahia/jsp/jahia/engines/images/adding.png\" width=\"16\"height=\"16\"
border=\"0\"></a>");
+ sb.append("')\" title=\"" + bundle.getString(bundle_prefix +
".criteria.add.label") + "\"><img
src=\"/jahia/jsp/jahia/engines/images/adding.png\" width=\"16\"height=\"16\"
border=\"0\"></a>");
}
sb.append("<a href=\"javascript:contractcontent('sc");
sb.append(z);
- sb.append("')\"
title=\""+bundle.getString(bundle_prefix+".criteria.remove.label")+"\"><img
src=\"/jahia/jsp/jahia/engines/images/deleting.png\" width=\"16\" height=\"16\"
border=\"0\"></a></span>");
+ sb.append("')\" title=\"" + bundle.getString(bundle_prefix +
".criteria.remove.label") + "\"><img
src=\"/jahia/jsp/jahia/engines/images/deleting.png\" width=\"16\" height=\"16\"
border=\"0\"></a></span>");
//condition modules
-
sb.append(bundle.getString(bundle_prefix+".prefix.author.label"));//which
+ sb.append(bundle.getString(bundle_prefix +
".prefix.author.label"));//which
sb.append(" <select name=\"condition");
sb.append(z);
sb.append("\" onchange=\"goSearch(this.name)\">");
@@ -620,28 +636,28 @@
if (z == 3 && smode3.equalsIgnoreCase("creator"))
sb.append("selected=\"selected\"");
if (z == 4 && smode4.equalsIgnoreCase("creator"))
sb.append("selected=\"selected\"");
sb.append(">");
- sb.append(bundle.getString(bundle_prefix+".condition.author.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.author.label"));
sb.append("</option>");
sb.append("<option value=\"keywords\" ");
if (z == 2 && smode2.equalsIgnoreCase("keywords"))
sb.append("selected=\"selected\"");
if (z == 3 && smode3.equalsIgnoreCase("keywords"))
sb.append("selected=\"selected\"");
if (z == 4 && smode4.equalsIgnoreCase("keywords"))
sb.append("selected=\"selected\"");
sb.append(">");
-
sb.append(bundle.getString(bundle_prefix+".condition.keywords.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.keywords.label"));
sb.append("</option>");
sb.append("<option value=\"pageid\" ");
if (z == 2 && smode2.equalsIgnoreCase("pageid"))
sb.append("selected=\"selected\"");
if (z == 3 && smode3.equalsIgnoreCase("pageid"))
sb.append("selected=\"selected\"");
if (z == 4 && smode4.equalsIgnoreCase("pageid"))
sb.append("selected=\"selected\"");
sb.append(">");
- sb.append(bundle.getString(bundle_prefix+".condition.pageid.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.pageid.label"));
sb.append("</option>");
sb.append("<option value=\"date\" ");
if (z == 2 && smode2.equalsIgnoreCase("date"))
sb.append("selected=\"selected\"");
if (z == 3 && smode3.equalsIgnoreCase("date"))
sb.append("selected=\"selected\"");
if (z == 4 && smode4.equalsIgnoreCase("date"))
sb.append("selected=\"selected\"");
sb.append(">");
- sb.append(bundle.getString(bundle_prefix+".condition.date.label"));
+ sb.append(bundle.getString(bundle_prefix + ".condition.date.label"));
sb.append("</option>");
sb.append("</select>");
@@ -651,25 +667,26 @@
sb.append(1);
sb.append("\" class=\"contvis");
if ((z == 2 && smode2.equalsIgnoreCase("creator"))
- ||(z == 3 && smode3.equalsIgnoreCase("creator"))
- ||(z == 4 && smode4.equalsIgnoreCase("creator"))
+ || (z == 3 && smode3.equalsIgnoreCase("creator"))
+ || (z == 4 && smode4.equalsIgnoreCase("creator"))
) sb.append("1\">");
- else sb.append("\">");
+ else
+ sb.append("\">");
// select type author
- sb.append(bundle.getString(bundle_prefix+".postfix.author.label"));
+ sb.append(bundle.getString(bundle_prefix + ".postfix.author.label"));
sb.append(" <select name=\"condition");
sb.append(z);
sb.append(1);
sb.append("\" onchange=\"goSearch(this.name)\">");
sb.append("<option value=\"creator\" >");
-
sb.append(bundle.getString(bundle_prefix+".condition.creator.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.creator.label"));
sb.append("</option>");
sb.append("<option value=\"contributor\" >");
-
sb.append(bundle.getString(bundle_prefix+".condition.contributor.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.contributor.label"));
sb.append("</option>");
sb.append("<option value=\"all\" >");
- sb.append(bundle.getString(bundle_prefix+".condition.both.label"));
+ sb.append(bundle.getString(bundle_prefix + ".condition.both.label"));
sb.append("</option>");
sb.append("</select>");
@@ -689,11 +706,12 @@
sb.append(2);
sb.append("\" class=\"contvis");
if ((z == 2 && smode2.equalsIgnoreCase("keywords"))
- ||(z == 3 && smode3.equalsIgnoreCase("keywords"))
- ||(z == 4 && smode4.equalsIgnoreCase("keywords"))
+ || (z == 3 && smode3.equalsIgnoreCase("keywords"))
+ || (z == 4 && smode4.equalsIgnoreCase("keywords"))
) sb.append("1\">");
- else sb.append("\">");
- sb.append(bundle.getString(bundle_prefix+".postfix.keywords.label"));
+ else
+ sb.append("\">");
+ sb.append(bundle.getString(bundle_prefix +
".postfix.keywords.label"));
sb.append(" <INPUT size=30 value=\"");
if (z == 2) sb.append(query22);
if (z == 3) sb.append(query32);
@@ -710,11 +728,12 @@
sb.append(3);
sb.append("\" class=\"contvis");
if ((z == 2 && smode2.equalsIgnoreCase("pageid"))
- ||(z == 3 && smode3.equalsIgnoreCase("pageid"))
- ||(z == 4 && smode4.equalsIgnoreCase("pageid"))
+ || (z == 3 && smode3.equalsIgnoreCase("pageid"))
+ || (z == 4 && smode4.equalsIgnoreCase("pageid"))
) sb.append("1\">");
- else sb.append("\">");
- sb.append(bundle.getString(bundle_prefix+".postfix.author.label"));
+ else
+ sb.append("\">");
+ sb.append(bundle.getString(bundle_prefix + ".postfix.author.label"));
sb.append(" <INPUT size=10 value=\"");
if (z == 2) sb.append(query23);
if (z == 3) sb.append(query33);
@@ -731,24 +750,25 @@
sb.append(4);
sb.append("\" class=\"contvis");
if ((z == 2 && smode2.equalsIgnoreCase("date"))
- ||(z == 3 && smode3.equalsIgnoreCase("date"))
- ||(z == 4 && smode4.equalsIgnoreCase("date"))
+ || (z == 3 && smode3.equalsIgnoreCase("date"))
+ || (z == 4 && smode4.equalsIgnoreCase("date"))
) sb.append("1\">");
- else sb.append("\">");
+ else
+ sb.append("\">");
// select type date
- sb.append(bundle.getString(bundle_prefix+".postfix.author.label"));
+ sb.append(bundle.getString(bundle_prefix + ".postfix.author.label"));
sb.append(" <select name=\"condition");
sb.append(z);
sb.append(4);
sb.append("\">");
sb.append("<option value=\"pub\"
selected=\"selected\">");//default:publication date
-
sb.append(bundle.getString(bundle_prefix+".results.publishdate.label"));
+ sb.append(bundle.getString(bundle_prefix +
".results.publishdate.label"));
sb.append("</option>");
sb.append("<option value=\"mod\" >");
-
sb.append(bundle.getString(bundle_prefix+".condition.contributiondate.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.contributiondate.label"));
sb.append("</option>");
sb.append("<option value=\"cre\" >");
-
sb.append(bundle.getString(bundle_prefix+".results.creationdate.label"));
+ sb.append(bundle.getString(bundle_prefix +
".results.creationdate.label"));
sb.append("</option>");
sb.append("</select>");
// select date range
@@ -758,16 +778,16 @@
sb.append(4);
sb.append("\" onchange=\"goSearch(this.name)\">");
sb.append("<option value=\"-\"
selected=\"selected\">");//default:vide
-
sb.append(bundle.getString(bundle_prefix+".condition.daterange.message.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.daterange.message.label"));
sb.append("</option>");
sb.append("<option value=\"week\">");
-
sb.append(bundle.getString(bundle_prefix+".condition.daterange.week.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.daterange.week.label"));
sb.append("</option>");
sb.append("<option value=\"month\" >");
-
sb.append(bundle.getString(bundle_prefix+".condition.daterange.month.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.daterange.month.label"));
sb.append("</option>");
sb.append("<option value=\"months\" >");
-
sb.append(bundle.getString(bundle_prefix+".condition.daterange.months.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.daterange.months.label"));
sb.append("</option>");
sb.append("</select>");
@@ -781,7 +801,7 @@
sb.append("<a href=\"javascript:callSelectPageLink(");
sb.append(z);
sb.append(")\">");
-
sb.append(bundle.getString(bundle_prefix+".condition.sitemapview.label"));
+ sb.append(bundle.getString(bundle_prefix +
".condition.sitemapview.label"));
sb.append("</a></span>");
sb.append("</div>");
@@ -791,8 +811,11 @@
</td></tr>
-<tr><td><a href="javascript:goSearch('go')"
title="<%=bundle.getString(bundle_prefix+".search.label")%>"
style="text-decoration:none"><img
src="/jahia/jsp/jahia/engines/images/view_next.png"
- width="48"
height="48"
border="0"> <%=bundle.getString(bundle_prefix+".search.label")%></a></td>
+<tr><td><a href="javascript:goSearch('go')"
title="<%=bundle.getString(bundle_prefix+".search.label")%>"
+ style="text-decoration:none"><img
src="/jahia/jsp/jahia/engines/images/view_next.png"
+ width="48" height="48"
+
border="0"> <%=bundle.getString(bundle_prefix + ".search.label")%></a>
+</td>
<td align="right"><img id="waiting"
src="/jahia/jsp/jahia/engines/images/pix.gif" width="16" height="16" border="0"
align="right"></td>
</tr>
@@ -810,127 +833,134 @@
<TR>
<TD class="text">
<fieldset>
-<legend><%=bundle.getString(bundle_prefix+".results.label")%></legend>
+<legend><%=bundle.getString(bundle_prefix + ".results.label")%></legend>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td valign="top" width="100%" class="maintable10">
<%
if (totalHits != 0) {
%>
-<table border="0" cellspacing="0" cellpadding="4" width="100%">
- <tr>
- <th class="text">
- <% if (orderBy.equalsIgnoreCase("score")) { %>
- <%=bundle.getString(bundle_prefix+".results.name.label")%>
- <% } else { %>
- <a
href="javascript:orderby('score');"><%=bundle.getString(bundle_prefix+".results.name.label")%></a>
- <% } %>
- </th>
- <th class="text">
- <% if (orderBy.equalsIgnoreCase("creator")) { %>
- <%=bundle.getString(bundle_prefix+".results.author.label")%>
- <% } else { %>
- <a
href="javascript:orderby('creator');"><%=bundle.getString(bundle_prefix+".results.author.label")%></a>
- <% } %>
- </th>
- <th class="text">
- <% if (orderBy.equalsIgnoreCase("lastcontributor")) { %>
- <%=bundle.getString(bundle_prefix+".results.contributor.label")%>
- <% } else { %>
- <a
href="javascript:orderby('lastcontributor');"><%=bundle.getString(bundle_prefix+".results.contributor.label")%></a>
- <% } %>
- </th>
- <th
class="text"><%=bundle.getString(bundle_prefix+".results.usage.label")%></th>
- <!--th class="text">score</th-->
- <th class="text">
- <% if (orderBy.equalsIgnoreCase("creationdate")) { %>
-
<%=bundle.getString(bundle_prefix+".results.creationdate.label")%>
- <% } else { %>
- <a
href="javascript:orderby('creationdate');"><%=bundle.getString(bundle_prefix+".results.creationdate.label")%></a>
- <% } %>
- </th>
- <th class="text">
- <% if (orderBy.equalsIgnoreCase("lastpublishdate")) { %>
- <%=bundle.getString(bundle_prefix+".results.publishdate.label")%>
- <% } else { %>
- <a
href="javascript:orderby('lastpublishdate');"><%=bundle.getString(bundle_prefix+".results.publishdate.label")%></a>
- <% } %>
- </th>
- <th
class="text"><center><%=bundle.getString(bundle_prefix+".results.copy.label")%></center></th>
- <th
class="text"><center><%=bundle.getString(bundle_prefix+".results.copylinked.label")%></center></th>
- </tr>
+<table border="0" cellspacing="2" cellpadding="4" width="100%">
+<tr bgcolor="#eeeeee" valign="top">
+ <th class="text">
+ <% if (orderBy.equalsIgnoreCase("score")) { %>
+ <%=bundle.getString(bundle_prefix + ".results.name.label")%>
+ <% } else { %>
+ <a
href="javascript:orderby('score');"><%=bundle.getString(bundle_prefix +
".results.name.label")%></a>
+ <% } %>
+ </th>
+ <th class="text">
+ <% if (orderBy.equalsIgnoreCase("creator")) { %>
+ <%=bundle.getString(bundle_prefix + ".results.author.label")%>
+ <% } else { %>
+ <a
href="javascript:orderby('creator');"><%=bundle.getString(bundle_prefix +
".results.author.label")%></a>
+ <% } %>
+ </th>
+ <th class="text">
+ <% if (orderBy.equalsIgnoreCase("lastcontributor")) { %>
+ <%=bundle.getString(bundle_prefix + ".results.contributor.label")%>
+ <% } else { %>
+ <a
href="javascript:orderby('lastcontributor');"><%=bundle.getString(bundle_prefix
+ ".results.contributor.label")%></a>
+ <% } %>
+ </th>
+ <th class="text"><%=bundle.getString(bundle_prefix +
".results.usage.label")%></th>
+ <!--th class="text">score</th-->
+ <th class="text">
+ <% if (orderBy.equalsIgnoreCase("creationdate")) { %>
+ <%=bundle.getString(bundle_prefix + ".results.creationdate.label")%>
+ <% } else { %>
+ <a
href="javascript:orderby('creationdate');"><%=bundle.getString(bundle_prefix +
".results.creationdate.label")%></a>
+ <% } %>
+ </th>
+ <th class="text">
+ <% if (orderBy.equalsIgnoreCase("lastpublishdate")) { %>
+ <%=bundle.getString(bundle_prefix + ".results.publishdate.label")%>
+ <% } else { %>
+ <a
href="javascript:orderby('lastpublishdate');"><%=bundle.getString(bundle_prefix
+ ".results.publishdate.label")%></a>
+ <% } %>
+ </th>
+ <th class="text"><center><%=bundle.getString(bundle_prefix +
".results.copy.label")%></center></th>
+ <th class="text"><center><%=bundle.getString(bundle_prefix +
".results.copylinked.label")%></center></th>
+</tr>
- <%
+<%
- sb = new StringBuffer();
- for (int i = 0; i < totalHits; i++) {
- JahiaSearchHit thisHit = (JahiaSearchHit) sr.results().get(i);
- String url = "#";
- if (thisHit.getTeaser() != null &&
!thisHit.getTeaser().equalsIgnoreCase("")) {
- url = serverpath + thisHit.getURL();
- }
- String sitekey = null;
- int pickersUsage = 0;
- try {
- sitekey =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(thisHit.getPage().getJahiaID()).getSiteKey();
- pickersUsage =
ContentContainer.getContainer(Integer.parseInt(thisHit.getId())).getPickerObjects().size();
- } catch (JahiaException e) {
- logger.error(e);
- }
+ sb = new StringBuffer();
+ for (int i = 0; i < totalHits; i++) {
+ JahiaSearchHit thisHit = (JahiaSearchHit) sr.results().get(i);
+ String url = "#";
+ if (thisHit.getTeaser() != null &&
!thisHit.getTeaser().equalsIgnoreCase("")) {
+ url = serverpath + thisHit.getURL();
+ }
+ String sitekey = null;
+ int pickersUsage = 0;
+ try {
+ sitekey =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(thisHit.getPage().getJahiaID()).getSiteKey();
+ pickersUsage =
ContentContainer.getContainer(Integer.parseInt(thisHit.getId())).getPickerObjects().size();
+ } catch (JahiaException e) {
+ logger.error(e);
+ }
- String cdate = printFriendlyDate(thisHit, "creationdate",
request.getLocale());
- String pdate = printFriendlyDate(thisHit, "lastpublishingdate",
request.getLocale());
- //object info
- String siteLocalisation="Id:"+thisHit.getId()+ " Site:"+sitekey;
- //check if object is a text contentfield or a contentpage
- if(thisHit.getType()== JahiaSearchHitInterface.PAGE_TYPE){
- siteLocalisation="PID:"+thisHit.getPageId()+ " Site:"+sitekey;
- }
- //page id container
- //String pageId=""+thisHit.getPage().getID();
- String pageId=""+thisHit.getPageId();
- sb.append("<tr><td class=\"text\"><a href=\"");
- sb.append(url);
- sb.append("\" title=\"pid");
- //sb.append(thisHit.getId());
- sb.append(pageId);
- sb.append(" in site:");
- sb.append(sitekey);
- sb.append("\" target=\"_new\"><b>");
- sb.append(thisHit.getTeaser());
- sb.append("</b></a><br><font size=\"1\"><i>(");
- sb.append(siteLocalisation);
- sb.append(")</i></font></td><td class=\"text\">");
- sb.append(thisHit.getParsedObject().getValue("creator"));
- sb.append("</td><td class=\"text\">");
- sb.append(thisHit.getParsedObject().getValue("lastcontributor"));
- sb.append("</td><td class=\"text\">");
- if(pickersUsage>0) {
- sb.append("<a href=\"javascript:displayPickers('");
- sb.append(thisHit.getId());
- sb.append("')\">");
- sb.append(pickersUsage);
- sb.append("</a>");
- } else sb.append("0");
-
-
- sb.append("</td><td class=\"text\">");
- sb.append(cdate);
- sb.append("</td><td class=\"text\">");
- sb.append(pdate);
- sb.append("</td><td class=\"text\"><input type=\"radio\"
name=\"contentPickOp\" value=\"copy_");
- sb.append(thisHit.getId());
- sb.append("\"/></center></td><td class=\"text\"><center><input
type=\"radio\" name=\"contentPickOp\" value=\"link_");
+ String cdate = printFriendlyDate(thisHit, "creationdate",
request.getLocale());
+ String pdate = printFriendlyDate(thisHit, "lastpublishingdate",
request.getLocale());
+ //object info
+ String siteLocalisation = "Id:" + thisHit.getId() + " Site:" +
sitekey;
+ //check if object is a text contentfield or a contentpage
+ if (thisHit.getType() == JahiaSearchHitInterface.PAGE_TYPE) {
+ siteLocalisation = "PID:" + thisHit.getPageId() + " Site:" +
sitekey;
+ }
+ //page id container
+ //String pageId=""+thisHit.getPage().getID();
+ String pageId = "" + thisHit.getPageId();
+ String color = "#FFFFFF";
+ if (i % 2 > 0) color = "#EEFFFF";
+ sb.append("<tr style=\"background-color:");
+ sb.append(color);
+ sb.append("\" onMouseOver=\"this.style.backgroundColor='#FFFFEE'\"
onMouseOut=\"this.style.backgroundColor='");
+ sb.append(color);
+ sb.append("'\"><td class=\"text\"><a href=\"");
+ sb.append(url);
+ sb.append("\" title=\"pid");
+ //sb.append(thisHit.getId());
+ sb.append(pageId);
+ sb.append(" in site:");
+ sb.append(sitekey);
+ sb.append("\" target=\"_new\"><b>");
+ sb.append(thisHit.getTeaser());
+ sb.append("</b></a><br><font size=\"1\"><i>(");
+ sb.append(siteLocalisation);
+ sb.append(")</i></font></td><td class=\"text\">");
+ sb.append(thisHit.getParsedObject().getValue("creator"));
+ sb.append("</td><td class=\"text\">");
+ sb.append(thisHit.getParsedObject().getValue("lastcontributor"));
+ sb.append("</td><td class=\"text\"><center>");
+ if (pickersUsage > 0) {
+ sb.append("<a href=\"javascript:displayPickers('");
sb.append(thisHit.getId());
- sb.append("\"/></center></td></tr>");
- }//end loop
- %>
- <%=sb.toString()%>
+ sb.append("')\">");
+ sb.append(pickersUsage);
+ sb.append("</a>");
+ } else
+ sb.append("0");
+
+
+ sb.append("</center></td><td class=\"text\">");
+ sb.append(cdate);
+ sb.append("</td><td class=\"text\">");
+ sb.append(pdate);
+ sb.append("</td><td class=\"text\"><center><input type=\"radio\"
name=\"contentPickOp\" value=\"copy_");
+ sb.append(thisHit.getId());
+ sb.append("\"/></center></td><td class=\"text\"><center><input
type=\"radio\" name=\"contentPickOp\" value=\"link_");
+ sb.append(thisHit.getId());
+ sb.append("\"/></center></td></tr>");
+ }//end loop
+%>
+<%=sb.toString()%>
</table>
<%
} else {
%>
-<div
class="text"><%=bundle.getString(bundle_prefix+".noresults.label")%></div>
+<div class="text"><%=bundle.getString(bundle_prefix +
".noresults.label")%></div>
<%
}
%>
@@ -953,6 +983,9 @@
<%
/**
* $Log: contentpick.jsp,v $
+ * Revision 1.36 2005/11/09 12:41:09 dpillot
+ * better visualization
+ *
* Revision 1.35 2005/11/08 17:36:54 dpillot
* fix for compilation
*
