dpillot 2005/10/04 11:24:12 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/importexport contentpick.jsp
Log:
bug fix
Revision Changes Path
1.18 +11 -3
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.17&r2=1.18&f=h
Index: contentpick.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- contentpick.jsp 3 Oct 2005 16:25:07 -0000 1.17
+++ contentpick.jsp 4 Oct 2005 09:24:12 -0000 1.18
@@ -8,11 +8,12 @@
<%@ page import="java.util.Vector" %>
<%@ page import="org.jahia.services.containers.ContentContainer" %>
+<%@ page import="org.apache.log4j.Logger"%>
<%@ taglib uri="/WEB-INF/etc/taglibs/pager-taglib" prefix="pg" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<%
/**
- * @version $Id: contentpick.jsp,v 1.17 2005/10/03 16:25:07 dpillot Exp $
+ * @version $Id: contentpick.jsp,v 1.18 2005/10/04 09:24:12 dpillot Exp $
*/
HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
@@ -22,9 +23,10 @@
String orderBy = (String) engineMap.get("orderby");
// # of sites
int sitecount=Integer.parseInt((String)engineMap.get("sitecount"));
-
+ // server path
String
serverpath="http://"+request.getServerName()+":"+request.getServerPort();
-
+ String searchsite=(String) engineMap.get("searchSite");
+ Logger logger=Logger.getLogger(this.getClass());
%>
<!-- css specific for contentpicker -->
<style type="text/css">
@@ -63,6 +65,7 @@
sort by <%=orderBy%><br/>
screen <%=theScreen%><br/>
<%=serverpath%>
+<%=sitecount%>
<script type="text/javascript">
function orderby(param) {
@@ -125,12 +128,14 @@
<!-- query -->
<INPUT name="query" size=50
value="<%=engineMap.get("searchString")%>"/>
+ <%=searchsite%>
<%
int count = 0;
Enumeration enum = (Enumeration) engineMap.get("sites");
if(sitecount>1){
// looping on all sites
%>
+ <%=enum%>
<select name="searchSite">
<%
@@ -294,6 +299,9 @@
</div>
<% /**
* $Log: contentpick.jsp,v $
+ * Revision 1.18 2005/10/04 09:24:12 dpillot
+ * bug fix
+ *
* Revision 1.17 2005/10/03 16:25:07 dpillot
* view page container
*
