From e022ced8250eed6df77bff1d401bedf859e9fe87 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 19 Jul 2006 17:03:07 +0000 Subject: [PATCH] . Dashboards impl checkpoint - beginnings of the dashboard configuration wizard (layouts) - icons for various layouts (a bit of Photoshop fun) - working layouts for single column, 2 column left and right narrow, three column . Added "immediate" attribute to ActionLink component - same functionality as for standard JSF Command Button . Fixed Wizard container.jsp to use "immediate=true" on Cancel button git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/bean/dashboard/DashboardWizard.java | 2 +- source/web/jsp/dashboards/wizard/columns.jsp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java index 3c031cbcfc..1b1bdf49a7 100644 --- a/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java +++ b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java @@ -64,7 +64,7 @@ public class DashboardWizard extends BaseWizardBean */ protected String finishImpl(FacesContext context, String outcome) throws Exception { - return null; + return outcome; } /** diff --git a/source/web/jsp/dashboards/wizard/columns.jsp b/source/web/jsp/dashboards/wizard/columns.jsp index d8c548e8d4..f609540f4e 100644 --- a/source/web/jsp/dashboards/wizard/columns.jsp +++ b/source/web/jsp/dashboards/wizard/columns.jsp @@ -21,3 +21,14 @@ <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + +