shuber 2005/11/08 12:15:21 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
. jahia-JAHIA-4-1-BRANCH.iws
src/java/org/jahia/gui HTMLToolBox.java
Log:
JAHIA-439
Added workflow launcher that can take a base page ID.
Revision Changes Path
1.1.2.10 +231 -41 jahia/jahia-JAHIA-4-1-BRANCH.iws
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/jahia-JAHIA-4-1-BRANCH.iws.diff?r1=1.1.2.9&r2=1.1.2.10&f=h
1.41.4.2 +14 -0 jahia/src/java/org/jahia/gui/HTMLToolBox.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/gui/HTMLToolBox.java.diff?r1=1.41.4.1&r2=1.41.4.2&f=h
Index: jahia-JAHIA-4-1-BRANCH.iws
===================================================================
RCS file: /home/cvs/repository/jahia/Attic/jahia-JAHIA-4-1-BRANCH.iws,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- jahia-JAHIA-4-1-BRANCH.iws 8 Nov 2005 11:05:36 -0000 1.1.2.9
+++ jahia-JAHIA-4-1-BRANCH.iws 8 Nov 2005 11:15:20 -0000 1.1.2.10
@@ -119,10 +119,19 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="DAVFilemanager_Engine.java" pinned="false"
current="false" current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
+ <file leaf-file-name="manage_rights.jsp" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/src/views/jsp/jahia/engines/rights/manage_rights.jsp">
<provider selected="true" editor-type-id="text-editor">
- <state line="959" column="34" selection-start="43985"
selection-end="43985" vertical-scroll-proportion="-1.1120163">
+ <state line="18" column="21" selection-start="792"
selection-end="792" vertical-scroll-proportion="-18.800407">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="HTMLToolBox.java" pinned="false" current="true"
current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/gui/HTMLToolBox.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="590" column="35" selection-start="22159"
selection-end="22159" vertical-scroll-proportion="0.7576375">
<folding />
</state>
</provider>
@@ -193,7 +202,7 @@
</provider>
</entry>
</file>
- <file leaf-file-name="DAVFileAccess.java" pinned="false"
current="true" current-in-tab="true">
+ <file leaf-file-name="DAVFileAccess.java" pinned="false"
current="false" current-in-tab="false">
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/webdav/DAVFileAccess.java">
<provider selected="true" editor-type-id="text-editor">
<state line="875" column="29" selection-start="34270"
selection-end="34270" vertical-scroll-proportion="0.60285133">
@@ -202,15 +211,6 @@
</provider>
</entry>
</file>
- <file leaf-file-name="JahiaPage.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPage.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="435" column="22" selection-start="14881"
selection-end="14881" vertical-scroll-proportion="0.29124236">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -439,6 +439,28 @@
<option name="myItemId" value="org" />
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gui" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
</component>
<component name="PerforceChangeBrowserSettings">
@@ -506,6 +528,174 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp\jahia"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp\jahia"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp\jahia\engines"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp\jahia"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp\jahia\engines"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src\views\jsp\jahia\engines\rights"
/>
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:C:\java\products\jahia-JAHIA-4-1-BRANCH\src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -814,20 +1004,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPageInfo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="362" column="31" selection-start="11944"
selection-end="11944" vertical-scroll-proportion="0.021628499">
- <folding />
- </state>
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/sites/JahiaSitesBaseService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/params/DummyServletRequestWrapper.java">
<provider selected="true" editor-type-id="text-editor">
<state line="22" column="0" selection-start="591"
selection-end="591" vertical-scroll-proportion="0.37443945">
@@ -849,20 +1025,6 @@
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/webdav/DAVFileAccess.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="875" column="29" selection-start="34270"
selection-end="34270" vertical-scroll-proportion="0.60285133">
- <folding />
- </state>
- </provider>
- </entry>
- <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="959" column="34" selection-start="43985"
selection-end="43985" vertical-scroll-proportion="-1.1120163">
- <folding />
- </state>
- </provider>
- </entry>
<entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/pages/JahiaPage.java">
<provider selected="true" editor-type-id="text-editor">
<state line="435" column="22" selection-start="14881"
selection-end="14881" vertical-scroll-proportion="0.29124236">
@@ -921,6 +1083,34 @@
</state>
</provider>
</entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/services/webdav/DAVFileAccess.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="875" column="29" selection-start="34270"
selection-end="34270" vertical-scroll-proportion="0.60285133">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="959" column="34" selection-start="43985"
selection-end="43985" vertical-scroll-proportion="2.2016294">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/views/jsp/jahia/engines/rights/manage_rights.jsp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="18" column="21" selection-start="792"
selection-end="792" vertical-scroll-proportion="-18.800407">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/java/org/jahia/gui/HTMLToolBox.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="590" column="35" selection-start="22159"
selection-end="22159" vertical-scroll-proportion="0.7576375">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Index: HTMLToolBox.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/gui/Attic/HTMLToolBox.java,v
retrieving revision 1.41.4.1
retrieving revision 1.41.4.2
diff -u -r1.41.4.1 -r1.41.4.2
--- HTMLToolBox.java 7 Jul 2005 10:12:15 -0000 1.41.4.1
+++ HTMLToolBox.java 8 Nov 2005 11:15:21 -0000 1.41.4.2
@@ -580,6 +580,20 @@
return ("".equals(workflowURL)) ? "" : "OpenJahiaScrollableWindow('"
+ workflowURL + "','" + name.toString() + "'," + JS_WINDOW_WIDTH + "," +
JS_WINDOW_HEIGHT +")";
}
+ /**
+ * @param basePage
+ * @return
+ */
+ public String drawWorkflowLauncher(int basePage) throws JahiaException {
+ StringBuffer name = new StringBuffer("workflow_");
+
+ name.append(basePage);
+ name.append(cleanSessionID(jParams.getSessionID()));
+
+ String workflowURL = gui.drawWorkflowUrl();
+ return ("".equals(workflowURL)) ? "" : "OpenJahiaScrollableWindow('"
+ workflowURL + "','" + name.toString()
+ + "'," + JS_WINDOW_WIDTH + "," + JS_WINDOW_HEIGHT + ")";
+ }
//-------------------------------------------------------
drawPageProperties
/**
*
