tdraier 2005/09/15 13:18:05 CEST
Modified files:
core/src/java/org/jahia/gui GuiBean.java HTMLToolBox.java
core/src/java/org/jahia/registries EnginesRegistry.java
core/src/webapp/jsp/jahia/engines/importexport export.jsp
import.jsp
core/src/webapp/jsp/jahia/engines/include actions_selector.jsp
core/src/webapp/jsp/jahia/engines engine.jsp
Added files:
core/src/webapp/jsp/jahia/engines/importexport close.jsp
contentpick.jsp
xml.jsp
Removed files:
core/src/webapp/jsp/jahia/engines/contentpicker
contentpicker.jsp
core/src/webapp/jsp/jahia/engines/images/actions
contentPick.gif
export.gif
import.gif
unlink.gif
Log:
rollback changes
Revision Changes Path
1.11 +0 -28 jahia/core/src/java/org/jahia/gui/GuiBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/gui/GuiBean.java.diff?r1=1.10&r2=1.11&f=h
1.25 +0 -125 jahia/core/src/java/org/jahia/gui/HTMLToolBox.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java.diff?r1=1.24&r2=1.25&f=h
1.6 +1 -3
jahia/core/src/java/org/jahia/registries/EnginesRegistry.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/registries/EnginesRegistry.java.diff?r1=1.5&r2=1.6&f=h
1.2 +0 -151
jahia/core/src/webapp/jsp/jahia/engines/contentpicker/contentpicker.jsp (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/contentpicker/contentpicker.jsp?rev=1.1&content-type=text/plain
1.8 +1 -5 jahia/core/src/webapp/jsp/jahia/engines/engine.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp.diff?r1=1.7&r2=1.8&f=h
1.2 +0 -2
jahia/core/src/webapp/jsp/jahia/engines/images/actions/contentPick.gif (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/actions/contentPick.gif?rev=1.1&content-type=text/plain
1.2 +0 -2
jahia/core/src/webapp/jsp/jahia/engines/images/actions/export.gif (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/actions/export.gif?rev=1.1&content-type=text/plain
1.2 +0 -2
jahia/core/src/webapp/jsp/jahia/engines/images/actions/import.gif (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/actions/import.gif?rev=1.1&content-type=text/plain
1.2 +0 -2
jahia/core/src/webapp/jsp/jahia/engines/images/actions/unlink.gif (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/actions/unlink.gif?rev=1.1&content-type=text/plain
1.3 +3 -0
jahia/core/src/webapp/jsp/jahia/engines/importexport/close.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/close.jsp?rev=1.3&content-type=text/plain
1.9 +226 -0
jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp?rev=1.9&content-type=text/plain
1.9 +1 -0
jahia/core/src/webapp/jsp/jahia/engines/importexport/export.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/export.jsp.diff?r1=1.8&r2=1.9&f=h
1.8 +36 -51
jahia/core/src/webapp/jsp/jahia/engines/importexport/import.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/import.jsp.diff?r1=1.7&r2=1.8&f=h
1.4 +5 -0
jahia/core/src/webapp/jsp/jahia/engines/importexport/xml.jsp (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/importexport/xml.jsp?rev=1.4&content-type=text/plain
1.10 +17 -1
jahia/core/src/webapp/jsp/jahia/engines/include/actions_selector.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/include/actions_selector.jsp.diff?r1=1.9&r2=1.10&f=h
Index: GuiBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/gui/GuiBean.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GuiBean.java 14 Sep 2005 16:54:36 -0000 1.10
+++ GuiBean.java 15 Sep 2005 11:18:03 -0000 1.11
@@ -449,16 +449,6 @@
return drawUrl("workflow", key);
}
- public String drawImportExportUrl(String key)
- throws JahiaException {
- return drawUrl("importexport", key);
- }
-
- public String drawContentPickerUrl(ContentContainerList list)
- throws JahiaException {
- return drawUrl("contentpicker", list);
- }
-
public String drawLockUrl(final LockKey lockKey)
throws JahiaException {
return drawUrl("lock", lockKey);
@@ -733,18 +723,10 @@
if (theEngine.authoriseRender(jParams)) {
if (anObject instanceof ContentObject) {
final ContentObject contentObject = (ContentObject)anObject;
- if (contentObject.getParent(null) != null &&
ServicesRegistry.getInstance().getImportExportService().isPicker(contentObject.getParent(null)))
{
- return "";
- }
if (contentObject.checkWriteAccess(currentUser)) {
return theEngine.renderLink( jParams, anObject );
}
} else if (anObject instanceof ACLResourceInterface) {
- if (anObject instanceof JahiaField) {
- if
(ServicesRegistry.getInstance().getImportExportService().isPicker(((JahiaField)anObject).getContentField()))
{
- return "";
- }
- }
if
(ACLResource.checkWriteAccess((ACLResourceInterface)anObject,currentUser)) {
return theEngine.renderLink( jParams, anObject );
}
@@ -753,16 +735,6 @@
// a container list doesn't yet exist (created at the same
time
// as the first container).
final JahiaContainerList containerList =
(JahiaContainerList)anObject;
- if (containerList.getID()==0) {
- if
(ServicesRegistry.getInstance().getImportExportService().isPicker(jParams.getPage().getContentPage()))
{
- return "";
- }
- } else {
- if
(ServicesRegistry.getInstance().getImportExportService().isPicker(containerList.getContentContainerList()))
{
- return "";
- }
- }
-
if (
engineName.equals(org.jahia.engines.containerlistproperties
.ContainerListProperties_Engine.ENGINE_NAME) ){
if (containerList.getID() == 0 &&
jParams.getPage().checkAdminAccess(currentUser)
Index: HTMLToolBox.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- HTMLToolBox.java 14 Sep 2005 16:54:36 -0000 1.24
+++ HTMLToolBox.java 15 Sep 2005 11:18:03 -0000 1.25
@@ -682,128 +682,6 @@
return drawButton(drawPagePropertiesLauncher(), "page properties");
}
-
- // --------------------------------------------------------
drawImportExport
- /**
- * returns the URL which opens the container add window
- * @param jahiaContainerList
- */
- public String drawImportExportLauncher(String key) {
- return drawImportExportLauncher(key, JS_WINDOW_WIDTH,
- JS_WINDOW_HEIGHT, false);
- }
-
- /**
- *
- * @param jahiaContainerList
- * @param width
- * @param height
- */
- public String drawImportExportLauncher(String key, final int width,
final int height) {
- return drawImportExportLauncher(key, width, height, false);
- }
-
- /**
- * @param jahiaContainerList
- * @param width
- * @param height
- */
- private String drawImportExportLauncher(String key, final int width,
final int height,
- final boolean checkLock) {
- String launcher;
- try {
- final StringBuffer name = new StringBuffer("importexport_");
- name.append(cleanSessionID(jParams.getSessionID()));
- final String contentPickerURL = gui.drawImportExportUrl(key);
- final StringBuffer buff = new StringBuffer();
- launcher = contentPickerURL.equals("") ? "" :
-
buff.append("OpenJahiaScrollableWindow('").append(contentPickerURL).
- append("','").append(name.toString()).append("',").
-
append(width).append(",").append(height).append(")").toString();
- // #ifdef LOCK
-// if (checkLock) {
-// final LockService lockRegistry =
ServicesRegistry.getInstance().
-// getLockService();
-// final LockKey lockKey = LockKey.composeLockKey(LockKey.
-// ADD_CONTAINER_TYPE, jahiaContainerList.getID(),
-// jahiaContainerList.getPageID());
-// if (!lockRegistry.canRelease(lockKey, jParams.getUser(),
-// jParams.getSessionID())) {
-// launcher = "";
-// }
-// }
- // #endif
- } catch (JahiaException je) {
- logger.error("Cannot draw content picker launcher", je);
- launcher = "";
- }
- return launcher;
- }
-
-
-
- // --------------------------------------------------------
drawContentPicker
- /**
- * returns the URL which opens the container add window
- * @param jahiaContainerList
- */
- public String drawContentPickerLauncher(ContentContainerList
- jahiaContainerList) {
- return drawContentPickerLauncher(jahiaContainerList, JS_WINDOW_WIDTH,
- JS_WINDOW_HEIGHT, false);
- }
-
- /**
- *
- * @param jahiaContainerList
- * @param width
- * @param height
- */
- public String drawContentPickerLauncher(ContentContainerList
- jahiaContainerList, final int width, final int height) {
- return drawContentPickerLauncher(jahiaContainerList, width, height,
false);
- }
-
- /**
- * @param jahiaContainerList
- * @param width
- * @param height
- */
- private String drawContentPickerLauncher(ContentContainerList
- jahiaContainerList, final int width, final int height,
- final boolean checkLock) {
- String launcher;
- try {
- final StringBuffer name = new StringBuffer("contentpicker_");
- name.append(jahiaContainerList.getID());
- name.append(cleanSessionID(jParams.getSessionID()));
- final String contentPickerURL =
gui.drawContentPickerUrl(jahiaContainerList);
- final StringBuffer buff = new StringBuffer();
- launcher = contentPickerURL.equals("") ? "" :
-
buff.append("OpenJahiaScrollableWindow('").append(contentPickerURL).
- append("','").append(name.toString()).append("',").
-
append(width).append(",").append(height).append(")").toString();
- // #ifdef LOCK
- if (checkLock) {
- final LockService lockRegistry =
ServicesRegistry.getInstance().
- getLockService();
- final LockKey lockKey = LockKey.composeLockKey(LockKey.
- ADD_CONTAINER_TYPE, jahiaContainerList.getID(),
- jahiaContainerList.getPageID());
- if (!lockRegistry.canRelease(lockKey, jParams.getUser(),
- jParams.getSessionID())) {
- launcher = "";
- }
- }
- // #endif
- } catch (JahiaException je) {
- logger.error("Cannot draw content picker launcher", je);
- launcher = "";
- }
- return launcher;
- }
-
-
// drawUpdateTemplateLauncher
public String drawUpdateTemplateLauncher(final JahiaPageDefinition
theTemplate)
throws JahiaException {
@@ -1185,9 +1063,6 @@
return;
}
- if (contentObject.getParent()!=null &&
contentObject.getParent().isPicker()) {
- return;
- }
} catch (JahiaException e) {
logger.error("Error checking ACL when drawing Action Menu", e);
return;
Index: EnginesRegistry.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/registries/EnginesRegistry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EnginesRegistry.java 14 Sep 2005 16:54:36 -0000 1.5
+++ EnginesRegistry.java 15 Sep 2005 11:18:03 -0000 1.6
@@ -97,8 +97,6 @@
classes.add ("org.jahia.engines.mysettings.MySettingsEngine");
classes.add
("org.jahia.engines.applications.JetspeedProcessActionEngine");
classes.add ("org.jahia.engines.importexport.ClipboardEngine");
- classes.add ("org.jahia.engines.importexport.ImportExportEngine");
- classes.add ("org.jahia.engines.contentpicker.ContentPickerEngine");
theRegistry = new Hashtable ();
@@ -176,4 +174,4 @@
}
-}
+}
\ No newline at end of file
Index: export.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/export.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- export.jsp 14 Sep 2005 17:01:40 -0000 1.8
+++ export.jsp 15 Sep 2005 11:18:04 -0000 1.9
@@ -41,6 +41,7 @@
function sendFormSaveExport()
{
if ( check() ){
+ alert(document.mainForm.exportformat.value);
if (document.mainForm.exportformat.value == "xml") {
document.mainForm.method = "POST";
document.mainForm.action = "export_<%=
request.getParameter("key")%>.xml?screen=save";
Index: import.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/importexport/import.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.jsp 14 Sep 2005 16:54:44 -0000 1.7
+++ import.jsp 15 Sep 2005 11:18:04 -0000 1.8
@@ -16,13 +16,15 @@
org.jahia.content.ContentObject,
org.jahia.params.ParamBean"%>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
-<%@ taglib uri="JahiaLib" prefix="jahia" %>
-<%@ taglib uri="contentLib" prefix="content" %>
<%
HashMap engineMap =
(HashMap)request.getAttribute("org.jahia.engines.EngineHashMap");
ParamBean jParams = (ParamBean) request.getAttribute(
"org.jahia.params.ParamBean" );
JahiaData jData =
(JahiaData)request.getAttribute("org.jahia.data.JahiaData");
+ ContentObject contentObject= (ContentObject) engineMap.get(
"contentObject" );
+
+ Integer userNameWidth=new Integer(15);
+ request.getSession().setAttribute("userNameWidth",userNameWidth);
String theURL = (String)
jParams.settings().getJahiaEnginesHttpPath();
String engineUrl = (String) engineMap.get( "engineUrl" );
@@ -30,53 +32,36 @@
int roleNb = 0; // Store the number of application roles
- final String workInProgressLauncher = "openWorkInProgressWindow('" +
- request.getContextPath() + "')";
-
%>
-
-<!-- include page start -->
-<table class="text" width="95%" align="center" border="0" cellspacing="0"
cellpadding="0">
-<tr>
- <td><jahia:displayIcon src="org.jahia.pix.image" width="1"
height="18"/></td>
- <td><b>Import / Export</b></td>
-</tr>
-</table>
-
-<!-- include actions selector form start -->
-<table border="0" width="100%" align="center">
-<form name="selector" action="">
-<tr>
- <td><jahia:displayIcon src="org.jahia.pix.image" width="5"
height="24"/></td>
- <td width="100%" align="right" valign="bottom">
- <content:jahiaButton img="ok"
- href="javascript:sendFormSave();"
- onclick="<%=workInProgressLauncher%>"
- altBundle="engine" altKey="org.jahia.altApplyAndClose.label" />
- <content:jahiaButton img="cancel"
- href="javascript:sendFormCancel();"
- altBundle="engine" altKey="org.jahia.altCloseWithoutSave.label"
/>
- </td>
- <td><jahia:displayIcon src="org.jahia.pix.image" width="5" height="24"
/></td>
-</tr>
-</form>
-</table>
-<br>
-<!-- include actions selector form ends -->
-
-<form name="mainForm" method="POST" action="" enctype="multipart/form-data">
- <input type="hidden" name="key" value="<%= request.getParameter("key")
%>" />
- <input type="hidden" name="type" value="import" />
-
- <table border="0" width="90%">
- <tr>
- <td> </td>
- <td colspan="3" class="text" align="left" valign="top" nowrap>
- <fieldset>
- <legend><b>Import</b></legend>
- Import file (XML or Zip): <input class="input"
type="file" name="data"/>
- </fieldset>
- </td>
- </tr>
- </table>
-</form>
\ No newline at end of file
+<script language="javascript">
+ document.mainForm.enctype="multipart/form-data";
+ document.mainForm.encoding="multipart/form-data";
+</script>
+ <input type="hidden" name="operation" value="import"/>
+ <table border="0" width="90%">
+ <tr>
+
+ <td colspan="4" class="text" align="left">
+ <b>Import</b>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4" height="10"> </td>
+ </tr>
+ <tr>
+
+ <td> </td>
+ <td colspan="3" class="text" align="left" valign="top"
nowrap>
+<fieldset>
+<legend><b>Import</b></legend>
+Import file (XML or Zip): <input class="input" type="file" name="data"/>
+</fieldset>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4" height="30"><img
src="/jahia/jsp/jahia/engines/images/hr.gif" height="2" width="100%"></td>
+ </tr>
+ <tr>
+ <td colspan="4"> </td>
+ </tr>
+ </table>
\ No newline at end of file
Index: actions_selector.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/include/actions_selector.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- actions_selector.jsp 14 Sep 2005 16:54:44 -0000 1.9
+++ actions_selector.jsp 15 Sep 2005 11:18:05 -0000 1.10
@@ -18,6 +18,11 @@
doAddEditViewRight = new Boolean(false);
}
+ Boolean enableContentPick = (Boolean)engineMap.get("enableContentPick");
+ if (enableContentPick == null) {
+ enableContentPick = new Boolean(false);
+ }
+
Boolean enableMetadata = (Boolean)engineMap.get("enableMetadata");
if (enableMetadata == null) {
enableMetadata = new Boolean(false);
@@ -43,6 +48,11 @@
enableAdvancedWorkflow = new Boolean(false);
}
+ Boolean enableImportExport = (Boolean)
engineMap.get("enableImportExport");
+ if (enableImportExport == null) {
+ enableImportExport = new Boolean(false);
+ }
+
Boolean enableContentDefinition = (Boolean)
engineMap.get("enableContentDefinition");
if (enableContentDefinition == null) {
enableContentDefinition = Boolean.FALSE;
@@ -117,6 +127,9 @@
<content:tabButtonsList>
<content:tabButton label="Authoring"
labelKey="org.jahia.engines.include.actionSelector.Authoring.label"
url="javascript:handleActionChange('edit')"
isSelected='<%=theScreen.equals("edit")?"true":"false" %>' />
<content:tabButton label="Metadata Mgmt"
labelKey="org.jahia.engines.include.actionSelector.Metadata.label"
url="javascript:handleActionChange('metadata')"
isSelected='<%=theScreen.equals("metadata")?"true":"false" %>' />
+ <% if (enableContentPick.booleanValue()) { %>
+ <content:tabButton label="Content Pick"
labelKey="org.jahia.engines.include.actionSelector.ContentPick.label"
url="javascript:handleActionChange('contentPick')"
isSelected='<%=theScreen.equals("contentPick")?"true":"false" %>' />
+ <% } %>
<% if (enableRightView.booleanValue() &&
adminAccess.booleanValue()){ %>
<content:tabButton label="Rights Mgmt"
labelKey="org.jahia.engines.include.actionSelector.RightsMgmt.label"
url="javascript:handleActionChange('rightsMgmt')"
isSelected='<%=theScreen.equals("rightsMgmt")?"true":"false" %>' />
<% } %>
@@ -135,6 +148,9 @@
<% if (enableAdvancedWorkflow.booleanValue()) { %>
<content:tabButton label="Workflow"
labelKey="org.jahia.engines.include.actionSelector.Workflow.label"
url="javascript:handleActionChange('workflow')"
isSelected='<%=theScreen.equals("workflow")?"true":"false" %>' />
<% } %>
+ <% if (enableImportExport.booleanValue()) { %>
+ <content:tabButton label="Import/Export"
labelKey="org.jahia.engines.include.actionSelector.ImportExport.label"
url="javascript:handleActionChange('importexport')"
isSelected='<%=theScreen.equals("importexport")?"true":"false" %>' />
+ <% } %>
<% if (enableContentDefinition.booleanValue()) { %>
<content:tabButton label="Content Definition"
labelKey="org.jahia.engines.include.actionSelector.ContentDefinition.label"
url="javascript:handleActionChange('contentdefinition')"
isSelected='<%=theScreen.equals("contentdefinition")?"true":"false" %>' />
<% } %>
@@ -146,4 +162,4 @@
<td><img src="<content:serverHttpPath /><content:engineResourceBundle
resourceName="org.jahia.pix.image" />" width="5" height="24"></td>
</tr>
</form>
-</table>
+</table>
\ No newline at end of file
Index: engine.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- engine.jsp 14 Sep 2005 16:54:44 -0000 1.7
+++ engine.jsp 15 Sep 2005 11:18:05 -0000 1.8
@@ -86,10 +86,6 @@
includes.setProperty( "advworkflow",
"/jsp/jahia/engines/workflow/adv_workflow.jsp");
includes.setProperty( "workflow",
"/jsp/jahia/engines/workflow/workflow.jsp");
- includes.setProperty( "import",
"/jsp/jahia/engines/importexport/import.jsp");
- includes.setProperty( "export",
"/jsp/jahia/engines/importexport/export.jsp");
- includes.setProperty( "contentpicker",
"/jsp/jahia/engines/contentpicker/contentpicker.jsp");
-
includes.setProperty( "lock",
"/jsp/jahia/engines/lock/lock.jsp");
// metadata engine
@@ -356,4 +352,4 @@
<!-- include page ends -->
</body>
-</html>
+</html>
\ No newline at end of file
