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 6a10f38d30ac1117a9d4e5903ed73e93f35760a5..70def0aaa8364ed3fffdec114148379da0f9712e 100644 (file)
--- 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 153cf41f55eba1dcaaff2ad19da82b400e2dd072..9de8f4052962eabd6f8e3ba6762e6ee06cad9921 100644 (file)
--- 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 28292b549059af8a6800e33ac74ed5ab727067ed..c351558f441a4d159527ee99c46d76a467ff4349 100644 (file)
--- 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 5a1df235c0403df6f3bb94e151fa1149f679610d..5fbaf8dfff00877be1331c6202cdf1b2804ca999 100644 (file)
--- 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 3496297088127e3ef40047e09992117aa7194298..a5b204af8a971c407375dbe29f6035b4fdad2bf6 100644 (file)
--- 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 577a74d79e4d3734b9c338fd1127dd22332cdc9c..64b491fa36b3758ad593585b27709367a64d1389 100644 (file)
--- 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 3c2e2c65c88d2b799fb994623c845a5213cfb3c4..9993e5440fa7fb592a23ceeb1897070a52557ebb 100644 (file)
--- 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 703840f8f23e2d2aeac22638aec3c553d2f99ef4..0066b9cf772f41f4935c40db316abb2ff2c6750a 100644 (file)
--- 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 648e5b484f6ee5e79123e57a426f3bcfdf2f0f3f..1cb3e76ee9631c394b46b877d539a02e3376278e 100644 (file)
--- 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 63434e381ed4a9c4ddd7ea63d5ee79039a299379..646d02991e906bd9cc51b522e22a5180a2d7012c 100644 (file)
--- 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 2db35fc040e08d877d8fc76122f8a4dd8321fa79..3391cad7a6b3929770c2b8189b608e413d54c993 100644 (file)
--- 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 95cf51a77312bfecdf01c595b9d09796430f860e..8e702d8c7e4ca62c87a71b5c6d05e383718d7f70 100644 (file)
--- 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 e4f470335b71aee16d747620b42ae177023ac28c..64da7984cf59e935dc37ea92a2945f07aaa4758c 100644 (file)
--- 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 96a4cf818e52afd7291ad1be301c142879146776..8d38d9725c1d126224a5a786be371fbd340d64f6 100644 (file)
--- 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 d2e31a4c807735bcd67d240e4ab9b4483e1e41aa..8ad533607acb3cc6804c4f398f932f9dcf858c33 100644 (file)
--- 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 eedd382b53b09c730a733cc2d3bd2874362bc297..7ec4760596fd46b7d7af4cddfc4d445f6bc090a3 100644 (file)
--- 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 4f0b47b840fdaa477b8566b1192f06750753a37d..7f19a5df24d188f835baa2fca4603659d0ec9052 100644 (file)
--- 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 ddf9056f50a3123bf05aefd24373d48cf0dadbc5..72926bba1b58720c6efc564b9d809489212c3975 100644 (file)
--- 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 a5137a902d785ad02dfad686bc6e7d560cee3a7d..3d02fe9b1c1a29a7fdfe348a8ee61c7c718068db 100644 (file)
--- 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 92d2bf1e7c7a41bd8417a48d1034a8d80f5e4e5b..02dfc30ee93c6f1f0b4da094107ad33254eae3ab 100644 (file)
--- 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 2ee96ece3a5b57afe4d8a14fac24f538dbc4c7d8..7c4df342943732afb99f263536873e1627787b4b 100644 (file)
--- 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 8a19b3e3468cf58736fef0c8c36b3b6210ce79fe..a281cca1594d733d2ec92e26d77e63bf0f1045e6 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=23
+SUBMINOR_VERSION:=24