- see ChangeLog;

Monotone-Parent: a94fdd73f46f13c408afc631567411d8f76242ba
Monotone-Revision: 9a1990daa03b7969b33420752ca0d11ef89f8d64

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-07-06T19:48:36
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,17 @@
+2006-07-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* The toolbar code from the MailerUI product was taken, renamed as
+	"UIxToolBar" and put into UI/Common. Toolbar plists were created
+	for the Contacts and Scheduler products and put in their respectir
+	Toolbars/ subdirectories. Finally,
+	UI/Templates/{UIxToolbarButton,UIxToolbarSeparator}.wox, and
+	UI/Common/{UIxToolbarButton,UIxToolbarSeparator}.m were removed
+	and an invocation to the UIxToolbar component was put at the top
+	of UI/Templaces/UIxPageFrame.wox.
+
+	* UI/Common/UIxToolbar.m: new "isLastGroup" method to determine
+	within the templates whether a separator should be displayed.
+
 2006-07-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Templates/UIxPageFrame.wox: replaced central table with a DIV.

UI/Common/GNUmakefile

@@ -20,6 +20,7 @@ CommonUI_OBJC_FILES +=		\
 	UIxTabView.m		\
 	UIxTabItem.m		\
 	\
+	UIxToolbar.m		\
 	UIxToolbarButton.m	\
 	UIxToolbarSeparator.m
 

UI/Common/UIxToolbar.m

@@ -19,11 +19,22 @@
   02111-1307, USA.
 */
 
+#if LIB_FOUNDATION_LIBRARY
+#  include <Foundation/exceptions/GeneralExceptions.h>
+#elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
+#endif
+
+#include <NGExtensions/NGExtensions.h>
+#include <NGObjWeb/NGObjWeb.h>
+#include <NGObjWeb/SoObjects.h>
+
 #include <SOGoUI/UIxComponent.h>
 
 @class NSArray, NSDictionary;
 
-@interface UIxMailToolbar : UIxComponent
+@interface UIxToolbar : UIxComponent
 {
   NSArray      *toolbarConfig;
   NSArray      *toolbarGroup;
@@ -31,11 +42,9 @@
 }
 @end
 
-#include <SoObjects/Mailer/SOGoMailBaseObject.h>
-#include "common.h"
 #include <NGObjWeb/SoComponent.h>
 
-@implementation UIxMailToolbar
+@implementation UIxToolbar
 
 - (void)dealloc {
   [self->toolbarGroup  release];
@@ -58,6 +67,7 @@
 - (void)setToolbarGroup:(id)_group {
   ASSIGN(self->toolbarGroup, _group);
 }
+
 - (id)toolbarGroup {
   return self->toolbarGroup;
 }
@@ -65,6 +75,7 @@
 - (void)setButtonInfo:(id)_info {
   ASSIGN(self->buttonInfo, _info);
 }
+
 - (id)buttonInfo {
   return self->buttonInfo;
 }
@@ -80,6 +91,30 @@
   return [[self application] resourceManager];
 }
 
+- (id) pathToResourceNamed: (NSString *) name
+{
+  WOResourceManager *rm;
+  NSRange  r;
+  NSString *fw, *rn;
+
+  r = [name rangeOfString: @"/"];
+  if (r.length > 0)
+    {
+      fw = [name substringToIndex: r.location];
+      rn = [name substringFromIndex: (r.location + r.length)];
+    }
+  else
+    {
+      rn = name;
+      fw = nil;
+    }
+  
+  rm = [self pageResourceManager];
+
+  return [rm pathForResourceNamed: rn inFramework: fw 
+	     languages: [[self context] resourceLookupLanguages]];
+}
+
 - (id)loadToolbarConfigFromResourceNamed:(NSString *)_name {
   /*
     Note: we cannot cache by name because we don't know how the resource
@@ -90,24 +125,10 @@
 	  cache the parsed content for a given path;
   */
   static NSMutableDictionary *pathToConfig = nil;
-  WOResourceManager *rm;
   NSDictionary *tb;
-  NSRange  r;
-  NSString *fw, *rn, *path;
+  NSString *path;
 
-  r = [_name rangeOfString:@"/"];
-  if (r.length > 0) {
-    fw = [_name substringToIndex:r.location];
-    rn = [_name substringFromIndex:(r.location + r.length)];
-  }
-  else {
-    rn = _name;
-    fw = nil;
-  }
-  
-  rm   = [self pageResourceManager];
-  path = [rm pathForResourceNamed:rn inFramework:fw 
-	     languages:[[self context] resourceLookupLanguages]];
+  path = [self pathToResourceNamed: _name];
   if (path == nil) {
     [self errorWithFormat:@"Did not find toolbar resource: %@", _name];
     return nil;
@@ -122,7 +143,7 @@
   if (pathToConfig == nil)
     pathToConfig = [[NSMutableDictionary alloc] initWithCapacity:32];
   [pathToConfig setObject:(tb ? tb : (id)[NSNull null]) forKey:path];
-  
+
   return tb;
 }
 
@@ -171,6 +192,18 @@
   return label;
 }
 
+- (id) buttonImage {
+  WOResourceManager *rm;
+  NSString *image;
+
+  rm = [self pageResourceManager];
+  image = [buttonInfo objectForKey: @"image"];
+  if (image && [image length] > 0)
+    image = [rm urlForResourceNamed: image];
+
+  return image;
+}
+
 /* enable/disable buttons */
 
 - (BOOL)isButtonEnabled {
@@ -184,4 +217,9 @@
   return [[[[self context] page] valueForKeyPath:onOffKey] boolValue];
 }
 
-@end /* UIxMailToolbar */
+- (BOOL) isLastGroup {
+  return ([toolbarConfig indexOfObject: toolbarGroup]
+	  == ([toolbarConfig count] - 1));
+}
+
+@end /* UIxToolbar */

UI/Common/UIxToolbarButton.m

@@ -1,113 +0,0 @@
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
-
-#import <SOGoUI/UIxComponent.h>
-
-@interface UIxToolbarButton : UIxComponent
-{
-  NSString *buttonImage;
-  NSString *buttonLabel;
-  NSString *buttonLink;
-  NSString *buttonTooltip;
-}
-
-- (void) setButtonImage: (NSString *) newButtonImage;
-- (NSString *) buttonImage;
-
-- (void) setButtonLabel: (NSString *) newButtonLabel;
-- (NSString *) buttonLabel;
-
-- (void) setButtonLink: (NSString *) newButtonLink;
-- (NSString *) buttonLink;
-
-- (void) setButtonTooltip: (NSString *) newButtonTooltip;
-- (NSString *) buttonTooltip;
-
-@end
-
-@implementation UIxToolbarButton
-
-
-- (id) init
-{
-  if ((self = [super init]))
-    {
-      buttonImage = nil;
-      buttonLabel = nil;
-      buttonLink = nil;
-      buttonTooltip = nil;
-    }
-
-  return self;
-}
-
-- (void) dealloc
-{
-  if (buttonImage)
-    [buttonImage release];
-  if (buttonLabel)
-    [buttonLabel release];
-  if (buttonLink)
-    [buttonLink release];
-  if (buttonTooltip)
-    [buttonTooltip release];
-  [super dealloc];
-}
-
-- (void) setButtonLabel: (NSString *) newButtonLabel
-{
-  if (buttonLabel)
-    [buttonLabel release];
-  buttonLabel = newButtonLabel;
-  if (buttonLabel)
-    [buttonLabel retain];
-}
-
-- (NSString *) buttonLabel
-{
-  return buttonLabel;
-}
-
-- (void) setButtonImage: (NSString *) newButtonImage
-{
-  if (buttonImage)
-    [buttonImage release];
-  buttonImage = newButtonImage;
-  if (buttonImage)
-    [buttonImage retain];
-}
-
-- (NSString *) buttonImage
-{
-  return buttonImage;
-}
-
-- (void) setButtonLink: (NSString *) newButtonLink
-{
-  if (buttonLink)
-    [buttonLink release];
-  buttonLink = newButtonLink;
-  if (buttonLink)
-    [buttonLink retain];
-}
-
-- (NSString *) buttonLink
-{
-  return [self completeHrefForMethod: buttonLink];
-}
-
-- (void) setButtonTooltip: (NSString *) newButtonTooltip
-{
-  if (buttonTooltip)
-    [buttonTooltip release];
-  buttonTooltip = newButtonTooltip;
-  if (buttonTooltip)
-    [buttonTooltip retain];
-}
-
-- (NSString *) buttonTooltip
-{
-  return buttonTooltip;
-}
-
-@end

UI/Common/UIxToolbarSeparator.m

@@ -1,14 +0,0 @@
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
-
-#import <SOGoUI/UIxComponent.h>
-
-@interface UIxToolbarSeparator : UIxComponent
-{
-}
-
-@end
-
-@implementation UIxToolbarSeparator
-
-@end

UI/Contacts/GNUmakefile

@@ -30,6 +30,9 @@ ContactsUI_RESOURCE_FILES +=		\
 	Images/properties.png		\
 	Images/write.png
 
+ContactsUI_RESOURCE_FILES +=		\
+	Toolbars/SOGoContactFolder.toolbar
+
 ContactsUI_LOCALIZED_RESOURCE_FILES +=	\
 	Localizable.strings		\
 

UI/Contacts/product.plist

@@ -9,6 +9,12 @@
 
   categories = {
     SOGoContactFolder = {
+      slots = {
+        toolbar = {
+          protectedBy = "View";
+          value = "SOGoContactFolder.toolbar";
+        };
+      };
       methods = {
         view = {
           protectedBy = "View";
@@ -27,6 +33,12 @@
     };
 
     SOGoContactObject = {
+      slots = {
+        toolbar = {
+          protectedBy = "View";
+          value = "SOGoContactObject.toolbar";
+        };
+      };
       methods = {
         view = { 
           protectedBy = "View";

UI/MailerUI/GNUmakefile

@@ -19,7 +19,6 @@ MailerUI_OBJC_FILES += \
 	UIxMailMainFrame.m		\
 	UIxMailTree.m			\
 	UIxMailTreeBlock.m		\
-	UIxMailToolbar.m		\
 	\
 	UIxMailAccountsView.m		\
 	UIxMailAccountView.m		\
@@ -46,7 +45,8 @@ MailerUI_OBJC_FILES += \
 MailerUI_RESOURCE_FILES += \
 	Version		\
 	product.plist	\
-	Toolbars/*.toolbar
+	Toolbars/*.toolbar \
+	Images/*.png
 
 MailerUI_LOCALIZED_RESOURCE_FILES += \
 	Localizable.strings

UI/MailerUI/Toolbars/SOGoDraftObject.toolbar

@@ -1,21 +1,27 @@
-( /* the toolbar groups */
+( /* the toolbar groups -*-cperl-*- */
   ( /* first group */
-              { link  = "#"; isSafe = NO;
-                onclick  = "clickedEditorSend(this);return false;";
-                cssClass = "tbicon_send"; label = "Send"; },
-              { link  = "#"; target = "addressbook";
-                onclick  = "openAddressbook(this);return false;";
-                cssClass = "tbicon_addressbook"; label = "Addressbook"; },
-              { link  = "#"; target = "anais";
-                onclick  = "openAnais(this);return false;";
-                cssClass = "tbicon_anais"; label = "Anais"; },
-              { link  = "#"; isSafe = NO;
-                onclick  = "clickedEditorAttach(this)";
-                cssClass = "tbicon_attach"; label = "Attach"; },
-              { link  = "#";  isSafe = NO;
-                onclick  = "clickedEditorSave(this);return false;";
-                cssClass = "tbicon_save"; label = "Save"; },
-              { link = "delete"; isSafe = NO;
-                cssClass = "tbicon_delete"; label = "Delete"; },
+    { link  = "#"; isSafe = NO;
+      onclick  = "clickedEditorSend(this);return false;";
+      image = "tb-compose-send-flat-24x24.png";
+      cssClass = "tbicon_send"; label = "Send"; },
+    { link  = "#"; target = "addressbook";
+      onclick  = "openAddressbook(this);return false;";
+      image = "tb-mail-addressbook-flat-24x24.png";
+      cssClass = "tbicon_addressbook"; label = "Addressbook"; },
+    { link  = "#"; target = "anais";
+      onclick  = "openAnais(this);return false;";
+      image = "tbtb_anais.png";
+      cssClass = "tbicon_anais"; label = "Anais"; },
+    { link  = "#"; isSafe = NO;
+      onclick  = "clickedEditorAttach(this)";
+      image = "tb-compose-attach-flat-24x24.png";
+      cssClass = "tbicon_attach"; label = "Attach"; },
+    { link  = "#";  isSafe = NO;
+      onclick  = "clickedEditorSave(this);return false;";
+      image = "tb-mail-file-flat-24x24.png";
+      cssClass = "tbicon_save"; label = "Save"; },
+    { link = "delete"; isSafe = NO;
+      image = "tb-mail-delete-flat-24x24.png";
+      cssClass = "tbicon_delete"; label = "Delete"; },
   )
 )

UI/MailerUI/Toolbars/SOGoMailAccount.toolbar

@@ -1,18 +1,21 @@
-( /* the toolbar groups */
-            ( /* first group */
-              { link  = "getMail";
-                cssClass = "tbicon_getmail"; label = "Get Mail"; },
-              {
-                link     = "#"; // "compose"; // target = "_blank";
-                isSafe   = NO;
-                onclick  = "clickedCompose(this);return false;";
-                cssClass = "tbicon_compose"; label = "Write";
-              },
-            ),
-            ( // fourth group (folders)
-              { link = "#"; onclick="return ctxFolderAdd(this)";
-                enabled  = "showFolderCreateButton";
-                isSafe = NO;
-                cssClass = "tbicon_folderadd"; label = "Create"; }
-            )
-)
+( /* the toolbar groups -*-cperl-*- */
+  ( /* first group */
+    { link  = "getMail";
+      image = "tb-mail-getmail-flat-24x24.png";
+      cssClass = "tbicon_getmail"; label = "Get Mail"; },
+    {
+     link     = "#"; // "compose"; // target = "_blank";
+     isSafe   = NO;
+     image = "tb-mail-write-flat-24x24.png";
+     onclick  = "clickedCompose(this);return false;";
+     cssClass = "tbicon_compose"; label = "Write";
+    },
+  ),
+  ( // fourth group (folders)
+    { link = "#"; onclick="return ctxFolderAdd(this)";
+      enabled  = "showFolderCreateButton";
+      isSafe = NO;
+      image = "tbtb_folderadd.png";
+      cssClass = "tbicon_folderadd"; label = "Create"; }
+  )
+)

UI/MailerUI/Toolbars/SOGoMailFolder.toolbar

@@ -1,10 +1,12 @@
-( /* the toolbar groups */
+( /* the toolbar groups -*-cperl-*- */
   ( /* first group */
     { link  = "getMail";
+      image = "tb-mail-getmail-flat-24x24.png";
       cssClass = "tbicon_getmail"; label = "Get Mail"; },
 
     { link     = "#"; // "compose"; // target = "_blank";
       isSafe   = NO;
+      image = "tb-mail-write-flat-24x24.png";
       onclick  = "clickedCompose(this);return false;";
       cssClass = "tbicon_compose"; label = "Write"; },
   ),
@@ -13,36 +15,46 @@
   ( // second group
     { link = "#";  isSafe = NO;
       onclick="openMessageWindowsForSelection(this, 'reply'); return false;";
+      image = "tb-mail-reply-flat-24x24.png";
       cssClass = "tbicon_reply";    label = "Reply";     },
 
     { link = "#";  isSafe = NO;
       onclick="openMessageWindowsForSelection(this, 'replyall'); return false;";
+      image = "tb-mail-replyall-flat-24x24.png";
       cssClass = "tbicon_replyall"; label = "Reply All"; },
 
     { link = "#";  isSafe = NO;
       onclick="openMessageWindowsForSelection(this, 'forward'); return false;";
+      image = "tb-mail-forward-flat-24x24.png";
       cssClass = "tbicon_forward";  label = "Forward";   },
   ),
 
 
   ( // third group
     /* TODO: maybe this should be a default or get enabled with no trash writes
-      { link = "expunge"; isSafe = NO;
-        enabled  = clientObject.isDeleteAndExpungeAllowed;
-        cssClass = "tbicon_delete"; label = "Expunge"; },
+    { link = "expunge"; isSafe = NO;
+      enabled  = clientObject.isDeleteAndExpungeAllowed;
+      image = "tb-mail-delete-flat-24x24.png";
+      cssClass = "tbicon_delete"; label = "Expunge"; },
     */
-    
+
     // TODO: rename to uixTrashSelectedMessages, be more consistent with
     //       SOGoMailObject.toolbar (trash AND delete button)
     { link = "#"; isSafe = NO;
       onclick = "uixDeleteSelectedMessages(this); return false;";
       enabled  = clientObject.isDeleteAndExpungeAllowed;
-      cssClass = "tbicon_delete"; label = "Delete"; },
+      image = "tb-mail-delete-flat-24x24.png";
+      cssClass = "tbicon_delete"; label = "Delete";
+    }
+    ,
 
     /* TODO: enable when implemented
-    // TODO: enable when we know how to mark junk (#971)
-      { link = "#"; isSafe = NO;
-        cssClass = "tbicon_junk";   label = "Junk";   },
+    // TODO: enable when we know how to mark junk #971)
+    { link = "#"; isSafe = NO;
+      image = "tb-mail-junk-flat-24x24.png";
+      cssClass = "tbicon_junk";   label = "Junk";
+    }
+    ,
     */
   ),
 
@@ -51,19 +63,24 @@
     { link = "#"; onclick="return ctxFolderAdd(this)";
       enabled  = "clientObject.isCreateAllowed";
       isSafe = NO;
-      cssClass = "tbicon_folderadd"; label = "Create"; },
+      image = "tbtb_folderadd.png";
+      cssClass = "tbicon_folderadd"; label = "Create";
+    }
+    ,
     { link = "#"; onclick="return ctxFolderDelete(this)";
       enabled  = "clientObject.isCreateAllowed"; // TODO: correct?
       isSafe = NO;
+      image = "tbtb_folderdel.png";
       cssClass = "tbicon_folderdel"; label = "Delete"; },
   ),
 
-/*
+  /*
   ( // fourth group
-    //TODO: enable when we can print (#1207)
-    //   { link = "#"; cssClass = "tbicon_print"; label = "Print"; },
-    
-    { link = "#"; cssClass = "tbicon_stop";  label = "Stop";  },
-  )
-*/
+  //TODO: enable when we can print ( #1207)
+				    //   { link = "#"; cssClass = "tbicon_print"; label = "Print"; },
+				    
+				    {
+				     link = "#"; cssClass = "tbicon_stop";  label = "Stop";  },
+				   )
+  */
 )

UI/MailerUI/Toolbars/SOGoMailObject.toolbar

@@ -1,11 +1,13 @@
-( /* the toolbar groups */
+( /* the toolbar groups -*-cperl-*- */
 
   ( /* first group */
     { link  = "getMail";
+      image = "tb-mail-getmail-flat-24x24.png";
       cssClass = "tbicon_getmail"; label = "Get Mail"; },
 
     { link     = "#"; // "compose"; // target = "_blank";
       isSafe   = NO;
+      image = "tb-mail-write-flat-24x24.png";
       onclick  = "clickedCompose(this);return false;";
       cssClass = "tbicon_compose"; label = "Write";    },
   ),
@@ -13,24 +15,29 @@
   ( // second group
     { link = "reply"; 
       isSafe   = NO;
+      image = "tb-mail-reply-flat-24x24.png";
       cssClass = "tbicon_reply";    label = "Reply";     },
 
     { link = "replyall"; 
       isSafe   = NO;
+      image = "tb-mail-replyall-flat-24x24.png";
       cssClass = "tbicon_replyall"; label = "Reply All"; },
 
     { link = "forward"; 
       isSafe   = NO;
+      image = "tb-mail-forward-flat-24x24.png";
       cssClass = "tbicon_forward";  label = "Forward";   },
   ),
 
   ( // third group
     { link     = "delete"; isSafe = NO;
       enabled  = showMarkDeletedButton;
+      image = "tb-mail-delete-flat-24x24.png";
       cssClass = "tbicon_delete"; label = "Delete"; },
 
     { link     = "trash"; isSafe = NO;
       enabled  = showTrashButton;
+      image = "tb-mail-delete-flat-24x24.png";
       cssClass = "tbicon_delete"; label = "Delete"; },
 
     /* TODO: enable when we know how to mark junk (#971)
@@ -47,4 +54,4 @@
     { link = "#"; cssClass = "tbicon_stop";  label = "Stop";  },
   ),
 */
-)
+)

UI/MailerUI/Toolbars/SOGoTrashFolder.toolbar

@@ -1,12 +1,15 @@
-( /* the toolbar groups */
+( /* the toolbar groups -*-cperl-*- */
             ( /* first group */
               {
                 link  = "getMail";
                 cssClass = "tbicon_getmail"; label = "Get Mail";
-              },
+		image = "tb-mail-getmail-flat-24x24.png";
+		tooltip = "test coucou blabla";
+             },
               {
                 link     = "#"; // "compose"; // target = "_blank";
                 isSafe   = NO;
+	        image = "tb-mail-write-flat-24x24.png";
                 onclick  = "clickedCompose(this);return false;";
                 cssClass = "tbicon_compose"; label = "Write";
               },
@@ -14,13 +17,16 @@
             ( // third group
               { link = "emptyTrash"; isSafe = NO;
                 enabled  = clientObject.isDeleteAndExpungeAllowed;
+	        image = "tb-mail-junk-flat-24x24.png";
                 cssClass = "tbicon_trash"; label = "Empty Trash"; },
 /* TODO: enable when implemented
 // TODO: enable when delete works (#1212)
               { link = "#"; isSafe = NO;
+	        image = "tb-mail-delete-flat-24x24.png";
                 cssClass = "tbicon_delete"; label = "Delete"; },
 // TODO: enable when we know how to mark junk (#971)
               { link = "#"; isSafe = NO;
+	        image = "tb-mail-junk-flat-24x24.png";
                 cssClass = "tbicon_junk";   label = "Junk";   },
 */
             ),
@@ -30,4 +36,4 @@
     { link = "#"; cssClass = "tbicon_stop";  label = "Stop";  },
   )
 */
-)
+)

UI/MailerUI/UIxMailEditor.m

@@ -54,7 +54,6 @@
 #include <SoObjects/Mailer/SOGoMailAccounts.h>
 #include <SoObjects/Mailer/SOGoMailIdentity.h>
 #include <SoObjects/SOGo/WOContext+Agenor.h>
-#include <SoObjects/SOGo/SOGoUser.h>
 #include <NGMail/NGMimeMessage.h>
 #include <NGMail/NGMimeMessageGenerator.h>
 #include <NGObjWeb/SoSubContext.h>

UI/MailerUI/product.plist

@@ -1,4 +1,4 @@
-{
+{ /* -*-cperl-*- */
   requires = ( MAIN, CommonUI, Mailer, Sieve );
 
   publicResources = (
@@ -228,6 +228,7 @@
           value = ( /* the toolbar groups */
             ( /* first group */
               { link  = "getMail";
+		image = "tb-mail-getmail-flat-24x24.png";
                 cssClass = "tbicon_getmail"; label = "Get Mail"; },
             )
           );
@@ -290,12 +291,14 @@
           value = ( /* the toolbar groups */
             ( /* first group */
               { link  = "getMail";
+		image = "tb-mail-getmail-flat-24x24.png";
                 cssClass = "tbicon_getmail"; label = "Get Mail"; },
               {
-                link     = "#"; // "compose"; // target = "_blank";
-                isSafe = NO;
-                onclick  = "clickedCompose(this);return false;";
-                cssClass = "tbicon_compose"; label = "Write"; },
+	       link     = "#"; // "compose"; // target = "_blank";
+	       isSafe = NO;
+	       onclick  = "clickedCompose(this);return false;";
+	       image = "tb-mail-write-flat-24x24.png";
+	       cssClass = "tbicon_compose"; label = "Write"; },
             )
           );
         };
@@ -387,13 +390,15 @@
           value = ( /* the toolbar groups */
             ( /* first group */
               {
-                link  = "getMail";
-                cssClass = "tbicon_getmail"; label = "Get Mail";
+	       link  = "getMail";
+	       image = "tb-mail-getmail-flat-24x24.png";
+	       cssClass = "tbicon_getmail"; label = "Get Mail";
               },
               {
-                link     = "#"; // "compose"; // target = "_blank";
-                onclick  = "clickedNewFilter(this); return false";
-                cssClass = "tbicon_compose"; label = "New Filter";
+	       link     = "#"; // "compose"; // target = "_blank";
+	       onclick  = "clickedNewFilter(this); return false";
+	       image = "tb-mail-write-flat-24x24.png";
+	       cssClass = "tbicon_compose"; label = "New Filter";
               },
             ),
             ( /* second group
@@ -422,11 +427,13 @@
           protectedBy = "View";
           value = ( /* the toolbar groups */
             ( /* first group */
-              { link  = "#"; 
+              { link  = "#";
                 onclick  = "clickedEditorSave(this);return false;";
-                cssClass = "tbicon_save"; label = "Save"; },
-              { link = "#"; 
+		image = "tb-mail-file-flat-24x24.png";
+		cssClass = "tbicon_save"; label = "Save"; },
+              { link = "#";
                 onclick  = "clickedEditorDelete(this);return false;";
+		image = "tb-mail-delete-flat-24x24.png";
                 cssClass = "tbicon_delete"; label = "Delete"; },
             )
           );

UI/Scheduler/GNUmakefile

@@ -83,6 +83,9 @@ SchedulerUI_RESOURCE_FILES += \
 	images/new-task.png			\
 	images/week-view.png
 
+SchedulerUI_RESOURCE_FILES += \
+	Toolbars/SOGoAppointmentFolder.toolbar
+
 SchedulerUI_LOCALIZED_RESOURCE_FILES += \
 	Localizable.strings		\
 

UI/Scheduler/product.plist

@@ -29,6 +29,12 @@
 
   categories = {
     SOGoAppointmentFolder = {
+      slots = {
+        toolbar = {
+          protectedBy = "View";
+          value = "SOGoAppointmentFolder.toolbar";
+        };
+      };
       methods = {
         dayoverview = {
           protectedBy = "View";

UI/Templates/ContactsUI/UIxContactView.wox

@@ -8,38 +8,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Cart"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New List"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Properties"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Write"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
          width="100%"
   >

UI/Templates/ContactsUI/UIxContactsListView.wox

@@ -24,38 +24,6 @@
     }
   </style>
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_card"
-	const:buttonLabel="New Card"
-	rsrc:buttonImage="new-card.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_list"
-	const:buttonLabel="New List"
-	rsrc:buttonImage="new-list.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="properties"
-	const:buttonLabel="Properties"
-	rsrc:buttonImage="properties.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="write"
-	const:buttonLabel="Write"
-	rsrc:buttonImage="write.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-</div>
-
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
          width="100%">
     <tr>

UI/Templates/MailerUI/UIxMailMainFrame.wox

@@ -51,29 +51,10 @@
 	    </div>
 	  </var:if>
 
+	  <var:component className="UIxToolbar" />
+
 	  <form name="pageform" var:href="pageFormURL" _wosid="0">
 
-	    <table border="0" class="tb_maintable" cellspacing="0" cellpadding="2"
-	      var:style="bannerToolbarStyle">
-	      <!-- this table is required for right alignment -->
-	      <tr>
-		<td valign="top" class="vertframerow">
-		  <var:component className="UIxMailToolbar" />
-		</td>
-		<td align="right" width="80" class="vertframerow">
-		  <table border="0"> <!-- TODO: what is this table for? -->
-		    <tr>
-		      <td class="tb_logocell tb_icon"
-			><div class="tbicon_logo"> </div></td>
-		    </tr>
-		  </table>
-		</td>
-	      </tr>
-	    </table>
-	    
-	    <!-- consume toolbar -->
-	    <div class="tb_consumer" var:style="bannerConsumeStyle"> </div>
-	    
 	    <table border="0" width="100%" cellspacing="0" cellpadding="2">
 	      <tr class="vertframerow">
 		<td width="100%" valign="top" class="vertframerow" colspan="2">

UI/Templates/MailerUI/UIxMailPanelFrame.wox

@@ -100,26 +100,7 @@
       </table>
     </var:if>
 
-    <table border="0" class="tb_maintable" cellspacing="0" cellpadding="2"
-           var:style="bannerToolbarStyle">
-      <!-- this table is required for right alignment -->
-      <tr>
-        <td valign="top" class="vertframerow">
-          <var:component className="UIxMailToolbar" />
-        </td>
-        <td align="right" width="80" class="vertframerow">
-          <table border="0"> <!-- TODO: what is this table for? -->
-            <tr>
-              <td class="tb_logocell tb_icon"
-                  ><div class="tbicon_logo"> </div></td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    
-    <!-- consume toolbar -->
-    <div class="tb_consumer" var:style="bannerConsumeStyle"> </div>
+    <var:component className="UIxToolbar" />
     
     <table border="0" width="100%" cellspacing="0" cellpadding="2">
       <tr class="vertframerow">

UI/Templates/MailerUI/UIxMailToolbar.wox

@@ -1,35 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<table
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:var="http://www.skyrix.com/od/binding"
-  xmlns:const="http://www.skyrix.com/od/constant"
-  xmlns:rsrc="OGo:url"
-  xmlns:label="OGo:label"
-  xmlns:so="http://www.skyrix.com/od/so-lookup"
->
-  <!-- image row -->
-  <tr>
-    <var:foreach list="toolbarConfig" item="toolbarGroup">
-      <var:foreach list="toolbarGroup" item="buttonInfo">
-        <var:if condition="isButtonEnabled">
-          <td class="tb_icon"
-            ><a var:href="buttonInfo.link" var:target="buttonInfo.target"
-		var:class="buttonInfo.cssClass"
-                var:onclick="buttonInfo.onclick"></a></td>
-        </var:if>
-      </var:foreach>
-      <td class="tb_spacer"> </td>
-    </var:foreach>
-  </tr>
-  <!-- label row -->
-  <tr>
-    <var:foreach list="toolbarConfig" item="toolbarGroup">
-      <var:foreach list="toolbarGroup" item="buttonInfo">
-        <var:if condition="isButtonEnabled">
-          <td class="tb_label"><var:string value="buttonLabel" /></td>
-        </var:if>
-      </var:foreach>
-      <td class="tb_spacer"> </td>
-    </var:foreach>
-  </tr>
-</table>

UI/Templates/UIxAppointmentEditor.wox

@@ -222,8 +222,7 @@
                 <td align="left" bgcolor="#FFFFF0">
                   <span class="aptview_text">
                     <!-- use '1' instead of 'YES', otherwise breaks on OSX -->
-<!--
-                    <var:component className="AnaisAttendeeSelector"
+                    <var:component className="AnaisSelector"
                                    const:selectorID="participant"
                                    const:role="REQ-PARTICIPANT"
                                    attendees="participants"
@@ -232,8 +231,6 @@
                                    const:withCN="1"
                                    const:withAddressBook="1"
                     />
--->
-                    TODO: need attendee selector (AB)
                   </span>
                 </td>
               </tr>

UI/Templates/UIxCalDayChartview.wox

@@ -8,53 +8,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable"
          class="wintable"
          cellspacing="0"

UI/Templates/UIxCalDayListview.wox

@@ -8,53 +8,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable"
          class="wintable"
          cellspacing="0"

UI/Templates/UIxCalDayOverview.wox

@@ -8,53 +8,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
       <td class="wintitle">

UI/Templates/UIxCalDayPrintview.wox

@@ -8,53 +8,6 @@
                title="title"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table border="1" cellpadding="5" cellspacing="0" width="100%">
     <tr>
       <td colspan="2" align="center">

UI/Templates/UIxCalMonthOverview.wox

@@ -8,53 +8,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable"
          class="wintable"
          cellspacing="0"

UI/Templates/UIxCalWeekChartview.wox

@@ -8,53 +8,6 @@
                className="UIxPageFrame"
                title="name">
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
       <td class="wintitle">

UI/Templates/UIxCalWeekColumnsview.wox

@@ -8,53 +8,6 @@
                className="UIxPageFrame"
                title="name">
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
       <td class="wintitle">

UI/Templates/UIxCalWeekListview.wox

@@ -9,53 +9,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable"
          class="wintable"
          cellspacing="0"

UI/Templates/UIxCalWeekOverview.wox

@@ -9,53 +9,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarSeparator" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
          width="100%">
   <tr>

UI/Templates/UIxCalYearOverview.wox

@@ -8,49 +8,6 @@
                title="name"
 >
 
-<div class="toolbar">
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new"
-	const:buttonLabel="New Event"
-	rsrc:buttonImage="new-event.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="new_task"
-	const:buttonLabel="New Task"
-	rsrc:buttonImage="new-task.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="edit"
-	const:buttonLabel="Edit"
-	rsrc:buttonImage="edit.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="delete"
-	const:buttonLabel="Delete"
-	rsrc:buttonImage="delete.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="today"
-	const:buttonLabel="Go to Today"
-	rsrc:buttonImage="goto-today.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="dayoverview"
-	const:buttonLabel="Day View"
-	rsrc:buttonImage="day-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="weekoverview"
-	const:buttonLabel="Week View"
-	rsrc:buttonImage="week-view.png" />
-
-<var:component className="UIxToolbarButton"
-	const:buttonLink="monthoverview"
-	const:buttonLabel="Month View"
-	rsrc:buttonImage="month-view.png" />
-
-</div>
-
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
          width="100%">
     <tr>

UI/Templates/UIxPageFrame.wox

@@ -38,6 +38,8 @@
 	><var:string label:value="Right Administration" /></a>
     </div>
 
+    <var:component className="UIxToolbar" />
+
     <div class="pageContent">
 
       <!--       <tr> -->

UI/Templates/UIxToolbar.wox

@@ -0,0 +1,38 @@
+<?xml version="1.0" standalone="yes"?>
+  <div class="toolbar"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    xmlns:so="http://www.skyrix.com/od/so-lookup">
+
+    <var:foreach list="toolbarConfig" item="toolbarGroup">
+      <var:foreach list="toolbarGroup" item="buttonInfo">
+	<var:if condition="isButtonEnabled">
+	  
+	  <a class="toolbarButton"
+	    var:href="buttonInfo.link"
+	    var:target="buttonInfo.target"
+	    var:onclick="buttonInfo.onclick"
+	    var:alt="buttonInfo.tooltip"
+	    var:title="buttonInfo.tooltip">
+	    <span class="toolbarButton">
+	      <img class="buttonImage"
+		var:src="buttonImage"
+		var:alt="buttonInfo.image" /><br />
+		  <span class="buttonLabel"><var:string
+		      value="buttonLabel" /></span>
+	    </span>
+	  </a>
+
+	</var:if>
+      </var:foreach>
+
+      <var:if condition="isLastGroup" const:negate="YES">
+	<span class="toolbarSeparator">
+	  <var:entity value="nbsp" />
+	</span>
+      </var:if>
+    </var:foreach>
+  </div>

UI/Templates/UIxToolbarButton.wox

@@ -1,18 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-<a xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url"
-    class="toolbarButton"
-    var:href="buttonLink">
-<span class="toolbarButton">
-<img class="buttonImage"
-	var:src="buttonImage"
-	var:alt="buttonTooltip"
-	var:title="buttonTooltip" /><br />
-<span class="buttonLabel"
-	    var:alt="buttonTooltip"
-	    var:title="buttonTooltip"><var:string
-	      value="buttonLabel" /></span>
-</span>
-</a>

UI/Templates/UIxToolbarSeparator.wox

@@ -1,8 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-<span class="toolbarSeparator"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:var="http://www.skyrix.com/od/binding"
-    xmlns:const="http://www.skyrix.com/od/constant"
-    xmlns:rsrc="OGo:url">
-<var:entity value="nbsp" />
-</span>

UI/WebServerResources/uix.css

@@ -291,12 +291,12 @@ DIV.linkbanner A:hover
 
 A.toolbarButton
 { color: #000;
+  cursor: default;
   text-decoration: none; }
 
 SPAN.toolbarButton
 { display: block;
   text-align: center;
-  width: 5em;
   height: 2.5em;
   float: left; 
   padding: .5em;
@@ -331,6 +331,8 @@ SPAN.toolbarButton:active
 
 .toolbarButton IMG.buttonImage
 { border: 0px;
+  width: 24px;
+  height: 24px;
   margin: auto; }
 
 .toolbarButton .buttonLabel