dpillot 2005/11/23 18:33:48 CET
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
object type info for cp display
Revision Changes Path
1.39 +11 -2
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.38&r2=1.39&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- contentpick.jsp 22 Nov 2005 16:42:21 -0000 1.38
+++ contentpick.jsp 23 Nov 2005 17:33:47 -0000 1.39
@@ -78,7 +78,7 @@
%>
<%
/**
- * @version $Id: contentpick.jsp,v 1.38 2005/11/22 16:42:21 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.39 2005/11/23 17:33:47 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -87,10 +87,14 @@
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";
+ // type of object
+ String objectType= (String)engineMap.get("objecttype");
+
//parameter to order the results (def:score)
String orderBy = (String) engineMap.get("orderby");
logger.debug("enginemap orderby=" + orderBy);
@@ -505,7 +509,9 @@
<input type="hidden" name="pageselected" value=""/>
<table border=0><tr><td colspan="2">
-<jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.welcome.label"/>
+<jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.welcome.label1"/>
+<%=objectType%>
+<jahia:engineResourceBundle
resourceName="org.jahia.engines.importexport.contentpick.welcome.label2"/>
<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")) {%>
@@ -983,6 +989,9 @@
<%
/**
* $Log: contentpick.jsp,v $
+ * Revision 1.39 2005/11/23 17:33:47 dpillot
+ * object type info for cp display
+ *
* Revision 1.38 2005/11/22 16:42:21 dpillot
* call disp pickers script fix
*
