diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index dcfec20cc..915e1a49f 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -854,7 +854,19 @@ dashboard_info=My Alfresco Dashboard dashboard_description=Configure this view and build your personal Alfresco dashboard configure=Configure -# My Alfresco Dashlets messages +# My Alfresco Layout Manager wizard messages +configure_dashboard_title=Configure Dashboard Wizard +configure_dashboard_desc=This wizard helps you configure your dashboard layout and contents +step_layout=Layout +configure_dashboard_step1_title=Step One - Select Layout +configure_dashboard_step1_desc=Choose the layout and number of columns for your dashboard. +step_columns=Components +configure_dashboard_step2_title=Step Two - Select Components +configure_dashboard_step2_desc=Select the components for your dashboard and add them to the columns. +configure_dashboard_finish_instruction=To save the dashboard configuration click Finish. To review or change your selections click Back. +select_layout=Select the style of layout for your dashboard. + +# My Alfresco Layouts messages layout_single_label=Single Column layout_single_desc=This layout displays components in a single column the full width of the page layout_narrow_left_label=Two Column Narrow Left @@ -863,6 +875,8 @@ layout_narrow_right_label=Two Column Narrow Right layout_narrow_right_desc=This layout display components in two columns with a narrow right hand column layout_three_column_label=Three Column layout_three_column_desc=This layout displays components across three columns of equal width + +# My Alfresco Dashlet components messages dashlet_gettingstarted_label=Getting Started dashlet_gettingstarted_desc=This component displays helpful information and links for getting started with the Alfresco web-client application diff --git a/config/alfresco/web-client-config-wizards.xml b/config/alfresco/web-client-config-wizards.xml index 638d499e6..a3aad002c 100644 --- a/config/alfresco/web-client-config-wizards.xml +++ b/config/alfresco/web-client-config-wizards.xml @@ -158,6 +158,30 @@ + + + + + + + + + + + + + diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index c60cac453..f4f1690fd 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -166,16 +166,16 @@ - - - - diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java index 5f3d66c36..e88f7fc33 100644 --- a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java +++ b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java @@ -42,8 +42,8 @@ public final class DashboardManager private static Log logger = LogFactory.getLog(DashboardManager.class); private static final String PREF_DASHBOARD = "dashboard"; - private static final String LAYOUT_DEFAULT = "default"; - private static final String DASHLET_DEFAULT = "getting-started"; + static final String LAYOUT_DEFAULT = "default"; + static final String DASHLET_DEFAULT = "getting-started"; private static final String JSP_DUMMY = "/jsp/dashboards/dummy.jsp"; @@ -202,7 +202,7 @@ public final class DashboardManager /** * @return The externally configured WebClient config element for the Dashboards */ - private static DashboardsConfigElement getDashboardConfig() + public static DashboardsConfigElement getDashboardConfig() { ConfigService service = Application.getConfigService(FacesContext.getCurrentInstance()); DashboardsConfigElement config = (DashboardsConfigElement)service.getConfig("Dashboards").getConfigElement( diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java new file mode 100644 index 000000000..3c031cbcf --- /dev/null +++ b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java @@ -0,0 +1,173 @@ +/* + * 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. + */ +package org.alfresco.web.bean.dashboard; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.faces.context.FacesContext; + +import org.alfresco.web.app.Application; +import org.alfresco.web.bean.wizard.BaseWizardBean; +import org.alfresco.web.config.DashboardsConfigElement; +import org.alfresco.web.config.DashboardsConfigElement.DashletDefinition; +import org.alfresco.web.config.DashboardsConfigElement.LayoutDefinition; +import org.alfresco.web.ui.common.component.UIListItem; +import org.alfresco.web.ui.common.component.description.UIDescription; + +/** + * @author Kevin Roast + */ +public class DashboardWizard extends BaseWizardBean +{ + /** List of icons items to display as selectable Layout definitions */ + private List layoutIcons = null; + + /** List of descriptions of the layouts */ + private List layoutDescriptions= null; + + /** Currently selected layout */ + private String layout = DashboardManager.LAYOUT_DEFAULT; + + + // ------------------------------------------------------------------------------ + // Wizard implementation + + /** + * @see org.alfresco.web.bean.dialog.BaseDialogBean#init(java.util.Map) + */ + public void init(Map parameters) + { + super.init(parameters); + + + } + + /** + * @see org.alfresco.web.bean.dialog.BaseDialogBean#finishImpl(javax.faces.context.FacesContext, java.lang.String) + */ + protected String finishImpl(FacesContext context, String outcome) throws Exception + { + return null; + } + + /** + * @return Returns the summary data for the wizard. + */ + public String getSummary() + { + LayoutDefinition def = DashboardManager.getDashboardConfig().getLayoutDefinition(this.layout); + String label = def.Label; + if (label == null || label.length() == 0) + { + label = Application.getMessage(FacesContext.getCurrentInstance(), def.LabelId); + } + return buildSummary( + new String[]{"Layout"}, + new String[]{label}); + } + + + // ------------------------------------------------------------------------------ + // Dashboard Wizard bean getters + + /** + * @return The currently selected layout ID - used by the Dynamic Description component + */ + public String getLayout() + { + // TODO: implement - need current PageConfig from DashboardManager + return this.layout; + } + + /** + * Set the currently selected layout ID + */ + public void setLayout(String layout) + { + this.layout = layout; + } + + /** + * @return List of UIDescription objects for the available layouts + */ + public List getLayoutDescriptions() + { + if (this.layoutDescriptions == null) + { + buildLayoutValueLists(); + } + return this.layoutDescriptions; + } + + /** + * @return the List of UIListItem objects representing the Layout icons + */ + public List getLayoutIcons() + { + if (this.layoutIcons == null) + { + buildLayoutValueLists(); + } + return this.layoutIcons; + } + + private void buildLayoutValueLists() + { + List icons = new ArrayList(4); + List descriptions = new ArrayList(4); + + FacesContext context = FacesContext.getCurrentInstance(); + + DashboardsConfigElement config = DashboardManager.getDashboardConfig(); + Iterator layoutItr = config.getLayouts().iterator(); + while (layoutItr.hasNext()) + { + LayoutDefinition layoutDef = layoutItr.next(); + + // build UIListItem to represent the layout image + String label = layoutDef.Label; + if (label == null || label.length() == 0) + { + label = Application.getMessage(context, layoutDef.LabelId); + } + String desc = layoutDef.Description; + if (desc == null || desc.length() == 0) + { + desc = Application.getMessage(context, layoutDef.DescriptionId); + } + UIListItem item = new UIListItem(); + item.setLabel(label); + item.setTooltip(desc); + item.setValue(layoutDef.Id); + // set the special attribute used by the imageRadioPicker component + item.getAttributes().put("image", layoutDef.Image); + icons.add(item); + + // build UIDescription to represent the layout description text + UIDescription description = new UIDescription(); + description.setControlValue(layoutDef.Id); + description.setText(desc); + descriptions.add(description); + } + + this.layoutIcons = icons; + this.layoutDescriptions = descriptions; + } +} diff --git a/source/java/org/alfresco/web/config/DashboardsConfigElement.java b/source/java/org/alfresco/web/config/DashboardsConfigElement.java index 3a3efc89a..d35e0256e 100644 --- a/source/java/org/alfresco/web/config/DashboardsConfigElement.java +++ b/source/java/org/alfresco/web/config/DashboardsConfigElement.java @@ -16,6 +16,7 @@ */ package org.alfresco.web.config; +import java.util.Collection; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -99,14 +100,14 @@ public class DashboardsConfigElement extends ConfigElementAdapter return this.dashletDefs.get(id); } - public Iterator getLayouts() + public Collection getLayouts() { - return this.layoutDefs.entrySet().iterator(); + return this.layoutDefs.values(); } - public Iterator getDashlets() + public Collection getDashlets() { - return this.dashletDefs.entrySet().iterator(); + return this.dashletDefs.values(); } /** diff --git a/source/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java b/source/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java index 979872f66..e3931a3a8 100644 --- a/source/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java +++ b/source/java/org/alfresco/web/ui/common/tag/ActionLinkTag.java @@ -57,7 +57,7 @@ public class ActionLinkTag extends HtmlComponentTag setStringProperty(component, "value", this.value); setStringProperty(component, "target", this.target); setStringProperty(component, "onclick", this.onclick); - + setBooleanProperty(component, "immediate", this.immediate); // TODO: Add image width/height properties } @@ -77,6 +77,7 @@ public class ActionLinkTag extends HtmlComponentTag this.href = null; this.target = null; this.onclick = null; + this.immediate = null; } /** @@ -178,6 +179,11 @@ public class ActionLinkTag extends HtmlComponentTag { this.onclick = onclick; } + + public void setImmediate(String immediate) + { + this.immediate = immediate; + } /** the target */ private String target; @@ -208,4 +214,7 @@ public class ActionLinkTag extends HtmlComponentTag /** the onclick handler */ private String onclick; + + /** the immediate flag */ + private String immediate; } diff --git a/source/web/WEB-INF/alfresco.tld b/source/web/WEB-INF/alfresco.tld index 6d3d9e2a2..cf592f757 100644 --- a/source/web/WEB-INF/alfresco.tld +++ b/source/web/WEB-INF/alfresco.tld @@ -657,6 +657,12 @@ false true + + + immediate + false + true + diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml index 2dcdcba70..d82e78280 100644 --- a/source/web/WEB-INF/faces-config-beans.xml +++ b/source/web/WEB-INF/faces-config-beans.xml @@ -1443,6 +1443,43 @@ org.alfresco.web.bean.dashboard.DashboardManager session + + + + The bean that backs up the Dashboard Config Wizard + + DashboardWizard + org.alfresco.web.bean.dashboard.DashboardWizard + session + + nodeService + #{NodeService} + + + fileFolderService + #{FileFolderService} + + + searchService + #{SearchService} + + + navigator + #{NavigationBean} + + + browseBean + #{BrowseBean} + + + dictionaryService + #{DictionaryService} + + + namespaceService + #{NamespaceService} + + diff --git a/source/web/css/main.css b/source/web/css/main.css index 49419161f..0eb69f108 100644 --- a/source/web/css/main.css +++ b/source/web/css/main.css @@ -492,16 +492,19 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl .tableThirdWidth { width: 33%; + vertical-align: top; } .tableNarrowWidth { width: 30%; + vertical-align: top; } .tableWideWidth { width: 70%; + vertical-align: top; } .summaryPopupPanel diff --git a/source/web/images/icons/configure_dashboard.gif b/source/web/images/icons/configure_dashboard.gif new file mode 100644 index 000000000..d79e1a233 Binary files /dev/null and b/source/web/images/icons/configure_dashboard.gif differ diff --git a/source/web/images/icons/configure_dashboard_large.gif b/source/web/images/icons/configure_dashboard_large.gif new file mode 100644 index 000000000..336f7967d Binary files /dev/null and b/source/web/images/icons/configure_dashboard_large.gif differ diff --git a/source/web/images/icons/layout_narrow_left_2column.gif b/source/web/images/icons/layout_narrow_left_2column.gif new file mode 100644 index 000000000..37ca9d084 Binary files /dev/null and b/source/web/images/icons/layout_narrow_left_2column.gif differ diff --git a/source/web/images/icons/layout_narrow_right_2column.gif b/source/web/images/icons/layout_narrow_right_2column.gif new file mode 100644 index 000000000..b129f738b Binary files /dev/null and b/source/web/images/icons/layout_narrow_right_2column.gif differ diff --git a/source/web/images/icons/layout_single_column.gif b/source/web/images/icons/layout_single_column.gif new file mode 100644 index 000000000..b02e7269e Binary files /dev/null and b/source/web/images/icons/layout_single_column.gif differ diff --git a/source/web/images/icons/layout_three_column.gif b/source/web/images/icons/layout_three_column.gif new file mode 100644 index 000000000..7204f5a5f Binary files /dev/null and b/source/web/images/icons/layout_three_column.gif differ diff --git a/source/web/jsp/dashboards/container.jsp b/source/web/jsp/dashboards/container.jsp index 63a8decb8..f5b8745a5 100644 --- a/source/web/jsp/dashboards/container.jsp +++ b/source/web/jsp/dashboards/container.jsp @@ -73,6 +73,9 @@
+ + + diff --git a/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp b/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp index 9ba8d8842..d587b9543 100644 --- a/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp +++ b/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp @@ -21,7 +21,7 @@ <%@ page import="org.alfresco.web.app.Application" %> - + <% Application.getDashboardManager().initDashboard(); %> <% Application.getDashboardManager().initDashboard(); %> - + diff --git a/source/web/jsp/dashboards/layouts/three-column.jsp b/source/web/jsp/dashboards/layouts/three-column.jsp index 71fc017b9..677b41158 100644 --- a/source/web/jsp/dashboards/layouts/three-column.jsp +++ b/source/web/jsp/dashboards/layouts/three-column.jsp @@ -21,8 +21,8 @@ <%@ page import="org.alfresco.web.app.Application" %> -<%=Application.getDashboardManager()...%> + <% Application.getDashboardManager().initDashboard(); %> diff --git a/source/web/jsp/parts/titlebar.jsp b/source/web/jsp/parts/titlebar.jsp index 01840f130..cc014227a 100644 --- a/source/web/jsp/parts/titlebar.jsp +++ b/source/web/jsp/parts/titlebar.jsp @@ -64,7 +64,7 @@   - + diff --git a/source/web/jsp/wizard/container.jsp b/source/web/jsp/wizard/container.jsp index 64d64be19..fdaa72d1b 100644 --- a/source/web/jsp/wizard/container.jsp +++ b/source/web/jsp/wizard/container.jsp @@ -163,7 +163,7 @@ + action="#{WizardManager.cancel}" immediate="true" />