dpillot 2005/10/19 16:22:15 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/selectpage select_page.jsp
Log:
content pick final enhancements
Revision Changes Path
1.8 +20 -6
jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp.diff?r1=1.7&r2=1.8&f=h
Index: select_page.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- select_page.jsp 7 Oct 2005 16:18:23 -0000 1.7
+++ select_page.jsp 19 Oct 2005 14:22:15 -0000 1.8
@@ -9,14 +9,23 @@
<%@ page import="java.util.HashMap" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
+<%!
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger("jsp.jahia.engines.engine");
+%>
<%
+ /**
+ * @version $Id: select_page.jsp,v 1.8 2005/10/19 14:22:15 dpillot Exp $
+ */
final HashMap selectedPageParams = (HashMap)
session.getAttribute(SelectPage_Engine.SESSION_PARAMS);
final HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
final ParamBean jParams = (ParamBean)
request.getAttribute("org.jahia.params.ParamBean");
final String engineError = (String) engineMap.get("engineError");
final String theScreen = (String) engineMap.get("screen");
final String engineUrl = (String) engineMap.get("engineUrl");
+ String cond = (String) engineMap.get("cond");
+ logger.debug("cond="+cond);
if (engineError == null) {
final String selectedPageOperation =
jParams.getParameter(SelectPage_Engine.OPERATION);
@@ -45,7 +54,7 @@
</h3>
<input type="hidden" name="<%=SelectPage_Engine.OPERATION%>"
value="<%=selectedPageOperation%>" />
-
+<input type="hidden" name="cond" value="<%=cond%>" />
<!-- Langs -->
<%@ include file="/jsp/jahia/engines/multilanguage_links.inc" %>
<!-- End Langs -->
@@ -75,7 +84,7 @@
final String[] optionsKey =
{"org.jahia.engines.selectpage.SelectPage_Engine.Tree_view.label",
"org.jahia.engines.selectpage.SelectPage_Engine.Flat_view.label"};
for (int i = 0; i < tabOptions.length; i++) {
final String hrefSelector =
"javascript:handleActionChanges('display&" +
-
SelectPage_Engine.constructDisplayParams(tabOptions[i], actualLanguageCode,
selectedPageOperation, parentPageID, pageID) + "')";
+
SelectPage_Engine.constructDisplayParams(tabOptions[i], actualLanguageCode,
selectedPageOperation, parentPageID, pageID,0) + "')";
%>
<li>
<% if (activeTabOption.intValue() == i) { %>
@@ -159,7 +168,7 @@
<td> </td>
<td colspan="4">
<% String href = "javascript:handleActionChanges('display" +
-
SelectPage_Engine.constructDisplayParams(tabOptions[activeTabOption.intValue()],
actualLanguageCode, selectedPageOperation, parentPageID, pageID) +
+
SelectPage_Engine.constructDisplayParams(tabOptions[activeTabOption.intValue()],
actualLanguageCode, selectedPageOperation, parentPageID, pageID,0) +
"&sitemap=expandall|0')"; %>
<a href="<%=href%>"
><jahia:engineResourceBundle
@@ -233,7 +242,7 @@
// -------------------------------------------------------------
// Draw expand/collapse icons ----------------------------------
String hrefParams = "display&" +
-
SelectPage_Engine.constructDisplayParams(tabOptions[activeTabOption.intValue()],
actualLanguageCode, selectedPageOperation, parentPageID, pageID);
+
SelectPage_Engine.constructDisplayParams(tabOptions[activeTabOption.intValue()],
actualLanguageCode, selectedPageOperation, parentPageID, pageID,0);
if (treeJahiaSiteMap.isExpanded(i)) {
// Draw cross node for MOVE operation *********************
if (SelectPage_Engine.LINK_OPERATION.equals(selectedPageOperation) ||
@@ -302,7 +311,7 @@
} else {
FlatSiteMapViewHelper flatJahiaSiteMap = (FlatSiteMapViewHelper)
engineMap.get("flatJahiaSiteMap");
String sortSiteMapURL = "display" +
-
SelectPage_Engine.constructDisplayParams(tabOptions[activeTabOption.intValue()],
actualLanguageCode, selectedPageOperation, parentPageID, pageID) +
+
SelectPage_Engine.constructDisplayParams(tabOptions[activeTabOption.intValue()],
actualLanguageCode, selectedPageOperation, parentPageID, pageID,0) +
"&sitemap=sort|" + actualLanguageCode + "|";
int sortOrder = flatJahiaSiteMap.getSortOrder() ==
FlatSiteMapViewHelper.ASCENDING_ORDER ?
FlatSiteMapViewHelper.DESCENDING_ORDER :
@@ -435,4 +444,12 @@
<% } %>
</td></tr>
</table>
-<% } %>
+<% }
+
+ /**
+ * $Log: select_page.jsp,v $
+ * Revision 1.8 2005/10/19 14:22:15 dpillot
+ * content pick final enhancements
+ *
+ */
+%>
