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

diff --git a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
index 7b85a73a17ab34b22b0cf5318c211089d1b756f2..f8592fae2a3ff8bfc210920fe6c32607889be409 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
@@ -25,12 +25,19 @@
 
 @implementation SOGoGroupAppointmentFolder
 
-#warning TODO: implement aggregation based on the container
-
 /* looking up shared objects */
 
 - (SOGoGroupsFolder *)lookupGroupsFolder {
   return [[self container] lookupGroupsFolder];
 }
 
+/* functionality */
+
+- (NSArray *)fetchCoreInfosFrom:(NSCalendarDate *)_startDate
+  to:(NSCalendarDate *)_endDate
+{
+#warning TODO: implement aggregation based on the container
+  return [NSArray array];
+}
+
 @end /* SOGoGroupAppointmentFolder */

diff --git a/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
index 7683829d671c0eb341bf466e8f9ea31912b17bbd..daa365d63f12331b87dc1a4354035a37f3cd9087 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
@@ -65,4 +65,19 @@ static NSString *SOGoUIDSeparator = @",";
   return self->uids;
 }
 
+/* display name */
+
+- (NSString *)davDisplayName {
+  NSArray *a;
+  
+  a = [self uids];
+  if ([a count] == 0)
+    return @"empty";
+  if ([a count] == 1)
+    return [a objectAtIndex:0];
+  
+#warning TODO: localize  
+  return @"Custom";
+}
+
 @end /* SOGoCustomGroupFolder */

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index c155e092798fbc4834dbb097451698707e343e8e..f9a7ee8c48f2869b4e795d1f7126568af07efd5e 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,10 +1,12 @@
+2004-08-11    <helge@agenor.opengroupware.org>
+
+       * UIxPageFrame: minor fixes to UI (v0.9.8)
+
 2004-08-05  Marcus Mueller  <znek@mulle-kybernetik.com>
 
-       * v0.9.7
-       
        * calendar.css: commented some styles out, because they don't really do
-         what I think they should do. Someone with better knowledge of CSS should
-         look into this.
+         what I think they should do. Someone with better knowledge of CSS
+         should look into this. (v0.9.7)
 
 2004-08-02  Marcus Mueller  <znek@mulle-kybernetik.com>
 

diff --git a/SOGo/UI/Common/UIxPageFrame.m b/SOGo/UI/Common/UIxPageFrame.m
index 089440db97d4823de5bcf379f007bee83af51704..a4a4d47a00a4b98c4d4633253cdb2e0af55b5b47 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.m
+++ b/SOGo/UI/Common/UIxPageFrame.m
@@ -40,47 +40,66 @@
 }
 
 - (SoUser *)user {
-    WOContext *ctx;
+  WOContext *ctx;
     
-    ctx = [self context];
-    return [[[self clientObject] authenticatorInContext:ctx]
-                                 userInContext:ctx];
+  ctx = [self context];
+  return [[[self clientObject] authenticatorInContext:ctx]
+                               userInContext:ctx];
 }
 
-- (NSString *)rootURL {
-    WOContext *ctx;
-    NSArray *traversalObjects;
+- (NSString *)shortUserNameForDisplay {
+  // TODO: better use a SoUser formatter?
+  NSString *s;
+  NSRange  r;
+  
+  s = [[self user] login];
+  if ([s length] < 10)
+    return s;
+  
+  // TODO: algorithm might be inappropriate, depends on the actual UID
+  
+  r = [s rangeOfString:@"."];
+  if (r.length == 0)
+    return s;
+  
+  return [s substringToIndex:r.location];
+}
 
-    if(self->rootURL)
-        return self->rootURL;
+/* URL generation */
+
+- (NSString *)rootURL {
+  WOContext *ctx;
+  NSArray   *traversalObjects;
 
-    ctx = [self context];
-    traversalObjects = [ctx objectTraversalStack];
-    self->rootURL = [[[traversalObjects objectAtIndex:0]
-                                        rootURLInContext:ctx]
-                                        retain];
+  if (self->rootURL)
     return self->rootURL;
+
+  ctx = [self context];
+  traversalObjects = [ctx objectTraversalStack];
+  self->rootURL = [[[traversalObjects objectAtIndex:0]
+                                      rootURLInContext:ctx]
+                                      retain];
+  return self->rootURL;
 }
 
 - (NSString *)userRootURL {
-    WOContext *ctx;
-    NSArray *traversalObjects;
-
-    if(self->userRootURL)
-        return self->userRootURL;
-
-    ctx = [self context];
-    traversalObjects = [ctx objectTraversalStack];
-    self->userRootURL = [[[[traversalObjects objectAtIndex:1]
-                                             baseURLInContext:ctx]
-                                             stringByAppendingString:@"/"]
-                                             retain];
+  WOContext *ctx;
+  NSArray   *traversalObjects;
+
+  if (self->userRootURL)
     return self->userRootURL;
+
+  ctx = [self context];
+  traversalObjects = [ctx objectTraversalStack];
+  self->userRootURL = [[[[traversalObjects objectAtIndex:1]
+                                           baseURLInContext:ctx]
+                                           stringByAppendingString:@"/"]
+                                           retain];
+  return self->userRootURL;
 }
 
 - (NSString *)calendarRootURL {
-    return [[self userRootURL] stringByAppendingString:@"Calendar/"];
+  return [[self userRootURL] stringByAppendingString:@"Calendar/"];
 }
 
-
 @end /* UIxPageFrame */

diff --git a/SOGo/UI/Common/UIxPageFrame.wox b/SOGo/UI/Common/UIxPageFrame.wox
index 263c0d505e18f003ada7e980a37d436ebebe14f8..82b6d2dd133ef6f40e83aa7be1f703a362810452 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.wox
+++ b/SOGo/UI/Common/UIxPageFrame.wox
@@ -38,15 +38,11 @@
           </table>
           <table cellpadding="0" cellspacing="0" border="0" width="100%">
             <tr>
-              <td class="linecolor">
-                <img rsrc:src="line_left.gif"/>
-              </td>
-              <td class="linecolor" width="100%">
+              <td class="linecolor"><img rsrc:src="line_left.gif"/></td>
+              <td class="linecolor" width="98%">
                 <img rsrc:src="line_stretch.gif"/>
               </td>
-              <td class="linecolor">
-                <img rsrc:src="line_right.gif"/>
-              </td>
+              <td class="linecolor"><img rsrc:src="line_right.gif"/></td>
             </tr>
           </table>
         </td>
@@ -88,7 +84,7 @@
                             <font class="skydockfont">
                               <a var:href="userRootURL"
                                  class="skydockfont"
-                              >SOGo (<var:string value="user.login" />)</a>
+                              >SOGo (<var:string value="shortUserNameForDisplay" />)</a>
                             </font>
                           </td>
                         </tr>

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index cab297dce179f93daddb8c8e20c17af86c0b5d3b..28292b549059af8a6800e33ac74ed5ab727067ed 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8