"); - } - else - { - first = false; - } - - builder.append("
![](");
- builder.append(context.getExternalContext().getRequestContextPath());
- builder.append("/images/icons/broken_link.gif){kind=icon}
");
- builder.append(parseBrokenLink(link));
- }
-
- return builder.toString();
- }
-
- /**
- * Removes the virtaulisation server host name from the link if appropriate
- *
- * @param linkUrl The URL that is broken
- * @return Parsed URL
- */
- protected String parseBrokenLink(String linkUrl)
- {
- String link = linkUrl;
-
- if (linkUrl.startsWith("http://") && linkUrl.indexOf("www--sandbox") != -1)
- {
- // remove the virtualisation server host name
- int idx = linkUrl.indexOf("/", 7);
- if (idx != -1)
- {
- link = linkUrl.substring(idx);
- }
- }
-
- // truncate the link if it is longer than 100 chars
- String title = link;
- if (link.length() > 60)
- {
- link = link.substring(0, 60) + "...";
- }
-
- return " " + link + "";
- }
-
- /**
- * Renders the HTML to display a file and it's optional broken links
- *
- * @param out ResponseWriter instance to write to
- * @param context FacesContext
- * @param fileName Name of the file
- * @param filePath Path to the file
- * @param brokenLinks List of broken links in the file
- * @throws IOException
- */
- protected void renderFile(ResponseWriter out, FacesContext context,
- String fileName, String filePath, String brokenLinks) throws IOException
- {
- out.write("");
- out.write(fileName);
- out.write(" ");
- out.write(filePath);
- out.write(" ");
-
- if (brokenLinks != null && brokenLinks.length() > 0)
- {
- out.write("");
- out.write(Application.getMessage(context, "broken_links"));
- out.write(": ");
- out.write(brokenLinks);
- out.write(" ");
- }
-
- out.write(" |
");
- out.write(Application.getMessage(context, "no_items"));
- out.write("
");
- out.write(Application.getMessage(context, "files_with_broken_links"));
- out.write("
");
-
- // setup the context for the actions
- AVMNodeDescriptor desc = avmService.lookup(-1, file);
- AVMNode node = new AVMNode(desc);
-
- String assetPath = file.substring(rootPathIndex);
- String previewUrl = AVMUtil.buildAssetUrl(assetPath, wcmDomain, wcmPort, dns);
- node.getProperties().put("previewUrl", previewUrl);
- actions.setContext(node);
-
- // render the actions
- Utils.encodeRecursive(context, actions);
-
- out.write("
");
- out.write(Application.getMessage(context, "forms_with_broken_links"));
- out.write("
![](");
- out.write(context.getExternalContext().getRequestContextPath());
- out.write("/images/icons/webform_large.gif){kind=icon}
");
- out.write(formName);
- out.write("
");
- out.write(formPath);
- out.write("
");
- out.write(Application.getMessage(context, "generated_files"));
- out.write(":");
- out.write(" ");
-
-
-
- // render the actions
- Utils.encodeRecursive(context, actions);
-
- out.write("
");
- out.write(Application.getMessage(context, "fixed_items"));
- out.write("
- "); + out.write(bundle.getString("broken")); + out.write(":
- ");
+ out.write(staticTabTitle);
+ out.write(" (
![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ out.write("/images/icons/broken_link.gif)
");
+ out.write(Integer.toString(numBrokenFileLinks));
+ out.write(") - ");
+ out.write(generatedTabTitle);
+ out.write(" (");
+ out.write(Integer.toString(numBrokenFormLinks));
+ out.write(")
- "); + out.write(bundle.getString("fixed")); + out.write(":
- ");
+ if (selectedTab.equals("fixedTab"))
+ {
+ out.write(" class='selectedTab'");
+ }
+ out.write("");
+ out.write(bundle.getString("all_items_tab"));
+ out.write(" (
![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ out.write("/images/icons/green_tick.gif)
");
+ out.write(Integer.toString(numFixedItems));
+ out.write(") ");
+ out.write(" - "); + + // render the update status button + UICommand updateStatusAction = aquireUpdateStatusAction(context, + "update_status_" + linkState.getStore()); + Utils.encodeRecursive(context, updateStatusAction); + + out.write("
");
+
+ // setup the context for the actions
+ AVMNodeDescriptor desc = avmService.lookup(-1, file);
+ AVMNode node = new AVMNode(desc);
+
+ String assetPath = file.substring(rootPathIndex);
+ String previewUrl = AVMUtil.buildAssetUrl(assetPath, wcmDomain, wcmPort, dns);
+ node.getProperties().put("previewUrl", previewUrl);
+ actions.setContext(node);
+
+ // render the actions
+ Utils.encodeRecursive(context, actions);
+
+ out.write("
");
+
+ // render the file details
+ String brokenLinks = getBrokenLinks(context, file, linkState);
+ int numBrokenLinks = linkState.getBrokenLinksForFile(file).size();
+ renderFileDetails(out, context, fileName, filePath, brokenLinks,
+ numBrokenLinks, brokenLinksExpanded);
+
+ out.write("![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ out.write("/images/icons/webform_large.gif){kind=icon}
");
+
+ // render the actions
+ Utils.encodeRecursive(context, actions);
+
+ out.write("
");
+
+ // render the generated files
+ List");
+ out.write(formName);
+ out.write("
");
+ out.write(formPath);
+ out.write("
![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ if (generatedFilesExpanded)
+ {
+ out.write("/images/icons/arrow_open.gif){kind=icon}
");
+ out.write(Application.getMessage(context, "generated_files"));
+ out.write(" (");
+ out.write(Integer.toString(brokenFiles.size()));
+ out.write(")"); + } + else + { + first = false; + } + + builder.append("
![](");
+ builder.append(context.getExternalContext().getRequestContextPath());
+ builder.append("/images/icons/broken_link.gif){kind=icon}
");
+ builder.append(parseBrokenLink(link));
+ }
+
+ return builder.toString();
+ }
+
+ /**
+ * Removes the virtaulisation server host name from the link if appropriate
+ *
+ * @param linkUrl The URL that is broken
+ * @return Parsed URL
+ */
+ protected String parseBrokenLink(String linkUrl)
+ {
+ String link = linkUrl;
+
+ if (linkUrl.startsWith("http://") && linkUrl.indexOf("www--sandbox") != -1)
+ {
+ // remove the virtualisation server host name
+ int idx = linkUrl.indexOf("/", 7);
+ if (idx != -1)
+ {
+ link = linkUrl.substring(idx);
+ }
+ }
+
+ // truncate the link if it is longer than 60 chars
+ String title = link;
+ if (link.length() > 65)
+ {
+ link = link.substring(0, 30) + " ... " +
+ link.substring(link.length()-30);
+ }
+
+ return " " + link + "";
+ }
+
+ protected void renderTabHeader(ResponseWriter out, FacesContext context,
+ String tabId, boolean showExpandCollapseControls) throws IOException
+ {
+ out.write("");
+ out.write("![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ out.write("/images/icons/dec_tab_size.gif "\");
+ out.write(Application.getMessage(context, \"dec_tab_size\"));
+ out.write(\"")
![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ out.write("/images/icons/inc_tab_size.gif "\");
+ out.write(Application.getMessage(context, \"inc_tab_size\"));
+ out.write(\"")
");
+ out.write(fileName);
+ out.write("
");
+ out.write(filePath);
+ out.write("
");
+
+ if (brokenLinks != null && brokenLinks.length() > 0)
+ {
+ out.write("![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ if (brokenLinksExpanded)
+ {
+ out.write("/images/icons/arrow_open.gif){kind=icon}
");
+ out.write(Application.getMessage(context, "broken_links"));
+ out.write(" (");
+ out.write(Integer.toString(numBrokenLinks));
+ out.write(")");
+ out.write(Application.getMessage(context, "no_items"));
+ out.write("
");
+ }
+
+ /**
+ * Returns the icon to use given a file name
+ *
+ * @param fileName File name to find an icon for
+ * @return The path to the icon to use
+ */
+ protected String getIcon(String fileName)
+ {
+ // work out what icon to use
+ String icon = "/images/filetypes32/html.gif";
+ String ext = "";
+ int idx = fileName.indexOf(".");
+ if (idx != -1)
+ {
+ ext = fileName.substring(idx);
+ }
+
+ if (ext.equals(".xml"))
+ {
+ icon = "/images/icons/webform_large.gif";
+ }
+
+ return icon;
+ }
+
+ /**
+ * Aquire the UIActions component for the specified action group ID.
+ * Search for the component in the child list or create as needed.
+ *
+ * @param id ActionGroup id of the UIActions component
+ *
+ * @return UIActions component
+ */
+ @SuppressWarnings("unchecked")
+ protected UIActions aquireFileActions(String id, String store)
+ {
+ UIActions uiActions = null;
+ String componentId = id + '_' + store;
+
+ for (UIComponent component : (List");
+
+ if (showTitle)
+ {
+ out.write("![](");
- out.write(context.getExternalContext().getRequestContextPath());
- out.write("/images/icons/broken_link.gif)
");
- out.write(initialBrokenSummary);
out.write("");
- }
-
- @SuppressWarnings("unchecked")
- private UICommand aquireAction(FacesContext context, String actionId)
- {
- UICommand action = null;
- // try find the action as a child of this component
- for (UIComponent component : (List)getChildren())
+ if (showPanel)
{
- if (actionId.equals(component.getId()))
- {
- action = (UICommand)component;
- break;
- }
+ // finish the surrounding panel
+ PanelGenerator.generatePanelEnd(out, context.getExternalContext().getRequestContextPath(),
+ "innerwhite");
}
-
- if (action == null)
- {
- // create the action and add as a child component
- javax.faces.application.Application facesApp = context.getApplication();
- action = (UICommand)facesApp.createComponent(UICommand.COMPONENT_TYPE);
- action.setId(actionId);
- action.setValue(Application.getMessage(context, "update_status"));
- MethodBinding binding = facesApp.createMethodBinding("#{DialogManager.bean.updateStatus}",
- new Class[] {});
- action.setAction(binding);
- this.getChildren().add(action);
- }
-
- return action;
}
}
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
index ca99e60385..1e0ffb77a3 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -375,7 +375,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
out.write(")");
// Direct actions for a sandbox...
- Map params = new HashMap(3);
+ Map params = new HashMap(6);
params.put("store", mainStore);
params.put("username", username);
params.put("webapp", this.getWebapp());
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationBrokenFilesTag.java b/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationBrokenFilesTag.java
deleted file mode 100644
index d223a1657e..0000000000
--- a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationBrokenFilesTag.java
+++ /dev/null
@@ -1,82 +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"
- */
-package org.alfresco.web.ui.wcm.tag;
-
-import javax.faces.component.UIComponent;
-
-import org.alfresco.web.ui.common.tag.HtmlComponentTag;
-
-/**
- * Tag class for adding the UILinkValidationBrokenFiles component to a JSP page.
- *
- * @author gavinc
- */
-public class LinkValidationBrokenFilesTag extends HtmlComponentTag
-{
- private String value;
-
- /**
- * @see javax.faces.webapp.UIComponentTag#getComponentType()
- */
- public String getComponentType()
- {
- return "org.alfresco.faces.LinkValidationBrokenFiles";
- }
-
- /**
- * @see javax.faces.webapp.UIComponentTag#getRendererType()
- */
- public String getRendererType()
- {
- return null;
- }
-
- /**
- * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
- */
- protected void setProperties(UIComponent component)
- {
- super.setProperties(component);
-
- setStringProperty(component, "value", this.value);
- }
-
- /**
- * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
- */
- public void release()
- {
- super.release();
- this.value = null;
- }
-
- /**
- * @param value the value (the list of servers to deploy to)
- */
- public void setValue(String value)
- {
- this.value = value;
- }
-}
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationFixedFilesTag.java b/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationFixedFilesTag.java
deleted file mode 100644
index 094efeca57..0000000000
--- a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationFixedFilesTag.java
+++ /dev/null
@@ -1,82 +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"
- */
-package org.alfresco.web.ui.wcm.tag;
-
-import javax.faces.component.UIComponent;
-
-import org.alfresco.web.ui.common.tag.HtmlComponentTag;
-
-/**
- * Tag class for adding the UILinkValidationFixedFiles component to a JSP page.
- *
- * @author gavinc
- */
-public class LinkValidationFixedFilesTag extends HtmlComponentTag
-{
- private String value;
-
- /**
- * @see javax.faces.webapp.UIComponentTag#getComponentType()
- */
- public String getComponentType()
- {
- return "org.alfresco.faces.LinkValidationFixedFiles";
- }
-
- /**
- * @see javax.faces.webapp.UIComponentTag#getRendererType()
- */
- public String getRendererType()
- {
- return null;
- }
-
- /**
- * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
- */
- protected void setProperties(UIComponent component)
- {
- super.setProperties(component);
-
- setStringProperty(component, "value", this.value);
- }
-
- /**
- * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
- */
- public void release()
- {
- super.release();
- this.value = null;
- }
-
- /**
- * @param value the value (the list of servers to deploy to)
- */
- public void setValue(String value)
- {
- this.value = value;
- }
-}
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationBrokenFormsTag.java b/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationReportTag.java
similarity index 72%
rename from source/java/org/alfresco/web/ui/wcm/tag/LinkValidationBrokenFormsTag.java
rename to source/java/org/alfresco/web/ui/wcm/tag/LinkValidationReportTag.java
index 85a6d59038..564018e294 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationBrokenFormsTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationReportTag.java
@@ -29,20 +29,22 @@ import javax.faces.component.UIComponent;
import org.alfresco.web.ui.common.tag.HtmlComponentTag;
/**
- * Tag class for adding the UILinkValidationBrokenForms component to a JSP page.
+ * Tag class for adding the UILinkValidationReport component to a JSP page.
*
* @author gavinc
*/
-public class LinkValidationBrokenFormsTag extends HtmlComponentTag
+public class LinkValidationReportTag extends HtmlComponentTag
{
private String value;
+ private String itemsExpanded;
+ private String initialTab;
/**
* @see javax.faces.webapp.UIComponentTag#getComponentType()
*/
public String getComponentType()
{
- return "org.alfresco.faces.LinkValidationBrokenForms";
+ return "org.alfresco.faces.LinkValidationReport";
}
/**
@@ -61,6 +63,8 @@ public class LinkValidationBrokenFormsTag extends HtmlComponentTag
super.setProperties(component);
setStringProperty(component, "value", this.value);
+ setStringProperty(component, "initialTab", this.initialTab);
+ setBooleanProperty(component, "itemsExpanded", this.itemsExpanded);
}
/**
@@ -70,6 +74,8 @@ public class LinkValidationBrokenFormsTag extends HtmlComponentTag
{
super.release();
this.value = null;
+ this.itemsExpanded = null;
+ this.initialTab = null;
}
/**
@@ -79,4 +85,21 @@ public class LinkValidationBrokenFormsTag extends HtmlComponentTag
{
this.value = value;
}
+
+ /**
+ * @param value true to render the report with all broken links and
+ * generated files expanded
+ */
+ public void setItemsExpanded(String value)
+ {
+ this.itemsExpanded = value;
+ }
+
+ /**
+ * @param initialTab The initial tab to be selected
+ */
+ public void setInitialTab(String initialTab)
+ {
+ this.initialTab = initialTab;
+ }
}
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationSummaryTag.java b/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationSummaryTag.java
index da8ab72849..a2337594ad 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationSummaryTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/LinkValidationSummaryTag.java
@@ -36,7 +36,8 @@ import org.alfresco.web.ui.common.tag.HtmlComponentTag;
public class LinkValidationSummaryTag extends HtmlComponentTag
{
private String value;
- private String initialCheckOnly;
+ private String showPanel;
+ private String showTitle;
/**
* @see javax.faces.webapp.UIComponentTag#getComponentType()
@@ -62,7 +63,8 @@ public class LinkValidationSummaryTag extends HtmlComponentTag
super.setProperties(component);
setStringProperty(component, "value", this.value);
- setBooleanProperty(component, "initialCheckOnly", this.initialCheckOnly);
+ setBooleanProperty(component, "showPanel", this.showPanel);
+ setBooleanProperty(component, "showTitle", this.showTitle);
}
/**
@@ -72,7 +74,8 @@ public class LinkValidationSummaryTag extends HtmlComponentTag
{
super.release();
this.value = null;
- this.initialCheckOnly = null;
+ this.showPanel = null;
+ this.showTitle = null;
}
/**
@@ -84,10 +87,18 @@ public class LinkValidationSummaryTag extends HtmlComponentTag
}
/**
- * @param initialCheckOnly true will make the component only show the initial check summary info
+ * @param showPanel false to hide the surrounding panel
*/
- public void setInitialCheckOnly(String initialCheckOnly)
+ public void setShowPanel(String showPanel)
{
- this.initialCheckOnly = initialCheckOnly;
+ this.showPanel = showPanel;
+ }
+
+ /**
+ * @param showTitle false to hide the title within the panel
+ */
+ public void setShowTitle(String showTitle)
+ {
+ this.showTitle = showTitle;
}
}
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index fe4f0b5b08..c79accbeb1 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -2035,10 +2035,6 @@
avmSyncService
#{AVMSyncService}
-
- avmSubmittedAspect
- #{AVMSubmittedAspect}
-
avmBrowseBean
#{AVMBrowseBean}
@@ -2639,10 +2635,6 @@
avmSyncService
#{AVMSyncService}
-
- avmSubmittedAspect
- #{AVMSubmittedAspect}
-
avmBrowseBean
#{AVMBrowseBean}
@@ -2700,10 +2692,6 @@
avmSyncService
#{AVMSyncService}
-
- avmSubmittedAspect
- #{AVMSubmittedAspect}
-
avmBrowseBean
#{AVMBrowseBean}
@@ -3433,10 +3421,6 @@
avmBrowseBean
#{AVMBrowseBean}
-
- avmSubmittedAspect
- #{AVMSubmittedAspect}
-
workflowService
#{WorkflowService}
diff --git a/source/web/WEB-INF/faces-config-wcm.xml b/source/web/WEB-INF/faces-config-wcm.xml
index 589d14f801..f385d9be5f 100644
--- a/source/web/WEB-INF/faces-config-wcm.xml
+++ b/source/web/WEB-INF/faces-config-wcm.xml
@@ -50,18 +50,8 @@
- org.alfresco.faces.LinkValidationBrokenFiles
- org.alfresco.web.ui.wcm.component.UILinkValidationBrokenFiles
-
-
-
- org.alfresco.faces.LinkValidationBrokenForms
- org.alfresco.web.ui.wcm.component.UILinkValidationBrokenForms
-
-
-
- org.alfresco.faces.LinkValidationFixedFiles
- org.alfresco.web.ui.wcm.component.UILinkValidationFixedFiles
+ org.alfresco.faces.LinkValidationReport
+ org.alfresco.web.ui.wcm.component.UILinkValidationReport
diff --git a/source/web/WEB-INF/wcm.tld b/source/web/WEB-INF/wcm.tld
index 64354ccb27..6e873af69e 100644
--- a/source/web/WEB-INF/wcm.tld
+++ b/source/web/WEB-INF/wcm.tld
@@ -303,10 +303,17 @@
- initialCheckOnly
+ showPanel
false
true
- Only shows the initial check summary if set to true, false by default
+ Hides the surrounding panel if set to false, true by default
+
+
+
+ showTitle
+ false
+ true
+ Hides the summary report title if set to false, true by default
@@ -322,14 +329,21 @@
true
Flag to determine whether component should be rendered
+
+
+ styleClass
+ false
+ true
+ CSS class to apply to the summary panel (applies to outer div element)
+
- linkValidationBrokenFiles
- org.alfresco.web.ui.wcm.tag.LinkValidationBrokenFilesTag
+ linkValidationReport
+ org.alfresco.web.ui.wcm.tag.LinkValidationReportTag
JSP
- Link Validation Broken Files
- Displays broken file information for a link validation report
+ Link Validation Report
+ Displays the results of a link validation report
value
@@ -351,63 +365,22 @@
true
Flag to determine whether component should be rendered
-
-
-
- linkValidationBrokenForms
- org.alfresco.web.ui.wcm.tag.LinkValidationBrokenFormsTag
- JSP
- Link Validation Broken Forms
- Displays broken form information for a link validation report
- value
- true
+ itemsExpanded
+ false
true
- The link validation state object holding the report data
+
+ Flag to determine whether component should render the broken
+ links and generated files sections expanded
+
- id
+ initialTab
false
true
- The component identifier for this component
-
-
-
- rendered
- false
- true
- Flag to determine whether component should be rendered
-
-
-
-
- linkValidationFixedFiles
- org.alfresco.web.ui.wcm.tag.LinkValidationFixedFilesTag
- JSP
- Link Validation Fixed Files
- Displays the list of files fixed since the initial run of a link validation report
-
-
- value
- true
- true
- The link validation state object holding the report data
-
-
-
- id
- false
- true
- The component identifier for this component
-
-
-
- rendered
- false
- true
- Flag to determine whether component should be rendered
+ The tab to be initially selected
diff --git a/source/web/css/main.css b/source/web/css/main.css
index ddf6af6393..ef0a624a8c 100644
--- a/source/web/css/main.css
+++ b/source/web/css/main.css
@@ -719,6 +719,90 @@ a.sidebarButtonLink, a.sidebarButtonLink:link, a.sidebarButtonLink:visited
white-space: nowrap;
}
+.tabs
+{
+ width: 100%;
+ line-height: 1.5em;
+}
+
+.tabs ul
+{
+ margin: 0px;
+ padding: 10px 10px 0px 0px;
+ list-style: none;
+}
+
+.tabs li
+{
+ display: inline;
+ margin: 0px;
+ padding: 0px;
+}
+
+.tabs a
+{
+ float: left;
+ background: url("../images/parts/tab_left.gif") no-repeat left top;
+ margin: 0px;
+ padding: 0px 0px 0px 4px;
+ text-decoration: none;
+ cursor: pointer;
+}
+
+.tabs a:hover
+{
+ text-decoration: none;
+}
+
+.tabs a span
+{
+ float: left;
+ display: block;
+ background: url("../images/parts/tab_right.gif") no-repeat right top;
+ padding: 5px 10px 4px 4px;
+ margin-right: 2px;
+ color: #627EB7;
+}
+
+.tabs .selectedTab a
+{
+ background:url("../images/parts/tab_left_selected.gif") no-repeat left top;
+}
+
+.tabs .selectedTab a span
+{
+ background:url("../images/parts/tab_right_selected.gif") no-repeat right top;
+ color: white;
+}
+
+.tabs span.tabLabel
+{
+ font-weight: bold;
+ float:left;
+ display: block;
+ color: #627EB7;
+ padding: 4px 6px 0px 6px;
+}
+
+.tabs span.tabButton
+{
+ float:left;
+ display: block;
+ color: #627EB7;
+ padding: 3px 0px 0px 15px;
+}
+
+.expandCollapseControls
+{
+ float: left;
+ padding-top: 3px;
+}
+
+.incDecControls
+{
+ text-align: right;
+}
+
.linkValidationProgressPanel
{
width: 100%;
@@ -736,68 +820,176 @@ a.sidebarButtonLink, a.sidebarButtonLink:link, a.sidebarButtonLink:visited
font-size: 11px;
}
-.linkValidationReportTitle
-{
- color: #004488;
- font-size: 14px;
- font-weight: bold;
- padding-bottom: 8px;
-}
-
-.linkValidationReportSubTitle
-{
- color: #004488;
- font-weight: bold;
- font-size: 11px;
- padding-right: 8px;
-}
-
.linkValidationSummaryPanel
{
- margin: 6px;
- margin-top: 3px;
- padding: 8px;
- background-color: white;
+ text-align: center;
+}
+
+.linkValidationSummaryPanel img
+{
+ vertical-align: -4px;
+}
+
+.linkValidationSummaryTitle
+{
+ font-weight: bold;
+ font-size: 12px;
+ padding-bottom: 7px;
+}
+
+.linkValSummaryText
+{
+ padding-bottom: 4px;
+}
+
+.linkValidationSummaryPanelTask
+{
+ text-align: left;
+ margin-bottom: 10px;
+ margin-left: 4px;
+}
+
+.linkValidationSummaryPanelTask img
+{
+ vertical-align: -4px;
+}
- _width: 100%;
+.linkValTabContentHeader
+{
+ border-bottom: 1px dotted #BCD2E6;
+ padding: 8px 15px 8px 10px;
}
-.linkValidationBrokenFilesPanel
+.linkValTabContentHeader img
{
- margin: 6px;
- padding: 8px;
- background-color: white;
+ cursor: pointer;
}
-.linkValidationBrokenFormsPanel
-{
- margin: 6px;
- padding: 8px;
- background-color: white;
-}
-
-.linkValidationFixedFilesPanel
-{
- margin: 6px;
- padding: 8px;
- background-color: white;
-}
-
-.linkValidationList
+.linkValTabContentBody
{
+ height: 300px;
+ width: 100%;
overflow: auto;
- height: 132px;
- border: 1px solid #aaa;
}
-.linkValidationListOddRow
+.linkValRow
{
- background-color: white;
+ padding: 10px 0px 10px 10px;
}
-.linkValidationListEvenRow
+.linkValRowEven
{
- background-color: #f9f9f9;
+ background-color: #f9f9f9 !important;
+}
+
+.linkValRowOdd
+{
+ background-color: #fff !important;
+}
+
+.linkValNoItems
+{
+ padding: 10px;
+}
+
+.linkValIcon
+{
+ float: left;
+ width: 40px;
+}
+
+.linkValActions
+{
+ float: right;
+ width: 70px;
+ text-align: right;
+ padding-right: 10px;
+}
+
+.linkValItemDetails
+{
+ margin: 0px 80px 0px 40px;
+}
+
+.linkValFileName
+{
+ font-weight: bold;
+}
+
+.linkValFilePath
+{
+ padding-top: 2px;
+}
+
+.linkValFormName
+{
+ font-weight: bold;
+}
+
+.linkValFormPath
+{
+ padding-top: 2px;
+}
+
+.linkValToggle
+{
+ color: #505E6B;
+ padding-bottom: 3px;
+}
+
+.linkValToggleExpanded
+{
+ vertical-align: -6px;
+}
+
+.linkValToggleCollapsed
+{
+ vertical-align: -6px;
+}
+
+.linkValBrokenLinks
+{
+ margin-left: 2px;
+}
+
+.linkValBrokenLinks img
+{
+ vertical-align: -4px;
+}
+
+.tabTitleBrokenLinkIcon
+{
+ border: none;
+ vertical-align: -4px;
+ margin-right: 2px;
+ margin-left: 2px;
+}
+
+#staticTabContent
+{
+ -moz-border-radius: 9px;
+ border: 1px solid #BCD2E6;
+ clear: both;
+ padding-bottom: 5px;
+ margin-bottom: 5px;
+}
+
+#generatedTabContent
+{
+ -moz-border-radius: 9px;
+ border: 1px solid #BCD2E6;
+ clear: both;
+ padding-bottom: 5px;
+ margin-bottom: 5px;
+}
+
+#fixedTabContent
+{
+ -moz-border-radius: 9px;
+ border: 1px solid #BCD2E6;
+ clear: both;
+ padding-bottom: 5px;
+ margin-bottom: 5px;
}
diff --git a/source/web/images/icons/dec_tab_size.gif b/source/web/images/icons/dec_tab_size.gif
new file mode 100644
index 0000000000..95b55159b3
Binary files /dev/null and b/source/web/images/icons/dec_tab_size.gif differ
diff --git a/source/web/images/icons/green_tick.gif b/source/web/images/icons/green_tick.gif
new file mode 100644
index 0000000000..c715e56be0
Binary files /dev/null and b/source/web/images/icons/green_tick.gif differ
diff --git a/source/web/images/icons/inc_tab_size.gif b/source/web/images/icons/inc_tab_size.gif
new file mode 100644
index 0000000000..c7ebf42bc5
Binary files /dev/null and b/source/web/images/icons/inc_tab_size.gif differ
diff --git a/source/web/images/parts/tab_left.gif b/source/web/images/parts/tab_left.gif
new file mode 100644
index 0000000000..4639494056
Binary files /dev/null and b/source/web/images/parts/tab_left.gif differ
diff --git a/source/web/images/parts/tab_left_selected.gif b/source/web/images/parts/tab_left_selected.gif
new file mode 100644
index 0000000000..ae92213103
Binary files /dev/null and b/source/web/images/parts/tab_left_selected.gif differ
diff --git a/source/web/images/parts/tab_right.gif b/source/web/images/parts/tab_right.gif
new file mode 100644
index 0000000000..8ec115c11b
Binary files /dev/null and b/source/web/images/parts/tab_right.gif differ
diff --git a/source/web/images/parts/tab_right_selected.gif b/source/web/images/parts/tab_right_selected.gif
new file mode 100644
index 0000000000..6b20c2e80f
Binary files /dev/null and b/source/web/images/parts/tab_right_selected.gif differ
diff --git a/source/web/jsp/wcm/browse-sandbox.jsp b/source/web/jsp/wcm/browse-sandbox.jsp
index 16a7f5b438..0deeeeef50 100644
--- a/source/web/jsp/wcm/browse-sandbox.jsp
+++ b/source/web/jsp/wcm/browse-sandbox.jsp
@@ -35,6 +35,32 @@
+
+
<%-- load a bundle of properties with I18N strings --%>
+
+
+
+
+
+
+ facetsId="folder-panel-facets" label="#{msg.website_browse_folders}">
-
@@ -160,14 +195,6 @@
-
-
- --%>
-
<%-- Creator column --%>
@@ -228,10 +255,19 @@
+
+
+
+
+
+
+ facetsId="files-panel-facets" label="#{msg.website_browse_files}">
-
@@ -247,14 +283,6 @@
-
-
- --%>
-
<%-- Size column --%>
diff --git a/source/web/jsp/wcm/link-validation.jsp b/source/web/jsp/wcm/link-validation.jsp
index 558bc1e3fa..1a50aad56b 100644
--- a/source/web/jsp/wcm/link-validation.jsp
+++ b/source/web/jsp/wcm/link-validation.jsp
@@ -36,11 +36,11 @@
+
diff --git a/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp b/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp
index 3f51349b7b..9fdffafbf4 100644
--- a/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp
+++ b/source/web/jsp/wcm/manage-broken-links-task-dialog.jsp
@@ -52,10 +52,11 @@
-
diff --git a/source/web/scripts/ajax/link-validation-report.js b/source/web/scripts/ajax/link-validation-report.js
index fc7babf0bf..4981e064e9 100644
--- a/source/web/scripts/ajax/link-validation-report.js
+++ b/source/web/scripts/ajax/link-validation-report.js
@@ -1,12 +1,69 @@
+Alfresco.tabSelected = function(tab)
+{
+ var tabElem = document.getElementById(_alfCurrentTab);
+ if (tabElem != null)
+ {
+ tabElem.className = "";
+ }
+
+ var tabContentElem = document.getElementById(_alfCurrentTab + "Content");
+ if (tabContentElem != null)
+ {
+ tabContentElem.style.display = "none";
+ }
+
+ tabElem = document.getElementById(tab + "Tab");
+ if (tabElem != null)
+ {
+ tabElem.className = "selectedTab";
+ _alfCurrentTab = tab + "Tab";
+ }
+
+ tabContentElem = document.getElementById(tab + "TabContent");
+ if (tabContentElem != null)
+ {
+ tabContentElem.style.display = "block";
+ }
+}
+
+Alfresco.toggleBrokenLinks = function(icon, brokenLinksId)
+{
+ var currentState = icon.className;
+ var brokenLinksDiv = document.getElementById(brokenLinksId);
+
+ if (currentState == "linkValToggleCollapsed")
+ {
+ icon.src = getContextPath() + "/images/icons/arrow_open.gif";
+ icon.className = "linkValToggleExpanded";
+
+ // show the div holding the broken links
+ if (brokenLinksDiv != null)
+ {
+ brokenLinksDiv.style.display = "block";
+ }
+ }
+ else
+ {
+ icon.src = getContextPath() + "/images/icons/arrow_closed.gif";
+ icon.className = "linkValToggleCollapsed";
+
+ // hide the div holding the broken links
+ if (brokenLinksDiv != null)
+ {
+ brokenLinksDiv.style.display = "none";
+ }
+ }
+}
+
Alfresco.toggleGeneratedFiles = function(icon, genFilesId)
{
var currentState = icon.className;
var genFilesDiv = document.getElementById(genFilesId);
- if (currentState == "collapsed")
+ if (currentState == "linkValToggleCollapsed")
{
icon.src = getContextPath() + "/images/icons/arrow_open.gif";
- icon.className = "expanded";
+ icon.className = "linkValToggleExpanded";
// show the div holding the generated files
if (genFilesDiv != null)
@@ -17,7 +74,7 @@ Alfresco.toggleGeneratedFiles = function(icon, genFilesId)
else
{
icon.src = getContextPath() + "/images/icons/arrow_closed.gif";
- icon.className = "collapsed";
+ icon.className = "linkValToggleCollapsed";
// hide the div holding the generated files
if (genFilesDiv != null)
@@ -25,4 +82,36 @@ Alfresco.toggleGeneratedFiles = function(icon, genFilesId)
genFilesDiv.style.display = "none";
}
}
-}
\ No newline at end of file
+}
+
+Alfresco.increaseTabSize = function(tabBodyId)
+{
+ var tabElem = document.getElementById(tabBodyId);
+
+ if (tabElem != null)
+ {
+ var currentHeight = YAHOO.util.Dom.getStyle(tabElem, "height");
+ var size = currentHeight.substring(0, currentHeight.length-2);
+ var newSize = Number(size) + 100;
+
+ YAHOO.util.Dom.setStyle(tabElem, "height", newSize + "px");
+ }
+}
+
+Alfresco.decreaseTabSize = function(tabBodyId)
+{
+ var tabElem = document.getElementById(tabBodyId);
+
+ if (tabElem != null)
+ {
+ var currentHeight = YAHOO.util.Dom.getStyle(tabElem, "height");
+ var size = currentHeight.substring(0, currentHeight.length-2);
+ var newSize = Number(size) - 100;
+ if (newSize < 100)
+ {
+ newSize = 100;
+ }
+
+ YAHOO.util.Dom.setStyle(tabElem, "height", newSize + "px");
+ }
+}
");
+ out.write(bundle.getString("report_summary"));
+ out.write("
");
+ }
+
if (linkState.getError() == null)
{
- Object initialCheckOnly = this.getAttributes().get("initialCheckOnly");
- if (initialCheckOnly instanceof Boolean &&
- ((Boolean)initialCheckOnly).booleanValue())
+ // render the main summary info
+
+ int latestVersion = linkState.getLatestSnapshotVersion();
+ int baseVersion = linkState.getBaseSnapshotVersion();
+
+ String pattern = bundle.getString("link_check_completed_at");
+ Date checkAt = linkState.getCheckCompletedAt();
+ String checkTime = Utils.getDateTimeFormat(context).format(checkAt);
+ String checkTimeSummary = MessageFormat.format(pattern,
+ new Object[] {checkTime, baseVersion});
+
+ out.write("");
+ out.write(checkTimeSummary);
+
+ // NOTE: Whenever latestVersion > baseVersion, link validation is "behind".
+ if (latestVersion > baseVersion)
{
- out.write("![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+ out.write("/images/icons/warning.gif)
");
+ out.write(bundle.getString("link_check_not_latest"));
+ out.write(")");
+ }
+
+ pattern = bundle.getString("link_check_items_found");
+ String checkedSummary = MessageFormat.format(pattern,
+ new Object[] {linkState.getNumberFilesChecked(),
+ linkState.getNumberLinksChecked()});
+
+ pattern = bundle.getString("link_check_items_broken");
+ String brokenSummary = MessageFormat.format(pattern,
+ new Object[] {linkState.getNumberBrokenLinks(),
+ linkState.getNumberBrokenFiles()});
+
+ out.write("
");
- renderInitialCheckSummary(context, out, linkState, bundle);
- out.write("
");
+ out.write(" ( ");
+ out.write(bundle.getString("link_check_not_latest"));
+ out.write(")");
+ }
+
+ pattern = bundle.getString("link_check_items_found");
+ String checkedSummary = MessageFormat.format(pattern,
+ new Object[] {linkState.getNumberFilesChecked(),
+ linkState.getNumberLinksChecked()});
+
+ pattern = bundle.getString("link_check_items_broken");
+ String brokenSummary = MessageFormat.format(pattern,
+ new Object[] {linkState.getNumberBrokenLinks(),
+ linkState.getNumberBrokenFiles()});
+
+ out.write("");
+ out.write(checkedSummary);
+ out.write(" ![](");
+ out.write(context.getExternalContext().getRequestContextPath());
+
+ if (linkState.getNumberBrokenLinks() == 0)
+ {
+ out.write("/images/icons/info_icon.gif)
");
+ out.write(bundle.getString("link_check_no_broken"));
}
else
{
- String pattern = bundle.getString("files_links_still_broken");
- String stillBroken = MessageFormat.format(pattern,
- new Object[] {linkState.getNumberBrokenLinks(), linkState.getNumberBrokenFiles()});
- pattern = bundle.getString("broken_items_fixed");
- String linksFixed = MessageFormat.format(pattern,
- new Object[] {linkState.getNumberFixedItems()});
-
- // get the action to update the current status
- UICommand updateStatusAction = aquireAction(context, "update_status_" + linkState.getStore());
-
-
- out.write("
");
}
else
{
- String pattern = bundle.getString("files_links_checked_error");
- Date initialCheck = linkState.getInitialCheckCompletedAt();
+ // render the error that occurred
+ String pattern = bundle.getString("link_check_error");
+ Date initialCheck = linkState.getCheckCompletedAt();
String initialCheckTime = Utils.getDateTimeFormat(context).format(initialCheck);
String initialCheckSummary = MessageFormat.format(pattern,
new Object[] {initialCheckTime});
- out.write(" ");
+ out.write(bundle.getString("link_check_no_broken"));
}
else
{
- String pattern = bundle.getString("files_links_still_broken");
- String stillBroken = MessageFormat.format(pattern,
- new Object[] {linkState.getNumberBrokenLinks(), linkState.getNumberBrokenFiles()});
- pattern = bundle.getString("broken_items_fixed");
- String linksFixed = MessageFormat.format(pattern,
- new Object[] {linkState.getNumberFixedItems()});
-
- // get the action to update the current status
- UICommand updateStatusAction = aquireAction(context, "update_status_" + linkState.getStore());
-
-
- out.write("");
-
- // render the summary area with a surrounding panel
- PanelGenerator.generatePanelStart(out, context.getExternalContext().getRequestContextPath(),
- "innerwhite", "white");
-
- out.write("
");
-
- // finish the surrounding panel
- PanelGenerator.generatePanelEnd(out, context.getExternalContext().getRequestContextPath(),
- "innerwhite");
-
- out.write("
");
+ out.write("/images/icons/warning.gif' /> ");
+ out.write(brokenSummary);
}
+ out.write("");
- out.write(bundle.getString("summary"));
- out.write("
| "); - out.write(bundle.getString("initial_check")); - out.write(": | "); - renderInitialCheckSummary(context, out, linkState, bundle); - out.write(" |
| "); - out.write(bundle.getString("current_status")); - out.write(": | ![](");
- out.write(context.getExternalContext().getRequestContextPath());
- out.write("/images/icons/broken_link.gif){kind=icon} ");
- out.write(stillBroken);
- out.write(" ![](");
- out.write(context.getExternalContext().getRequestContextPath());
- out.write("/images/icons/fixed_link.gif){kind=icon} ");
- out.write(linksFixed);
- out.write(" ");
- Utils.encodeRecursive(context, updateStatusAction);
- out.write(" |
");
out.write(initialCheckSummary);
out.write(" ");
String err = linkState.getError().getMessage();
@@ -158,61 +188,16 @@ public class UILinkValidationSummary extends AbstractLinkValidationReportCompone
{
out.write(err);
}
- out.write("
");
+ out.write("");
}
- }
-
- protected void renderInitialCheckSummary(FacesContext context,
- ResponseWriter out, LinkValidationState linkState,
- ResourceBundle bundle) throws IOException
- {
- String pattern = bundle.getString("files_links_checked");
- Date initialCheck = linkState.getInitialCheckCompletedAt();
- String initialCheckTime = Utils.getDateTimeFormat(context).format(initialCheck);
- String initialCheckSummary = MessageFormat.format(pattern,
- new Object[] {initialCheckTime, linkState.getInitialNumberFilesChecked(),
- linkState.getInitialNumberLinksChecked()});
- pattern = bundle.getString("files_links_broken");
- String initialBrokenSummary = MessageFormat.format(pattern,
- new Object[] {linkState.getInitialNumberBrokenLinks(), linkState.getInitialNumberBrokenFiles()});
- out.write("");
- out.write(initialCheckSummary);
- out.write("
");
- out.write(initialBrokenSummary);
out.write("