git-svn-id: http://svn.opengroupware.org/SOGo/trunk@179 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 18be6aa40a1fa73497e3511e8b21974fe28cc219..5b066117cad3365c9587495acb54b5b3d6eba880 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-11  Helge Hess  <helge.hess@skyrix.com>
 
+       * added SOGoGroupPage and SOGoGroupsPage (default views for the group
+         folders) (v0.9.7)
+
        * sogod.m: do not set SoRootURL manually (v0.9.6)
 
 2004-08-10  Marcus Mueller  <znek@mulle-kybernetik.com>

diff --git a/SOGo/Main/GNUmakefile b/SOGo/Main/GNUmakefile
index cedd1b321d417d2344b10d99c59273c936cffcea..1d3a0ddb2e775303bdf95fd275c840d16ccc0238 100644 (file)
--- a/SOGo/Main/GNUmakefile
+++ b/SOGo/Main/GNUmakefile
@@ -13,6 +13,8 @@ sogod_OBJC_FILES += \
        \
        SOGoRootPage.m          \
        SOGoUserHomePage.m      \
+       SOGoGroupPage.m         \
+       SOGoGroupsPage.m        \
 
 sogod_RESOURCE_FILES +=        \
        Version                 \
@@ -20,6 +22,8 @@ sogod_RESOURCE_FILES +=       \
        \
        SOGoRootPage.wox        \
        SOGoUserHomePage.wox    \
+       SOGoGroupPage.wox       \
+       SOGoGroupsPage.wox      \
 
 sogod_LOCALIZED_RESOURCE_FILES += \
        Locale

diff --git a/SOGo/Main/SOGoGroupPage.m b/SOGo/Main/SOGoGroupPage.m
new file mode 100644 (file)
index 0000000..cb70b59
--- /dev/null
+++ b/SOGo/Main/SOGoGroupPage.m
@@ -0,0 +1,35 @@
+/*
+  Copyright (C) 2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo 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 Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id: SOGoGroupPage.m 106 2004-06-30 09:44:35Z helge $
+
+#include <NGObjWeb/SoComponent.h>
+
+@interface SOGoGroupPage : SoComponent
+{
+}
+
+@end
+
+#include "common.h"
+
+@implementation SOGoGroupPage
+
+@end /* SOGoGroupPage */

diff --git a/SOGo/Main/SOGoGroupPage.wox b/SOGo/Main/SOGoGroupPage.wox
new file mode 100644 (file)
index 0000000..a1d1686
--- /dev/null
+++ b/SOGo/Main/SOGoGroupPage.wox
@@ -0,0 +1,26 @@
+<?xml version='1.0' standalone='yes'?>
+<var:component xmlns="http://www.w3.org/1999/xhtml"
+               xmlns:var="http://www.skyrix.com/od/binding"
+               xmlns:const="http://www.skyrix.com/od/constant"
+               xmlns:uix="OGo:uix"
+               className="UIxPageFrame"
+               title="SOGo User Homepage"
+>
+  <h3 class="window_label">
+    OpenGroupware.org: 
+    <var:string value="clientObject.davDisplayName" />
+  </h3>
+
+  <h4>Actions</h4>  
+  <ul>
+    <li><a href="Calendar/weekoverview">Calendar</a></li>
+  </ul>
+
+  <h4>Group Members</h4>
+  <ul>
+    <var:foreach list="clientObject.uids" item="item">
+      <li><var:string value="item" /></li>
+    </var:foreach>
+  </ul>
+  
+</var:component>

diff --git a/SOGo/Main/SOGoGroupsPage.m b/SOGo/Main/SOGoGroupsPage.m
new file mode 100644 (file)
index 0000000..fe6e10e
--- /dev/null
+++ b/SOGo/Main/SOGoGroupsPage.m
@@ -0,0 +1,35 @@
+/*
+  Copyright (C) 2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo 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 Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id: SOGoGroupsPage.m 106 2004-06-30 09:44:35Z helge $
+
+#include <NGObjWeb/SoComponent.h>
+
+@interface SOGoGroupsPage : SoComponent
+{
+}
+
+@end
+
+#include "common.h"
+
+@implementation SOGoGroupsPage
+
+@end /* SOGoGroupsPage */

diff --git a/SOGo/Main/SOGoGroupsPage.wox b/SOGo/Main/SOGoGroupsPage.wox
new file mode 100644 (file)
index 0000000..4328209
--- /dev/null
+++ b/SOGo/Main/SOGoGroupsPage.wox
@@ -0,0 +1,17 @@
+<?xml version='1.0' standalone='yes'?>
+<var:component xmlns="http://www.w3.org/1999/xhtml"
+               xmlns:var="http://www.skyrix.com/od/binding"
+               xmlns:const="http://www.skyrix.com/od/constant"
+               xmlns:uix="OGo:uix"
+               className="UIxPageFrame"
+               title="SOGo User Homepage"
+>
+  <h3 class="window_label">
+    OpenGroupware.org: 
+    <var:string value="clientObject.davDisplayName" />
+  </h3>
+  
+  <p>
+    This is an (intentionally) empty page, <a href="..">go back</a>.
+  </p>
+</var:component>

diff --git a/SOGo/Main/TODO b/SOGo/Main/TODO
index b377c1e8c253fb47ed6166bb23508264bc660cb3..fbbab2d1199b1de168c7f25fb5e7eac727b3d066 100644 (file)
--- a/SOGo/Main/TODO
+++ b/SOGo/Main/TODO
@@ -1,7 +1 @@
 # $Id$
-
-- add a 'view' page for Groups (SOGoGroupsFolder)
-  (initially empty ...)
-
-- add a 'view' page for custom groups (SOGoCustomGroupFolder)
-  - or: a generic one for groups?

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 0eb47da345be1d4c8ac5a363234ca3f2c77473cb..cab297dce179f93daddb8c8e20c17af86c0b5d3b 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=7

diff --git a/SOGo/Main/product.plist b/SOGo/Main/product.plist
index d2e944f51fad6db0094ee59a05e0730c36cd1eb2..b6b8673719d9f8f096e42325f40a5c5f3b53d370 100644 (file)
--- a/SOGo/Main/product.plist
+++ b/SOGo/Main/product.plist
@@ -60,11 +60,19 @@
     SOGoGroupsFolder = {
       superclass    = "SOGoObject";
       methods = {
+        index = { 
+          protectedBy = "View";
+          pageName    = "SOGoGroupsPage"; 
+        };
       };
     };
     SOGoGroupFolder = {
       superclass    = "SOGoObject";
       methods = {
+        index = { 
+          protectedBy = "View";
+          pageName    = "SOGoGroupPage"; 
+        };
       };
     };
     SOGoCustomGroupFolder = {

diff --git a/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
index daa365d63f12331b87dc1a4354035a37f3cd9087..2a8a8e9efe732a9c2ce28ac37cf2a41e545ca46b 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
@@ -68,16 +68,33 @@ static NSString *SOGoUIDSeparator = @",";
 /* display name */
 
 - (NSString *)davDisplayName {
-  NSArray *a;
+  NSArray  *a;
+  unsigned count;
   
   a = [self uids];
-  if ([a count] == 0)
+  if ((count = [a count]) == 0)
     return @"empty";
-  if ([a count] == 1)
+  if (count == 1)
     return [a objectAtIndex:0];
   
-#warning TODO: localize  
-  return @"Custom";
+  if (count < 6) {
+    NSMutableString *ms;
+    unsigned i;
+    
+    ms = [NSMutableString stringWithCapacity:64];
+    for (i = 0; i < count; i++) {
+      if (i != 0) [ms appendString:@"|"];
+      [ms appendString:[a objectAtIndex:i]];
+      if ([ms length] > 60) {
+       ms = nil;
+       break;
+      }
+    }
+    if (ms != nil) return ms;
+  }
+  
+#warning TODO: localize 'members'
+  return [NSString stringWithFormat:@"Members: %d", count];
 }
 
 @end /* SOGoCustomGroupFolder */