From f6357ddb6ffb0b003cf9a4d69f4e12a09502ceb0 Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 8 Dec 2004 11:50:24 +0000
Subject: [PATCH] fix for SOGo bug #1071

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@462 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/Scheduler/ChangeLog                 |  6 ++++++
 SOGo/UI/Scheduler/UIxCalDayChartview.wox    | 12 +++++------
 SOGo/UI/Scheduler/UIxCalDayListview.wox     | 12 +++++------
 SOGo/UI/Scheduler/UIxCalDayOverview.wox     | 12 +++++------
 SOGo/UI/Scheduler/UIxCalMonthOverview.wox   | 12 +++++------
 SOGo/UI/Scheduler/UIxCalWeekChartview.wox   | 12 +++++------
 SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox | 22 ++++++++++-----------
 SOGo/UI/Scheduler/UIxCalWeekListview.wox    | 12 +++++------
 SOGo/UI/Scheduler/UIxCalWeekOverview.wox    | 20 +++++++++----------
 SOGo/UI/Scheduler/UIxCalYearOverview.wox    | 12 +++++------
 SOGo/UI/Scheduler/Version                   |  2 +-
 11 files changed, 70 insertions(+), 64 deletions(-)

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 6e8cbb0d..3be821e4 100644
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,11 @@
 2004-12-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+	* UIxCalDayOverview.wox, UIxCalDayChartview.wox, UIxCalDayListview.wox
+	  UIxCalWeekOverview.wox, UIxCalWeekListview.wox,
+	  UIxCalWeekChartview.wox, UIxCalWeekColumnsview.wox,
+	  UIxCalMonthOverview.wox, UIxCalYearOverview.wox:
+	  changed layout according to SOGo bug #1071 (v0.9.95)
+
 	* UIxAppointmentView.m, UIxDatePicker.m, UIxCalView.m: changed to use
 	  NGLogging (v0.9.94)
 
diff --git a/SOGo/UI/Scheduler/UIxCalDayChartview.wox b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
index f2b8d276..d3a80387 100644
--- a/SOGo/UI/Scheduler/UIxCalDayChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayChartview.wox
@@ -36,12 +36,7 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              />
-            </td><!-- 99% -->
-            <td align="right">
+            <td align="left">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
                              prevQueryParameters="prevDayQueryParameters"
@@ -50,6 +45,11 @@
                              label:label="today"
               />
             </td>
+            <td align="right" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td>
           </tr>
         </table>
       </td>
diff --git a/SOGo/UI/Scheduler/UIxCalDayListview.wox b/SOGo/UI/Scheduler/UIxCalDayListview.wox
index 6e79ec39..2b9ff18d 100644
--- a/SOGo/UI/Scheduler/UIxCalDayListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayListview.wox
@@ -36,12 +36,7 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              />
-            </td><!-- 99% -->
-            <td align="right">
+            <td align="left">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
                              prevQueryParameters="prevDayQueryParameters"
@@ -50,6 +45,11 @@
                              label:label="today"
               />
             </td>
+            <td align="right" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td>
           </tr>
         </table>
       </td>
diff --git a/SOGo/UI/Scheduler/UIxCalDayOverview.wox b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
index d684a986..20abf6a5 100644
--- a/SOGo/UI/Scheduler/UIxCalDayOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalDayOverview.wox
@@ -31,12 +31,7 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              />
-            </td><!-- 99% -->
-            <td align="right">
+            <td align="left"  >
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
                              prevQueryParameters="prevDayQueryParameters"
@@ -45,6 +40,11 @@
                              label:label="today"
               />
             </td>
+            <td align="right" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td>
           </tr>
         </table>
       </td>
diff --git a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
index a8064aaf..9606c2e2 100644
--- a/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalMonthOverview.wox
@@ -36,12 +36,7 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              />
-            </td><!-- 99% -->
-            <td align="right">
+            <td align="left">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
                              prevQueryParameters="prevMonthQueryParameters"
@@ -50,6 +45,11 @@
                              label:label="this month"
               />
             </td>
+            <td align="right" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td>
           </tr>
         </table>
       </td>
diff --git a/SOGo/UI/Scheduler/UIxCalWeekChartview.wox b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
index 367c735d..f028f8f3 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekChartview.wox
@@ -31,12 +31,7 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              />
-            </td><!-- 99% -->
-            <td align="right">
+            <td align="left">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
                              prevQueryParameters="prevWeekQueryParameters"
@@ -45,6 +40,11 @@
                              label:label="this week"
               />
             </td>
+            <td align="right" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td>
           </tr>
         </table>
       </td>
diff --git a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
index f76ace16..8fa06be4 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekColumnsview.wox
@@ -21,7 +21,7 @@
                                       const:selection="week"
                        /></td>
   <td width="36" align="right" valign="center">
-  <var:component className="UIxWinClose" />
+    <var:component className="UIxWinClose" />
   </td>
   </tr>
   </table>
@@ -32,19 +32,19 @@
   <td id="skywinbodycell" class="wincontent">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr bgcolor="#e8e8e0">
-    <td align="left" valign="middle" width="80%">
+    <td align="left">
+      <var:component className="UIxCalBackForthNavView"
+                     methodName="ownMethodName"
+                     prevQueryParameters="prevWeekQueryParameters"
+                     currentQueryParameters="todayQueryParameters"
+                     nextQueryParameters="nextWeekQueryParameters"
+                     label:label="this week"
+      />
+    </td>
+    <td align="right" valign="middle" width="80%">
       <var:component className="AnaisUidSelector"
                      calendarUIDs="clientObject.calendarUIDs"
       />
-    </td><!-- 99% -->
-    <td align="right">
-    <var:component className="UIxCalBackForthNavView"
-                   methodName="ownMethodName"
-                   prevQueryParameters="prevWeekQueryParameters"
-                   currentQueryParameters="todayQueryParameters"
-                   nextQueryParameters="nextWeekQueryParameters"
-                   label:label="this week"
-    />
     </td>
     </tr>
     </table>
diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.wox b/SOGo/UI/Scheduler/UIxCalWeekListview.wox
index 5191f6c2..311b2476 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekListview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekListview.wox
@@ -35,18 +35,18 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              />
-            </td><!-- 99% -->
-            <td align="right">
+            <td align="left">
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
                              prevQueryParameters="prevWeekQueryParameters"
                              currentQueryParameters="todayQueryParameters"
                              nextQueryParameters="nextWeekQueryParameters"
                              label:label="this week"
+              />              
+            </td>
+            <td align="right" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
               />
             </td>
           </tr>
diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
index c9da590d..63913c7b 100644
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
@@ -32,19 +32,19 @@
   <td id="skywinbodycell" class="wincontent">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr bgcolor="#e8e8e0">
-    <td align="left" valign="middle" width="80%">
+    <td align="left">
+      <var:component className="UIxCalBackForthNavView"
+                     methodName="ownMethodName"
+                     prevQueryParameters="prevWeekQueryParameters"
+                     currentQueryParameters="todayQueryParameters"
+                     nextQueryParameters="nextWeekQueryParameters"
+                     label:label="this week"
+      />
+    </td><!-- 99% -->
+    <td align="right" valign="middle" width="80%">
       <var:component className="AnaisUidSelector"
                      calendarUIDs="clientObject.calendarUIDs"
       />
-    </td><!-- 99% -->
-    <td align="right">
-    <var:component className="UIxCalBackForthNavView"
-                   methodName="ownMethodName"
-                   prevQueryParameters="prevWeekQueryParameters"
-                   currentQueryParameters="todayQueryParameters"
-                   nextQueryParameters="nextWeekQueryParameters"
-                   label:label="this week"
-    />
     </td>
     </tr>
     </table>
diff --git a/SOGo/UI/Scheduler/UIxCalYearOverview.wox b/SOGo/UI/Scheduler/UIxCalYearOverview.wox
index 62f56870..9b358e6d 100644
--- a/SOGo/UI/Scheduler/UIxCalYearOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalYearOverview.wox
@@ -32,12 +32,7 @@
       <td id="skywinbodycell" class="wincontent">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
           <tr bgcolor="#e8e8e0">
-            <td align="left" valign="middle" width="80%">
-              <var:component className="AnaisUidSelector"
-                             calendarUIDs="clientObject.calendarUIDs"
-              />
-            </td><!-- 99% -->
-            <td align="right">
+            <td align="left"  >
               <var:component className="UIxCalBackForthNavView"
                              methodName="ownMethodName"
                              prevQueryParameters="prevYearQueryParameters"
@@ -46,6 +41,11 @@
                              label:label="this year"
               />
             </td>
+            <td align="right" valign="middle" width="80%">
+              <var:component className="AnaisUidSelector"
+                             calendarUIDs="clientObject.calendarUIDs"
+              />
+            </td>
           </tr>
         </table>
       </td>
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 5eda7ea3..a555eeeb 100644
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=94
+SUBMINOR_VERSION:=95
 
 # v0.9.94 requires NGExtensions v4.5.136
 # v0.9.84 requires SOGoLogic    v0.9.12
-- 
2.39.5