. First pass of a new style for the header area in the web-client UI

- Reclaims a large ammount of unused vertical space at the top of the application

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

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

@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.TemplateImageResolver;
 import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -97,6 +98,14 @@ public class NavigationBean
       this.namespaceService = namespaceService;
    }
    
+   /**
+    * @param ruleService The ruleService to use
+    */
+   public void setRuleService(RuleService ruleService)
+   {
+      this.ruleService = ruleService;
+   }
+   
    /**
     * @param cifsServer The cifsServer to set.
     */
@@ -189,6 +198,15 @@ public class NavigationBean
       this.helpUrl = helpUrl;
    }
    
+   /**
+    * @return the number of rules associated with the current space
+    */
+   public int getRuleCount()
+   {
+       Node node = getCurrentNode();
+       return (node != null ? this.ruleService.countRules(node.getNodeRef()) : 0);
+   }
+   
    /**
     * @return Returns the search context object if any.
     */
@@ -361,7 +379,6 @@ public class NavigationBean
          Path path = this.nodeService.getPath(nodeRef);
          
          // resolve CIFS network folder location for this node
-         
          DiskSharedDevice diskShare = cifsServer.getConfiguration().getPrimaryFilesystem();
          
          if (diskShare != null)
@@ -650,6 +667,9 @@ public class NavigationBean
    /** NamespaceService bean reference */
    protected NamespaceService namespaceService;
    
+   /** RuleService bean reference*/
+   protected RuleService ruleService;
+   
    /** CIFSServer bean reference */
    protected CIFSServer cifsServer;
    

source/java/org/alfresco/web/bean/users/UserMembersBean.java

@@ -99,6 +99,7 @@ public abstract class UserMembersBean
    /** roles for current person */
    private List<PermissionWrapper> personRoles = null;
    
+   
    // ------------------------------------------------------------------------------
    // Abstract methods
    
@@ -109,6 +110,7 @@ public abstract class UserMembersBean
     */
    public abstract Node getNode();
    
+   
    // ------------------------------------------------------------------------------
    // Bean property getters and setters
 

source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java

@@ -111,8 +111,8 @@ public class NewRuleWizard extends BaseActionWizard
    private boolean editingAction;
    private boolean editingCondition;
 
-   private RuleService ruleService;
-   private RulesBean rulesBean;
+   protected RuleService ruleService;
+   protected RulesBean rulesBean;
    
    private List<SelectItem> modelTypes;
    private List<SelectItem> mimeTypes;