From 97b5b391c8beae1bbf7764521d99cbbbc240c78a Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 10 Sep 2007 22:07:27 +0000 Subject: [PATCH] Merged V2.1 to HEAD 6436: Support for virtualized cookie paths, aggressive cleanup of sockets when virt server is down. 6439: Fix for WCM-619 & WCM-571 6440: Encoding of text/html files created inline using the web-client now has sensible default. AWC-1324. 6442: Fix for WCM-621 (reviewer can not view or run links report) 6443: Fix for AWC-1488. Dashboard 6444: Fix for WCM-693 issue with submitting a deleted directory if no workflow associated with web project. 6445: Icons for use in fix for WCM-522 6446: Office Add-Ins: Fix for AWC-1481 - Login dialog can appear recursively git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient.properties | 4 +- .../alfresco/portlets/myspaces.get.html.ftl | 4 +- config/alfresco/web-client-config-dialogs.xml | 9 +- config/alfresco/web-client-config.xml | 4 + .../web/bean/content/BaseContentWizard.java | 33 +- .../org/alfresco/web/bean/wcm/AVMUtil.java | 2 +- .../web/bean/wcm/LinkValidationDialog.java | 30 ++ ...va => ManageLinkValidationTaskDialog.java} | 290 +++++++++--------- .../alfresco/web/bean/wcm/SubmitDialog.java | 13 +- .../ui/repo/component/UICharsetSelector.java | 26 +- .../wcm/component/UILinkValidationReport.java | 8 +- source/web/WEB-INF/faces-config-beans.xml | 4 +- .../images/icons/abort_submission_large.gif | Bin 0 -> 450 bytes .../images/icons/promote_submission_large.gif | Bin 0 -> 808 bytes .../wcm/manage-broken-links-task-dialog.jsp | 186 ----------- .../web/jsp/wcm/manage-review-task-dialog.jsp | 18 +- source/web/scripts/ajax/doclist.js | 2 +- source/web/scripts/ajax/myspaces.js | 2 +- 18 files changed, 271 insertions(+), 364 deletions(-) rename source/java/org/alfresco/web/bean/wcm/{ManageVerifyBrokenLinksTaskDialog.java => ManageLinkValidationTaskDialog.java} (93%) create mode 100644 source/web/images/icons/abort_submission_large.gif create mode 100644 source/web/images/icons/promote_submission_large.gif delete mode 100644 source/web/jsp/wcm/manage-broken-links-task-dialog.jsp diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 87b9078102..9dc5eeb5f6 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -1203,7 +1203,9 @@ checking_links_status=Checked 0 links in -
+
@@ -506,7 +506,7 @@ a.spaceBreadcrumbLink:link, a.spaceBreadcrumbLink:visited, a.spaceBreadcrumbLink font-size: 12px; } -#docUpdatePanel +#spaceUpdateDocPanel { position: absolute; border: 1px solid #CCD4DB; diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index 2bd775c272..751c8d77ff 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -243,8 +243,7 @@ @@ -311,8 +310,8 @@ - diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index c268d5f412..a86cfe4606 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -289,6 +289,10 @@ + + + diff --git a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java index 21760b214d..0ea7933063 100644 --- a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java +++ b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java @@ -54,6 +54,7 @@ import org.alfresco.web.bean.wizard.BaseWizardBean; import org.alfresco.web.data.IDataContainer; import org.alfresco.web.data.QuickSort; import org.alfresco.web.ui.common.Utils; +import org.alfresco.web.ui.repo.component.UICharsetSelector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -167,6 +168,27 @@ public abstract class BaseContentWizard extends BaseWizardBean */ public String getEncoding() { + if (encoding == null) + { + ConfigService configSvc = Application.getConfigService(FacesContext.getCurrentInstance()); + Config config = configSvc.getConfig("Content Wizards"); + if (config != null) + { + ConfigElement defaultEncCfg = config.getConfigElement("default-encoding"); + if (defaultEncCfg != null) + { + String value = defaultEncCfg.getValue(); + if (value != null) + { + encoding = value.trim(); + } + } + } + if (encoding == null || encoding.length() == 0) + { + encoding = Charset.defaultCharset().name(); + } + } return encoding; } @@ -270,14 +292,7 @@ public abstract class BaseContentWizard extends BaseWizardBean public List getEncodings() { - Map availableCharsets = Charset.availableCharsets(); - List items = new ArrayList(availableCharsets.size()); - for (Charset charset : availableCharsets.values()) - { - SelectItem item = new SelectItem(charset.name(), charset.displayName()); - items.add(item); - } - return items; + return UICharsetSelector.getCharsetEncodingList(); } /** @@ -437,7 +452,7 @@ public abstract class BaseContentWizard extends BaseWizardBean ContentWriter writer = contentService.getWriter(fileNodeRef, ContentModel.PROP_CONTENT, true); // set the mimetype and encoding writer.setMimetype(this.mimeType); - writer.setEncoding(this.encoding); + writer.setEncoding(getEncoding()); if (fileContent != null) { writer.putContent(fileContent); diff --git a/source/java/org/alfresco/web/bean/wcm/AVMUtil.java b/source/java/org/alfresco/web/bean/wcm/AVMUtil.java index a73a0b62b4..d76e11f937 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMUtil.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMUtil.java @@ -1075,7 +1075,7 @@ public final class AVMUtil } // Component Separator. - private static final String STORE_SEPARATOR = "--"; + /*package*/ static final String STORE_SEPARATOR = "--"; // names of the stores representing the layers for an AVM website //XXXarielb this should be private diff --git a/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java b/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java index f84c091c1f..8137f4ca40 100644 --- a/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/LinkValidationDialog.java @@ -25,6 +25,7 @@ package org.alfresco.web.bean.wcm; import java.io.Serializable; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; @@ -70,6 +71,7 @@ public class LinkValidationDialog extends BaseDialogBean private String webapp; private String webappPath; private String initialTab; + private String title; private NodeRef webappPathRef; private boolean runningReport = false; private boolean update = false; @@ -118,6 +120,28 @@ public class LinkValidationDialog extends BaseDialogBean this.compareToStaging = true; } + // work out title for dialog by examining store type + FacesContext context = FacesContext.getCurrentInstance(); + if (this.avmService.getStoreProperty(this.store, + SandboxConstants.PROP_SANDBOX_AUTHOR_MAIN) != null) + { + String pattern = Application.getMessage(context, "link_validaton_dialog_title_user"); + String user = this.store.substring( + this.store.indexOf(AVMUtil.STORE_SEPARATOR)+AVMUtil.STORE_SEPARATOR.length()); + this.title = MessageFormat.format(pattern, + new Object[] {user}); + } + else if (this.avmService.getStoreProperty(this.store, + SandboxConstants.PROP_SANDBOX_STAGING_MAIN) != null) + { + this.title = Application.getMessage(context, "link_validaton_dialog_title_staging"); + } + else if (this.avmService.getStoreProperty(this.store, + SandboxConstants.PROP_SANDBOX_WORKFLOW_MAIN) != null) + { + this.title = Application.getMessage(context, "link_validaton_dialog_title_workflow"); + } + if (logger.isDebugEnabled()) { if (this.runningReport) @@ -155,6 +179,12 @@ public class LinkValidationDialog extends BaseDialogBean return null; } + @Override + public String getContainerTitle() + { + return this.title; + } + @Override public boolean getFinishButtonDisabled() { diff --git a/source/java/org/alfresco/web/bean/wcm/ManageVerifyBrokenLinksTaskDialog.java b/source/java/org/alfresco/web/bean/wcm/ManageLinkValidationTaskDialog.java similarity index 93% rename from source/java/org/alfresco/web/bean/wcm/ManageVerifyBrokenLinksTaskDialog.java rename to source/java/org/alfresco/web/bean/wcm/ManageLinkValidationTaskDialog.java index 5c944168cc..3fe1661b8f 100644 --- a/source/java/org/alfresco/web/bean/wcm/ManageVerifyBrokenLinksTaskDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/ManageLinkValidationTaskDialog.java @@ -1,145 +1,145 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.web.bean.wcm; - -import java.util.HashMap; -import java.util.Map; - -import javax.faces.context.FacesContext; -import javax.transaction.UserTransaction; - -import org.alfresco.linkvalidation.LinkValidationReport; -import org.alfresco.repo.domain.PropertyValue; -import org.alfresco.sandbox.SandboxConstants; -import org.alfresco.web.app.Application; -import org.alfresco.web.bean.repository.Repository; -import org.alfresco.web.bean.workflow.ManageTaskDialog; -import org.alfresco.web.ui.common.Utils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Bean implementation for the "Manage Task" dialog when dealing - * with the "WCM Review" task specifically. - * - * @author gavinc - */ -public class ManageVerifyBrokenLinksTaskDialog extends ManageTaskDialog -{ - protected String store; - protected String webapp; - protected AVMBrowseBean avmBrowseBean; - - private static final Log logger = LogFactory.getLog(ManageVerifyBrokenLinksTaskDialog.class); - - // ------------------------------------------------------------------------------ - // Implementation - - @Override - public void init(Map parameters) - { - super.init(parameters); - - FacesContext context = FacesContext.getCurrentInstance(); - UserTransaction tx = null; - - try - { - tx = Repository.getUserTransaction(context, true); - tx.begin(); - - // reset any previous link validation state - this.avmBrowseBean.setLinkValidationState(null); - this.avmBrowseBean.setLinkValidationMonitor(null); - - // try and retrieve the deployment report from the workflow - // store, if present setup the validation state on AVMBrowseBean - String storeName = this.workflowPackage.getStoreRef().getIdentifier(); - - if (logger.isDebugEnabled()) - logger.debug("Retrieving link validation report from store '" + storeName + "'"); - - PropertyValue val = this.avmService.getStoreProperty(storeName, - SandboxConstants.PROP_LINK_VALIDATION_REPORT); - if (val != null) - { - LinkValidationReport report = (LinkValidationReport)val.getSerializableValue(); - if (report != null) - { - this.store = report.getStore(); - this.webapp = report.getWebapp(); - - if (logger.isDebugEnabled()) - logger.debug("Found link validation report for webapp '" + - AVMUtil.buildStoreWebappPath(this.store, this.webapp) + "'"); - - LinkValidationState state = new LinkValidationState(report); - this.avmBrowseBean.setLinkValidationState(state); - - if (logger.isDebugEnabled()) - logger.debug("Stored link validation state: " + state); - } - } - - // commit the changes - tx.commit(); - } - catch (Throwable e) - { - // rollback the transaction - try { if (tx != null) {tx.rollback();} } catch (Exception ex) {} - Utils.addErrorMessage(formatErrorMessage(e), e); - } - } - - // ------------------------------------------------------------------------------ - // Event handlers - - public String viewLinkReport() - { - if (logger.isDebugEnabled()) - logger.debug("Viewing link validation report for webapp '" + - AVMUtil.buildStoreWebappPath(this.store, this.webapp) + "'"); - - Map params = new HashMap(1); - params.put("store", this.store); - params.put("webapp", this.webapp); - params.put("compareToStaging", "true"); - Application.getDialogManager().setupParameters(params); - - return "dialog:linkValidation"; - } - - // ------------------------------------------------------------------------------ - // Getters and Setters - - /** - * @param avmBrowseBean AVMBrowseBean instance - */ - public void setAvmBrowseBean(AVMBrowseBean avmBrowseBean) - { - this.avmBrowseBean = avmBrowseBean; - } -} +/* + * Copyright (C) 2005-2007 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.web.bean.wcm; + +import java.util.HashMap; +import java.util.Map; + +import javax.faces.context.FacesContext; +import javax.transaction.UserTransaction; + +import org.alfresco.linkvalidation.LinkValidationReport; +import org.alfresco.repo.domain.PropertyValue; +import org.alfresco.sandbox.SandboxConstants; +import org.alfresco.web.app.Application; +import org.alfresco.web.bean.repository.Repository; +import org.alfresco.web.bean.workflow.ManageTaskDialog; +import org.alfresco.web.ui.common.Utils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Bean implementation for the "Manage Task" dialog when dealing + * with link validation related WCM tasks. + * + * @author gavinc + */ +public class ManageLinkValidationTaskDialog extends ManageTaskDialog +{ + protected String store; + protected String webapp; + protected AVMBrowseBean avmBrowseBean; + + private static final Log logger = LogFactory.getLog(ManageLinkValidationTaskDialog.class); + + // ------------------------------------------------------------------------------ + // Implementation + + @Override + public void init(Map parameters) + { + super.init(parameters); + + FacesContext context = FacesContext.getCurrentInstance(); + UserTransaction tx = null; + + try + { + tx = Repository.getUserTransaction(context, true); + tx.begin(); + + // reset any previous link validation state + this.avmBrowseBean.setLinkValidationState(null); + this.avmBrowseBean.setLinkValidationMonitor(null); + + // try and retrieve the deployment report from the workflow + // store, if present setup the validation state on AVMBrowseBean + String storeName = this.workflowPackage.getStoreRef().getIdentifier(); + + if (logger.isDebugEnabled()) + logger.debug("Retrieving link validation report from store '" + storeName + "'"); + + PropertyValue val = this.avmService.getStoreProperty(storeName, + SandboxConstants.PROP_LINK_VALIDATION_REPORT); + if (val != null) + { + LinkValidationReport report = (LinkValidationReport)val.getSerializableValue(); + if (report != null) + { + this.store = report.getStore(); + this.webapp = report.getWebapp(); + + if (logger.isDebugEnabled()) + logger.debug("Found link validation report for webapp '" + + AVMUtil.buildStoreWebappPath(this.store, this.webapp) + "'"); + + LinkValidationState state = new LinkValidationState(report); + this.avmBrowseBean.setLinkValidationState(state); + + if (logger.isDebugEnabled()) + logger.debug("Stored link validation state: " + state); + } + } + + // commit the changes + tx.commit(); + } + catch (Throwable e) + { + // rollback the transaction + try { if (tx != null) {tx.rollback();} } catch (Exception ex) {} + Utils.addErrorMessage(formatErrorMessage(e), e); + } + } + + // ------------------------------------------------------------------------------ + // Event handlers + + public String viewLinkReport() + { + if (logger.isDebugEnabled()) + logger.debug("Viewing link validation report for webapp '" + + AVMUtil.buildStoreWebappPath(this.store, this.webapp) + "'"); + + Map params = new HashMap(1); + params.put("store", this.store); + params.put("webapp", this.webapp); + params.put("compareToStaging", "true"); + Application.getDialogManager().setupParameters(params); + + return "dialog:linkValidation"; + } + + // ------------------------------------------------------------------------------ + // Getters and Setters + + /** + * @param avmBrowseBean AVMBrowseBean instance + */ + public void setAvmBrowseBean(AVMBrowseBean avmBrowseBean) + { + this.avmBrowseBean = avmBrowseBean; + } +} diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index e755369279..1fd9b547b0 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -643,7 +643,18 @@ public class SubmitDialog extends BaseDialogBean } else { - Map list = avmService.getDirectoryListing(version, path, true); + if (desc.isDeletedDirectory()) + { + // lookup the previous child and get its contents + final List history = avmService.getHistory(desc, 2); + if (history.size() == 1) + { + return; + } + desc = history.get(1); + } + + Map list = avmService.getDirectoryListing(desc, true); for (AVMNodeDescriptor child : list.values()) { recursivelyRemoveLocks(webProject, version, child.getPath()); diff --git a/source/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java b/source/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java index cfb59be485..d83e3f0e09 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java +++ b/source/java/org/alfresco/web/ui/repo/component/UICharsetSelector.java @@ -46,6 +46,8 @@ public class UICharsetSelector extends UISelectOne public static final String COMPONENT_TYPE = "org.alfresco.faces.CharsetSelector"; public static final String COMPONENT_FAMILY = "javax.faces.SelectOne"; + private static List charsetEncodings = null; + @Override @SuppressWarnings("unchecked") public void encodeBegin(FacesContext context) throws IOException @@ -75,13 +77,25 @@ public class UICharsetSelector extends UISelectOne */ protected List createList() { - Map availableCharsets = Charset.availableCharsets(); - List items = new ArrayList(availableCharsets.size()); - for (Charset charset : availableCharsets.values()) + return getCharsetEncodingList(); + } + + /** + * @return the List of available system character set encodings as a List of SelectItem objects + */ + public static List getCharsetEncodingList() + { + if (charsetEncodings == null) { - SelectItem item = new SelectItem(charset.name(), charset.displayName()); - items.add(item); + Map availableCharsets = Charset.availableCharsets(); + List items = new ArrayList(availableCharsets.size()); + for (Charset charset : availableCharsets.values()) + { + SelectItem item = new SelectItem(charset.name(), charset.displayName()); + items.add(item); + } + charsetEncodings = items; } - return items; + return charsetEncodings; } } diff --git a/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationReport.java b/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationReport.java index 9185b9ed09..09eb1b13e9 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationReport.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UILinkValidationReport.java @@ -776,7 +776,7 @@ public class UILinkValidationReport extends AbstractLinkValidationReportComponen protected String getIcon(String fileName) { // work out what icon to use - String icon = "/images/filetypes32/html.gif"; + String icon = "/images/filetypes32/_default.gif"; String ext = ""; int idx = fileName.indexOf("."); if (idx != -1) @@ -784,7 +784,11 @@ public class UILinkValidationReport extends AbstractLinkValidationReportComponen ext = fileName.substring(idx); } - if (ext.equals(".xml")) + if (ext.equals(".html") || ext.equals(".htm")) + { + icon = "/images/filetypes32/html.gif"; + } + else if (ext.equals(".xml")) { icon = "/images/icons/webform_large.gif"; } diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml index c79accbeb1..1f53906bab 100644 --- a/source/web/WEB-INF/faces-config-beans.xml +++ b/source/web/WEB-INF/faces-config-beans.xml @@ -2045,8 +2045,8 @@ The bean that backs up the Verify Broken Links Task Dialog - ManageVerifyBrokenLinksTaskDialog - org.alfresco.web.bean.wcm.ManageVerifyBrokenLinksTaskDialog + ManageLinkValidationTaskDialog + org.alfresco.web.bean.wcm.ManageLinkValidationTaskDialog session nodeService diff --git a/source/web/images/icons/abort_submission_large.gif b/source/web/images/icons/abort_submission_large.gif new file mode 100644 index 0000000000000000000000000000000000000000..4a600c95670f8a69eaf133cd2f0b663c5c377ec1 GIT binary patch literal 450 zcmZ?wbhEHbRA5kGxT?o+hJiuBtNqXW_ty*z8rI(Z|Nno*@*6d)ZZ~hZ-@f@#>5^+j zi>{m(5csrz|DAw2ku-)6O%U-Pg`jsUx)H{GPkhDuq-ZAAGu`Qbw+zj=dh23<)SFkP{x=r72FM*zn(EoLGh+D~jh?Fk+=`W*0(Cb}Y+QW2 K-@l20!5RQ`nYJ$g literal 0 HcmV?d00001 diff --git a/source/web/images/icons/promote_submission_large.gif b/source/web/images/icons/promote_submission_large.gif new file mode 100644 index 0000000000000000000000000000000000000000..436a8fa8fdcc6d1bf447ff414614106f1c0493f0 GIT binary patch literal 808 zcmZ?wbhEHbRA5kGc;?FR^y$<6`}hC<|6jqYedf%WH*enj{rmU(_wWDy{rm3SyP8$E zE0*7ASbMj0$+d=thUN|TixypJ-~8y;uU~)u{Q3Fw=eKX){{8#+`Sa%wA3l8g^y$l& zFPg#q>Vdr~-n_YM<+$$KCo!}r8%1~MtANzaOKtVU6&L34z1XE zDY9*M?ZQ*jHe8&w<%(C~((*-@x>uern0xN&`(Izbeg%4jVMqbRpDc_F46Y11AXkIp zgn|8kgKJZBOKV$uM-zimdv|Al6Dv#mqzNsIGiFYjIcN49#!g12#fv8`S-x!ff{sN? z_$Ki!7hBJ=ak1Fy_O(o#H;66SyY;}%w%wcgPV8UIapJ@hjw7v%99OPhyM9&p*2U?< z%kMu}E_|n%QJCQc!}FJ~U%X{td(yjr{4+wBZ=e#J?Y_Y3hU|SJ$a?(>S1?j9Qs}(lH?P3%x zdUfaI$K0&AGhPZM&4iYi7>i0*S(x4R3GnD1PmC zqOpC;ZO$fcdB2znC!wQun(^mWp5PU2=Mb6Uw|CdqSCi!gZ=Bn^`}_N8hq~qc=LIM* GSOWmu*;u&% literal 0 HcmV?d00001 diff --git a/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp b/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp deleted file mode 100644 index 9fdffafbf4..0000000000 --- a/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp +++ /dev/null @@ -1,186 +0,0 @@ -<%-- - * Copyright (C) 2005-2007 Alfresco Software Limited. - - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" ---%> -<%@ 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" %> -<%@ taglib uri="/WEB-INF/wcm.tld" prefix="w" %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- Name column --%> - - - - - - - - - - - - <%-- Description column --%> - - - - - - - - <%-- Path column --%> - - - - - - - - <%-- Created Date column --%> - - - - - - - - - - <%-- Modified Date column --%> - - - - - - - - - - <%-- Expiration Date column --%> - - - - - - - - - - <%-- Actions column --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - diff --git a/source/web/jsp/wcm/manage-review-task-dialog.jsp b/source/web/jsp/wcm/manage-review-task-dialog.jsp index d4c93ba16f..f3c622b0b8 100644 --- a/source/web/jsp/wcm/manage-review-task-dialog.jsp +++ b/source/web/jsp/wcm/manage-review-task-dialog.jsp @@ -26,6 +26,7 @@ <%@ 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" %> +<%@ taglib uri="/WEB-INF/wcm.tld" prefix="w" %> @@ -48,6 +49,19 @@ + + + + + + + + + + @@ -152,7 +166,7 @@ - + @@ -167,7 +181,7 @@
- + diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js index 1ee1b00a1e..008f474cec 100644 --- a/source/web/scripts/ajax/doclist.js +++ b/source/web/scripts/ajax/doclist.js @@ -609,7 +609,7 @@ var MyDocs = { var anim = new Fx.Styles(panel, {duration: MyDocs.ANIM_LENGTH, transition: Fx.Transitions.linear}); anim.start({'opacity': 1}); - this.fxOverlay.start(OVERLAY_OPACITY); + this.fxOverlay.start(MyDocs.OVERLAY_OPACITY); this.popupPanel = panel; this.popupPanel.nodeRef = nodeRef; diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js index 9e08637f07..0390840092 100644 --- a/source/web/scripts/ajax/myspaces.js +++ b/source/web/scripts/ajax/myspaces.js @@ -764,7 +764,7 @@ var MySpaces = { this.fxOverlay = $("spacePanelOverlay").effect('opacity', {duration: MySpaces.ANIM_LENGTH}); - var panel = $("docUpdatePanel"); + var panel = $("spaceUpdateDocPanel"); panel.setStyle("opacity", 0); panel.setStyle("display", "inline"); Alfresco.Dom.smartAlignElement(panel, actionEl);