Category browsing shelf component and view - contribution from Jean-Luc Viselé (Atol Conseils et Développements)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6871 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -1776,3 +1776,12 @@ click_to_edit=click to edit
 
 # File Picker
 go_up=Go up
+
+#Category browsing
+category_browser_plugin_label=Categories
+category_browser_plugin_description=Category Browsing
+category_browser_plugin_include_subcategories=Browse items in sub-categories?
+category_browser_browse_title=Category \"{0}\"
+category_browser_browse_include=and its sub-categories
+category_browser_browse_description=This view allows you to see all items in this category
+title_category_browse=Alfresco Web Client - Category Browsing

config/alfresco/web-client-config.xml

@@ -267,6 +267,9 @@
                     page="/jsp/sidebar/shelf.jsp" />
             <plugin id="opensearch" label-id="opensearch" description-id="opensearch_desc"
                     page="/jsp/sidebar/opensearch.jsp" />
+            <plugin id="category-browser" label-id="category_browser_plugin_label"
+                    description-id="category_browser_plugin_description" 
+                    page="/jsp/sidebar/category-browser.jsp" />
          </plugins>
          
          <!-- the default sidebar plugin to be shown on app startup -->

source/java/org/alfresco/web/bean/BrowseBean.java

@@ -698,8 +698,16 @@ public class BrowseBean implements IContextListener
 
          // setup dispatch context for custom views
          this.navigator.setupDispatchContext(this.navigator.getCurrentNode());
-
+         
-         navigateBrowseScreen();
+         // browse to appropriate view
+         FacesContext fc = FacesContext.getCurrentInstance();
+         String outcome = null;
+         String viewId = fc.getViewRoot().getViewId();
+         if (viewId.equals(BROWSE_VIEW_ID) == false && viewId.equals(CATEGORY_VIEW_ID) == false)
+         {
+            outcome = "browse";
+         }
+         fc.getApplication().getNavigationHandler().handleNavigation(fc, null, outcome);
       }
       else
       {
@@ -1964,7 +1972,8 @@ public class BrowseBean implements IContextListener
    // Private data
 
    /** Browse screen view ID */
-   public static final String BROWSE_VIEW_ID = "/jsp/browse/browse.jsp";
+   public static final String BROWSE_VIEW_ID    = "/jsp/browse/browse.jsp";
+   public static final String CATEGORY_VIEW_ID  = "/jsp/browse/category-browse.jsp";
 
    /** Small icon default name */
    public static final String SPACE_SMALL_DEFAULT = "space_small";

source/java/org/alfresco/web/bean/CategoryBrowserBean.java

@@ -0,0 +1,82 @@
+/*
+ * 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;
+ 
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+
+public class CategoryBrowserBean
+{
+      public static String BEAN_NAME = "CategoryBrowserBean";
+ 
+   private NodeService nodeService;
+ 
+   private NodeRef currentCategory = null;
+ 
+   private boolean includeSubcategories = false;
+ 
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+ 
+   public void setCurrentCategory(NodeRef currentCategory)
+   {
+      this.currentCategory = currentCategory;
+   }
+ 
+   public String getCurrentCategoryName()
+   {
+      String currentCategoryName = null;
+      if (currentCategory != null)
+         currentCategoryName = (String) this.nodeService.getProperty(currentCategory, ContentModel.PROP_NAME);
+ 
+      return currentCategoryName;
+   }
+ 
+   public boolean isIncludeSubcategories()
+   {
+      return includeSubcategories;
+   }
+ 
+   public void setIncludeSubcategories(boolean includeSubcategories)
+   {
+      this.includeSubcategories = includeSubcategories;
+   }
+ 
+   public SearchContext generateCategorySearchContext()
+   {
+      SearchContext categorySearch = new SearchContext();
+ 
+      String[] categories = new String[1];
+      categories[0] = SearchContext.getPathFromSpaceRef(currentCategory, includeSubcategories);
+ 
+      categorySearch.setText("");
+      categorySearch.setCategories(categories);
+ 
+      return categorySearch;
+   }
+}

source/java/org/alfresco/web/bean/ajax/CategoryBrowserPluginBean.java

@@ -0,0 +1,327 @@
+/*
+ * 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.ajax;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.transaction.UserTransaction;
+
+import org.alfresco.model.ApplicationModel;
+import org.alfresco.model.ContentModel;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.search.CategoryService;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.web.bean.repository.Repository;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.repo.component.UITree.TreeNode;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class CategoryBrowserPluginBean
+{
+   public static final String BEAN_NAME = "CategoryBrowserPluginBean";
+   
+   private static final Log logger = LogFactory.getLog(CategoryBrowserPluginBean.class);
+ 
+   private CategoryService categoryService;
+ 
+   private NodeService nodeService;
+ 
+   private List<TreeNode> categoryRootNodes;
+ 
+   private Map<String, TreeNode> categoryNodes;
+ 
+   protected NodeRef previouslySelectedNode;
+ 
+   /**
+    * @param categoryService
+    *           the categoryService to set
+    */
+   public void setCategoryService(CategoryService categoryService)
+   {
+      this.categoryService = categoryService;
+   }
+ 
+   /**
+    * @param nodeService
+    *           the nodeService to set
+    */
+   public void setNodeService(NodeService nodeService)
+   {
+      this.nodeService = nodeService;
+   }
+ 
+   public List<TreeNode> getCategoryRootNodes()
+   {
+      if (this.categoryRootNodes == null)
+      {
+         this.categoryRootNodes = new ArrayList<TreeNode>();
+         this.categoryNodes = new HashMap<String, TreeNode>();
+ 
+         UserTransaction tx = null;
+         try
+         {
+            tx = Repository.getUserTransaction(FacesContext.getCurrentInstance(), true);
+            tx.begin();
+ 
+            Collection<ChildAssociationRef> childRefs = this.categoryService.getRootCategories(
+                  Repository.getStoreRef(), ContentModel.ASPECT_GEN_CLASSIFIABLE);
+ 
+            for (ChildAssociationRef ref : childRefs)
+            {
+               NodeRef child = ref.getChildRef();
+               TreeNode node = createTreeNode(child);
+               this.categoryRootNodes.add(node);
+               this.categoryNodes.put(node.getNodeRef(), node);
+            }
+ 
+            tx.commit();
+         }
+         catch (Throwable err)
+         {
+            Utils.addErrorMessage("NavigatorPluginBean exception in getCompanyHomeRootNodes()", err);
+            try
+            {
+               if (tx != null)
+               {
+                  tx.rollback();
+               }
+            }
+            catch (Exception tex)
+            {
+            }
+         }
+      }
+ 
+      return this.categoryRootNodes;
+   }
+ 
+   protected Map<String, TreeNode> getNodesMap()
+   {
+      return this.categoryNodes;
+   }
+ 
+   /**
+    * Retrieves the child folders for the noderef given in the 'noderef' parameter and caches the nodes against the area
+    * in the 'area' parameter.
+    */
+   public void retrieveChildren() throws IOException
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      ResponseWriter out = context.getResponseWriter();
+ 
+      UserTransaction tx = null;
+      try
+      {
+         tx = Repository.getUserTransaction(context, true);
+         tx.begin();
+ 
+         Map params = context.getExternalContext().getRequestParameterMap();
+         String nodeRefStr = (String) params.get("nodeRef");
+ 
+         // work out which list to cache the nodes in
+         Map<String, TreeNode> currentNodes = getNodesMap();
+ 
+         if (nodeRefStr != null && currentNodes != null)
+         {
+            // get the given node's details
+            NodeRef parentNodeRef = new NodeRef(nodeRefStr);
+            TreeNode parentNode = currentNodes.get(parentNodeRef.toString());
+            parentNode.setExpanded(true);
+ 
+            if (logger.isDebugEnabled())
+               logger.debug("retrieving children for noderef: " + parentNodeRef);
+ 
+            // remove any existing children as the latest ones will be added
+            // below
+            parentNode.removeChildren();
+ 
+            // get all the child folder objects for the parent
+            List<ChildAssociationRef> childRefs = this.nodeService.getChildAssocs(parentNodeRef,
+                  ContentModel.ASSOC_SUBCATEGORIES, RegexQNamePattern.MATCH_ALL);
+            List<TreeNode> sortedNodes = new ArrayList<TreeNode>();
+            for (ChildAssociationRef ref : childRefs)
+            {
+               NodeRef nodeRef = ref.getChildRef();
+               logger.debug("retrieving child : " + nodeRef);
+               // build the XML representation of the child node
+               TreeNode childNode = createTreeNode(nodeRef);
+               parentNode.addChild(childNode);
+               currentNodes.put(childNode.getNodeRef(), childNode);
+               sortedNodes.add(childNode);
+            }
+ 
+            // order the tree nodes by the tree label
+            if (sortedNodes.size() > 1)
+            {
+               QuickSort sorter = new QuickSort(sortedNodes, "name", true, IDataContainer.SORT_CASEINSENSITIVE);
+               sorter.sort();
+            }
+ 
+            // generate the XML representation
+            StringBuilder xml = new StringBuilder(
+                  "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><nodes>");
+            for (TreeNode childNode : sortedNodes)
+            {
+               xml.append(childNode.toXML());
+            }
+            xml.append("</nodes>");
+ 
+            // send the generated XML back to the tree
+            out.write(xml.toString());
+ 
+            if (logger.isDebugEnabled())
+               logger.debug("returning XML: " + xml.toString());
+         }
+ 
+         // commit the transaction
+         tx.commit();
+      }
+      catch (Throwable err)
+      {
+         try
+         {
+            if (tx != null)
+            {
+               tx.rollback();
+            }
+         }
+         catch (Exception tex)
+         {
+         }
+      }
+   }
+ 
+   /**
+    * Sets the state of the node given in the 'nodeRef' parameter to collapsed
+    */
+   public void nodeCollapsed() throws IOException
+   {
+      FacesContext context = FacesContext.getCurrentInstance();
+      ResponseWriter out = context.getResponseWriter();
+      Map params = context.getExternalContext().getRequestParameterMap();
+      String nodeRefStr = (String) params.get("nodeRef");
+ 
+      // work out which list to cache the nodes in
+      Map<String, TreeNode> currentNodes = getNodesMap();
+ 
+      if (nodeRefStr != null && currentNodes != null)
+      {
+         TreeNode treeNode = currentNodes.get(nodeRefStr);
+         if (treeNode != null)
+         {
+            treeNode.setExpanded(false);
+ 
+            // we need to return something for the client to be happy!
+            out.write("<ok/>");
+ 
+            if (logger.isDebugEnabled())
+               logger.debug("Set node " + treeNode + " to collapsed state");
+         }
+      }
+   }
+ 
+   public void selectNode(NodeRef selectedNode, String area)
+   {
+      // if there is a currently selected node, get hold of
+      // it (from any of the areas) and reset to unselected
+      if (this.previouslySelectedNode != null)
+      {
+         TreeNode node = this.categoryNodes.get(this.previouslySelectedNode.toString());
+         if (node != null)
+         {
+            node.setSelected(false);
+         }
+      }
+ 
+      // find the node just selected and set its state to selected
+      if (selectedNode != null)
+      {
+         TreeNode node = this.categoryNodes.get(selectedNode.toString());
+         if (node != null)
+         {
+            node.setSelected(true);
+         }
+      }
+ 
+      this.previouslySelectedNode = selectedNode;
+ 
+      if (logger.isDebugEnabled())
+         logger.debug("Selected node: " + selectedNode);
+   }
+ 
+   /**
+    * Resets the selected node
+    */
+   public void resetSelectedNode()
+   {
+      if (this.previouslySelectedNode != null)
+      {
+         TreeNode node = this.categoryNodes.get(this.previouslySelectedNode.toString());
+         if (node != null)
+         {
+            node.setSelected(false);
+         }
+      }
+      if (logger.isDebugEnabled())
+         logger.debug("Reset selected node: " + this.previouslySelectedNode);
+   }
+ 
+   /**
+    * Resets all the caches held by the bean.
+    */
+   public void reset()
+   {
+      this.categoryNodes = null;
+      this.categoryRootNodes = null;
+ 
+      resetSelectedNode();
+   }
+ 
+   /**
+    * Creates a TreeNode object from the given NodeRef
+    * 
+    * @param nodeRef
+    *           The NodeRef to create the TreeNode from
+    */
+   protected TreeNode createTreeNode(NodeRef nodeRef)
+   {
+      TreeNode node = new TreeNode(nodeRef.toString(), Repository.getNameForNode(this.nodeService, nodeRef),
+            (String) this.nodeService.getProperty(nodeRef, ApplicationModel.PROP_ICON));
+ 
+      return node;
+   }
+}

source/java/org/alfresco/web/ui/repo/component/UICategoryBrowser.java

@@ -0,0 +1,253 @@
+/*
+ * 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.ui.repo.component;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesEvent;
+
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.web.app.Application;
+import org.alfresco.web.app.servlet.FacesHelper;
+import org.alfresco.web.bean.CategoryBrowserBean;
+import org.alfresco.web.bean.NavigationBean;
+import org.alfresco.web.bean.SearchContext;
+import org.alfresco.web.bean.ajax.CategoryBrowserPluginBean;
+import org.alfresco.web.data.IDataContainer;
+import org.alfresco.web.data.QuickSort;
+import org.alfresco.web.ui.common.Utils;
+import org.alfresco.web.ui.common.component.SelfRenderingComponent;
+import org.alfresco.web.ui.repo.component.UITree.TreeNode;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class UICategoryBrowser extends SelfRenderingComponent
+{
+   private static final Log logger = LogFactory.getLog(UICategoryBrowser.class);
+ 
+   public static final String COMPONENT_TYPE = "org.alfresco.faces.CategoryBrowser";
+ 
+   private static final String AJAX_URL_START = "/ajax/invoke/" + CategoryBrowserPluginBean.BEAN_NAME;
+ 
+   private static final String SUBCATEGORIES_PARAM = "include-subcategories-checkbox";
+ 
+   @Override
+   public String getFamily()
+   {
+      return COMPONENT_TYPE;
+   }
+ 
+   @Override
+   public void restoreState(FacesContext context, Object state)
+   {
+      Object values[] = (Object[]) state;
+      // standard component attributes are restored by the super class
+      super.restoreState(context, values[0]);
+   }
+ 
+   @Override
+   public Object saveState(FacesContext context)
+   {
+      Object values[] = new Object[2];
+      // standard component attributes are saved by the super class
+      values[0] = super.saveState(context);
+      return values;
+   }
+ 
+   /**
+    * @see javax.faces.component.UIComponentBase#decode(javax.faces.context.FacesContext)
+    */
+   public void decode(FacesContext context)
+   {
+      Map requestMap = context.getExternalContext().getRequestParameterMap();
+      String fieldId = getClientId(context);
+      String value = (String) requestMap.get(fieldId);
+ 
+      if (value != null && value.length() != 0)
+      {
+         if (logger.isDebugEnabled())
+            logger.debug("Received post back: " + value);
+ 
+         // work out whether a panel or a node was selected
+         String item = value;
+ 
+         String subcategoriesStr = (String) requestMap.get(SUBCATEGORIES_PARAM);
+         boolean includeSubcategories = "1".equals(subcategoriesStr);
+         logger.debug("Booléen = " + includeSubcategories);
+ 
+         // queue an event to be handled later
+         CategoryBrowserEvent event = new CategoryBrowserEvent(this, item, includeSubcategories);
+         this.queueEvent(event);
+      }
+   }
+ 
+   /*
+    * (non-Javadoc)
+    * 
+    * @see org.alfresco.extension.web.ui.repo.component.UINavigator#broadcast(javax.faces.event.FacesEvent)
+    */
+   @Override
+   public void broadcast(FacesEvent event) throws AbortProcessingException
+   {
+      if (event instanceof CategoryBrowserEvent)
+      {
+         FacesContext context = FacesContext.getCurrentInstance();
+         CategoryBrowserEvent categoryBrowseEvent = (CategoryBrowserEvent) event;
+         NodeRef nodeClicked = new NodeRef(categoryBrowseEvent.getItem());
+         boolean subcategories = categoryBrowseEvent.isIncludeSubcategories();
+         if (logger.isDebugEnabled())
+            logger.debug("Selected category: " + nodeClicked + " subcategories? " + subcategories);
+ 
+         CategoryBrowserBean categoryBrowserBean = (CategoryBrowserBean) FacesHelper.getManagedBean(context,
+               CategoryBrowserBean.BEAN_NAME);
+         categoryBrowserBean.setCurrentCategory(nodeClicked);
+         categoryBrowserBean.setIncludeSubcategories(subcategories);
+         SearchContext categorySearch = categoryBrowserBean.generateCategorySearchContext();
+ 
+         NavigationBean nb = (NavigationBean) FacesHelper.getManagedBean(context, NavigationBean.BEAN_NAME);
+         nb.setSearchContext(categorySearch);
+         context.getApplication().getNavigationHandler().handleNavigation(context, null, "category-browse");
+      }
+      else
+      {
+         super.broadcast(event);
+      }
+   }
+ 
+   /*
+    * (non-Javadoc)
+    * 
+    * @see org.alfresco.web.ui.repo.component.UINavigator#encodeBegin(javax.faces.context.FacesContext)
+    */
+   @Override
+   public void encodeBegin(FacesContext context) throws IOException
+   {
+      if (!isRendered())
+         return;
+ 
+      // TODO: pull width and height from user preferences and/or the main config,
+      // if present override below using the style attribute
+ 
+      ResponseWriter out = context.getResponseWriter();
+      CategoryBrowserPluginBean categoryBrowserPluginBean = (CategoryBrowserPluginBean) FacesHelper.getManagedBean(
+            context, CategoryBrowserPluginBean.BEAN_NAME);
+      CategoryBrowserBean categoryBrowserBean = (CategoryBrowserBean) FacesHelper.getManagedBean(context,
+            CategoryBrowserBean.BEAN_NAME);
+ 
+      List<TreeNode> rootNodes = null;
+ 
+      rootNodes = categoryBrowserPluginBean.getCategoryRootNodes();
+      // order the root nodes by the tree label
+      if (rootNodes != null && rootNodes.size() > 1)
+      {
+         QuickSort sorter = new QuickSort(rootNodes, "name", true, IDataContainer.SORT_CASEINSENSITIVE);
+         sorter.sort();
+      }
+ 
+      // main container div
+      out.write("<div id=\"category-navigator\" class=\"navigator\">");
+ 
+      // Subcategories parameter
+      String includeSub = Application.getMessage(context, "category_browser_plugin_include_subcategories");
+      out.write("<input type='checkbox' id='" + SUBCATEGORIES_PARAM + "' name='" + SUBCATEGORIES_PARAM + "' value=1 "
+            + (categoryBrowserBean.isIncludeSubcategories() ? "checked" : "") + "/>");
+      out.write("<label for='" + SUBCATEGORIES_PARAM + "'>" + includeSub + "</label>");
+ 
+      // generate the javascript method to capture the tree node click events
+      out.write("<script type=\"text/javascript\">");
+      out.write("function treeNodeSelected(nodeRef) {");
+      out.write(Utils.generateFormSubmit(context, this, getClientId(context), "nodeRef", true, null));
+      out.write("}</script>");
+ 
+      // generate the active panel containing the tree
+      out.write("<div class=\"navigatorPanelBody\">");
+      UITree tree = (UITree) context.getApplication().createComponent(UITree.COMPONENT_TYPE);
+      tree.setId("tree");
+      tree.setRootNodes(rootNodes);
+      tree.setRetrieveChildrenUrl(AJAX_URL_START + ".retrieveChildren?");
+      tree.setNodeCollapsedUrl(AJAX_URL_START + ".nodeCollapsed?");
+      tree.setNodeSelectedCallback("treeNodeSelected");
+      tree.setNodeCollapsedCallback("informOfCollapse");
+      Utils.encodeRecursive(context, tree);
+      out.write("</div>");
+ 
+      out.write("</div>");
+   }
+ 
+   @Override
+   public void encodeChildren(FacesContext context) throws IOException
+   {
+      if (!isRendered())
+         return;
+      for (Iterator i = this.getChildren().iterator(); i.hasNext();)
+      {
+         UIComponent child = (UIComponent) i.next();
+         Utils.encodeRecursive(context, child);
+      }
+   }
+ 
+   @Override
+   public boolean getRendersChildren()
+   {
+      return true;
+   }
+ 
+   /**
+    * Class representing the clicking of a tree node.
+    */
+   @SuppressWarnings("serial")
+   public static class CategoryBrowserEvent extends ActionEvent
+   {
+      private String item;
+ 
+      private boolean includeSubcategories;
+ 
+      public CategoryBrowserEvent(UIComponent component, String item, boolean include)
+      {
+         super(component);
+ 
+         this.item = item;
+         this.includeSubcategories = include;
+      }
+ 
+      public String getItem()
+      {
+         return item;
+      }
+ 
+      public boolean isIncludeSubcategories()
+      {
+         return includeSubcategories;
+      }
+   }
+}

source/java/org/alfresco/web/ui/repo/tag/CategoryBrowserTag.java

@@ -0,0 +1,62 @@
+/*
+ * 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.ui.repo.tag;
+
+import javax.faces.component.UIComponent;
+
+import org.alfresco.web.ui.common.tag.HtmlComponentTag;
+
+public class CategoryBrowserTag extends HtmlComponentTag
+{
+   /**
+    * @see javax.faces.webapp.UIComponentTag#getRendererType()
+    */
+   public String getRendererType()
+   {
+      return null;
+   }
+
+   /**
+    * @see javax.faces.webapp.UIComponentTag#setProperties(javax.faces.component.UIComponent)
+    */
+   protected void setProperties(UIComponent component)
+   {
+      super.setProperties(component);
+   }
+   
+   /**
+    * @see org.alfresco.web.ui.common.tag.HtmlComponentTag#release()
+    */
+   public void release()
+   {
+      super.release();
+   }
+
+   @Override
+   public String getComponentType()
+   {
+      return "org.alfresco.faces.CategoryBrowser";
+   }
+}

source/web/WEB-INF/faces-config-beans.xml

@@ -5014,4 +5014,28 @@
       </managed-property>
    </managed-bean>
    
+   <managed-bean>
+      <managed-bean-name>CategoryBrowserPluginBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.ajax.CategoryBrowserPluginBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>categoryService</property-name>
+         <value>#{CategoryService}</value>
+      </managed-property>
+   </managed-bean>
+   
+   <managed-bean>
+      <managed-bean-name>CategoryBrowserBean</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.CategoryBrowserBean</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+   </managed-bean>
+   
 </faces-config>

source/web/WEB-INF/faces-config-navigation.xml

@@ -930,4 +930,13 @@
       </navigation-case>
    </navigation-rule>
    
+   <!-- Category Browsing -->
+   <navigation-rule>
+      <from-view-id>/jsp/*</from-view-id>
+      <navigation-case>
+         <from-outcome>category-browse</from-outcome>
+         <to-view-id>/jsp/browse/category-browse.jsp</to-view-id>
+      </navigation-case>
+   </navigation-rule>
+   
 </faces-config>

source/web/WEB-INF/faces-config-repo.xml

@@ -203,6 +203,12 @@
       <component-type>org.alfresco.faces.WebScript</component-type>
       <component-class>org.alfresco.web.scripts.jsf.UIWebScript</component-class>
    </component>
+   
+   <component>
+      <component-type>org.alfresco.faces.CategoryBrowser</component-type>
+      <component-class>org.alfresco.web.ui.repo.component.UICategoryBrowser</component-class>
+   </component>
+
 
    <!-- ==================== CONVERTERS ==================== -->
    <component>

source/web/WEB-INF/repo.tld

@@ -2168,4 +2168,22 @@
       </attribute>
    </tag>
    
+   <tag>
+      <name>categoryBrowser</name>
+      <tag-class>org.alfresco.web.ui.repo.tag.CategoryBrowserTag</tag-class>
+      <body-content>JSP</body-content>
+ 
+      <attribute>
+      	<name>id</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+       
+      <attribute>
+         <name>rendered</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+   </tag>
+   
 </taglib>

source/web/jsp/browse/category-browse.jsp

@@ -0,0 +1,460 @@
+<%--
+ * 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"
+--%>
+<%@ page import="org.alfresco.web.app.Application" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+
+<%@ 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 buffer="100kb" contentType="text/html;charset=UTF-8" %>
+<%@ page isELIgnored="false" %>
+
+<r:page titleId="title_category_browse">
+
+<script language="JavaScript1.2">
+   function applySizeSpaces(e)
+   {
+      return applySize(e, 'spaces-apply');
+   }
+   
+   function applySizeContent(e)
+   {
+      return applySize(e, 'content-apply');
+   }
+   
+   function applySize(e, field)
+   {
+      var keycode;
+      if (window.event) keycode = window.event.keyCode;
+      else if (e) keycode = e.which;
+      if (keycode == 13)
+      {
+         document.forms['browse']['browse:act'].value='browse:' + field;
+         document.forms['browse'].submit();
+         return false;
+      }
+      return true;
+   }
+</script>
+
+<f:view>
+<%
+FacesContext fc = FacesContext.getCurrentInstance();
+
+// set locale for JSF framework usage
+fc.getViewRoot().setLocale(Application.getLanguage(fc));
+%>
+
+<%-- load a bundle of properties with I18N strings --%>
+<f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
+
+<h:form acceptcharset="UTF-8" id="category-browse">
+
+   <%-- Main outer table --%>
+   <table cellspacing=0 cellpadding=2>
+   
+      <%-- Title bar --%>
+      <tr>
+         <td colspan=2>
+            <%@ include file="../parts/titlebar.jsp" %>
+         </td>
+      </tr>
+      
+      <%-- Main area --%>
+      <tr valign=top>
+         <%-- Shelf --%>
+         <td>
+            <%@ include file="../parts/shelf.jsp" %>
+         </td>
+         
+         <%-- Work Area --%>
+         <td width=100%>
+            <table cellspacing=0 cellpadding=0 width=100%>
+               <%-- Breadcrumb --%>
+               <%@ include file="../parts/breadcrumb.jsp" %>
+               
+               <%-- Status and Actions --%>
+               <tr>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_4.gif)" width=4></td>
+                  <td bgcolor="#dfe6ed">
+                  
+                     <%-- Status and Actions inner contents table --%>
+                     <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
+                     <table cellspacing=4 cellpadding=0 width=100%>
+                        <tr>
+                           <%-- actions --%>
+                           <a:panel id="category-search-actions" rendered="#{NavigationBean.searchContext != null}">
+                              <td width=32>
+                                 <img src="<%=request.getContextPath()%>/images/icons/search_results_large.gif" width=32 height=32>
+                              </td>
+                              <td>
+                                 <%-- Summary --%>
+                                 <div class="mainTitle"><h:outputFormat value="#{msg.category_browser_browse_title}" id="category-msg11"><f:param value="#{CategoryBrowserBean.currentCategoryName}" id="category-param2" /></h:outputFormat><h:outputLabel id="category-msg121" value=" #{msg.category_browser_browse_include}" rendered="#{CategoryBrowserBean.includeSubcategories}"/></div>
+                                 <div class="mainSubText"><h:outputText value="#{msg.category_browser_browse_description}" id="category-msg13" /><h:outputLabel id="category-msg131" value=" #{msg.category_browser_browse_include}" rendered="#{CategoryBrowserBean.includeSubcategories}"/></div>
+                              </td>
+                           </a:panel>
+                           
+                           <td class="separator" width=1><img src="<%=request.getContextPath()%>/images/parts/dotted_separator.gif" border=0 height=29 width=1></td>
+                           <td width=118 valign=middle>
+                              <%-- View mode settings --%>
+                              <a:modeList id="category-viewMode" itemSpacing="4" iconColumnWidth="20" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
+                                    value="#{BrowseBean.browseViewMode}" actionListener="#{BrowseBean.viewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
+                                 <a:listItem value="details" label="#{msg.details_view}" />
+                                 <a:listItem value="icons" label="#{msg.view_icon}" />
+                                 <a:listItem value="list" label="#{msg.view_browse}" />
+                              </a:modeList>
+                           </td>
+                        </tr>
+                     </table>
+                  
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with gradient shadow --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_7.gif" width=4 height=9></td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/statuspanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/statuspanel_9.gif" width=4 height=9></td>
+               </tr>
+               
+               <%-- Custom Template View --%>
+               <a:panel id="category-custom-wrapper-panel" rendered="#{NavigationBean.hasCustomView}">
+                  <tr valign=top>
+                     <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                     <td style="padding:4px">
+                        <a:panel id="category-custom-panel" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle"
+                           label="#{msg.custom_view}" progressive="true"
+                           expanded='#{BrowseBean.panels["custom-panel"]}' expandedActionListener="#{BrowseBean.expandPanel}">
+                           <r:webScript id="category-webscript" scriptUrl="#{NavigationBean.currentNodeWebscript}" context="#{NavigationBean.currentNode.nodeRef}" rendered="#{NavigationBean.hasWebscriptView}" />
+                           <r:template id="category-template" template="#{NavigationBean.currentNodeTemplate}" model="#{NavigationBean.templateModel}" rendered="#{!NavigationBean.hasWebscriptView && NavigationBean.hasTemplateView}" />
+                        </a:panel>
+                     </td>
+                     <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+                  </tr>
+               </a:panel>
+               
+               <%-- Details - Spaces --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td style="padding:4px">
+                  
+                     <%-- wrapper comment used by the panel to add additional component facets --%>
+                     <h:panelGroup id="category-spaces-panel-facets">
+                        <f:facet name="title">
+                           <a:panel id="category-page-controls1" style="font-size:9px">
+                              <h:outputText value="#{msg.items_per_page}" id="category-items-txt1"/>
+                              <h:inputText id="category-spaces-pages" value="#{BrowseBean.pageSizeSpacesStr}" style="width:24px;margin-left:4px" maxlength="3" onkeyup="return applySizeSpaces(event);" />
+                              <div style="display:none"><a:actionLink id="category-spaces-apply" value="" actionListener="#{BrowseBean.updateSpacesPageSize}" /></div>
+                           </a:panel>
+                        </f:facet>
+                     </h:panelGroup>
+                     <a:panel id="category-spaces-panel" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle"
+                        label="#{msg.browse_spaces}" progressive="true" facetsId="category-spaces-panel-facets"
+                        expanded='#{BrowseBean.panels["spaces-panel"]}' expandedActionListener="#{BrowseBean.expandPanel}">
+                        
+                        <%-- Spaces List --%>
+                        <a:richList id="category-spacesList" binding="#{BrowseBean.spacesRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeSpaces}"
+                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                           value="#{BrowseBean.nodes}" var="r">
+                           
+                           <%-- Primary column for details view mode --%>
+                           <a:column id="category-col1" primary="true" width="200" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+                              </f:facet>
+                              <f:facet name="small-icon">
+                                 <a:actionLink id="category-col1-act1" value="#{r.name}" image="/images/icons/#{r.smallIcon}.gif" actionListener="#{BrowseBean.clickSpace}" showLink="false">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </f:facet>
+                              <a:actionLink id="category-col1-act2" value="#{r.name}" actionListener="#{BrowseBean.clickSpace}">
+                              <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              <r:nodeInfo id="category-col1-info" value="#{r.id}">
+                                 <h:graphicImage id="category-col1-img" url="/images/icons/popup.gif" styleClass="popupImage" width="16" height="16" />
+                              </r:nodeInfo>
+                           </a:column>
+                           
+                           <%-- Primary column for icons view mode --%>
+                           <a:column id="category-col2" primary="true" style="padding:2px;text-align:left;vertical-align:top;" rendered="#{BrowseBean.browseViewMode == 'icons'}">
+                              <f:facet name="large-icon">
+                                 <a:actionLink id="category-col2-act1" value="#{r.name}" image="/images/icons/#{r.icon}.gif" actionListener="#{BrowseBean.clickSpace}" showLink="false">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </f:facet>
+                              <a:actionLink id="category-col2-act2" value="#{r.name}" actionListener="#{BrowseBean.clickSpace}" styleClass="header">
+                              <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              <r:nodeInfo id="category-col2-info" value="#{r.id}">
+                                 <h:graphicImage id="category-col2-img" url="/images/icons/popup.gif" styleClass="popupImage" width="16" height="16" />
+                              </r:nodeInfo>
+                           </a:column>
+                           
+                           <%-- Primary column for list view mode --%>
+                           <a:column id="category-col3" primary="true" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'list'}">
+                              <f:facet name="large-icon">
+                                 <a:actionLink id="category-col3-act1" value="#{r.name}" image="/images/icons/#{r.icon}.gif" actionListener="#{BrowseBean.clickSpace}" showLink="false">
+                                    <f:param name="id" value="#{r.id}" />
+                                 </a:actionLink>
+                              </f:facet>
+                              <a:actionLink id="category-col3-act2" value="#{r.name}" actionListener="#{BrowseBean.clickSpace}" styleClass="title">
+                                 <f:param name="id" value="#{r.id}" />
+                              </a:actionLink>
+                              <r:nodeInfo id="category-col3-info" value="#{r.id}">
+                                 <h:graphicImage id="category-col3-img" url="/images/icons/popup.gif" styleClass="popupImage" width="16" height="16" />
+                              </r:nodeInfo>
+                           </a:column>
+                           
+                           <%-- Description column for all view modes --%>
+                           <a:column id="category-col4" style="text-align:left">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col4-sort" label="#{msg.description}" value="description" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="category-col4-txt" value="#{r.description}" />
+                           </a:column>
+                           
+                           <%-- Path column for search mode in details view mode --%>
+                           <a:column id="category-col5" style="text-align:left" rendered="#{NavigationBean.searchContext != null && BrowseBean.browseViewMode == 'details'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col5-sort" label="#{msg.path}" value="displayPath" styleClass="header"/>
+                              </f:facet>
+                              <r:nodePath id="category-col5-path" value="#{r.path}" actionListener="#{BrowseBean.clickSpacePath}" />
+                           </a:column>
+                           
+                           <%-- Created Date column for details view mode --%>
+                           <a:column id="category-col6" style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col6-sort" label="#{msg.created}" value="created" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="category-col6-txt" value="#{r.created}">
+                                 <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                              </h:outputText>
+                           </a:column>
+                           
+                           <%-- Modified Date column for details/icons view modes --%>
+                           <a:column id="category-col7" style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details' || BrowseBean.browseViewMode == 'icons'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col7-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="category-col7-txt" value="#{r.modified}">
+                                 <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                              </h:outputText>
+                           </a:column>
+                           
+                           <%-- Node Descendants links for list view mode --%>
+                           <a:column id="category-col8" style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'list'}">
+                              <r:nodeDescendants id="category-col8-kids" value="#{r.nodeRef}" styleClass="header" actionListener="#{BrowseBean.clickDescendantSpace}" />
+                           </a:column>
+                           
+                           <%-- Space Actions column --%>
+                           <a:column id="category-col9" actions="true" style="text-align:left">
+                              <f:facet name="header">
+                                 <h:outputText id="category-col9-txt" value="#{msg.actions}"/>
+                              </f:facet>
+                           
+                              <%-- actions are configured in web-client-config-actions.xml --%>
+                              <r:actions id="category-col9-acts1" value="space_browse" context="#{r}" showLink="false" styleClass="inlineAction" />
+                              
+                              <%-- More actions menu --%>
+                              <a:menu id="category-spaces-more-menu" itemSpacing="4" image="/images/icons/more.gif" tooltip="#{msg.more_actions}" menuStyleClass="moreActionsMenu">
+                                 <r:actions id="category-col9-acts2" value="space_browse_menu" context="#{r}" />
+                              </a:menu>
+                           </a:column>
+                           
+                           <a:dataPager id="category-pager1" styleClass="pager" />
+                        </a:richList>
+                     
+                     </a:panel>
+                  
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+                  
+               <%-- Details - Content --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td style="padding:4px">
+                  
+                     <h:panelGroup id="category-content-panel-facets">
+                        <f:facet name="title">
+                           <a:panel id="category-page-controls2" style="font-size:9px">
+                              <h:outputText value="#{msg.items_per_page}" id="category-items-txt2"/>
+                              <h:inputText id="category-content-pages" value="#{BrowseBean.pageSizeContentStr}" style="width:24px;margin-left:4px" maxlength="3" onkeyup="return applySizeContent(event);" />
+                              <div style="display:none"><a:actionLink id="category-content-apply" value="" actionListener="#{BrowseBean.updateContentPageSize}" /></div>
+                           </a:panel>
+                        </f:facet>
+                     </h:panelGroup>
+                     <a:panel id="category-content-panel" border="white" bgcolor="white" titleBorder="lbgrey" expandedTitleBorder="dotted" titleBgcolor="white" styleClass="mainSubTitle"
+                        label="#{msg.browse_content}" progressive="true" facetsId="category-content-panel-facets"
+                        expanded='#{BrowseBean.panels["content-panel"]}' expandedActionListener="#{BrowseBean.expandPanel}">
+                     
+                        <%-- Content list --%>
+                        <a:richList id="category-contentRichList" binding="#{BrowseBean.contentRichList}" viewMode="#{BrowseBean.browseViewMode}" pageSize="#{BrowseBean.pageSizeContent}"
+                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                           value="#{BrowseBean.content}" var="r">
+                           
+                           <%-- Primary column for details view mode --%>
+                           <a:column id="category-col10" primary="true" width="200" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col10-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+                              </f:facet>
+                              <f:facet name="small-icon">
+                                 <a:actionLink id="category-col10-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" showLink="false" styleClass="inlineAction" />
+                              </f:facet>
+                              <a:actionLink id="category-col10-act2" value="#{r.name}" href="#{r.url}" target="new" />
+                              <r:lockIcon id="category-col10-lock" value="#{r.nodeRef}" align="absmiddle" />
+                              <h:outputLabel id="category-col10-lang" value="#{r.lang}" styleClass="langCode" rendered="#{r.lang != null}" />
+                              <r:nodeInfo id="category-col10-info" value="#{r.id}">
+                                 <h:graphicImage id="category-col10-img" url="/images/icons/popup.gif" styleClass="popupImage" width="16" height="16" />
+                              </r:nodeInfo>
+                           </a:column>
+                           
+                           <%-- Primary column for icons view mode --%>
+                           <a:column id="category-col11" primary="true" style="padding:2px;text-align:left;vertical-align:top;" rendered="#{BrowseBean.browseViewMode == 'icons'}">
+                              <f:facet name="large-icon">
+                                 <a:actionLink id="category-col11-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType32}" showLink="false" styleClass="inlineAction" />
+                              </f:facet>
+                              <a:actionLink id="category-col11-act2" value="#{r.name}" href="#{r.url}" target="new" styleClass="header" />
+                              <r:lockIcon id="category-col11-lock" value="#{r.nodeRef}" align="absmiddle" />
+                              <h:outputLabel id="category-col11-lang" value="#{r.lang}" styleClass="langCode" rendered="#{r.lang != null}"/>
+                              <r:nodeInfo id="category-col11-info" value="#{r.id}">
+                                 <h:graphicImage id="category-col11-img" url="/images/icons/popup.gif" styleClass="popupImage" width="16" height="16" />
+                              </r:nodeInfo>
+                           </a:column>
+                           
+                           <%-- Primary column for list view mode --%>
+                           <a:column id="category-col12" primary="true" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'list'}">
+                              <f:facet name="large-icon">
+                                 <a:actionLink id="category-col12-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType32}" showLink="false" styleClass="inlineAction" />
+                              </f:facet>
+                              <a:actionLink id="category-col12-act2" value="#{r.name}" href="#{r.url}" target="new" styleClass="title" />
+                              <r:lockIcon id="category-col12-lock" value="#{r.nodeRef}" align="absmiddle" />
+                              <h:outputLabel id="category-col12-lang" value="#{r.lang}" styleClass="langCode" rendered="#{r.lang != null}"/>
+                              <r:nodeInfo id="category-col12-info" value="#{r.id}">
+                                 <h:graphicImage id="category-col12-img" url="/images/icons/popup.gif" styleClass="popupImage" width="16" height="16" />
+                              </r:nodeInfo>
+                           </a:column>
+                           
+                           <%-- Description column for all view modes --%>
+                           <a:column id="category-col13" style="text-align:left">
+                              <f:facet name="header">
+                                 <a:sortLink  id="category-col13-sort" label="#{msg.description}" value="description" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="category-col13-txt" value="#{r.description}" />
+                           </a:column>
+                           
+                           <%-- Path column for search mode in details view mode --%>
+                           <a:column id="category-col14" style="text-align:left" rendered="#{NavigationBean.searchContext != null && BrowseBean.browseViewMode == 'details'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col14-sort" label="#{msg.path}" value="displayPath" styleClass="header"/>
+                              </f:facet>
+                              <r:nodePath id="category-col14-path" value="#{r.path}" actionListener="#{BrowseBean.clickSpacePath}" />
+                           </a:column>
+                           
+                           <%-- Size for details/icons view modes --%>
+                           <a:column id="category-col15" style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details' || BrowseBean.browseViewMode == 'icons'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col15-sort" label="#{msg.size}" value="size" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="category-col15-txt" value="#{r.size}">
+                                 <a:convertSize />
+                              </h:outputText>
+                           </a:column>
+                           
+                           <%-- Created Date column for details view mode --%>
+                           <a:column id="category-col16" style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col16-sort" label="#{msg.created}" value="created" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="category-col16-txt" value="#{r.created}">
+                                 <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                              </h:outputText>
+                           </a:column>
+                           
+                           <%-- Modified Date column for details/icons view modes --%>
+                           <a:column id="category-col17" style="text-align:left" rendered="#{BrowseBean.browseViewMode == 'details' || BrowseBean.browseViewMode == 'icons'}">
+                              <f:facet name="header">
+                                 <a:sortLink id="category-col17-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="category-col17-txt" value="#{r.modified}">
+                                 <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+                              </h:outputText>
+                           </a:column>
+                           
+                           <%-- Content Actions column --%>
+                           <a:column id="category-col18" actions="true" style="text-align:left">
+                              <f:facet name="header">
+                                 <h:outputText id="category-col18-txt" value="#{msg.actions}"/>
+                              </f:facet>
+                              
+                              <%-- actions are configured in web-client-config-actions.xml --%>
+                              <r:actions id="category-col18-acts1" value="document_browse" context="#{r}" showLink="false" styleClass="inlineAction" />
+                              
+                              <%-- More actions menu --%>
+                              <a:menu id="category-content-more-menu" itemSpacing="4" image="/images/icons/more.gif" tooltip="#{msg.more_actions}" menuStyleClass="moreActionsMenu">
+                                 <r:actions id="category-col18-acts2" value="document_browse_menu" context="#{r}" />
+                              </a:menu>
+                           </a:column>
+                           
+                           <a:dataPager id="category-pager2" styleClass="pager" />
+                        </a:richList>
+                     
+                     </a:panel>
+                  
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- Error Messages --%>
+               <tr valign=top>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
+                  <td style="padding:4px">
+                     <%-- messages tag to show messages not handled by other specific message tags --%>
+                     <a:errors message="" infoClass="statusWarningText" errorClass="statusErrorText" />
+                  </td>
+                  <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
+               </tr>
+               
+               <%-- separator row with bottom panel graphics --%>
+               <tr>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_7.gif" width=4 height=4></td>
+                  <td width=100% align=center style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_8.gif)"></td>
+                  <td><img src="<%=request.getContextPath()%>/images/parts/whitepanel_9.gif" width=4 height=4></td>
+               </tr>
+            
+            </table>
+         </td>
+      </tr>
+   </table>
+
+</h:form>
+
+</f:view>
+
+</r:page>

source/web/jsp/sidebar/category-browser.jsp

@@ -0,0 +1,30 @@
+<%--
+ * 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"
+--%>
+<%@ 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" %>
+
+<r:categoryBrowser id="category-browser"/>