From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 16 Aug 2004 13:00:44 +0000 (+0000)
Subject: render other appointments in different color
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=518272cbfccd915b41e9223866c702f9491ff845;p=scalable-opengroupware.org

render other appointments in different color

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

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index bca248fc..7edd2302 100644
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* calendar.css: additional css for other appointments (v0.9.14)
+
 2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* UIxPageFrame.m: -title returns label for "OpenGroupware.org" when
diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index 92c8fa08..cc039aca 100644
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=13
+SUBMINOR_VERSION:=14
diff --git a/SOGo/UI/Common/calendar.css b/SOGo/UI/Common/calendar.css
index dc846200..943a369b 100644
--- a/SOGo/UI/Common/calendar.css
+++ b/SOGo/UI/Common/calendar.css
@@ -11,6 +11,13 @@
   color:            #000000;
 }
 
+.apt_other {
+  color:            #000000;
+}
+
+.apt_other_print {
+  font-style:       italic;
+}
 
 /* day overview */
 
diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 8de44a1b..80bb7c4e 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* v0.9.63
+
+	* UIxCalView.m: -isMyApt done properly.
+
+	* UIxCalWeekOverview.wox: use extra stylesheet info to colorize other's
+	  appointments differently.
+
+	* UIxDatePicker.m: removed a debug log.
+
 2004-08-16  Helge Hess  <helge.hess@skyrix.com>
 
 	* UIxAppointmentProposal.m: first working version of proposal (v0.9.62)
diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 066f6c57..917c45fe 100644
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -8,6 +8,7 @@
 #include <NGObjWeb/SoUser.h>
 #include <SOGoUI/SOGoAptFormatter.h>
 #include <SOGoLogic/AgenorUserManager.h>
+#include "UIxComponent+Agenor.h"
 
 @interface UIxCalView (PrivateAPI)
 - (NSString *)_userFolderURI;
@@ -98,12 +99,19 @@ static BOOL shouldDisplayWeekend = NO;
 }
 
 - (BOOL)isMyApt {
-    return YES;
+    NSString *mailtoChunk;
+    NSString *myEmail;
+
+    mailtoChunk = [self->appointment valueForKey:@"partmails"];
+    myEmail = [self emailForUser];
+    if([mailtoChunk rangeOfString:myEmail].length > 0)
+        return YES;
+    return NO;
 }
 
 - (NSString *)aptStyle {
     if(![self isMyApt])
-        return @"other_apt";
+        return @"apt_other";
     return nil;
 }
 
diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
index 6cddf487..c9da590d 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
@@ -154,10 +154,10 @@
           <var:foreach list="allDayApts" item="appointment">
             <a var:href="appointmentViewURL"
                var:queryDictionary="currentDayQueryParameters"
+               var:class="aptStyle"
             ><var:string value="appointment"
                          formatter="aptFormatter"
                          const:escapeHTML="NO"
-                         style="aptStyle"
              /></a>
           </var:foreach>
         </var:week-info>
diff --git a/SOGo/UI/Scheduler/UIxDatePicker.m b/SOGo/UI/Scheduler/UIxDatePicker.m
index 56c830b8..121737be 100644
--- a/SOGo/UI/Scheduler/UIxDatePicker.m
+++ b/SOGo/UI/Scheduler/UIxDatePicker.m
@@ -164,7 +164,6 @@
   if (d == nil)
     [self logWithFormat:@"WARNING: Could not parse dateString: '%@'", 
 	  dateString];
-  [self logWithFormat:@"%s setting date: %@", __PRETTY_FUNCTION__, d];
   [self setDay:[NSNumber numberWithInt:[d dayOfMonth]]];
   [self setMonth:[NSNumber numberWithInt:[d monthOfYear]]];
   [self setYear:[NSNumber numberWithInt:[d yearOfCommonEra]]];
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 4b7ecabd..b2044669 100644
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=61
+SUBMINOR_VERSION:=63
 
 # v0.9.61 requires libNGExtensions v4.2.102
 # v0.9.41 requires libNGObjWeb     v4.2.431