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

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 8c333dbbd1d6d47b6789dc3754e9a20768b6a179..1baef4c1fd474c90077cf281034ad76066d2f8a8 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-15  Helge Hess  <helge.hess@skyrix.com>
+
+       * v0.9.39
+       
+       * UIxAppointmentProposal.wox: work on page layout
+
+       * UIxAppointmentView.wox, UIxCalWeekOverview.wox: minor cleanups
+
 2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v0.9.38

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
index 17419a878f714d3e02f61952c3164b9237e2596d..34940b98f181323de51941e5126c41a3c483a599 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox
@@ -1,11 +1,215 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component xmlns="http://www.w3.org/1999/xhtml"
-               xmlns:var="http://www.skyrix.com/od/binding"
-               xmlns:const="http://www.skyrix.com/od/constant"
-               xmlns:uix="OGo:uix"
-               xmlns:label="OGo:label"
-               className="UIxPageFrame"
-               title="name"
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:label="OGo:label"
+  className="UIxPageFrame"
+  title="name"
 >
-  proposal
+  <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
+         width="100%">
+    <tr>
+      <td class="wintitle">
+        <table cellpadding="0" cellspacing="0" width="100%">
+          <tr>
+            <td width="5"/>
+            <td class="window_label">Search Appointments</td>
+            <td width="36" align="right" valign="center">
+              <var:component className="UIxWinClose" />
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td id="skywinbodycell" class="wincontent">
+        <uix:tabview const:tabStyle="tab_selected"
+                     const:selectedTabStyle="tab_selected"
+                     const:bodyStyle="tabview_body"
+        >
+          <uix:tab const:key="proposal" const:label="proposal" href="#">
+            <form href="search">
+              <table border="0" width="100%" cellspacing="0" cellpadding="4">
+                <tr bgcolor="#e8e8e0">
+                  <td align="left" colspan="2">
+                    <span class="aptview_title">Search Appointments</span>
+                  </td>
+                </tr>
+                <tr><td colspan="2"> </td></tr>
+
+                <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text">Startdate:</span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    date selector here
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text">Enddate:</span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    date selector here
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text">Earliest Starttime:</span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    time selector here
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text">Latest Endtime:</span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    time selector here
+                  </td>
+                </tr>
+                <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
+                      <span class="aptview_text">Duration:</span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    duration popup here
+                  </td>
+                </tr>
+                <tr><td colspan="2"> </td></tr>
+
+
+                <tr bgcolor="#e8e8e0">
+                  <td align="left" colspan="2">
+                    <span class="aptview_title">Search Resources</span>
+                  </td>
+                </tr>
+                <tr><td colspan="2"> </td></tr>
+                <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
+                    <span class="aptview_text">Select in Anais:</span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    Anais resource selector
+                  </td>
+                </tr>
+                <tr><td colspan="2"> </td></tr>
+
+
+                <tr bgcolor="#e8e8e0">
+                  <td align="left" colspan="2">
+                    <span class="aptview_title">Search Participants</span>
+                  </td>
+                </tr>
+                <tr><td colspan="2"> </td></tr>
+                <tr valign="top">
+                  <td align="right" width="15%" bgcolor="#E8E8E0">
+                    <span class="aptview_text">Select in Anais:</span>
+                  </td>
+                  <td align="left" bgcolor="#FFFFF0">
+                    Anais person selector
+                  </td>
+                </tr>
+                <tr><td colspan="2"> </td></tr>
+
+                <tr>
+                  <td></td>
+                  <td>
+                    <input type="submit" label:value="Search" 
+                           name="search:method" />
+                    <span class="button_auto_env"
+                      ><a href=".." class="button_auto"
+                      ><var:string label:value="Cancel" /></a></span>
+                  </td>
+                </tr>
+              </table>
+            </form>
+
+
+            <hr size="1" noshade="noshade" />
+           <table border="0" cellpadding="0" width="100%" cellspacing="1">
+              <tr>
+                <td align="middle" bgcolor="#FFDAAA" 
+                    colspan="1" rowspan="2"> </td>
+<!-- TODO: need a CSS style over here -->
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                         face="Arial,Helvetica,Verdana,Geneva,Tahoma">9</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">10</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">11</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">12</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">13</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">14</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">15</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">16</font>
+                </td>
+                <td colspan="2" align="middle" bgcolor="#FFDAAA">
+                  <font color="black" size="2" 
+                        face="Arial,Helvetica,Verdana,Geneva,Tahoma">17</font>
+                </td>
+              </tr>
+              <tr>
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r                  </TD>
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r                  </TD>
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r\r                  </TD>
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r                  </TD>\r                \r                  
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r                  </TD>\r                \r                  
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r                  </TD>\r                \r                  
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r                  </TD>\r                \r                  
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r\r                  </TD>\r                \r                  
+                <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">00</font>\r                  </TD>\r                \r                  <TD COLSPAN="1" ALIGN="middle" BGCOLOR="#FFDAAA">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">30</font>\r\r                  </TD>\r                \r              
+</tr>
+<tr>
+  <td WIDTH="15%" ALIGN="middle" BGCOLOR="#FFDAAA" COLSPAN="1">\r                    <font color="black" size="2" face="Arial,Helvetica,Verdana,Geneva,Tahoma">2004-08-15</font>\r                  </td>\r                  \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.0.1.1.1.1">\r\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.1.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r\r                        <a href="1.3.1.3.1.7.0.3.2.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.3.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.4.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.5.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.6.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.7.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.8.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.9.1.1.1.1">\r\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.10.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r\r                        <a href="1.3.1.3.1.7.0.3.11.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.12.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.13.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.14.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.15.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                      
+  <td ALIGN="left" BGCOLOR="#FAE8B8" COLSPAN="1" VALIGN="top">\r                        <a href="1.3.1.3.1.7.0.3.16.1.1.1.1">\r                          <img src="/OpenGroupware.woa/WebServerResources/English.lproj/green_corner.gif" ALT="new" border="NO" />\r\r                        </a>\r                      </td>\r                    \r                    \r                    \r                    \r                    \r                    \r                    \r                    \r                      
+                <td align="middle" bgcolor="#FFAAAA" 
+                    colspan="1" valign="middle"> </td>
+              </tr>
+            </table>
+          </uix:tab>
+        </uix:tabview>
+      </td>
+    </tr>
+  </table>
 </var:component>

diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.wox b/SOGo/UI/Scheduler/UIxAppointmentView.wox
index 9b7138cf6817a6918c7683d3afd24a97318f3f8e..eacc6e7801f75c1ae84c72af3fbd75bf006a7b2d 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentView.wox
+++ b/SOGo/UI/Scheduler/UIxAppointmentView.wox
@@ -6,20 +6,19 @@
                className="UIxPageFrame"
                title="name"
 >
-
   <table cellspacing="0" cellpadding="5" width="100%">
   <tr>
-  <td>
-  <table cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-  <td width="5"/>
-  <td class="window_label">Appointment Viewer</td>
-  <td width="36" align="right" valign="center">
-  <var:component className="UIxWinClose" />
-  </td>
-  </tr>
-  </table>
-  </td>
+    <td>
+      <table cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+          <td width="5"/>
+          <td class="window_label">Appointment Viewer</td>
+          <td width="36" align="right" valign="center">
+            <var:component className="UIxWinClose" />
+          </td>
+        </tr>
+      </table>
+    </td>
   </tr>
 
   <tr>
@@ -33,41 +32,26 @@
                /></span>
             </td>
             <td align="right" >
-                <table border='0' cellpadding='0' cellspacing='1'>
-                    <tr>
-                        <td class="button_auto_env"
-                            nowrap="true"
-                            valign='middle'
-                            align='center'
-                        >
-                            <a class="button_auto"
-                               href="printview"
-                               var:queryDictionary="queryParameters"
-                               target="SOGoPrintView"
-                            >printview</a>
-                        </td>
-                        <td class="button_auto_env"
-                            nowrap="true"
-                            valign='middle'
-                            align='center'
-                        >
-                            <a class="button_auto"
-                               href="edit"
-                               var:queryDictionary="queryParameters"
-                            >edit</a>
-                        </td>
-                        <td class="button_auto_env"
-                            nowrap="true"
-                            valign='middle'
-                            align='center'
-                        >
-                            <a class="button_auto"
-                               href="delete"
-                               var:queryDictionary="queryParameters"
-                            >delete</a>
-                        </td>
-                    </tr>
-                </table>
+              <table border='0' cellpadding='0' cellspacing='1'>
+                <tr>
+                  <td class="button_auto_env" nowrap="true"
+                      valign='middle' align='center'>
+                    <a class="button_auto" href="printview"
+                       var:queryDictionary="queryParameters"
+                       target="SOGoPrintView">printview</a>
+                  </td>
+                  <td class="button_auto_env" nowrap="true"
+                      valign='middle' align='center'>
+                    <a class="button_auto" href="edit"
+                       var:queryDictionary="queryParameters">edit</a>
+                  </td>
+                  <td class="button_auto_env" nowrap="true"
+                      valign='middle' align='center'>
+                    <a class="button_auto" href="delete"
+                       var:queryDictionary="queryParameters">delete</a>
+                  </td>
+                </tr>
+              </table>
             </td>
           </tr>
         </table>

diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
index 603b83652b0cd31f431744986e73815f21fc7c91..6cddf4872d3f1caf0ef06ed645239bf83f7a2816 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
+++ b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox
@@ -6,25 +6,26 @@
                xmlns:label="OGo:label"
                xmlns:uix="OGo:uix"
                className="UIxPageFrame"
-               title="name">
+               title="name"
+>
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
          width="100%">
   <tr>
-  <td class="wintitle">
-  <table cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-  <td width="5"/>
-  <td class="wintitle"><var:component className="UIxCalDateLabel"
-                                      startDate="startDate"
-                                      endDate="endDate"
-                                      const:selection="week"
-                       /></td>
-  <td width="36" align="right" valign="center">
-    <var:component className="UIxWinClose" />
-  </td>
-  </tr>
-  </table>
-  </td>
+    <td class="wintitle">
+      <table cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+          <td width="5"/>
+          <td class="wintitle"><var:component className="UIxCalDateLabel"
+                                              startDate="startDate"
+                                              endDate="endDate"
+                                              const:selection="week"
+                               /></td>
+          <td width="36" align="right" valign="center">
+            <var:component className="UIxWinClose" />
+          </td>
+        </tr>
+      </table>
+    </td>
   </tr>
 
   <tr>
@@ -65,36 +66,24 @@
               <table border='0' cellpadding='0' cellspacing='0'>
                <tr>
                   <td><img rsrc:src="icon_view_overview_inactive.gif"
-                           label:title="Overview"
-                           label:alt="Overview"
-                           border="0"
-                           valign="top"
-                      /></td>
+                           label:title="Overview" label:alt="Overview"
+                           border="0" valign="top" /></td>
                   <td><a href="weekchartview"
                          var:queryDictionary="queryParameters"
                       ><img rsrc:src="icon_view_chart.gif"
-                                                   label:title="Chart"
-                                                   label:alt="Chart"
-                                                   border="0"
-                                                   valign="top"
-                                              /></a></td>
+                            label:title="Chart" label:alt="Chart"
+                            border="0" valign="top" /></a></td>
                   <td><a href="weeklistview"
                          var:queryDictionary="queryParameters"
                       ><img rsrc:src="icon_view_list.gif"
-                                                  label:title="List"
-                                                  label:alt="List"
-                                                  border="0"
-                                                  valign="top"
-                                             /></a></td>
+                            label:title="List" label:alt="List"
+                            border="0" valign="top" /></a></td>
                   <td>
                     <a href="weekcolumnsview"
                        var:queryDictionary="queryParameters"
                     ><img rsrc:src="icon_view_columns.gif"
-                                                   label:title="Columns"
-                                                   label:alt="Columns"
-                                                   border="0"
-                                                   valign="top"
-                                              /></a>
+                          label:title="Columns" label:alt="Columns"
+                          border="0" valign="top" /></a>
                   </td>
                </tr>
               </table>

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 4b9056fce557f63f7534b84a05effce978c36ace..6e39df96abeec11609c4ebab5ca7d53640c83bfe 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=37
+SUBMINOR_VERSION:=39
 
 # v0.9.31 requires libWEExtensions v4.2.52
 # v0.9.29 requires libWEExtensions v4.2.51