"); } @@ -214,7 +214,7 @@ public class CreateRuleWizard extends BaseActionWizard StringBuilder actionsSummary = new StringBuilder(); for (Map
"); } diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java index a5f40ad73d..08da4853b3 100644 --- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java +++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java @@ -479,7 +479,7 @@ public class CreateSpaceWizard extends BaseWizardBean return buildSummary( new String[] {bundle.getString("space_type"), bundle.getString("name"), bundle.getString("description"), bundle.getString("creating_from")}, - new String[] {spaceTypeLabel, this.name, Utils.encode(this.description), summaryCreateType}); + new String[] {spaceTypeLabel, Utils.encode(this.name), Utils.encode(this.description), summaryCreateType}); } /** diff --git a/source/java/org/alfresco/web/bean/spaces/DeleteSpaceAssociationDialog.java b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceAssociationDialog.java new file mode 100755 index 0000000000..ceda4a915a --- /dev/null +++ b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceAssociationDialog.java @@ -0,0 +1,104 @@ +/* + * 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.bean.spaces; + +import java.text.MessageFormat; + +import javax.faces.context.FacesContext; + +import org.alfresco.model.ContentModel; +import org.alfresco.service.cmr.repository.ChildAssociationRef; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; +import org.alfresco.web.app.Application; +import org.alfresco.web.bean.repository.Node; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Bean implementation for the "Delete Space" dialog + * + * @author gavinc + */ +public class DeleteSpaceAssociationDialog extends DeleteSpaceDialog +{ + private static final Log logger = LogFactory.getLog(DeleteSpaceAssociationDialog.class); + + // ------------------------------------------------------------------------------ + // Dialog implementation + + @Override + protected String finishImpl(FacesContext context, String outcome) + throws Exception + { + // get the space to delete + Node node = this.browseBean.getActionSpace(); + if (node != null) + { + if (logger.isDebugEnabled()) + logger.debug("Trying to delete space association: " + node.getId()); + + NodeRef parentRef = this.navigator.getCurrentNode().getNodeRef(); + QName qname = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, + QName.createValidLocalName(node.getName())); + ChildAssociationRef childAssocRef = new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, + parentRef, qname, node.getNodeRef()); + + // remove the child association + this.getNodeService().removeChildAssociation(childAssocRef); + } + else + { + logger.warn("WARNING: delete called without a current Space!"); + } + + return outcome; + } + + // ------------------------------------------------------------------------------ + // Bean Getters and Setters + + /** + * Returns the confirmation to display to the user before deleting the content. + * + * @return The formatted message to display + */ + public String getConfirmMessage() + { + Node node = this.browseBean.getActionSpace(); + if (node != null) + { + String spaceConfirmMsg = Application.getMessage(FacesContext.getCurrentInstance(), + "delete_space_assoc_confirm"); + return MessageFormat.format(spaceConfirmMsg, new Object[] {node.getName()}); + } + else + { + return Application.getMessage(FacesContext.getCurrentInstance(), + "delete_node_not_found"); + } + } +} diff --git a/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java index 47883bebb4..6f4e86face 100644 --- a/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java +++ b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java @@ -27,6 +27,7 @@ package org.alfresco.web.bean.spaces; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; +import java.util.Map; import javax.faces.context.FacesContext; import javax.transaction.UserTransaction; @@ -65,10 +66,25 @@ public class DeleteSpaceDialog extends BaseDialogBean private String deleteMode = DELETE_ALL; + protected boolean hasMultipleParents = false; // ------------------------------------------------------------------------------ // Dialog implementation + @Override + public void init(Map
img tag
+ */
+ public static String buildImageTag(FacesContext context, String image, int width, int height,
+ String alt, String onclick, String verticalAlign)
+ {
+ return buildImageTag(context, image, width, height, alt, onclick, verticalAlign, null);
+ }
/**
* Build a context path safe image tag for the supplied image path.
@@ -518,16 +540,17 @@ public final class Utils extends StringUtils
* @param height Height in pixels
* @param alt Optional alt/title text
* @param onclick JavaScript onclick event handler code
- * @param verticalAlign Optional HTML alignment value
+ * @param verticalAlign Optional HTML alignment value
+ * @param style Optional inline CSS styling
*
* @return Populated img tag
*/
public static String buildImageTag(FacesContext context, String image, int width, int height,
- String alt, String onclick, String verticalAlign)
+ String alt, String onclick, String verticalAlign, String style)
{
StringBuilder buf = new StringBuilder(200);
- String style = "border-width:0px;";
+ style = style != null ? "border-width:0px; " + style : "border-width:0px;";
buf.append("");
- out.write(item.getLabel());
+ out.write(Utils.encode(item.getLabel()));
out.write("
");
if (description != null)
{
out.write("");
- out.write(description);
+ out.write(Utils.encode(description));
out.write("
");
}
out.write("");
diff --git a/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java b/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
index 85691d110e..69bd1fc2bd 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIStatusMessage.java
@@ -174,7 +174,7 @@ public class UIStatusMessage extends SelfRenderingComponent implements Serializa
out.write(" ");
- out.write(msg.getSummary());
+ out.write(Utils.encode(msg.getSummary()));
out.write(" - ");
out.write(Utils.encode(msg.getDetail()));
out.write("");
diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java b/source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
index 6e88107415..ad0e6f4c5a 100644
--- a/source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
+++ b/source/java/org/alfresco/web/ui/common/component/data/UIDataPager.java
@@ -45,6 +45,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.data.IDataContainer;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.WebResources;
+import org.springframework.util.StringUtils;
/**
* @author Kevin Roast
@@ -59,7 +60,9 @@ public class UIDataPager extends UICommand
private static final String FIRST_PAGE = "first_page";
private static final String MSG_PAGEINFO = "page_info";
-
+ private static final int VISIBLE_PAGE_RANGE = 3;
+ private static final int AMOUNT_FIRST_PAGES = 7;
+
// ------------------------------------------------------------------------------
// Construction
@@ -100,11 +103,45 @@ public class UIDataPager extends UICommand
int currentPage = dataContainer.getCurrentPage();
int pageCount = dataContainer.getPageCount();
- buf.append("