adjust display to more closely meet requirements specs.

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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index d9c8dcd6daaef1738026c5213876b64c12e03526..ffdd4deee3ee779387c12d7605e275b059cbf097 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-13  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.33
+
+       * UIxCalView.m: adjusted shortTextForApt to meet the requirements
+         specifictions.
+
+       * UIxCalDayView.m: removed shortTextForApt (moved to superclass).
+
+       * UIxCal*view.wox: escapeHTML="NO" for shortTextForApt.
+
 2004-08-13  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.32

diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.wox b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
index a5b204af8a971c407375dbe29f6035b4fdad2bf6..887e05d21e08e5e729a028770ce82ea210380d73 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
@@ -212,7 +212,9 @@
                               <a var:href="appointmentViewURL"
                                  var:queryDictionary="currentDateQueryParameters"
                                  var:title="tooltipForApt"
-                              ><var:string value="shortTextForApt" /></a>
+                              ><var:string value="shortTextForApt"
+                                           const:escapeHTML="NO"
+                                /></a>
                             </var:matrix-cell>
                           </var:vspan-matrix>
                         </td>

diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.wox b/SOGo/UI/Scheduler/UIxCalDayListview.wox
index 64b491fa36b3758ad593585b27709367a64d1389..e390358723043cba9f6aa2aa4e803aa043d6b48b 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayListview.wox
@@ -167,7 +167,9 @@
                               <var:foreach list="aptsForCurrentDate" item="appointment">
                                 <a var:href="appointmentViewURL"
                                    var:queryDictionary="currentDateQueryParameters"
-                                ><var:string value="shortTextForApt" /></a>
+                                ><var:string value="shortTextForApt"
+                                             const:escapeHTML="NO"
+                                 /></a>
                                 <br />
                               </var:foreach>
                             </td>

diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.wox b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
index 0066b9cf772f41f4935c40db316abb2ff2c6750a..cd1d0c237264b22ab093bfbba276f9d6bfa4fd27 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
@@ -167,7 +167,9 @@
                                 <a var:href="appointmentViewURL"
                                    var:queryDictionary="currentDateQueryParameters"
                                    var:title="tooltipForApt"
-                                ><var:string value="shortTextForApt" /></a>
+                                ><var:string value="shortTextForApt"
+                                             const:escapeHTML="NO"
+                                 /></a>
                                 <br />
                               </var:foreach>
                             </td>
@@ -191,7 +193,9 @@
                                 <a var:href="appointmentViewURL"
                                    var:queryDictionary="currentDateQueryParameters"
                                    var:title="tooltipForApt"
-                                ><var:string value="shortTextForApt" /></a>
+                                ><var:string value="shortTextForApt"
+                                             const:escapeHTML="NO"
+                                 /></a>
                                 <br />
                               </var:foreach>
                             </td>

diff --git a/SOGo/UI/Scheduler/UIxCalDayPrintview.wox b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
index 646d02991e906bd9cc51b522e22a5180a2d7012c..c6b5533e3248630b4138c7b6af2ccfd51c800d44 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayPrintview.wox
@@ -30,7 +30,9 @@
           </td>
           <td class="dayprintview_content">
             <var:foreach list="allDayApts" item="appointment">
-              <var:string value="shortTextForApt" />
+              <var:string value="shortTextForApt"
+                          const:escapeHTML="NO"
+              />
               <br />
             </var:foreach>
           </td>
@@ -45,7 +47,9 @@
           </td>
           <var:foreach list="aptsForCurrentDate" item="appointment">
             <td class="dayprintview_content">
-              <var:string value="shortTextForApt" />
+              <var:string value="shortTextForApt"
+                          const:escapeHTML="NO"
+              />
             </td>
             <var:if condition="minRequiredRowSpan" const:value="1" const:negate="YES">
             </var:if>

diff --git a/SOGo/UI/Scheduler/UIxCalDayView.m b/SOGo/UI/Scheduler/UIxCalDayView.m
index 5c3d14c6bd1c9cfe8be2bd1825c36228b9628282..7d7c734a1bc53ce9d8b685ee8b91dcaeb971b1b2 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalDayView.m
+++ b/SOGo/UI/Scheduler/UIxCalDayView.m
@@ -117,43 +117,6 @@
 }
 
 
-- (NSString *)shortTextForApt {
-    NSCalendarDate *startDate, *endDate;
-    NSMutableString *aptDescr;
-    NSString *s;
-    BOOL spansRange;
-    id apt;
-    
-    apt = [self appointment];
-    spansRange = NO;
-    startDate = [apt valueForKey:@"startDate"];
-    [startDate setTimeZone:[self viewTimeZone]];
-    endDate = [apt valueForKey:@"endDate"];
-    if(endDate != nil) {
-        [endDate setTimeZone:[self viewTimeZone]];
-        spansRange = ![endDate isEqualToDate:startDate];
-    }
-    aptDescr = [[NSMutableString alloc] init];
-    [aptDescr appendFormat:@"%02i:%02i",
-        [startDate hourOfDay],
-        [startDate minuteOfHour]];
-    if(spansRange) {
-        [aptDescr appendFormat:@"- %02i:%02i",
-            [endDate hourOfDay],
-            [endDate minuteOfHour]];
-    }
-    s = [apt valueForKey:@"title"];
-    if(s) {
-        [aptDescr appendFormat:@"; %@", s];
-    }
-    s = [apt valueForKey:@"location"];
-    if(s) {
-        [aptDescr appendFormat:@"; %@", s];
-    }
-    return [aptDescr autorelease];
-}
-
-
 /* URLs */
 
 - (NSDictionary *)prevDayQueryParameters {

diff --git a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
index 3391cad7a6b3929770c2b8189b608e413d54c993..a8064aaf398553789bb353c18044a0df03408f5b 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
@@ -112,7 +112,9 @@
                     </var:if>
                     <var:foreach list="allDayApts" item="appointment">
                       <a var:href="appointmentViewURL"
-                      ><var:string value="shortTextForApt"/></a>
+                      ><var:string value="shortTextForApt"
+                                   const:escapeHTML="NO"
+                       /></a>
                       <br />
                     </var:foreach>
                   </var:month-info>
@@ -148,7 +150,9 @@
                        class="monthoverview_content_link"
                        var:title="tooltipForApt"
                        var:queryDictionary="currentDayQueryParameters"
-                    ><var:string value="shortTitleForApt"/></a>
+                    ><var:string value="shortTextForApt"
+                                 const:escapeHTML="NO"
+                     /></a>
                     <br />
                   </var:month>
                 </var:month-overview>

diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m
index 9405d2e95a67e882218aa43e8e421061033a55bf..b08b88cc5dcc2fb3b8a3539f086774a833caf9cc 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalView.m
+++ b/SOGo/UI/Scheduler/UIxCalView.m
@@ -57,16 +57,44 @@ static BOOL shouldDisplayWeekend = NO;
 }
 
 - (NSString *)shortTextForApt {
-  NSCalendarDate *startDate;
-  NSString *ms;
-  
-  startDate = [[self appointment] valueForKey:@"startDate"];
-  [startDate setTimeZone:[self viewTimeZone]];
-  ms = [NSString stringWithFormat:@"%02i:%02i %@",
-                [startDate hourOfDay],
-                [startDate minuteOfHour],
-                [[self appointment] valueForKey:@"title"]];
-  return ms;
+    NSCalendarDate *startDate, *endDate;
+    NSMutableString *aptDescr;
+    NSString *s;
+    BOOL spansRange;
+    id apt;
+    
+    apt = [self appointment];
+    spansRange = NO;
+    startDate = [apt valueForKey:@"startDate"];
+    [startDate setTimeZone:[self viewTimeZone]];
+    endDate = [apt valueForKey:@"endDate"];
+    if(endDate != nil) {
+        [endDate setTimeZone:[self viewTimeZone]];
+        spansRange = ![endDate isEqualToDate:startDate];
+    }
+    aptDescr = [[NSMutableString alloc] init];
+    [aptDescr appendFormat:@"%02i:%02i",
+        [startDate hourOfDay],
+        [startDate minuteOfHour]];
+    if(spansRange) {
+        [aptDescr appendFormat:@", %02i:%02i",
+            [endDate hourOfDay],
+            [endDate minuteOfHour]];
+    }
+    s = [apt valueForKey:@"location"];
+    if(s) {
+        if([s length] > 12) {
+            s = [NSString stringWithFormat:@"%@...",
+                [s substringToIndex:11]];
+        }
+        [aptDescr appendFormat:@" (%@)", s];
+    }
+    s = [apt valueForKey:@"title"];
+    if(s) {
+        [aptDescr appendFormat:@"<br />%@",
+            [self shortTitleForApt]];
+    }
+    return [aptDescr autorelease];
 }
 
 - (NSString *)shortTitleForApt {

diff --git a/SOGo/UI/Scheduler/UIxCalWeekChartview.wox b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
index 8ad533607acb3cc6804c4f398f932f9dcf858c33..0fefb3f3db9b2bcac075bb21c4aeeff86423b844 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
@@ -158,13 +158,17 @@
           <var:foreach list="allDayApts" item="appointment">
             <a var:href="appointmentViewURL"
                var:queryDictionary="currentDayQueryParameters"
-              ><var:string value="shortTextForApt" /></a>
+              ><var:string value="shortTextForApt"
+                           const:escapeHTML="NO"
+               /></a>
           </var:foreach>
         </var:week-info>
       </var:if>
       <var:week>
         <a var:href="appointmentViewURL" 
-          ><small><var:string value="shortTextForApt" /></small></a><br />
+          ><small><var:string value="shortTextForApt"
+                              const:escapeHTML="NO"
+                  /></small></a><br />
       </var:week>
     </var:week-overview>
   </var:component>

diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
index 4eda8c988e6a29bd4d0001974e20e3114e741206..f76ace16aa2b202eaea6659101faecff995aa248 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
@@ -207,13 +207,17 @@
                     <var:foreach list="allDayApts" item="appointment">
                       <a var:href="appointmentViewURL"
                          var:queryDictionary="currentDayQueryParameters"
-                        ><var:string value="shortTextForApt" /></a>
+                        ><var:string value="shortTextForApt"
+                                     const:escapeHTML="NO"
+                         /></a>
                     </var:foreach>
                   </var:weekcol-info>
                 </var:if>
                 <var:weekcol>
                   <a var:href="appointmentViewURL" 
-                    ><small><var:string value="shortTextForApt" /></small></a><br />
+                    ><small><var:string value="shortTextForApt"
+                                        const:escapeHTML="NO"
+                            /></small></a><br />
                 </var:weekcol>
               </var:weekcol-view>
             </td>

diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.wox b/SOGo/UI/Scheduler/UIxCalWeekListview.wox
index 7f19a5df24d188f835baa2fca4603659d0ec9052..14dbb7549dc3ad217d7b529e71167f20926a3bd2 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekListview.wox
@@ -161,13 +161,17 @@
           <var:foreach list="allDayApts" item="appointment">
             <a var:href="appointmentViewURL"
                var:queryDictionary="currentDayQueryParameters"
-              ><var:string value="shortTextForApt" /></a>
+              ><var:string value="shortTextForApt"
+                           const:escapeHTML="NO"
+               /></a>
           </var:foreach>
         </var:week-info>
       </var:if>
       <var:week>
         <a var:href="appointmentViewURL" 
-          ><small><var:string value="shortTextForApt" /></small></a><br />
+          ><small><var:string value="shortTextForApt"
+                              const:escapeHTML="NO"
+                  /></small></a><br />
       </var:week>
     </var:week-overview>
   </var:component>

diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
index 87aceebf2dc7fe8e4fc565a7f909dd765e3cda5a..a00b2357ae575f6af66a6edfa6684b56d99556a7 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
@@ -165,14 +165,18 @@
           <var:foreach list="allDayApts" item="appointment">
             <a var:href="appointmentViewURL"
                var:queryDictionary="currentDayQueryParameters"
-              ><var:string value="shortTextForApt" /></a>
+            ><var:string value="shortTextForApt"
+                         const:escapeHTML="NO"
+             /></a>
           </var:foreach>
         </var:week-info>
       </var:if>
       <var:week>
         <a var:href="appointmentViewURL" 
            var:title="tooltipForApt"
-          ><small><var:string value="shortTextForApt" /></small></a><br />
+          ><small><var:string value="shortTextForApt"
+                              const:escapeHTML="NO"
+                  /></small></a><br />
       </var:week>
     </var:week-overview>
   </var:component>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index cf4bca34b87c8f93c90222941a67f5b9012b7b9a..8c14e0bf3a706d3f64a618e0092a0155527e6233 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=32
+SUBMINOR_VERSION:=33
 
 # v0.9.31 requires libWEExtensions v4.2.52
 # v0.9.29 requires libWEExtensions v4.2.51