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
2025-08-07 17:49:17 +00:00 · 2007-09-10 22:07:27 +00:00
parent a8023d20a2
commit 97b5b391c8
18 changed files with 271 additions and 364 deletions
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1203,7 +1203,9 @@ checking_links_status=Checked <span id='link-count'>0</span> links in <span id='
 view_link_validation_report=View Link Validation Report
 link_validation_unknown_error=An unknown error occurred during the link validation check
 link_validation_error=An error occurred during the link validation check
-link_validaton_dialog_title=Link Validation Report
+link_validaton_dialog_title_staging=Link Validation Report for Staging Sandbox
+link_validaton_dialog_title_user=Link Validation Report for {0}''s Sandbox
+link_validaton_dialog_title_workflow=Link Validation Report for Submitted Items
 link_validaton_dialog_desc=This dialog shows the results of a link validation check and allows you to fix broken links.
 report_summary=Report Summary
 link_check_completed_at=Broken links were checked at {0} using snapshot {1}.
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
@@ -62,7 +62,7 @@
         <input class="spaceFormItem" type="button" value="OK" onclick='MySpaces.uploadOK(this, "${path?url?replace("'","_%_")}");'>
         <input class="spaceFormItem" type="button" value="Cancel" onclick="MySpaces.closePopupPanel();">
      </div>
-      <div id="docUpdatePanel">
+      <div id="spaceUpdateDocPanel">
         <input class="spaceFormItem" type="button" value="OK" onclick="MySpaces.updateOK(this);">
         <input class="spaceFormItem" type="button" value="Cancel" onclick="MySpaces.closePopupPanel();">
      </div>
@@ -506,7 +506,7 @@ a.spaceBreadcrumbLink:link, a.spaceBreadcrumbLink:visited, a.spaceBreadcrumbLink
   font-size: 12px;
 }

-#docUpdatePanel
+#spaceUpdateDocPanel
 {
   position: absolute;
   border: 1px solid #CCD4DB;
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -244,7 +244,6 @@
         <dialog name="viewDeploymentReport" page="/jsp/wcm/deployment-report.jsp" 
                 managed-bean="ViewDeploymentReportDialog"
                 icon="/images/icons/deployment_report_large.gif"  
-                 title-id="deployment_report_title" 
                 description-id="deployment_report_desc" show-ok-button="false" />
                 
         <dialog name="monitorDeployment" page="/jsp/wcm/monitor-deployment.jsp" 
@@ -303,7 +302,7 @@
   <config evaluator="node-type" condition="wcmwf:reviewTask">
      <dialogs>
         <dialog name="manageTask" page="/jsp/wcm/manage-review-task-dialog.jsp"
-                 managed-bean="ManageTaskDialog" 
+                 managed-bean="ManageLinkValidationTaskDialog" 
                 icon="/images/icons/manage_workflow_task_large.gif" 
                 description-id="manage_task_desc" />
      </dialogs>
@@ -311,8 +310,8 @@
   
   <config evaluator="node-type" condition="wcmwf:verifyBrokenLinksTask">
      <dialogs>
-         <dialog name="manageTask" page="/jsp/wcm/manage-broken-links-task-dialog.jsp"
-                 managed-bean="ManageVerifyBrokenLinksTaskDialog" 
+         <dialog name="manageTask" page="/jsp/wcm/manage-review-task-dialog.jsp"
+                 managed-bean="ManageLinkValidationTaskDialog" 
                 icon="/images/icons/manage_workflow_task_large.gif" 
                 description-id="manage_task_desc" />
      </dialogs>
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -289,6 +289,10 @@
         <mime-type name="text/xml" />
      </create-mime-types>
      
+      <!-- default encoding when creating new inline content
+           if not set then server default charset encoding will be used -->
+      <default-encoding></default-encoding>
+      
      <!-- Controls the message regarding property editing after the content is created -->
      <other-properties user-choice-visible="true" user-choice-default="true" /> 
   </config>
--- 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<SelectItem> getEncodings()
   {
-      Map<String, Charset> availableCharsets = Charset.availableCharsets();
-      List<SelectItem> items = new ArrayList<SelectItem>(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);
--- 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
--- 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()
   {
--- a/source/java/org/alfresco/web/bean/wcm/ManageVerifyBrokenLinksTaskDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ManageVerifyBrokenLinksTaskDialog.java
@@ -42,17 +42,17 @@ import org.apache.commons.logging.LogFactory;

 /**
 * Bean implementation for the "Manage Task" dialog when dealing
- * with the "WCM Review" task specifically.
+ * with link validation related WCM tasks.
 * 
 * @author gavinc
 */
-public class ManageVerifyBrokenLinksTaskDialog extends ManageTaskDialog
+public class ManageLinkValidationTaskDialog extends ManageTaskDialog
 {
   protected String store;
   protected String webapp;
   protected AVMBrowseBean avmBrowseBean;
   
-   private static final Log logger = LogFactory.getLog(ManageVerifyBrokenLinksTaskDialog.class);
+   private static final Log logger = LogFactory.getLog(ManageLinkValidationTaskDialog.class);
   
   // ------------------------------------------------------------------------------
   // Implementation
--- 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<String, AVMNodeDescriptor> list = avmService.getDirectoryListing(version, path, true);
+         if (desc.isDeletedDirectory())
+         {
+            // lookup the previous child and get its contents
+            final List<AVMNodeDescriptor> history = avmService.getHistory(desc, 2);
+            if (history.size() == 1)
+            {
+               return;
+            }
+            desc = history.get(1);
+         }
+         
+         Map<String, AVMNodeDescriptor> list = avmService.getDirectoryListing(desc, true);
         for (AVMNodeDescriptor child : list.values())
         {
            recursivelyRemoveLocks(webProject, version, child.getPath());
--- 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<SelectItem> charsetEncodings = null;
+   
   @Override
   @SuppressWarnings("unchecked")
   public void encodeBegin(FacesContext context) throws IOException
@@ -74,6 +76,16 @@ public class UICharsetSelector extends UISelectOne
    * @return List of SelectItem components
    */
   protected List<SelectItem> createList()
+   {
+      return getCharsetEncodingList();
+   }
+   
+   /**
+    * @return the List of available system character set encodings as a List of SelectItem objects
+    */
+   public static List<SelectItem> getCharsetEncodingList()
+   {
+      if (charsetEncodings == null)
      {
         Map<String, Charset> availableCharsets = Charset.availableCharsets();
         List<SelectItem> items = new ArrayList<SelectItem>(availableCharsets.size());
@@ -82,6 +94,8 @@ public class UICharsetSelector extends UISelectOne
            SelectItem item = new SelectItem(charset.name(), charset.displayName());
            items.add(item);
         }
-      return items;
+         charsetEncodings = items;
+      }
+      return charsetEncodings;
   }
 }
--- 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";
      }
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -2045,8 +2045,8 @@
      <description>
         The bean that backs up the Verify Broken Links Task Dialog
      </description>
-      <managed-bean-name>ManageVerifyBrokenLinksTaskDialog</managed-bean-name>
-      <managed-bean-class>org.alfresco.web.bean.wcm.ManageVerifyBrokenLinksTaskDialog</managed-bean-class>
+      <managed-bean-name>ManageLinkValidationTaskDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.ManageLinkValidationTaskDialog</managed-bean-class>
      <managed-bean-scope>session</managed-bean-scope>
      <managed-property>
         <property-name>nodeService</property-name>
--- a/source/web/images/icons/abort_submission_large.gif
+++ b/source/web/images/icons/abort_submission_large.gif
--- a/source/web/images/icons/promote_submission_large.gif
+++ b/source/web/images/icons/promote_submission_large.gif
--- a/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp
+++ b/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp
@@ -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" %>
-
-<a:panel id="pooled-panel" label="#{msg.task_pooled_properties}" rendered="#{DialogManager.bean.pooledTask}" 
-         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
-   
-   <r:propertySheetGrid id="pooled-task-props" value="#{DialogManager.bean.taskNode}" columns="1" >
-      <r:property id="pooled-task-owner" readOnly="true" name="owner" />
-      <r:association id="pooled-task-pool" readOnly="true" name="bpm:pooledActors" />
-   </r:propertySheetGrid>
-
-</a:panel>
-
-<h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" rendered="#{DialogManager.bean.pooledTask}" />
-
-<a:panel id="metadata-panel" label="#{msg.task_properties}" 
-         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
-   
-   <r:propertySheetGrid id="task-props" value="#{DialogManager.bean.taskNode}"
-                       var="taskProps" columns="1" externalConfig="true" />
-</a:panel>
-
-<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
-
-<a:panel id="link-validation-panel" label="#{msg.link_validation}" rendered="#{AVMBrowseBean.linkValidationState != null}"
-         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
-   
-   <w:linkValidationSummary value="#{AVMBrowseBean.linkValidationState}" styleClass="linkValidationSummaryPanelTask"
-                            showPanel="false" showTitle="false" />
-   
-   <a:actionLink value="#{msg.view_link_validation_report}" action="#{DialogManager.bean.viewLinkReport}" 
-                 style='margin-left: 4px;'/>
-   <h:outputText value="<div>&nbsp;</div>" escape="false" />
-</a:panel>
-
-<h:outputText id="padding3" styleClass="paddingRow" value="&nbsp;" escape="false" />
-
-<a:panel id="resources-panel" label="#{msg.resources}"
-         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
-   
-   <h:outputText value="#{msg.no_resources}" rendered="#{empty DialogManager.bean.resources}" />
-   
-   <a:richList id="resources-list" viewMode="details" value="#{DialogManager.bean.resources}" var="r"
-               binding="#{DialogManager.bean.packageItemsRichList}"
-               styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
-               altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
-               initialSortColumn="name" initialSortDescending="true"
-               rendered="#{not empty DialogManager.bean.resources}">
-      
-      <%-- Name column --%>
-      <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
-         <f:facet name="header">
-            <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
-         </f:facet>
-         <f:facet name="small-icon">
-               <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
-                             showLink="false" styleClass="inlineAction" />
-         </f:facet>
-         <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
-         <r:lockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
-      </a:column>
-      
-      <%-- Description column --%>
-      <a:column id="col2" style="padding:2px;text-align:left">
-         <f:facet name="header">
-            <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
-         </f:facet>
-         <h:outputText id="col2-txt" value="#{r.description}" />
-      </a:column>
-      
-      <%-- Path column --%>
-      <a:column id="col3" style="padding:2px;text-align:left">
-         <f:facet name="header">
-            <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
-         </f:facet>
-         <r:nodePath id="col3-path" value="#{r.path}" action="dialog:close:browse" 
-                     actionListener="#{BrowseBean.clickSpacePath}" />
-      </a:column>
-
-      <%-- Created Date column --%>
-      <a:column id="col4" style="padding:2px;text-align:left">
-         <f:facet name="header">
-            <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
-         </f:facet>
-         <h:outputText id="col4-txt" value="#{r.created}">
-            <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
-         </h:outputText>
-      </a:column>
-      
-      <%-- Modified Date column --%>
-      <a:column id="col5" style="padding:2px;text-align:left">
-         <f:facet name="header">
-            <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
-         </f:facet>
-         <h:outputText id="col5-txt" value="#{r.modified}">
-            <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
-         </h:outputText>
-      </a:column>
-      
-      <%-- Expiration Date column --%>
-		<a:column id="col16" style="text-align:left; white-space:nowrap">
-		   <f:facet name="header">
-		      <a:sortLink label="#{msg.expiration_date}" value="expirationDate" styleClass="header" />
-		   </f:facet>
-		   <h:outputText id="col16-date" value='#{r["wca:expirationDate"]}'>
-		      <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
-		   </h:outputText>
-		</a:column>
-                        
-      <%-- Actions column --%>
-      <a:column id="col7" actions="true" style="padding:2px;text-align:left">
-         <f:facet name="header">
-            <h:outputText id="col7-txt" value="#{msg.actions}"/>
-         </f:facet>
-         <r:actions id="col7-actions" value="#{DialogManager.bean.packageItemActionGroup}" 
-                    context="#{r}" showLink="false" styleClass="inlineAction" />
-      </a:column>
-      <a:dataPager styleClass="pager" />
-   </a:richList>
-
-   <h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">
-      <r:actions id="package-actions" context="#{DialogManager.bean.taskNode}" 
-                 value="#{DialogManager.bean.packageActionGroup}" />
-   </h:panelGrid>
-   
-   <h:panelGrid id="add-item-control" columns="1" rendered="#{DialogManager.bean.itemBeingAdded}" 
-                styleClass="selector" style="margin-top: 6px;">
-      <r:contentSelector id="content-picker" value="#{DialogManager.bean.itemsToAdd}" styleClass="" />
-      <h:panelGrid columns="2">
-         <h:commandButton value="#{msg.add_to_list_button}" actionListener="#{DialogManager.bean.addPackageItems}" />
-         <h:commandButton value="#{msg.cancel}" actionListener="#{DialogManager.bean.cancelAddPackageItems}" />
-      </h:panelGrid>
-   </h:panelGrid>
-
-</a:panel>
-
-<h:outputText id="padding4" styleClass="paddingRow" value="&nbsp;" escape="false" />
-
-<a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
-         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
-
-   <r:workflowSummary id="workflow-summary" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
-   
-   <f:verbatim><div style="padding-left:9px;padding-top:8px;padding-bottom:4px"></f:verbatim>
-      <a:panel id="pending-submission-panel" label="#{msg.workflow_history}" progressive="true" 
-            expanded="false" styleClass="mainSubTitle">
-         <r:workflowHistory id="workflow-history" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowHistoryList" />
-      </a:panel>
-   <f:verbatim></div></f:verbatim>
-</a:panel>
-
-<h:outputText id="padding5" styleClass="paddingRow" value="&nbsp;" escape="false" />
-
-<a:panel rendered="false" id="workflow-outline" label="#{msg.workflow_outline}" progressive="true" expanded="false" 
-         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
-
-   <h:graphicImage value="#{DialogManager.bean.workflowDefinitionImageUrl}"/>
-   
-</a:panel>
--- 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" %>

 <a:panel id="pooled-panel" label="#{msg.task_pooled_properties}" rendered="#{DialogManager.bean.pooledTask}" 
         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
@@ -48,6 +49,19 @@

 <h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />

+<a:panel id="link-validation-panel" label="#{msg.link_validation}" rendered="#{AVMBrowseBean.linkValidationState != null}"
+         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
+   
+   <w:linkValidationSummary value="#{AVMBrowseBean.linkValidationState}" styleClass="linkValidationSummaryPanelTask"
+                            showPanel="false" showTitle="false" />
+   
+   <a:actionLink value="#{msg.view_link_validation_report}" action="#{DialogManager.bean.viewLinkReport}" 
+                 style='margin-left: 4px;'/>
+   <h:outputText value="<div>&nbsp;</div>" escape="false" />
+</a:panel>
+
+<h:outputText id="padding3" styleClass="paddingRow" value="&nbsp;" escape="false" />
+
 <a:panel id="resources-panel" label="#{msg.resources}"
         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
   
@@ -152,7 +166,7 @@

 </a:panel>

-<h:outputText id="padding3" styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding4" styleClass="paddingRow" value="&nbsp;" escape="false" />

 <a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
@@ -167,7 +181,7 @@
   <f:verbatim></div></f:verbatim>
 </a:panel>

-<h:outputText id="padding4" styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding5" styleClass="paddingRow" value="&nbsp;" escape="false" />

 <a:panel rendered="false" id="workflow-outline" label="#{msg.workflow_outline}" progressive="true" expanded="false" 
         border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle">
--- 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;
--- 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);