dpillot 2005/10/20 18:53:41 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
internationalization & bug NFE fix
Revision Changes Path
1.29 +124 -88
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.28&r2=1.29&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- contentpick.jsp 19 Oct 2005 14:22:27 -0000 1.28
+++ contentpick.jsp 20 Oct 2005 16:53:40 -0000 1.29
@@ -14,6 +14,7 @@
<%@ 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"%>
<%@ taglib uri="/WEB-INF/etc/taglibs/pager-taglib" prefix="pg" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%!
@@ -80,7 +81,7 @@
%>
<%
/**
- * @version $Id: contentpick.jsp,v 1.28 2005/10/19 14:22:27 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.29 2005/10/20 16:53:40 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -88,6 +89,11 @@
String theScreen = (String) engineMap.get("screen");
final JahiaData jData = (JahiaData)
request.getAttribute("org.jahia.data.JahiaData");
+ 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";
+
//parameter to order the results (def:score)
String orderBy = (String) engineMap.get("orderby");
logger.debug("enginemap orderby=" + orderBy);
@@ -103,7 +109,6 @@
StringBuffer sb;
// specific code to render link to call select_page engine
- final ParamBean jParams = (ParamBean)
request.getAttribute("org.jahia.params.ParamBean");
HashMap selectPageURLParams = new HashMap();
selectPageURLParams.put(SelectPage_Engine.OPERATION,
SelectPage_Engine.LINK_OPERATION);
selectPageURLParams.put(SelectPage_Engine.PARENT_PAGE_ID, new
Integer(0));
@@ -201,6 +206,12 @@
width: 100%;
}
+ /* add & remove criteria*/
+ .command {
+ float:right;
+ display: block;
+ text-align: right;
+ }
</style>
@@ -486,41 +497,45 @@
<input type="hidden" name="pageselected" value=""/>
<table border=0><tr><td colspan="2">
+<jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.welcome.label"/>
<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">au moins une de ces
conditions</option>
+ <option value="or" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition0.or.label"/></option>
<% } else { %>
- <option value="or">au moins une de ces conditions</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">toutes ces
conditions</option>
+ <option value="and" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition0.and.label"/></option>
<% } else { %>
- <option value="and">toutes ces conditions</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">
+ <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>
+ </span>
<select name="condition1" id="cond1" onchange="goSearch(this.name)">
<% if (((String) engineMap.get("smode")).equalsIgnoreCase("or")) {%>
- <option value="or" selected="selected">au moins un des mots</option>
+ <option value="or" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.or.label"/></option>
<% } else { %>
- <option value="or">au moins un des mots</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">tous les mots</option>
+ <option value="and" selected="selected"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.and.label"/></option>
<% } else { %>
- <option value="and">tous les mots</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">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">la phrase exacte</option>
+ <option value="exact"><jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.condition1.exact.label"/></option>
<% } %>
</select>
-
<!-- main query -->
<INPUT id="query" name="query" size=30
value="<%=engineMap.get("query1")%>"
onkeypress="submitenter(this,event)" onfocus="this.value=''"/>
@@ -531,10 +546,12 @@
if (sitecount > 1) {
// looping on all sites
%>
-
+ <br/><%=bundle.getString(bundle_prefix+"searchsite.allpos.label")%>
<select name="searchSite" onchange="goSearch(this.name)">
<%
sb = new StringBuffer();
+
+
while (enum.hasMoreElements()) {
sb.append("<option value=\"");
JahiaSite jahiaSite = (JahiaSite) enum.nextElement();
@@ -551,7 +568,9 @@
sb.append("<option value=\"all\" ");
if (searchsite.equalsIgnoreCase("all"))
sb.append("selected=\"selected\"");
- sb.append(" >all</option>");
+ sb.append(" >");
+
sb.append(bundle.getString(bundle_prefix+".searchsite.all.label"));
+ sb.append("</option>");
%>
<%=sb.toString()%>
</select>
@@ -560,12 +579,10 @@
// one site only
JahiaSite jahiaSite = (JahiaSite) enum.nextElement();
%>
- on site <b><%=jahiaSite.getSiteKey() %></b>
+ <br/><%=bundle.getString(bundle_prefix+".searchsite.onesite.label")%>
<b><%=jahiaSite.getSiteKey() %></b>
<input type="hidden" name="searchSite" value="<%=jahiaSite.getID() %>"/>
<% } %>
- <a href="javascript:expandcontent('sc2')"><img
src="/jahia/jsp/jahia/engines/images/adding.png" width="16"
- height="16" border="0"
alt="ajoute un critere"></a>
</div>
<%
@@ -579,30 +596,49 @@
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("<span class=\"command\">");
+ if (z != 4) {
+ sb.append("<a href=\"javascript:expandcontent('sc");
+ sb.append((z + 1));
+ sb.append("')\"><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("')\"><img
src=\"/jahia/jsp/jahia/engines/images/deleting.png\" width=\"16\" height=\"16\"
border=\"0\"></a></span>");
//condition modules
- sb.append("\"><select name=\"condition");
+
sb.append(bundle.getString(bundle_prefix+".prefix.author.label"));//which
+ sb.append(" <select name=\"condition");
sb.append(z);
sb.append("\" onchange=\"goSearch(this.name)\">");
sb.append("<option value=\"creator\" ");
if (z == 2 && smode2.equalsIgnoreCase("creator"))
sb.append("selected=\"selected\"");
if (z == 3 && smode3.equalsIgnoreCase("creator"))
sb.append("selected=\"selected\"");
if (z == 4 && smode4.equalsIgnoreCase("creator"))
sb.append("selected=\"selected\"");
- sb.append(">par auteur</option>");
+ sb.append(">");
+ 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(">par mots-cles</option>");
+ sb.append(">");
+
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(">par page id</option>");
+ sb.append(">");
+ 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(">par intervalle de temps</option>");
+ sb.append(">");
+ sb.append(bundle.getString(bundle_prefix+".condition.date.label"));
+ sb.append("</option>");
sb.append("</select>");
// author submodule
@@ -616,16 +652,22 @@
) sb.append("1\">");
else sb.append("\">");
// select type author
- sb.append("<select name=\"condition");
+ 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(">par createur</option>");
- sb.append("<option value=\"contributor\" ");
- sb.append(">par dernier contributor</option>");
- sb.append("<option value=\"all\" ");
- sb.append(">les 2</option>");
+ sb.append("<option value=\"creator\" >");
+
+
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("</option>");
+ sb.append("<option value=\"all\" >");
+ sb.append(bundle.getString(bundle_prefix+".condition.both.label"));
+
+ sb.append("</option>");
sb.append("</select>");
sb.append("<INPUT size=20 value=\"");
if (z == 2) sb.append(query21);
@@ -647,7 +689,8 @@
||(z == 4 && smode4.equalsIgnoreCase("keywords"))
) sb.append("1\">");
else sb.append("\">");
- sb.append("<INPUT size=30 value=\"");
+ 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);
if (z == 4) sb.append(query42);
@@ -667,7 +710,8 @@
||(z == 4 && smode4.equalsIgnoreCase("pageid"))
) sb.append("1\">");
else sb.append("\">");
- sb.append("<INPUT size=10 value=\"");
+ 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);
if (z == 4) sb.append(query43);
@@ -688,16 +732,20 @@
) sb.append("1\">");
else sb.append("\">");
// select type date
- sb.append("<select name=\"condition");
+ 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(">par derniere publication</option>");
- sb.append("<option value=\"mod\" ");
- sb.append(">par dernier contribution</option>");
- sb.append("<option value=\"cre\" ");
- sb.append(">par date de creation</option>");
+ sb.append("<option value=\"pub\"
selected=\"selected\">");//default:publication date
+
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("</option>");
+ sb.append("<option value=\"cre\" >");
+
sb.append(bundle.getString(bundle_prefix+".results.creationdate.label"));
+ sb.append("</option>");
sb.append("</select>");
// select date range
sb.append("<select name=\"condition");
@@ -705,14 +753,18 @@
sb.append(4);
sb.append(4);
sb.append("\" onchange=\"goSearch(this.name)\">");
- sb.append("<option value=\"-\" selected=\"selected\"");//default:vide
- sb.append(">slectionnez une periode</option>");
- sb.append("<option value=\"week\"");
- sb.append(">depuis une semaine</option>");
- sb.append("<option value=\"month\" ");
- sb.append(">depuis 1 mois</option>");
- sb.append("<option value=\"months\" ");
- sb.append(">depuis 6 mois</option>");
+ sb.append("<option value=\"-\"
selected=\"selected\">");//default:vide
+
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("</option>");
+ sb.append("<option value=\"month\" >");
+
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("</option>");
sb.append("</select>");
sb.append("</span>");
@@ -721,28 +773,12 @@
sb.append("<span id=\"sitemap");
sb.append(z);
sb.append("\" class=\"contvis\">");
- sb.append("<a href=\"javascript:callSelectPageLink(");
- sb.append(z);
- sb.append(")\">voir le sitemap</a></span>");
- /*
- sb.append("<INPUT size=30 value=\"");
- if(z==2) sb.append(query2);
- if(z==3) sb.append(query3);
- if(z==4) sb.append(query4);
- sb.append("\" name=\"query");
- sb.append(z);
- sb.append("\" onkeypress=\"submitenter(this,event)\"/>");
- */
- if (z != 4) {
- sb.append("<a href=\"javascript:expandcontent('sc");
- sb.append((z + 1));
- sb.append("')\"><img
src=\"/jahia/jsp/jahia/engines/images/adding.png\" width=\"16\"\n" +
- "
height=\"16\" border=\"0\"></a>");
- }
- sb.append("<a href=\"javascript:contractcontent('sc");
+ sb.append("<a href=\"javascript:callSelectPageLink(");
sb.append(z);
- sb.append("')\"><img
src=\"/jahia/jsp/jahia/engines/images/deleting.png\" width=\"16\" height=\"16\"
border=\"0\"></a>");
+ sb.append(")\">");
+
sb.append(bundle.getString(bundle_prefix+".condition.sitemapview.label"));
+ sb.append("</a></span>");
sb.append("</div>");
}
@@ -751,8 +787,8 @@
</td></tr>
-<tr><td><a href="javascript:goSearch('go')" title="search"><img
src="/jahia/jsp/jahia/engines/images/view_next.png"
- width="48"
height="48"> search</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>
@@ -770,7 +806,7 @@
<TR>
<TD class="text">
<fieldset>
-<legend>Results</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">
@@ -781,46 +817,43 @@
<tr>
<th class="text">
<% if (orderBy.equalsIgnoreCase("score")) { %>
- nom
+ <%=bundle.getString(bundle_prefix+".results.name.label")%>
<% } else { %>
- <a href="javascript:orderby('score');">nom</a>
+ <a
href="javascript:orderby('score');"><%=bundle.getString(bundle_prefix+".results.name.label")%></a>
<% } %>
</th>
<th class="text">
<% if (orderBy.equalsIgnoreCase("creator")) { %>
- creator
+ <%=bundle.getString(bundle_prefix+".results.author.label")%>
<% } else { %>
- <a href="javascript:orderby('creator');">creator</a>
+ <a
href="javascript:orderby('creator');"><%=bundle.getString(bundle_prefix+".results.author.label")%></a>
<% } %>
</th>
<th class="text">
<% if (orderBy.equalsIgnoreCase("lastcontributor")) { %>
- last contributor
+ <%=bundle.getString(bundle_prefix+".results.contributor.label")%>
<% } else { %>
- <a href="javascript:orderby('lastcontributor');">last
- contributor</a>
+ <a
href="javascript:orderby('lastcontributor');"><%=bundle.getString(bundle_prefix+".results.contributor.label")%></a>
<% } %>
</th>
- <th class="text">usage</th>
+ <th
class="text"><%=bundle.getString(bundle_prefix+".results.usage.label")%></th>
<!--th class="text">score</th-->
<th class="text">
<% if (orderBy.equalsIgnoreCase("creationdate")) { %>
- creation date
+
<%=bundle.getString(bundle_prefix+".results.creationdate.label")%>
<% } else { %>
- <a href="javascript:orderby('creationdate');">creation date</a>
+ <a
href="javascript:orderby('creationdate');"><%=bundle.getString(bundle_prefix+".results.creationdate.label")%></a>
<% } %>
</th>
<th class="text">
<% if (orderBy.equalsIgnoreCase("lastpublishdate")) { %>
- last publish
- date
+ <%=bundle.getString(bundle_prefix+".results.publishdate.label")%>
<% } else { %>
- <a href="javascript:orderby('lastpublishdate');">last publish
- date</a>
+ <a
href="javascript:orderby('lastpublishdate');"><%=bundle.getString(bundle_prefix+".results.publishdate.label")%></a>
<% } %>
</th>
- <th class="text"><center>Copie simple</center></th>
- <th class="text"><center>Copie liee</center></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>
<%
@@ -874,7 +907,7 @@
<%
} else {
%>
-<div class="text">No Match.</div>
+<div
class="text"><%=bundle.getString(bundle_prefix+".noresults.label")%></div>
<%
}
%>
@@ -897,6 +930,9 @@
<%
/**
* $Log: contentpick.jsp,v $
+ * Revision 1.29 2005/10/20 16:53:40 dpillot
+ * internationalization & bug NFE fix
+ *
* Revision 1.28 2005/10/19 14:22:27 dpillot
* content pick final enhancements
*
