From: helge Date: Sun, 15 Aug 2004 12:54:44 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/trunk@219 d1b88da0-ebda-0310-925b-ed51d... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=049c8f065b64712eafe04bbf8c7d5232a09f7906;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/trunk@219 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 8c333dbb..1baef4c1 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,11 @@ +2004-08-15 Helge Hess + + * v0.9.39 + + * UIxAppointmentProposal.wox: work on page layout + + * UIxAppointmentView.wox, UIxCalWeekOverview.wox: minor cleanups + 2004-08-14 Marcus Mueller * v0.9.38 diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox index 17419a87..34940b98 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentProposal.wox +++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.wox @@ -1,11 +1,215 @@ - - proposal + + + + + + + + +
+ + + + + +
+ Search Appointments + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Search Appointments +
+ Startdate: + + date selector here +
+ Enddate: + + date selector here +
+ Earliest Starttime: + + time selector here +
+ Latest Endtime: + + time selector here +
+ Duration: + + duration popup here +
+ Search Resources +
+ Select in Anais: + + Anais resource selector +
+ Search Participants +
+ Select in Anais: + + Anais person selector +
+ + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 9 + + 10 + + 11 + + 12 + + 13 + + 14 + + 15 + + 16 + + 17 +
00 30 00 30 00 30 00 30 00 30 00 30 00 30 00 30 00 30
2004-08-15 new new new new new new new new new new new new new new new new new
+
+
+
diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.wox b/SOGo/UI/Scheduler/UIxAppointmentView.wox index 9b7138cf..eacc6e78 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentView.wox +++ b/SOGo/UI/Scheduler/UIxAppointmentView.wox @@ -6,20 +6,19 @@ className="UIxPageFrame" title="name" > - - + @@ -33,41 +32,26 @@ />
- - - - - -
- Appointment Viewer - -
-
+ + + + + +
+ Appointment Viewer + +
+
- - - - - - -
- printview - - edit - - delete -
+ + + + + + +
+ printview + + edit + + delete +
diff --git a/SOGo/UI/Scheduler/UIxCalWeekOverview.wox b/SOGo/UI/Scheduler/UIxCalWeekOverview.wox index 603b8365..6cddf487 100644 --- 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" +> - + @@ -65,36 +66,24 @@
- - - - - -
- - -
-
+ + + + + +
+ + +
+
+ label:title="Overview" label:alt="Overview" + border="0" valign="top" /> + label:title="Chart" label:alt="Chart" + border="0" valign="top" /> + label:title="List" label:alt="List" + border="0" valign="top" />
+ label:title="Columns" label:alt="Columns" + border="0" valign="top" />
diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 4b9056fc..6e39df96 100644 --- 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