Author: bpapez
Date: Thu Nov 29 08:59:05 2007
New Revision: 19311
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19311&repname=
=3Djahia
Log:
Add new launcher methods (backport from previous trunk)
Modified:
trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
Modified: trunk/core/src/java/org/jahia/gui/HTMLToolBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/gui/HTMLToolBox.java&rev=3D19311&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/gui/HTMLToolBox.java (original)
+++ trunk/core/src/java/org/jahia/gui/HTMLToolBox.java Thu Nov 29 08:59:05 =
2007
@@ -28,6 +28,8 @@
package org.jahia.gui;
=
import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+
+import org.apache.log4j.Logger;
import org.jahia.ajax.usersession.userSettings;
import org.jahia.bin.Jahia;
import org.jahia.content.ContentObject;
@@ -82,7 +84,7 @@
=
public static final String IMAGE_DIRECTORY =3D "/jsp/jahia/engines/ima=
ges/actions";
=
- private static final org.apache.log4j.Logger logger =3D org.apache.log=
4j.Logger.getLogger(HTMLToolBox.class);
+ private static final Logger logger =3D Logger.getLogger(HTMLToolBox.cl=
ass);
=
private static final int JS_WINDOW_WIDTH =3D 950;
private static final int JS_WINDOW_HEIGHT =3D 820;
@@ -714,6 +716,17 @@
}
=
/**
+ * @param basePage
+ * @return
+ */
+ public String drawWorkflowLauncher(final int basePage) throws JahiaExc=
eption {
+ final StringBuffer buff =3D new StringBuffer();
+ buff.append(ContentPageKey.PAGE_TYPE).append("_").
+ append(basePage);
+ return drawWorkflowLauncher(buff.toString());
+ } =
+ =
+ /**
*
*/
public String drawWorkflowLauncher(final String key) throws JahiaExcep=
tion {
@@ -731,6 +744,27 @@
append(JS_WINDOW_WIDTH).append(",").append(JS_WIND=
OW_HEIGHT).
append(")").toString();
}
+ =
+ /**
+ * Returns the link for the workflow engine with parameters.
+ * =
+ * @param basePage the base page Id
+ * @param engineUrlParams parameters to be appended to the workflow en=
gine
+ * URL
+ * @return the link for the workflow engine with parameters
+ */
+ public String drawWorkflowLauncher(int basePage, String engineUrlParam=
s)
+ throws JahiaException
+ {
+ String key =3D ContentPageKey.PAGE_TYPE + "_" + basePage;
+ String workflowURL =3D gui.drawWorkflowUrl(key);
+ =
+ return workflowURL.length() =3D=3D 0 ? "" : new StringBuffer(64).app=
end(
+ "OpenJahiaScrollableWindow('").append(workflowURL)
+ .append(engineUrlParams).append("','").append("workflow_").append(
+ basePage).append(cleanSessionID(jParams.getSessionID())).append(
+ "'," + JS_WINDOW_WIDTH + "," + JS_WINDOW_HEIGHT + ")").toString(=
);
+ } =
=
/**
*
@@ -751,24 +785,6 @@
append(");").toString();
}
=
- /**
- * @param basePage
- * @return smthg
- */
- /*
- public String drawWorkflowLauncher(int basePage) throws JahiaException=
{
- final StringBuffer buff =3D new StringBuffer();
- buff.append(ContentPageKey.PAGE_TYPE).append("_").
- append(basePage);
- final StringBuffer name =3D new StringBuffer();
- name.append("workflow_");
- name.append(basePage);
- name.append(cleanSessionID(jParams.getSessionID()));
- String workflowURL =3D gui.drawWorkflowUrl(buff.toString());
- return ("".equals(workflowURL)) ? "" : "OpenJahiaScrollableWindow(=
'" + workflowURL + "','" + name.toString()
- + "'," + JS_WINDOW_WIDTH + "," + JS_WINDOW_HEIGHT + ")";
- }
- */
//------------------------------------------------------- drawPageProp=
erties
=
/**
@@ -936,9 +952,18 @@
return gui.drawMySettingsUrl();
}
=
+ public String drawMySettingsLauncher(Object params) throws JahiaExcept=
ion {
+ return gui.drawMySettingsUrl(params);
+ } =
+ =
public String drawNewUserRegistrationLauncher() throws JahiaException {
return gui.drawNewUserRegistrationUrl();
}
+ =
+ public String drawNewUserRegistrationLauncher(Object params)
+ throws JahiaException {
+ return gui.drawNewUserRegistrationUrl(params);
+ } =
=
/**
* returns the site map page URL
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
