diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 929f875191..7c58bd50c5 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -28,6 +28,7 @@ modify_user_roles_description=Modify the permissions granted to a user for acces modify_content_user_roles_description=Modify the permissions granted to a user for accessing your content. advancedsearch_description=Perform a more detailed search of the repository. edit_content_description=Modify the content properties then click OK. +view_content_description=View the content properties. editcategory_description=Set the category for the document then click OK. editcategory_space_description=Set the category for the space then click OK. editworkflow_description=Modify the simple workflow properties then click OK. @@ -513,6 +514,7 @@ preview_of=Preview of modify_props_of=Modify Properties of modify_space_properties=Modify Space Properties modify_content_properties=Modify Content Properties +view_content_properties=View Content Properties preview=Preview in Template custom_view=Custom View view_links=Links @@ -965,6 +967,8 @@ resources=Resources manage_task=Manage Task manage_task_title=Manage Task manage_task_desc=This dialog allows the task to be managed. +view_completed_task_title=View Completed Task +view_completed_task_desc=This dialog allows the completed task details to be viewed. task_properties=Task Properties id=Id status=Status @@ -991,6 +995,8 @@ part_of_workflow=Part of Workflow initiated_by=Initiated by start_date=Start date add_resource=Add Resource +view_properties=View Content Properties +edit_properties=Edit Content Properties # Admin Console messages title_admin_console=Administration Console diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml index 38489a4837..36305e76ab 100644 --- a/config/alfresco/web-client-application-context.xml +++ b/config/alfresco/web-client-application-context.xml @@ -12,8 +12,8 @@ classpath:alfresco/web-client-config-properties.xml classpath:alfresco/web-client-config-navigation.xml classpath:alfresco/web-client-config-actions.xml - classpath:alfresco/web-client-config-workflow.xml classpath:alfresco/web-client-config-forum-actions.xml + classpath:alfresco/web-client-config-workflow-actions.xml classpath:alfresco/extension/web-client-config-custom.xml diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index 1484cbaa8a..7249c970dd 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -88,7 +88,7 @@ checkin /images/icons/CheckIn_icon.gif #{CheckinCheckoutBean.setupContentAction} - checkinFile + dialog:checkinFile #{actionContext.id} @@ -100,7 +100,7 @@ checkout /images/icons/CheckOut_icon.gif #{CheckinCheckoutBean.setupContentAction} - checkoutFile + dialog:checkoutFile #{actionContext.id} @@ -112,7 +112,7 @@ undocheckout /images/icons/undo_checkout.gif #{CheckinCheckoutBean.setupContentAction} - undoCheckoutFile + dialog:undoCheckoutFile #{actionContext.id} @@ -200,7 +200,7 @@ update /images/icons/update.gif #{CheckinCheckoutBean.setupContentAction} - updateFile + dialog:updateFile #{actionContext.id} diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index 2768dd5126..9e0b5b47ea 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -23,6 +23,12 @@ icon="/images/icons/delete_large.gif" title-id="delete_space" description-id="delete_space_info" /> + + + - + + + + + + + + + + + diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml index d50e31ff8d..7416ddd145 100644 --- a/config/alfresco/web-client-config-forum-actions.xml +++ b/config/alfresco/web-client-config-forum-actions.xml @@ -11,7 +11,7 @@ checkin /images/icons/CheckIn_icon.gif #{CheckinCheckoutBean.setupContentAction} - checkinFile + dialog:checkinFile #{actionContext.id} diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml index 00cd3f2ffb..c3176fbaff 100644 --- a/config/alfresco/web-client-config-properties.xml +++ b/config/alfresco/web-client-config-properties.xml @@ -172,7 +172,9 @@ + + @@ -207,4 +209,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/alfresco/web-client-config-wizards.xml b/config/alfresco/web-client-config-wizards.xml index a3aad002c2..1c2c1c0f07 100644 --- a/config/alfresco/web-client-config-wizards.xml +++ b/config/alfresco/web-client-config-wizards.xml @@ -182,6 +182,32 @@ + + + + + + + + + + + + + diff --git a/config/alfresco/web-client-config-workflow-actions.xml b/config/alfresco/web-client-config-workflow-actions.xml new file mode 100644 index 0000000000..1a549b5601 --- /dev/null +++ b/config/alfresco/web-client-config-workflow-actions.xml @@ -0,0 +1,114 @@ + + + + + + start_workflow + /images/icons/new_workflow.gif + wizard:startWorkflow + #{WizardManager.setupParameters} + + #{actionContext.id} + + + + + reassign + /images/icons/reassign_task.gif + dialog:reassignTask + #{DialogManager.setupParameters} + + #{actionContext.id} + + + + + cancel_workflow + /images/icons/cancel_workflow.gif + dialog:cancelWorkflow + #{DialogManager.setupParameters} + + #{actionContext.workflowInstanceId} + #{actionContext.workflowInstanceName} + + + + + add_resource + /images/icons/add_item.gif + #{DialogManager.bean.prepareForAdd} + + + + remove + /images/icons/remove_item.gif + #{DialogManager.bean.removePackageItem} + + #{actionContext.id} + + + + + view_properties + /images/icons/View_details.gif + dialog:viewContentProperties + #{BrowseBean.setupContentAction} + + #{actionContext.id} + + + + + edit_properties + /images/icons/Change_details.gif + dialog:editContentProperties + #{BrowseBean.setupContentAction} + + #{actionContext.id} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/alfresco/web-client-config-workflow.xml b/config/alfresco/web-client-config-workflow.xml deleted file mode 100644 index 4834158309..0000000000 --- a/config/alfresco/web-client-config-workflow.xml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - start_workflow - /images/icons/new_workflow.gif - wizard:startWorkflow - #{WizardManager.setupParameters} - - #{actionContext.id} - - - - - reassign - /images/icons/reassign_task.gif - dialog:reassignTask - #{DialogManager.setupParameters} - - #{actionContext.id} - - - - - cancel_workflow - /images/icons/cancel_workflow.gif - dialog:cancelWorkflow - #{DialogManager.setupParameters} - - #{actionContext.workflowInstanceId} - #{actionContext.workflowInstanceName} - - - - - add_resource - /images/icons/add_item.gif - #{DialogManager.bean.prepareForAdd} - - - - remove - /images/icons/remove_item.gif - #{DialogManager.bean.removePackageItem} - - #{actionContext.id} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java index 9a0fabb997..236e3cf13f 100644 --- a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java +++ b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java @@ -47,9 +47,9 @@ import org.apache.commons.logging.LogFactory; public class AlfrescoNavigationHandler extends NavigationHandler { public final static String OUTCOME_SEPARATOR = ":"; - public final static String DIALOG_PREXIX = "dialog" + OUTCOME_SEPARATOR; + public final static String DIALOG_PREFIX = "dialog" + OUTCOME_SEPARATOR; public final static String WIZARD_PREFIX = "wizard" + OUTCOME_SEPARATOR; - public final static String CLOSE_DIALOG_OUTCOME = DIALOG_PREXIX + "close"; + public final static String CLOSE_DIALOG_OUTCOME = DIALOG_PREFIX + "close"; public final static String CLOSE_WIZARD_OUTCOME = WIZARD_PREFIX + "close"; protected final static String CONFIG_NAV_BEAN = "NavigationBean"; @@ -135,7 +135,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler { boolean dialog = false; - if (outcome != null && outcome.startsWith(DIALOG_PREXIX)) + if (outcome != null && outcome.startsWith(DIALOG_PREFIX)) { dialog = true; } diff --git a/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java b/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java index eaf32c4830..3359683f70 100644 --- a/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java +++ b/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java @@ -40,6 +40,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionType; +import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.Application; import org.alfresco.web.app.context.UIContextService; import org.alfresco.web.app.servlet.DownloadContentServlet; @@ -492,12 +493,18 @@ public class CheckinCheckoutBean Node node = getWorkingDocument(); if (node != null) { + // reset the underlying node + if (this.browseBean.getDocument() != null) + { + this.browseBean.getDocument().reset(); + } + // clean up and clear action context clearUpload(); setDocument(null); setWorkingDocument(null); - - outcome = "browse"; + + outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } else { @@ -522,7 +529,7 @@ public class CheckinCheckoutBean setDocument(null); setWorkingDocument(null); - outcome = "browse"; + outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } else { @@ -570,7 +577,7 @@ public class CheckinCheckoutBean // navigate to appropriate screen FacesContext fc = FacesContext.getCurrentInstance(); this.navigator.setupDispatchContext(node); - fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "editTextInline"); + fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dialog:editTextInline"); } else { @@ -581,7 +588,7 @@ public class CheckinCheckoutBean // navigate to appropriate screen FacesContext fc = FacesContext.getCurrentInstance(); this.navigator.setupDispatchContext(node); - fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "editHtmlInline"); + fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dialog:editHtmlInline"); } } } @@ -591,7 +598,7 @@ public class CheckinCheckoutBean // normal downloadable document FacesContext fc = FacesContext.getCurrentInstance(); this.navigator.setupDispatchContext(node); - fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "editFile"); + fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "dialog:editFile"); } } } @@ -628,8 +635,8 @@ public class CheckinCheckoutBean setDocument(null); setDocumentContent(null); setEditorOutput(null); - - outcome = "browse"; + + outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } catch (Throwable err) { @@ -664,7 +671,7 @@ public class CheckinCheckoutBean clearUpload(); - outcome = "browse"; + outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } catch (Throwable err) { @@ -711,10 +718,10 @@ public class CheckinCheckoutBean { throw new IllegalStateException("Node supplied for undo checkout has neither Working Copy or Locked aspect!"); } - + clearUpload(); - outcome = "browse"; + outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browse"; } catch (Throwable err) { @@ -801,7 +808,8 @@ public class CheckinCheckoutBean setDocument(null); clearUpload(); - outcome = "browse"; + outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME + + AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browse"; } catch (Throwable err) { @@ -857,7 +865,7 @@ public class CheckinCheckoutBean setDocument(null); clearUpload(); - outcome = "browse"; + outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } catch (Throwable err) { @@ -883,7 +891,7 @@ public class CheckinCheckoutBean // reset the state clearUpload(); - return "browse"; + return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME; } /** diff --git a/source/java/org/alfresco/web/bean/content/ViewContentPropertiesDialog.java b/source/java/org/alfresco/web/bean/content/ViewContentPropertiesDialog.java new file mode 100644 index 0000000000..1b3f75825f --- /dev/null +++ b/source/java/org/alfresco/web/bean/content/ViewContentPropertiesDialog.java @@ -0,0 +1,75 @@ +package org.alfresco.web.bean.content; + +import java.util.Map; + +import javax.faces.context.FacesContext; + +import org.alfresco.model.ContentModel; +import org.alfresco.service.cmr.repository.ContentData; +import org.alfresco.web.app.Application; +import org.alfresco.web.bean.dialog.BaseDialogBean; +import org.alfresco.web.bean.repository.Node; + +/** + * Bean implementation of the "View Content Properties" dialog. + * + * @author gavinc + */ +public class ViewContentPropertiesDialog extends BaseDialogBean +{ + protected static final String TEMP_PROP_MIMETYPE = "mimetype"; + + protected Node viewingNode; + + // ------------------------------------------------------------------------------ + // Dialog implementation + + @Override + public void init(Map parameters) + { + super.init(parameters); + + // setup the editable node + this.viewingNode = new Node(this.browseBean.getDocument().getNodeRef()); + + // special case for Mimetype - since this is a sub-property of the ContentData object + // we must extract it so it can be edited in the client, then we check for it later + // and create a new ContentData object to wrap it and it's associated URL + ContentData content = (ContentData)this.viewingNode.getProperties().get(ContentModel.PROP_CONTENT); + if (content != null) + { + this.viewingNode.getProperties().put(TEMP_PROP_MIMETYPE, content.getMimetype()); + } + + // add the specially handled 'size' property + this.viewingNode.addPropertyResolver("size", this.browseBean.resolverSize); + } + + @Override + protected String finishImpl(FacesContext context, String outcome) + throws Exception + { + // nothing to do as the finish button is not shown and the dialog is read only + + return outcome; + } + + @Override + public String getCancelButtonLabel() + { + return Application.getMessage(FacesContext.getCurrentInstance(), "close"); + } + + // ------------------------------------------------------------------------------ + // Bean getters and setters + + /** + * Returns the node being viewed + * + * @return The node being viewed + */ + public Node getViewingNode() + { + return this.viewingNode; + } +} diff --git a/source/java/org/alfresco/web/bean/repository/TransientNode.java b/source/java/org/alfresco/web/bean/repository/TransientNode.java index 50a2c11e32..34d0e09a79 100644 --- a/source/java/org/alfresco/web/bean/repository/TransientNode.java +++ b/source/java/org/alfresco/web/bean/repository/TransientNode.java @@ -1,7 +1,9 @@ package org.alfresco.web.bean.repository; import java.io.Serializable; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; @@ -10,6 +12,8 @@ import org.alfresco.service.cmr.dictionary.AssociationDefinition; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition; +import org.alfresco.service.cmr.repository.AssociationRef; +import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; @@ -93,11 +97,64 @@ public class TransientNode extends Node { if (assocDef.isChild()) { - this.childAssociations.put(item, data.get(item)); + // TODO: handle lists of NodeRef's + NodeRef child = null; + Object obj = data.get(item); + if (obj instanceof String) + { + child = new NodeRef((String)obj); + } + else if (obj instanceof NodeRef) + { + child = (NodeRef)obj; + } + else if (obj instanceof List) + { + if (logger.isWarnEnabled()) + logger.warn("0..* child associations are not supported yet"); + } + + if (child != null) + { + // create a child association reference, add it to a list and add the list + // to the list of child associations for this node + List assocs = new ArrayList(1); + ChildAssociationRef childRef = new ChildAssociationRef(assocDef.getName(), this.nodeRef, + null, child); + assocs.add(childRef); + + this.childAssociations.put(item, assocs); + } } else { - this.associations.put(item, data.get(item)); + // TODO: handle lists of NodeRef's + NodeRef target = null; + Object obj = data.get(item); + if (obj instanceof String) + { + target = new NodeRef((String)obj); + } + else if (obj instanceof NodeRef) + { + target = (NodeRef)obj; + } + else if (obj instanceof List) + { + if (logger.isWarnEnabled()) + logger.warn("0..* associations are not supported yet"); + } + + if (target != null) + { + // create a association reference, add it to a list and add the list + // to the list of associations for this node + List assocs = new ArrayList(1); + AssociationRef assocRef = new AssociationRef(this.nodeRef, assocDef.getName(), target); + assocs.add(assocRef); + + this.associations.put(item, assocs); + } } } } @@ -140,7 +197,7 @@ public class TransientNode extends Node // don't reset anything otherwise we'll lose our data // with no way of getting it back!! } - + @Override public String toString() { diff --git a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java index 5e9db0e3bd..78c838bf4b 100644 --- a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java +++ b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java @@ -24,6 +24,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTransition; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; +import org.alfresco.web.app.AlfrescoNavigationHandler; import org.alfresco.web.app.Application; import org.alfresco.web.bean.dialog.BaseDialogBean; import org.alfresco.web.bean.repository.MapNode; @@ -60,7 +61,7 @@ public class ManageTaskDialog extends BaseDialogBean protected boolean isItemBeingAdded = false; protected static final String ID_PREFIX = "transition_"; - protected static final String CLIENT_ID_PREFIX = "dialog:" + ID_PREFIX; + protected static final String CLIENT_ID_PREFIX = AlfrescoNavigationHandler.DIALOG_PREFIX + ID_PREFIX; private static final Log logger = LogFactory.getLog(ManageTaskDialog.class); @@ -86,6 +87,7 @@ public class ManageTaskDialog extends BaseDialogBean if (this.packageItemsRichList != null) { this.packageItemsRichList.setValue(null); + this.packageItemsRichList = null; } // get the task details diff --git a/source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java b/source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java new file mode 100644 index 0000000000..9f4136e40b --- /dev/null +++ b/source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java @@ -0,0 +1,40 @@ +package org.alfresco.web.bean.workflow; + +import java.util.List; + +import javax.faces.context.FacesContext; + +import org.alfresco.web.app.Application; +import org.alfresco.web.config.DialogsConfigElement.DialogButtonConfig; + +/** + * Bean implementation for the "View Completed Task" dialog. + * + * @author gavinc + */ +public class ViewCompletedTaskDialog extends ManageTaskDialog +{ + // ------------------------------------------------------------------------------ + // Dialog implementation + + @Override + protected String finishImpl(FacesContext context, String outcome) + throws Exception + { + // nothing to do as the finish button is not shown and the dialog is read only + + return outcome; + } + + @Override + public String getCancelButtonLabel() + { + return Application.getMessage(FacesContext.getCurrentInstance(), "close"); + } + + @Override + public List getAdditionalButtons() + { + return null; + } +} diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml index 5cfccdab15..e342a8fd21 100644 --- a/source/web/WEB-INF/faces-config-beans.xml +++ b/source/web/WEB-INF/faces-config-beans.xml @@ -497,6 +497,31 @@ + + + The bean that backs up the View Content Properties Dialog + + ViewContentPropertiesDialog + org.alfresco.web.bean.content.ViewContentPropertiesDialog + session + + nodeService + #{NodeService} + + + fileFolderService + #{FileFolderService} + + + dictionaryService + #{DictionaryService} + + + browseBean + #{BrowseBean} + + + The bean that backs up the Set Content Properties Dialog @@ -1743,6 +1768,47 @@ + + + The bean that backs up the View Completed Task Dialog + + ViewCompletedTaskDialog + org.alfresco.web.bean.workflow.ViewCompletedTaskDialog + session + + nodeService + #{NodeService} + + + fileFolderService + #{FileFolderService} + + + searchService + #{SearchService} + + + navigator + #{NavigationBean} + + + browseBean + #{BrowseBean} + + + dictionaryService + #{DictionaryService} + + + namespaceService + #{NamespaceService} + + + workflowService + #{WorkflowService} + + + StartWorkflowWizard org.alfresco.web.bean.workflow.StartWorkflowWizard diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml index 87ecf8cdc0..cd614b523e 100644 --- a/source/web/WEB-INF/faces-config-navigation.xml +++ b/source/web/WEB-INF/faces-config-navigation.xml @@ -862,9 +862,10 @@ - /jsp/dialog/container.jsp + + forumsDeleted /jsp/forums/forums.jsp @@ -877,6 +878,37 @@ topicDeleted /jsp/forums/forum.jsp + + + + + checkoutFile + /jsp/dialog/checkout-file.jsp + + + checkinFile + /jsp/dialog/checkin-file.jsp + + + undoCheckoutFile + /jsp/dialog/undocheckout-file.jsp + + + updateFile + /jsp/dialog/update-file.jsp + + + editFile + /jsp/dialog/edit-file.jsp + + + editHtmlInline + /jsp/dialog/edit-html-inline.jsp + + + editTextInline + /jsp/dialog/edit-text-inline.jsp + diff --git a/source/web/jsp/content/view-content-properties.jsp b/source/web/jsp/content/view-content-properties.jsp new file mode 100644 index 0000000000..95e5c607b2 --- /dev/null +++ b/source/web/jsp/content/view-content-properties.jsp @@ -0,0 +1,24 @@ +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> + + \ No newline at end of file diff --git a/source/web/jsp/dialog/checkout-file.jsp b/source/web/jsp/dialog/checkout-file.jsp index c1ac8ac394..7a4284cb69 100644 --- a/source/web/jsp/dialog/checkout-file.jsp +++ b/source/web/jsp/dialog/checkout-file.jsp @@ -121,7 +121,7 @@ - + diff --git a/source/web/jsp/dialog/edit-html-inline.jsp b/source/web/jsp/dialog/edit-html-inline.jsp index 4430c68a08..a205d7512e 100644 --- a/source/web/jsp/dialog/edit-html-inline.jsp +++ b/source/web/jsp/dialog/edit-html-inline.jsp @@ -153,7 +153,7 @@ - + diff --git a/source/web/jsp/dialog/edit-text-inline.jsp b/source/web/jsp/dialog/edit-text-inline.jsp index 137dd3e494..35cfc19545 100644 --- a/source/web/jsp/dialog/edit-text-inline.jsp +++ b/source/web/jsp/dialog/edit-text-inline.jsp @@ -126,7 +126,7 @@ - + diff --git a/source/web/jsp/dialog/undocheckout-file.jsp b/source/web/jsp/dialog/undocheckout-file.jsp index a093647aaf..ce5ad2fdab 100644 --- a/source/web/jsp/dialog/undocheckout-file.jsp +++ b/source/web/jsp/dialog/undocheckout-file.jsp @@ -115,7 +115,7 @@ - + diff --git a/source/web/jsp/workflow/manage-task-dialog.jsp b/source/web/jsp/workflow/manage-task-dialog.jsp index 7fb6d21753..131268c079 100644 --- a/source/web/jsp/workflow/manage-task-dialog.jsp +++ b/source/web/jsp/workflow/manage-task-dialog.jsp @@ -47,6 +47,7 @@ showLink="false" styleClass="inlineAction" /> + <%-- Description column --%> @@ -90,7 +91,7 @@ - diff --git a/source/web/jsp/workflow/tasks-completed-dashlet.jsp b/source/web/jsp/workflow/tasks-completed-dashlet.jsp index e635ed910c..0efb655524 100644 --- a/source/web/jsp/workflow/tasks-completed-dashlet.jsp +++ b/source/web/jsp/workflow/tasks-completed-dashlet.jsp @@ -14,9 +14,15 @@ - + + + - + + + <%-- Task id column --%> diff --git a/source/web/jsp/workflow/tasks-todo-dashlet.jsp b/source/web/jsp/workflow/tasks-todo-dashlet.jsp index 6683debdf9..ee386f5ca5 100644 --- a/source/web/jsp/workflow/tasks-todo-dashlet.jsp +++ b/source/web/jsp/workflow/tasks-todo-dashlet.jsp @@ -14,12 +14,10 @@ - - - - - + + + diff --git a/source/web/jsp/workflow/view-completed-task-dialog.jsp b/source/web/jsp/workflow/view-completed-task-dialog.jsp new file mode 100644 index 0000000000..6287762b9c --- /dev/null +++ b/source/web/jsp/workflow/view-completed-task-dialog.jsp @@ -0,0 +1,98 @@ +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. +--%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> + + + + + + + + + + + + + <%-- Name column --%> + + + + + + + + + + + + <%-- Description column --%> + + + + + + + + <%-- Path column --%> + + + + + + + + <%-- Created Date column --%> + + + + + + + + + + <%-- Modified Date column --%> + + + + + + + + + + + + + + + + + +