From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 12 Aug 2004 18:08:29 +0000 (+0000)
Subject: improvements, improvements ;-)
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e99d9cdf62d339fd52af77d24575fa4e62420999;p=scalable-opengroupware.org

improvements, improvements ;-)

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

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 6a10f38d..70def0aa 100644
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* UIxWinClose.wox: removed rendering of (X) on Laurent's request
+	  (v0.9.11)
+
 2004-08-11  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* UIxPageFrame subclasses from UIxComponent now, removed -SoUser
diff --git a/SOGo/UI/Common/UIxWinClose.wox b/SOGo/UI/Common/UIxWinClose.wox
index 153cf41f..9de8f405 100644
--- a/SOGo/UI/Common/UIxWinClose.wox
+++ b/SOGo/UI/Common/UIxWinClose.wox
@@ -1,6 +1,13 @@
 <?xml version='1.0' standalone='yes'?>
+<span 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">
+ <!--
 <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"
    href="javascript:history.back()"><img border="0" alt="X" src="/sogod/so/ControlPanel/Products/CommonUI/Resources/closewindow.gif"/></a>
+-->
+</span>
\ No newline at end of file
diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index 28292b54..c351558f 100644
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=11
diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 5a1df235..5fbaf8df 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,15 @@
+2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* v0.9.24
+
+	* Added AnaisUidSelector to all views. Removed worse named -owner
+	  method from all affected views and instead added
+	  -formattedCalendarUIDs to UIxCalView. This is now used by all
+	  print views in their header.
+
+	* UIxCalWeekOverview.m: adjusted endDate properly, if -displayWeekends
+	  returns NO (the default).
+
 2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* UIxCalView.m: fixed problems with redirect (v0.9.23)
diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.wox b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
index 34962970..a5b204af 100644
--- a/SOGo/UI/Scheduler/UIxCalDayChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
@@ -36,10 +36,11 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left"
-                valign="middle"
-                width="80%"
-            >TODO: controls</td><!-- 99% -->
+            <td align="left" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td><!-- 99% -->
             <td align="right">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.wox b/SOGo/UI/Scheduler/UIxCalDayListview.wox
index 577a74d7..64b491fa 100644
--- a/SOGo/UI/Scheduler/UIxCalDayListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayListview.wox
@@ -31,7 +31,11 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+            <td align="left" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td><!-- 99% -->
             <td align="right">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.h b/SOGo/UI/Scheduler/UIxCalDayOverview.h
index 3c2e2c65..9993e544 100644
--- a/SOGo/UI/Scheduler/UIxCalDayOverview.h
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.h
@@ -25,7 +25,7 @@
 
 #include "UIxCalDayView.h"
 
-@className= NSArray;
+@class NSArray;
 
 @interface UIxCalDayOverview : UIxCalDayView
 {
diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.wox b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
index 703840f8..0066b9cf 100644
--- a/SOGo/UI/Scheduler/UIxCalDayOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
@@ -31,7 +31,11 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+            <td align="left" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td><!-- 99% -->
             <td align="right">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/UIxCalDayPrintview.m b/SOGo/UI/Scheduler/UIxCalDayPrintview.m
index 648e5b48..1cb3e76e 100644
--- a/SOGo/UI/Scheduler/UIxCalDayPrintview.m
+++ b/SOGo/UI/Scheduler/UIxCalDayPrintview.m
@@ -30,6 +30,7 @@
 
 @end
 
+#include "common.h"
 
 @implementation UIxCalDayPrintview
 
@@ -40,9 +41,4 @@
     return [[self startDate] descriptionWithCalendarFormat:fmt];
 }
 
-- (NSString *)owner {
-#warning ** TODO: owner
-    return @"TODO: owner";
-}
-
 @end
diff --git a/SOGo/UI/Scheduler/UIxCalDayPrintview.wox b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
index 63434e38..646d0299 100644
--- a/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
@@ -11,7 +11,8 @@
     <tr>
       <td colspan="2" align="center">
         <h1 class="dayprintview"><var:string value="title" /></h1>
-        <h2 class="dayprintview"><var:string value="owner" /></h2>
+        <h2 class="dayprintview"
+        ><var:string value="formattedCalendarUIDs"/></h2>
       </td>
     </tr>
     <tr valign="top">
diff --git a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
index 2db35fc0..3391cad7 100644
--- a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
@@ -36,10 +36,11 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left"
-                valign="middle"
-                width="80%"
-            >TODO: controls</td><!-- 99% -->
+            <td align="left" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td><!-- 99% -->
             <td align="right">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
index 95cf51a7..8e702d8c 100644
--- a/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
+++ b/SOGo/UI/Scheduler/UIxCalMonthPrintview.m
@@ -79,10 +79,6 @@
         [date yearOfCommonEra]];
 }
 
-- (NSString *)owner {
-#warning ** TODO: owner
-    return @"TODO: owner";
-}
 
 /* style sheet */
 
diff --git a/SOGo/UI/Scheduler/UIxCalMonthPrintview.wox b/SOGo/UI/Scheduler/UIxCalMonthPrintview.wox
index e4f47033..64da7984 100644
--- a/SOGo/UI/Scheduler/UIxCalMonthPrintview.wox
+++ b/SOGo/UI/Scheduler/UIxCalMonthPrintview.wox
@@ -26,7 +26,8 @@
                      const:class="monthprintview_header"
     >
       <h1 class="monthprintview_header"><var:string value="title" /></h1>
-      <h2 class="monthprintview_header"><var:string value="owner" /></h2>
+      <h2 class="monthprintview_header"
+      ><var:string value="formattedCalendarUIDs" /></h2>
     </var:month-label>
     <var:month-info>
       <var:if condition="hasHolidayInfo">
diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 96a4cf81..8d38d972 100644
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -387,6 +387,12 @@
     [_qp removeObjectForKey:@"day"];
 }
 
+/* calendarUIDs */
+
+- (NSString *)formattedCalendarUIDs {
+    return [[[self clientObject] calendarUIDs]
+                                 componentsJoinedByString:@", "];
+}
 
 /* Actions */
 
diff --git a/SOGo/UI/Scheduler/UIxCalWeekChartview.wox b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
index d2e31a4c..8ad53360 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
@@ -28,7 +28,11 @@
   <td id="skywinbodycell" class="wincontent">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr bgcolor="#e8e8e0">
-    <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+    <td align="left" valign="middle" width="80%">
+      <var:component className="AnaisUidSelector"
+                     calendarUIDs="clientObject.calendarUIDs"
+      />
+    </td><!-- 99% -->
     <td align="right">
     <var:component className="UIxCalBackForthNavView"
                    methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
index eedd382b..7ec47605 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
@@ -32,7 +32,11 @@
   <td id="skywinbodycell" class="wincontent">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr bgcolor="#e8e8e0">
-    <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+    <td align="left" valign="middle" width="80%">
+      <var:component className="AnaisUidSelector"
+                     calendarUIDs="clientObject.calendarUIDs"
+      />
+    </td><!-- 99% -->
     <td align="right">
     <var:component className="UIxCalBackForthNavView"
                    methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.wox b/SOGo/UI/Scheduler/UIxCalWeekListview.wox
index 4f0b47b8..7f19a5df 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekListview.wox
@@ -31,7 +31,11 @@
   <td id="skywinbodycell" class="wincontent">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr bgcolor="#e8e8e0">
-    <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+    <td align="left" valign="middle" width="80%">
+      <var:component className="AnaisUidSelector"
+                     calendarUIDs="clientObject.calendarUIDs"
+      />
+    </td><!-- 99% -->
     <td align="right">
     <var:component className="UIxCalBackForthNavView"
                    methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/UIxCalWeekPrintview.m b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
index ddf9056f..72926bba 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
+++ b/SOGo/UI/Scheduler/UIxCalWeekPrintview.m
@@ -91,11 +91,6 @@
     
 }
 
-- (NSString *)owner {
-#warning ** TODO: owner
-    return @"TODO: owner";
-}
-
 /* style sheet */
 
 - (NSString *)titleStyle {
diff --git a/SOGo/UI/Scheduler/UIxCalWeekPrintview.wox b/SOGo/UI/Scheduler/UIxCalWeekPrintview.wox
index a5137a90..3d02fe9b 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekPrintview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekPrintview.wox
@@ -12,7 +12,7 @@
   <tr>
     <td class="weekprintview">
       <h1 class="weekprintview"><var:string value="title" /></h1>
-      <h2 class="weekprintview"><var:string value="owner" /></h2>
+      <h2 class="weekprintview"><var:string value="formattedCalendarUIDs" /></h2>
     </td>
   </tr>
   <tr>
diff --git a/SOGo/UI/Scheduler/UIxCalWeekView.m b/SOGo/UI/Scheduler/UIxCalWeekView.m
index 92d2bf1e..02dfc30e 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekView.m
+++ b/SOGo/UI/Scheduler/UIxCalWeekView.m
@@ -10,8 +10,14 @@
 }
 
 - (NSCalendarDate *)endDate {
-  return [[[self startDate] dateByAddingYears:0 months:0 days:7
-			    hours:0 minutes:0 seconds:0]
+    unsigned offset;
+    
+    if([self shouldDisplayWeekend])
+        offset = 7;
+    else
+        offset = 5;
+  return [[[self startDate] dateByAddingYears:0 months:0 days:offset
+                            hours:0 minutes:0 seconds:0]
                             endOfDay];
 }
 
diff --git a/SOGo/UI/Scheduler/UIxCalYearOverview.wox b/SOGo/UI/Scheduler/UIxCalYearOverview.wox
index 2ee96ece..7c4df342 100644
--- a/SOGo/UI/Scheduler/UIxCalYearOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalYearOverview.wox
@@ -31,7 +31,11 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+            <td align="left" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td><!-- 99% -->
             <td align="right">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 8a19b3e3..a281cca1 100644
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=23
+SUBMINOR_VERSION:=24