inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

. Dashboards impl checkpoint

Browse Source 
- Dashboard configuration wizard - finished column editing page
  - Fixed 3 column layout to display correctly
  - Added some fake example dashlets so we can play with the layouts and config etc.
  - Added a FreeMarker template based dashlet component as an example

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-07-21 11:07:31 +00:00
parent 6cb76e8190
commit 6e095ad6dc
20 changed files with 331 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/webclient.properties
View File

@@ -871,6 +871,7 @@ dashlet_btn_select=Add
dashlet_btn_remove=Remove
selected_dashlets=Selected Components
dashboard_column=Column
column_max_components=this column can display {0} components
# My Alfresco Layouts messages
layout_single_label=Single Column

23
config/alfresco/web-client-config.xml
View File

@@ -169,12 +169,12 @@
<layout id="default" columns="1" column-length="5" image="/images/icons/layout_single_column.gif"
label-id="layout_single_label" description-id="layout_single_desc"
jsp="/jsp/dashboards/layouts/single-column.jsp" />
<layout id="narrow-left-2column" columns="2" column-length="4" image="/images/icons/layout_narrow_left_2column.gif"
label-id="layout_narrow_left_label" description-id="layout_narrow_left_desc"
jsp="/jsp/dashboards/layouts/narrow-left-2column.jsp" />
<layout id="narrow-right-2column" columns="2" column-length="4" image="/images/icons/layout_narrow_right_2column.gif"
label-id="layout_narrow_right_label" description-id="layout_narrow_right_desc"
jsp="/jsp/dashboards/layouts/narrow-right-2column.jsp" />
<layout id="narrow-left-2column" columns="2" column-length="4" image="/images/icons/layout_narrow_left_2column.gif"
label-id="layout_narrow_left_label" description-id="layout_narrow_left_desc"
jsp="/jsp/dashboards/layouts/narrow-left-2column.jsp" />
<layout id="three-column" columns="3" column-length="4" image="/images/icons/layout_three_column.gif"
label-id="layout_three_column_label" description-id="layout_three_column_desc"
jsp="/jsp/dashboards/layouts/three-column.jsp" />
@@ -184,9 +184,20 @@
<dashlet id="getting-started" label-id="dashlet_gettingstarted_label"
description-id="dashlet_gettingstarted_desc"
jsp="/jsp/dashboards/dashlets/getting-started.jsp" allow-narrow="false" />
<!-- TEMP -->
<dashlet id="task-list" label="My Tasklist" description="A description of the Task List"
jsp="/jsp/dashboards/dashlets/tasklist.jsp" allow-narrow="false" />
<!-- TEMP! -->
<dashlet id="my-docs-template" label="My Documents"
description="My Documents Template Page"
jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />
<dashlet id="task-list" label="My Tasklist To-do" description="List of your tasks still to complete"
jsp="/jsp/dashboards/dashlets/tasklist-todo.jsp" allow-narrow="false" />
<dashlet id="task-list-complete" label="My Tasks Completed" description="List of your completed tasks"
jsp="/jsp/dashboards/dashlets/tasklist-completed.jsp" allow-narrow="false" />
<dashlet id="content-checkedout" label="My Checkedout Content" description="List of the content checked out to you"
jsp="/jsp/dashboards/dashlets/content-checkedout.jsp" allow-narrow="false" />
<dashlet id="calculator" label="Calculator" description="A small calculator applet"
jsp="/jsp/dashboards/dashlets/calculator.jsp" allow-narrow="true" />
<dashlet id="calendar" label="Calendar" description="A small calendar application"
jsp="/jsp/dashboards/dashlets/calendar.jsp" allow-narrow="true" />
</dashlets>
</dashboards>
</config>

9
source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
View File

@@ -71,6 +71,7 @@ public class DashboardManager
public void initDashboard()
{
this.renderingList = null;
this.titleList = null;
}
/**
@@ -157,9 +158,6 @@ public class DashboardManager
pageConfig.addPage(page);
}
}
// persist the initial config for this user
//PreferencesService.getPreferences().setValue(PREF_DASHBOARD, pageConfig.toXML());
}
this.pageConfig = pageConfig;
@@ -174,6 +172,11 @@ public class DashboardManager
public void savePageConfig(PageConfig config)
{
this.pageConfig = config;
// reset cached values
initDashboard();
// persist the changes
PreferencesService.getPreferences().setValue(PREF_DASHBOARD, this.pageConfig.toXML());
}

141
source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
View File

@@ -155,6 +155,14 @@ public class DashboardWizard extends BaseWizardBean
return DashboardManager.getDashboardConfig().getLayoutDefinition(getLayout()).Columns;
}
/**
* @return the number of components per column supported in the selected page layout
*/
public int getColumnMax()
{
return DashboardManager.getDashboardConfig().getLayoutDefinition(getLayout()).ColumnLength;
}
/**
* @return the array of UI select items representing the columns that can be configured
*/
@@ -171,11 +179,20 @@ public class DashboardWizard extends BaseWizardBean
return columns;
}
/**
* @return the index of the column being edited in the columns wizard page
*/
public int getColumn()
{
return this.column;
}
/**
* Set the index of the column being edited in the columns wizard page. This value is
* set when the Columns drop-down value is changed by the user.
*
* @param column Column index
*/
public void setColumn(int column)
{
if (column != this.column)
@@ -186,6 +203,9 @@ public class DashboardWizard extends BaseWizardBean
}
}
/**
* @return The SelectItem List of all available dashlets
*/
public List<SelectItem> getAllDashlets()
{
if (this.dashlets == null)
@@ -265,6 +285,10 @@ public class DashboardWizard extends BaseWizardBean
return this.layoutIcons;
}
/**
* Build the cached list of values for the layout page. The lists are used by the
* image radio picker and dynamic description components.
*/
private void buildLayoutValueLists()
{
List<UIListItem> icons = new ArrayList<UIListItem>(4);
@@ -319,14 +343,33 @@ public class DashboardWizard extends BaseWizardBean
// get the IDs of the selected Dashlet definitions
Object[] selected = dashletPicker.getSelectedValues();
// get the column to add the dashlets too
DashboardsConfigElement config = DashboardManager.getDashboardConfig();
LayoutDefinition layoutDef = this.editConfig.getCurrentPage().getLayoutDefinition();
Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
// add each selected dashlet to the column
for (int i=0; i<selected.length && column.getDashlets().size() < layoutDef.ColumnLength; i++)
if (selected.length != 0)
{
column.addDashlet(config.getDashletDefinition((String)selected[i]));
// get the column to add the dashlets too
DashboardsConfigElement config = DashboardManager.getDashboardConfig();
LayoutDefinition layoutDef = this.editConfig.getCurrentPage().getLayoutDefinition();
Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
// add each selected dashlet to the column
for (int i=0; i<selected.length && column.getDashlets().size() < layoutDef.ColumnLength; i++)
{
String dashletId = (String)selected[i];
// don't add if already present in the list
boolean found = false;
for (int x=0; x<column.getDashlets().size(); x++)
{
if (column.getDashlets().get(x).Id.equals(dashletId))
{
found = true;
break;
}
}
if (found == false)
{
column.addDashlet(config.getDashletDefinition(dashletId));
}
}
}
}
@@ -339,15 +382,85 @@ public class DashboardWizard extends BaseWizardBean
// get the ID of the selected Dashlet definition
String dashletId = (String)dashletColumn.getValue();
Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
// remove the selected dashlet from the column
for (int i=0; i<column.getDashlets().size(); i++)
if (dashletId != null)
{
if (column.getDashlets().get(i).Id.equals(dashletId))
Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
// remove the selected dashlet from the column
for (int i=0; i<column.getDashlets().size(); i++)
{
column.getDashlets().remove(i);
break;
if (column.getDashlets().get(i).Id.equals(dashletId))
{
column.getDashlets().remove(i);
break;
}
}
}
}
/**
* Action event called to move a dashlet up the column list
*/
public void dashletUp(ActionEvent event)
{
UISelectOne dashletColumn = (UISelectOne)event.getComponent().findComponent(COMPONENT_COLUMNDASHLETS);
// get the ID of the selected Dashlet definition
String dashletId = (String)dashletColumn.getValue();
if (dashletId != null)
{
Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
// find the dashlet in the list
for (int i=0; i<column.getDashlets().size(); i++)
{
if (column.getDashlets().get(i).Id.equals(dashletId))
{
if (i != 0)
{
DashletDefinition dashletDef = column.getDashlets().get(i);
column.getDashlets().remove(i);
column.getDashlets().add(i - 1, dashletDef);
}
break;
}
}
}
}
/**
* Action event called to move a dashlet down the column list
*/
public void dashletDown(ActionEvent event)
{
UISelectOne dashletColumn = (UISelectOne)event.getComponent().findComponent(COMPONENT_COLUMNDASHLETS);
// get the ID of the selected Dashlet definition
String dashletId = (String)dashletColumn.getValue();
if (dashletId != null)
{
Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
// find the dashlet in the list
for (int i=0; i<column.getDashlets().size(); i++)
{
if (column.getDashlets().get(i).Id.equals(dashletId))
{
if (i != column.getDashlets().size() - 1)
{
DashletDefinition dashletDef = column.getDashlets().get(i);
column.getDashlets().remove(i);
if (i + 1 < column.getDashlets().size())
{
column.getDashlets().add(i + 1, dashletDef);
}
else
{
column.getDashlets().add(dashletDef);
}
}
break;
}
}
}
}

22
source/web/jsp/dashboards/dashlets/calculator.jsp Normal file
View File

@@ -0,0 +1,22 @@
<%--
Copyright (C) 2006 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="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:graphicImage value="/jsp/dashboards/dashlets/calculator.png" />

BIN
source/web/jsp/dashboards/dashlets/calculator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

22
source/web/jsp/dashboards/dashlets/calendar.jsp Normal file
View File

@@ -0,0 +1,22 @@
<%--
Copyright (C) 2006 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="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:graphicImage value="/jsp/dashboards/dashlets/calendar.png" />

BIN
source/web/jsp/dashboards/dashlets/calendar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

22
source/web/jsp/dashboards/dashlets/content-checkedout.jsp Normal file
View File

@@ -0,0 +1,22 @@
<%--
Copyright (C) 2006 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="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:graphicImage value="/jsp/dashboards/dashlets/content-checkedout.png" />

BIN
source/web/jsp/dashboards/dashlets/content-checkedout.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
source/web/jsp/dashboards/dashlets/my-completed-tasks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

2
source/web/jsp/dashboards/dashlets/tasklist.jsp → source/web/jsp/dashboards/dashlets/my-docs.jsp
View File

@@ -19,4 +19,4 @@
<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:outputText value="---TASKLIST DASHLET---" />
<r:template template="/alfresco/templates/my_docs.ftl" />

BIN
source/web/jsp/dashboards/dashlets/my-tasks-todo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

22
source/web/jsp/dashboards/dashlets/tasklist-completed.jsp Normal file
View File

@@ -0,0 +1,22 @@
<%--
Copyright (C) 2006 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="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:graphicImage value="/jsp/dashboards/dashlets/my-completed-tasks.png" />

22
source/web/jsp/dashboards/dashlets/tasklist-todo.jsp Normal file
View File

@@ -0,0 +1,22 @@
<%--
Copyright (C) 2006 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="/WEB-INF/alfresco.tld" prefix="a" %>
<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<h:graphicImage value="/jsp/dashboards/dashlets/my-tasks-todo.png" />

26
source/web/jsp/dashboards/layouts/narrow-left-2column.jsp
View File

@@ -24,25 +24,28 @@
<h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableNarrowWidth,tableWideWidth">
<% Application.getDashboardManager().initDashboard(); %>
<h:panelGroup>
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" rendered="#{DashboardManager.dashletAvailable[0]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" style="padding:4px">
<f:subview id="dashlet-1-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[1]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" style="padding:4px">
<f:subview id="dashlet-2-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[2]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-3-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[3]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-4-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
@@ -50,25 +53,28 @@
</a:panel>
</h:panelGroup>
<h:panelGroup>
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[4]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-5-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[5]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[5]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-6-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(5)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" progressive="true" rendered="#{DashboardManager.dashletAvailable[6]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" rendered="#{DashboardManager.dashletAvailable[6]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-7-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(6)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" progressive="true" rendered="#{DashboardManager.dashletAvailable[7]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" rendered="#{DashboardManager.dashletAvailable[7]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-8-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(7)%>" />

22
source/web/jsp/dashboards/layouts/narrow-right-2column.jsp
View File

@@ -24,25 +24,28 @@
<h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableWideWidth,tableNarrowWidth">
<% Application.getDashboardManager().initDashboard(); %>
<h:panelGroup>
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" rendered="#{DashboardManager.dashletAvailable[0]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-1-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[1]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-2-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[2]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-3-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[3]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-4-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
@@ -50,25 +53,28 @@
</a:panel>
</h:panelGroup>
<h:panelGroup>
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[4]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-5-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[5]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[5]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-6-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(5)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" progressive="true" rendered="#{DashboardManager.dashletAvailable[6]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" rendered="#{DashboardManager.dashletAvailable[6]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-7-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(6)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" progressive="true" rendered="#{DashboardManager.dashletAvailable[7]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" rendered="#{DashboardManager.dashletAvailable[7]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-8-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(7)%>" />

10
source/web/jsp/dashboards/layouts/single-column.jsp
View File

@@ -23,31 +23,31 @@
<% Application.getDashboardManager().initDashboard(); %>
<h:panelGrid columns="1" cellpadding="2" cellspacing="2" width="100%">
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[0]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-1-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[1]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-2-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[2]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-3-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[3]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-4-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[4]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-5-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />

51
source/web/jsp/dashboards/layouts/three-column.jsp
View File

@@ -21,28 +21,31 @@
<%@ page import="org.alfresco.web.app.Application" %>
<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableThirdWidth">
<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableThirdWidth,tableThirdWidth,tableThirdWidth">
<% Application.getDashboardManager().initDashboard(); %>
<h:panelGroup>
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
<a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" rendered="#{DashboardManager.dashletAvailable[0]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-1-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[1]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-2-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[2]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-3-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[3]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-4-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
@@ -50,53 +53,59 @@
</a:panel>
</h:panelGroup>
<h:panelGroup>
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
<a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[4]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-1-view">
<f:subview id="dashlet-5-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[5]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[5]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-2-view">
<f:subview id="dashlet-6-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(5)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" progressive="true" rendered="#{DashboardManager.dashletAvailable[6]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" rendered="#{DashboardManager.dashletAvailable[6]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-3-view">
<f:subview id="dashlet-7-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(6)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" progressive="true" rendered="#{DashboardManager.dashletAvailable[7]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" rendered="#{DashboardManager.dashletAvailable[7]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-4-view">
<f:subview id="dashlet-8-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(7)%>" />
</f:subview>
</a:panel>
</h:panelGroup>
<h:panelGroup>
<a:panel label="#{DashboardManager.dashletTitle[8]}" id="dashlet-8" progressive="true" rendered="#{DashboardManager.dashletAvailable[8]}"
<a:panel label="#{DashboardManager.dashletTitle[8]}" id="dashlet-8" rendered="#{DashboardManager.dashletAvailable[8]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-1-view">
<f:subview id="dashlet-9-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(8)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[9]}" id="dashlet-9" progressive="true" rendered="#{DashboardManager.dashletAvailable[9]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[9]}" id="dashlet-9" rendered="#{DashboardManager.dashletAvailable[9]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-2-view">
<f:subview id="dashlet-10-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(9)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[10]}" id="dashlet-10" progressive="true" rendered="#{DashboardManager.dashletAvailable[10]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[10]}" id="dashlet-10" rendered="#{DashboardManager.dashletAvailable[10]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-3-view">
<f:subview id="dashlet-11-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(10)%>" />
</f:subview>
</a:panel>
<a:panel label="#{DashboardManager.dashletTitle[11]}" id="dashlet-11" progressive="true" rendered="#{DashboardManager.dashletAvailable[11]}"
<f:verbatim><div style='padding:4px'></div></f:verbatim>
<a:panel label="#{DashboardManager.dashletTitle[11]}" id="dashlet-11" rendered="#{DashboardManager.dashletAvailable[11]}"
border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
<f:subview id="dashlet-4-view">
<f:subview id="dashlet-12-view">
<jsp:include page="<%=Application.getDashboardManager().getDashletPage(11)%>" />
</f:subview>
</a:panel>

4
source/web/jsp/dashboards/wizard/columns.jsp
View File

@@ -40,6 +40,10 @@
<h:selectOneMenu id="columns" value="#{WizardManager.bean.column}" onchange="document.forms['wizard'].submit(); return true;">
<f:selectItems value="#{WizardManager.bean.columns}" />
</h:selectOneMenu>
<f:verbatim>&nbsp;</f:verbatim>
<h:outputFormat value="- #{msg.column_max_components}">
<f:param value="#{WizardManager.bean.columnMax}" />
</h:outputFormat>
</h:panelGroup>
<h:panelGrid columns="3" cellpadding="2" cellspacing="0" border="0" columnClasses="alignTop,alignMiddle">