new UI element and refinement

[scalable-opengroupware.org] / ZideStore / UI-X / Scheduler / OGoCalWeekOverview.wox

diff --git a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
index f14b92cb6f15d356f3a66ee472cbb2b11a9cbc73..73699bea515333b43844be849e2f59d92c59e419 100644 (file)
--- a/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
+++ b/ZideStore/UI-X/Scheduler/OGoCalWeekOverview.wox
@@ -6,11 +6,25 @@
                xmlns:uix="OGo:uix"
                className="OGoPageFrame"
                title="name">
-    <br/>
-    OGo ZideStore Server - <var:string value="name"/><br/>
-    Client: <var:string value="clientObject"/><br/>
-    Appointments: #<var:string value="appointments.count"/><br/>
-    <hr/>
+
+  <!-- $Id: SkyNews.html,v 1.3 2003/12/22 16:53:55 helge Exp $ -->
+  <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="OGoCalDateLabel" startDate="startDate" endDate="endDate" const:selection="week" /></td>
+  <td width="36" align="right" valign="center">
+  <var:component className="OGoWinClose" />
+  </td>
+  </tr>
+  </table>
+  </td>
+  </tr>
+
+  <tr>
+  <td id="skywinbodycell" class="wincontent">
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr bgcolor="#E0E0E0">
     <td align="left" valign="middle" width="80%">other stuff</td><!-- 99% -->
@@ -30,30 +44,20 @@
     </td>
     </tr>
     </table>
-    <br/>
-    
-  <!-- $Id: SkyNews.html,v 1.3 2003/12/22 16:53:55 helge Exp $ -->
-  <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">TODO:Date</td>
-  <td width="36" align="right" valign="center">
-  <var:component className="OGoWinClose" />
-  </td>
-  </tr>
-  </table>
   </td>
   </tr>
+
   <tr>
   <td id="skywinbodycell" class="wincontent">
   <table border="0" width="100%" cellpadding="0" cellspacing="0">
   <tr>
   <td colspan="2">
   <var:component className="OGoCalSelectTab" const:selection="week" currentDate="startDate">
-  week content, right?
+  <var:week-overview list="appointments" item="appointment" weekStart="startDate" const:startDateKey="startDate" const:endDateKey="endDate" const:titleStyle="weekoverview_title" const:contentStyle="weekoverview_content">
+  <var:week>
+  <a var:href="appointmentViewURL"><var:string value="appointment.title"/></a>
+  </var:week>
+  </var:week-overview>
   </var:component>
   </td>
   </tr>
@@ -72,14 +76,12 @@
   </td>
   </tr>
   </table>
-  <var:week-overview list="appointments" item="appointment" weekStart="startDate" const:startDateKey="startDate" const:endDateKey="endDate" const:titleStyle="weekoverview_title" const:contentStyle="weekoverview_content">
-  <var:week>
-  <a var:href="appointmentViewURL"><var:string value="appointment.title"/></a>
-  </var:week>
-  </var:week-overview>
+  <!--
   <hr/>
     
     Appointments: 
     <var:component className="OGoAptTableView" appointments="appointments"/>
+  -->
     <!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
+
 </var:component>