From b6049d4b9eabb7bc7e3b925822364ad744f7189c Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 29 Nov 2006 12:44:15 +0000 Subject: [PATCH] . Full summary screen added to Create Web Project wizard git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient.properties | 1 + config/alfresco/web-client-config-wizards.xml | 2 +- .../web/bean/wcm/CreateWebsiteWizard.java | 23 ++++- .../jsp/wcm/create-form-wizard/summary.jsp | 1 + .../jsp/wcm/create-website-wizard/summary.jsp | 96 +++++++++++++++++++ 5 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 source/web/jsp/wcm/create-website-wizard/summary.jsp diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 3f60c410d0..7130b14f7c 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -818,6 +818,7 @@ website_dnsname=DNS name validation_invalid_dns_name=Invalid website DNS name, a minimum of 2 alpha-numeric characters are accepted. website_webapp=Default Webapp website_selected_forms=Selected Web Content Forms +website_web_content_forms=Web Content Forms website_save_location=Save Location website_save_location_info=Use the following pattern when saving content website_filename_pattern=Filename pattern diff --git a/config/alfresco/web-client-config-wizards.xml b/config/alfresco/web-client-config-wizards.xml index 586381d541..ef59a73aa1 100644 --- a/config/alfresco/web-client-config-wizards.xml +++ b/config/alfresco/web-client-config-wizards.xml @@ -40,7 +40,7 @@ instruction-id="default_instruction" /> - diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java index 13cb658080..4ed5275322 100644 --- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java @@ -441,7 +441,6 @@ public class CreateWebsiteWizard extends BaseWizardBean public String getSummary() { FacesContext fc = FacesContext.getCurrentInstance(); - ResourceBundle bundle = Application.getBundle(fc); // build a summary section to list the invited users and there roles StringBuilder buf = new StringBuilder(128); @@ -465,10 +464,8 @@ public class CreateWebsiteWizard extends BaseWizardBean } return buildSummary( - new String[] {bundle.getString(MSG_NAME), - bundle.getString(MSG_DESCRIPTION), - bundle.getString(MSG_USERROLES)}, - new String[] {this.name, this.description, buf.toString()}); + new String[] {Application.getMessage(fc, MSG_USERROLES)}, + new String[] {buf.toString()}); } @@ -489,6 +486,14 @@ public class CreateWebsiteWizard extends BaseWizardBean return this.formsDataModel; } + + /** + * @return the List of selected and configured Form objects (for summary screen) + */ + public List getForms() + { + return this.forms; + } /** * @param formsDataModel JSF data model for the Form templates @@ -627,6 +632,14 @@ public class CreateWebsiteWizard extends BaseWizardBean this.workflowsDataModel = workflowsDataModel; } + /** + * @return the list of workflows (for the summary screen) + */ + public List getWorkflows() + { + return this.workflows; + } + /** * @return List of UI items to represent the available Workflows for all websites */ diff --git a/source/web/jsp/wcm/create-form-wizard/summary.jsp b/source/web/jsp/wcm/create-form-wizard/summary.jsp index f6a7fbb48d..90035e045c 100644 --- a/source/web/jsp/wcm/create-form-wizard/summary.jsp +++ b/source/web/jsp/wcm/create-form-wizard/summary.jsp @@ -20,6 +20,7 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> <%@ page isELIgnored="false" %> + diff --git a/source/web/jsp/wcm/create-website-wizard/summary.jsp b/source/web/jsp/wcm/create-website-wizard/summary.jsp new file mode 100644 index 0000000000..f8091168d5 --- /dev/null +++ b/source/web/jsp/wcm/create-website-wizard/summary.jsp @@ -0,0 +1,96 @@ +<%-- + Copyright (C) 2005 Alfresco, Inc. + + Licensed under the Mozilla Public License version 1.1 + with a permitted attribution clause. You may obtain a + copy of the License at + + http://www.alfresco.org/legal/license.txt + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + either express or implied. See the License for the specific + language governing permissions and limitations under the + License. + --%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +<%@ page isELIgnored="false" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${r.name} + + ${r.title} + + ${r.filenamePattern} + + + ${r.workflow.name} + + + ${msg.none} + + + + + + + + + + + + + + ${r.name} + + ${r.title} + + ${r.filenamePattern} + + + + + + + + + + + +