--- /dev/null
+# $Id$
+
+include $(GNUSTEP_MAKEFILES)/common.make
+
+SUBPROJECTS = \
+ OGoContentStore \
+ SOGoLogic \
+ SOGo \
+
+
+include $(GNUSTEP_MAKEFILES)/aggregate.make
tabWidth = 4;
usesTabs = 1;
};
+ AD5ED0AF06B1385700E3EC4B = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = text.xml;
+ path = UIxCalDayOverview.wox;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ AD5ED0B006B1385700E3EC4B = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.objc;
+ path = UIxCalDayOverview.m;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ AD5ED1AE06B1768900E3EC4B = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ path = UIxCalDayView.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ AD5ED1AF06B1768900E3EC4B = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.objc;
+ path = UIxCalDayView.m;
+ refType = 4;
+ sourceTree = "<group>";
+ };
AD6BCEE5069D77E9003664CD = {
children = (
AD6BCF0D069D77E9003664CD,
E87209050692E3D30099CBBD,
AD7379B306AEBB2500735920,
AD7379B206AEBB2500735920,
+ AD5ED0B006B1385700E3EC4B,
+ AD5ED0AF06B1385700E3EC4B,
E87209080692E3D30099CBBD,
E87209090692E3D30099CBBD,
AD737A1706AEC77E00735920,
E87208F50692E3D30099CBBD,
E87208F60692E3D30099CBBD,
E87208F70692E3D30099CBBD,
- E87209020692E3D30099CBBD,
- E87209030692E3D30099CBBD,
E87209060692E3D30099CBBD,
E87209070692E3D30099CBBD,
+ AD5ED1AE06B1768900E3EC4B,
+ AD5ED1AF06B1768900E3EC4B,
E872090A0692E3D30099CBBD,
E872090B0692E3D30099CBBD,
+ E87209020692E3D30099CBBD,
+ E87209030692E3D30099CBBD,
);
isa = PBXGroup;
name = Classes;
-2004-07-21 Marcus Mueller <znek@mulle-kybernetik.com>
+2004-07-23 Marcus Mueller <znek@mulle-kybernetik.com>
+
+ * calendar.css: added styles for dayoverview's calendar.
+
+2004-07-22 Marcus Mueller <znek@mulle-kybernetik.com>
* calendar.css: complete style for 'yearoverview' and fixed style in
'monthoverview'.
color: #000000;
}
+
+.dayoverview_cal {
+ color: #000000;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ font-size: 10pt;
+ letter-spacing: 0pt;
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.dayoverview_cal table {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.dayoverview_cal td {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.dayoverview_cal a {
+ color: #000000;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ font-size: 10pt;
+ letter-spacing: 0pt;
+ padding: 0px;
+ text-decoration: none;
+}
+.dayoverview_cal a:hover {
+ text-decoration: underline;
+}
+
+.dayoverview_cal_title {
+ background-color: #d2d2cc;
+ text-align: center;
+ font-size: 10pt;
+ font-weight: bold;
+ letter-spacing: 0pt;
+}
+
+.dayoverview_cal_day_header {
+ background-color: #d2d2cc;
+ text-align: center;
+ vertical-align: middle;
+ font-size: 11pt;
+ width: 20px;
+ padding: 2px 2px 2px 2px;
+ margin: 2px 2px 2px 2px;
+}
+
+.dayoverview_cal_content {
+ color: #0033cc;
+ background-color: #e8e8e0;
+ text-align: center;
+ vertical-align: middle;
+}
+
+.dayoverview_cal_content_hilite {
+ color: #0033cc;
+ background-color: #fffff0;
+ text-align: center;
+ vertical-align: middle;
+}
+
+.dayoverview_cal_content_selected {
+ color: #ff0000;
+}
+.dayoverview_cal_content_selected a {
+ color: #ff0000;
+}
+.dayoverview_cal_content_selected a:hover {
+ color: #ff0000;
+}
+
+.dayoverview_cal_content_dimmed {
+ color: #0033cc;
+ background-color: #d2d2cc;
+ text-align: center;
+ vertical-align: middle;
+}
+.dayoverview_cal_content_dimmed a {
+ color: #5a5a5a;
+}
+.dayoverview_cal_content_dimmed a:hover {
+ color: #5a5a5a;
+}
+
+
.weekoverview_title {
font-size: 10pt;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
-2004-07-21 Marcus Mueller <znek@mulle-kybernetik.com>
+2004-07-23 Marcus Mueller <znek@mulle-kybernetik.com>
+
+ * v0.9.6
+
+ * GNUmakefile: added UIxCalDayView.[hm] and UIxCalDayOverview.[m|wox]
+
+ * UIxCalDayView.[hm]: abstract superclass for all day related views.
+
+ * UIxCalDayOverview.[m|wox]: new component rendering the day overview.
+
+ * UIxCalInlineMonthOverview.[m|wox]: uses new "selectedDayExtraStyle"
+ binding and implements accompanied logic for its usage.
+
+ * product.plist: added 3 dayview methods, all currently pointing to
+ UIxCalDayOverview.
+
+2004-07-22 Marcus Mueller <znek@mulle-kybernetik.com>
* v0.9.5
"a2_Saturday" = "Sa";
"dayLabelFormat" = "%Y-%m-%d";
-
+"today" = "today";
/* Week */
"new" = "new";
"printview" = "printview";
"proposal" = "proposal";
-
+"Calendar" = "Calendar";
/* calendar modes */
SchedulerUIProduct.m \
UIxAppointmentFormatter.m \
UIxCalView.m \
+ UIxCalDayView.m \
UIxCalWeekView.m \
UIxCalMonthView.m \
UIxAptTableView.m \
\
+ UIxCalDayOverview.m \
UIxCalWeekOverview.m \
UIxCalMonthOverview.m \
UIxCalYearOverview.m \
product.plist \
\
UIxAptTableView.wox \
+ UIxCalDayOverview.wox \
UIxCalWeekOverview.wox \
UIxCalMonthOverview.wox \
UIxCalYearOverview.wox \
--- /dev/null
+/*
+ Copyright (C) 2000-2004 SKYRIX Software AG
+
+ This file is part of OGo
+
+ OGo is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with OGo; see the file COPYING. If not, write to the
+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
+// $Id$
+
+
+#include "UIxCalDayView.h"
+
+@interface UIxCalDayOverview : UIxCalDayView
+{
+
+}
+
+@end
+
+
+@implementation UIxCalDayOverview
+
+@end
--- /dev/null
+<?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:rsrc="OGo:url"
+ xmlns:label="OGo:label"
+ className="UIxPageFrame"
+ label:title="Calendar"
+>
+ <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="year"
+ />
+ </td>
+ <td width="36" align="right" valign="center">
+ <var:component className="UIxWinClose"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td id="skywinbodycell" class="wincontent">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr bgcolor="#e8e8e0">
+ <td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
+ <td align="right">
+ <var:component className="UIxCalBackForthNavView"
+ methodName="ownMethodName"
+ prevQueryParameters="prevDayQueryParameters"
+ currentQueryParameters="todayQueryParameters"
+ nextQueryParameters="nextDayQueryParameters"
+ label:label="today"
+ />
+ </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="UIxCalSelectTab"
+ const:selection="day"
+ currentDate="selectedDate"
+ >
+ <table border="0" cellpadding="4" width="100%" cellspacing="2">
+ <tr>
+ <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
+ <table border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td><img rsrc:src="icon_apt_overview_inactive.gif"
+ label:title="Overview"
+ label:alt="Overview"
+ border="0"
+ valign="top"
+ /></td>
+ <td><a href="daychartview"
+ var:queryDictionary="queryParameters"
+ ><img rsrc:src="icon_apt_chart.gif"
+ label:title="Chart"
+ label:alt="Chart"
+ border="0"
+ valign="top"
+ /></a></td>
+ <td><a href="daylistview"
+ var:queryDictionary="queryParameters"
+ ><img rsrc:src="icon_apt_list.gif"
+ label:title="List"
+ label:alt="List"
+ border="0"
+ valign="top"
+ /></a></td>
+ </tr>
+ </table>
+ </td>
+ <td align="right" bgcolor="#e8e8e0">
+ <table border="0" cellpadding="0" cellspacing="1">
+ <tr>
+ <td class="button_auto_env" nowrap="true" valign="middle" align="center">
+ <a class="button_auto"
+ href="dayprintview"
+ var:queryDictionary="queryParameters"
+ target="SOGoPrintView"
+ ><var:string label:value="printview"/></a>
+ </td>
+ <td class="button_auto_env" nowrap="true" valign="middle" align="center">
+ <a class="button_auto"
+ href="proposal"
+ var:queryDictionary="queryParameters"
+ ><var:string label:value="proposal"/></a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <table>
+ <tr valign="top">
+ <td>
+ <table>
+ <tr>
+ <td>
+ <var:component className="UIxCalInlineMonthOverview"
+ selectedDate="thisMonth"
+ const:showYear="1"
+ const:daySelectionHref="dayoverview"
+ const:showWeekColumn="0"
+ const:style="dayoverview_cal"
+ const:headerStyle="dayoverview_cal_title"
+ const:dayHeaderStyle="dayoverview_cal_day_header"
+ const:dayBodyStyle="dayoverview_cal_content"
+ const:todayBodyStyle="dayoverview_cal_content_hilite"
+ const:selectedDayExtraStyle="dayoverview_cal_content_selected"
+ const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
+ />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <var:component className="UIxCalInlineMonthOverview"
+ selectedDate="nextMonth"
+ const:showYear="1"
+ const:daySelectionHref="dayoverview"
+ const:showWeekColumn="0"
+ const:style="dayoverview_cal"
+ const:headerStyle="dayoverview_cal_title"
+ const:dayHeaderStyle="dayoverview_cal_day_header"
+ const:dayBodyStyle="dayoverview_cal_content"
+ const:todayBodyStyle="dayoverview_cal_content_hilite"
+ const:inactiveDayBodyStyle="dayoverview_cal_content_dimmed"
+ />
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>
+ TODO: Content
+ </td>
+ </tr>
+ </table>
+ </var:component>
+ </td>
+ </tr>
+ <tr bgcolor="#F5F5E9">
+ <td align="left" width="10">
+ <var:entity const:name="nbsp"/>
+ </td>
+ <td align="right">
+ <img border="0"
+ alt=""
+ src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"
+ />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" bgcolor="#F5F5E9">
+ <table border="0" width="100%" cellpadding="10" cellspacing="0">
+ <tr/>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</var:component>
--- /dev/null
+/*
+ Copyright (C) 2000-2004 SKYRIX Software AG
+
+ This file is part of OGo
+
+ OGo is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with OGo; see the file COPYING. If not, write to the
+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
+// $Id$
+
+
+#ifndef __UIxCalDayView_H_
+#define __UIxCalDayView_H_
+
+
+#include "UIxCalView.h"
+
+@interface UIxCalDayView : UIxCalView
+{
+
+}
+
+- (NSCalendarDate *)thisMonth;
+- (NSCalendarDate *)nextMonth;
+
+@end
+
+#endif /* __UIxCalDayView_H_ */
--- /dev/null
+/*
+ Copyright (C) 2000-2004 SKYRIX Software AG
+
+ This file is part of OGo
+
+ OGo is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with OGo; see the file COPYING. If not, write to the
+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+*/
+// $Id$
+
+
+#import "UIxCalDayView.h"
+#include <NGExtensions/NGExtensions.h>
+
+
+@implementation UIxCalDayView
+
+- (NSCalendarDate *)thisMonth {
+ return [self selectedDate];
+}
+
+- (NSCalendarDate *)nextMonth {
+ NSCalendarDate *date = [self thisMonth];
+ return [date dateByAddingYears:0 months:0 days:[date numberOfDaysInMonth]
+ hours:0 minutes:0 seconds:0];
+}
+
+
+/* URLs */
+
+- (NSDictionary *)prevDayQueryParameters {
+ NSCalendarDate *date;
+
+ date = [[self startDate] dateByAddingYears:0 months:0 days:-1
+ hours:0 minutes:0 seconds:0];
+ return [self queryParametersBySettingSelectedDate:date];
+}
+
+- (NSDictionary *)nextDayQueryParameters {
+ NSCalendarDate *date;
+
+ date = [[self startDate] dateByAddingYears:0 months:0 days:1
+ hours:0 minutes:0 seconds:0];
+ return [self queryParametersBySettingSelectedDate:date];
+}
+
+
+/* fetching */
+
+- (NSCalendarDate *)startDate {
+ return [[self selectedDate] beginOfDay];
+}
+- (NSCalendarDate *)endDate {
+ return [[self startDate] endOfDay];
+}
+
+@end
NSString *dayBodyStyle;
NSString *todayBodyStyle;
NSString *inactiveDayBodyStyle;
+ NSString *selectedDayExtraStyle;
NSString *daySelectionHref;
NSString *weekSelectionHref;
NSString *monthSelectionHref;
[self->dayBodyStyle release];
[self->todayBodyStyle release];
[self->inactiveDayBodyStyle release];
+ [self->selectedDayExtraStyle release];
[self->daySelectionHref release];
[self->weekSelectionHref release];
[self->monthSelectionHref release];
- (NSString *)inactiveDayBodyStyle {
return self->inactiveDayBodyStyle;
}
+- (void)setSelectedDayExtraStyle:(NSString *)_style {
+ ASSIGN(self->selectedDayExtraStyle, _style);
+}
+- (NSString *)selectedDayExtraStyle {
+ return self->selectedDayExtraStyle;
+}
- (void)setDaySelectionHref:(NSString *)_href {
ASSIGN(self->daySelectionHref, _href);
}
return [self dayBodyStyle];
}
+- (NSString *)extraStyle {
+ if([[self selectedDate] isDateOnSameDay:self->currentDay]) {
+ return [self selectedDayExtraStyle];
+ }
+ return nil;
+}
+
/* URLs */
</var:month-label>
</var:if>
<var:month-title class="contentStyle">
- <var:if condition="hasDaySelectionHref">
- <a var:href="daySelectionHref"
- var:queryDictionary="currentDayQueryParameters"
- ><var:string value="currentDay.dayOfMonth" /></a>
- </var:if>
- <var:if condition="hasDaySelectionHref" const:negate="YES">
- <var:string value="currentDay.dayOfMonth" />
- </var:if>
+ <span var:class="extraStyle">
+ <var:if condition="hasDaySelectionHref">
+ <a var:href="daySelectionHref"
+ var:queryDictionary="currentDayQueryParameters"
+ ><var:string value="currentDay.dayOfMonth"/></a>
+ </var:if>
+ <var:if condition="hasDaySelectionHref" const:negate="YES">
+ <var:string value="currentDay.dayOfMonth"/>
+ </var:if>
+ </span>
</var:month-title>
</var:month-overview>
</td>
-<?xml version='1.0' standalone='yes'?>
-<var:component className="UIxPageFrame" title="name"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:var="http://www.skyrix.com/od/binding"
- xmlns:const="http://www.skyrix.com/od/constant"
- xmlns:rsrc="OGo:url"
- xmlns:label="OGo:label"
+<?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:rsrc="OGo:url"
+ xmlns:label="OGo:label"
+ className="UIxPageFrame"
+ 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="month" /></td>
- <td width="36" align="right" valign="center">
- <var:component className="UIxWinClose" />
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td id="skywinbodycell" class="wincontent">
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr bgcolor="#e8e8e0">
+ <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="month"
+ />
+ </td>
+ <td width="36" align="right" valign="center">
+ <var:component className="UIxWinClose"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td id="skywinbodycell" class="wincontent">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr bgcolor="#e8e8e0">
<td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
<td align="right">
- <var:component className="UIxCalBackForthNavView"
- methodName="ownMethodName"
- prevQueryParameters="prevMonthQueryParameters"
- currentQueryParameters="todayQueryParameters"
- nextQueryParameters="nextMonthQueryParameters"
- label:label="this month"
- />
+ <var:component className="UIxCalBackForthNavView"
+ methodName="ownMethodName"
+ prevQueryParameters="prevMonthQueryParameters"
+ currentQueryParameters="todayQueryParameters"
+ nextQueryParameters="nextMonthQueryParameters"
+ label:label="this month"
+ />
</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="UIxCalSelectTab"
- const:selection="month"
- currentDate="selectedDate"
- >
- <table border="0" cellpadding="4" width="100%" cellspacing="2">
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td id="skywinbodycell" class="wincontent">
+ <table border="0" width="100%" cellpadding="0" cellspacing="0">
<tr>
- <td align="right" bgcolor="#e8e8e0">
- <table border='0' cellpadding='0' cellspacing='1'>
- <tr>
- <td class="button_auto_env" nowrap="true" valign='middle' align='center'>
- <a class="button_auto" href="monthprintview" var:queryDictionary="queryParameters" target="SOGoPrintView"><var:string label:value="printview" /></a>
- </td>
- <td class="button_auto_env" nowrap="true" valign='middle' align='center'>
- <a class="button_auto" href="proposal" var:queryDictionary="queryParameters"><var:string label:value="proposal" /></a>
- </td>
- </tr>
+ <td colspan="2">
+ <var:component className="UIxCalSelectTab"
+ const:selection="month"
+ currentDate="selectedDate"
+ >
+ <table border="0" cellpadding="4" width="100%" cellspacing="2">
+ <tr>
+ <td align="right" bgcolor="#e8e8e0">
+ <table border="0" cellpadding="0" cellspacing="1">
+ <tr>
+ <td class="button_auto_env" nowrap="true" valign="middle" align="center">
+ <a class="button_auto"
+ href="monthprintview"
+ var:queryDictionary="queryParameters"
+ target="SOGoPrintView"
+ ><var:string label:value="printview"/></a>
+ </td>
+ <td class="button_auto_env" nowrap="true" valign="middle" align="center">
+ <a class="button_auto"
+ href="proposal"
+ var:queryDictionary="queryParameters"
+ ><var:string label:value="proposal"/></a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
+ <var:month-overview list="appointments"
+ item="appointment"
+ currentDay="currentDay"
+ index="dayIndex"
+ year="year"
+ month="month"
+ const:startDateKey="startDate"
+ const:endDateKey="endDate"
+ const:class="monthoverview"
+ contentStyle="contentStyle"
+ const:width="100%"
+ >
+ <var:month-info>
+ <var:if condition="hasHolidayInfo">
+ <var:string value="holidayInfo" const:class="monthoverview_holidayinfo"/>
+ </var:if>
+ <var:foreach list="allDayApts" item="appointment">
+ <a var:href="appointmentViewURL"
+ ><var:string value="shortTextForApt"/></a>
+ </var:foreach>
+ </var:month-info>
+ <var:month-label const:orientation="top" dayOfWeek="dayOfWeek" const:class="monthoverview_title">
+ <var:string value="localizedDayOfWeekName"/>
+ </var:month-label>
+ <var:month-label const:orientation="left" weekOfYear="weekOfYear" class="weekStyle">
+ <a href="weekoverview"
+ var:queryDictionary="currentWeekQueryParameters"
+ ><var:string value="weekOfYear"/></a>
+ </var:month-label>
+ <var:month-title class="contentStyle">
+ <span class="monthoverview_day">
+ <a href="dayoverview"
+ var:queryDictionary="currentDayQueryParameters"
+ ><var:string value="currentDay.dayOfMonth"/></a>
+ </span>
+ <br/>
+ <span class="monthoverview_day_new">
+ <a href="new"
+ var:queryDictionary="currentDayQueryParameters"
+ >[<var:string label:value="new"/>]</a>
+ </span>
+ </var:month-title>
+ <var:month>
+ <a var:href="appointmentViewURL"
+ class="monthoverview_content_link"
+ var:title="shortTextForApt"
+ var:queryDictionary="currentDayQueryParameters"
+ ><var:string value="shortTitleForApt"/></a>
+ </var:month>
+ </var:month-overview>
+ </var:component>
+ </td>
+ </tr>
+ <tr bgcolor="#F5F5E9">
+ <td align="left" width="10">
+ <var:entity const:name="nbsp"/>
+ </td>
+ <td align="right">
+ <img border="0"
+ alt=""
+ src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"
+ />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" bgcolor="#F5F5E9">
+ <table border="0" width="100%" cellpadding="10" cellspacing="0">
+ <tr/>
+ </table>
</td>
</tr>
</table>
-
- <var:month-overview
- list="appointments"
- item="appointment"
- currentDay="currentDay"
- index="dayIndex"
- year="year"
- month="month"
- const:startDateKey = "startDate"
- const:endDateKey = "endDate"
-
- const:class="monthoverview"
- contentStyle="contentStyle"
- const:width="100%"
- >
- <var:month-info>
- <var:if condition="hasHolidayInfo">
- <var:string value="holidayInfo"
- const:class="monthoverview_holidayinfo" />
- </var:if>
- <var:foreach list="allDayApts" item="appointment">
- <a var:href="appointmentViewURL"
- ><var:string value="shortTextForApt" /></a>
- </var:foreach>
- </var:month-info>
- <var:month-label const:orientation="top"
- dayOfWeek="dayOfWeek"
- const:class="monthoverview_title"
- >
- <var:string value="localizedDayOfWeekName" />
- </var:month-label>
- <var:month-label const:orientation="left"
- weekOfYear="weekOfYear"
- class="weekStyle"
- >
- <a href="weekoverview"
- var:queryDictionary="currentWeekQueryParameters"
- ><var:string value="weekOfYear" /></a>
- </var:month-label>
-
- <var:month-title class="contentStyle">
- <span class="monthoverview_day">
- <a href="dayoverview"
- var:queryDictionary="currentDayQueryParameters"
- ><var:string value="currentDay.dayOfMonth" /></a>
- </span>
- <br />
- <span class="monthoverview_day_new">
- <a href="new" var:queryDictionary="currentDayQueryParameters"
- >[<var:string label:value="new" />]</a>
- </span>
- </var:month-title>
-
- <var:month>
- <a var:href="appointmentViewURL"
- class="monthoverview_content_link"
- var:title="shortTextForApt"
- var:queryDictionary="currentDayQueryParameters"
- ><var:string value="shortTitleForApt" /></a>
- </var:month>
- </var:month-overview>
- </var:component>
- </td>
- </tr>
- <tr bgcolor="#F5F5E9">
- <td align="left" width="10"><var:entity const:name="nbsp"/></td>
- <td align="right"><img border="0" alt="" src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif" /></td>
- </tr>
- <tr>
- <td colspan="2" bgcolor="#F5F5E9">
- <table border="0" width="100%" cellpadding="10" cellspacing="0">
- <tr/>
+ </td>
+ </tr>
</table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-
-<!--
- <hr />
- SOGo Server - <var:string value="name"/>
- <br />
- Client: <var:string value="clientObject"/>
- <br />
- Appointments: #<var:string value="appointments.count"/>
- from <var:string value="startDate" />
- to <var:string value="endDate" />
- <br />
+ <!--
+ <hr />
+ SOGo Server - <var:string value="name"/>
+ <br />
+ Client: <var:string value="clientObject"/>
+ <br />
+ Appointments: #<var:string value="appointments.count"/>
+ from <var:string value="startDate" />
+ to <var:string value="endDate" />
+ <br />
- <hr />
+ <hr />
- Appointments:
- <var:component className="UIxAptTableView" appointments="appointments"/>
- -->
- <!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
+ Appointments:
+ <var:component className="UIxAptTableView" appointments="appointments"/>
+ -->
+<!-- pre><var:string value="appointments" const:insertBR="YES"/></pre -->
</var:component>
@implementation UIxCalMonthView
- (NSCalendarDate *)startDate {
- return [[super startDate] firstDayOfMonth];
+ return [[[super startDate] firstDayOfMonth] beginOfDay];
}
- (NSCalendarDate *)endDate {
- NSCalendarDate *startDate = [self startDate];
+ NSCalendarDate *startDate = [[self startDate] endOfDay];
return [startDate dateByAddingYears:0
months:0
days:[startDate numberOfDaysInMonth]
<table border="0" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
- <var:component className="UIxCalSelectTab" const:selection="week"
- currentDate="selectedDate">
+ <var:component className="UIxCalSelectTab"
+ const:selection="week"
+ currentDate="selectedDate"
+ >
<table border="0" cellpadding="4" width="100%" cellspacing="2">
<tr>
<td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
<tr>
<td class="button_auto_env" nowrap="true" valign='middle'
align='center'>
- <a class="button_auto" href="weekprintview"
- var:queryDictionary="queryParameters"
- target="SOGoPrintView"><var:string label:value="printview" /></a>
+ <a class="button_auto"
+ href="weekprintview"
+ var:queryDictionary="queryParameters"
+ target="SOGoPrintView"
+ ><var:string label:value="printview" /></a>
</td>
<td class="button_auto_env" nowrap="true" valign='middle'
align='center'>
- <a class="button_auto" href="proposal"
- var:queryDictionary="queryParameters"><var:string label:value="proposal" /></a>
+ <a class="button_auto"
+ href="proposal"
+ var:queryDictionary="queryParameters"
+ ><var:string label:value="proposal" /></a>
</td>
</tr>
</table>
@implementation UIxCalWeekView
- (NSCalendarDate *)startDate {
- return [[super startDate] mondayOfWeek];
+ return [[[super startDate] mondayOfWeek] beginOfDay];
}
- (NSCalendarDate *)endDate {
- return [[self startDate] dateByAddingYears:0 months:0 days:7
- hours:0 minutes:0 seconds:0];
+ return [[[self startDate] dateByAddingYears:0 months:0 days:7
+ hours:0 minutes:0 seconds:0] endOfDay];
}
/* URLs */
-<?xml version='1.0' standalone='yes'?>
-<var:component className="UIxPageFrame"
- title="name"
- xmlns="http://www.w3.org/1999/xhtml"
+<?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:rsrc="OGo:url"
xmlns:label="OGo:label"
+ className="UIxPageFrame"
+ 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="year"
- /></td>
- <td width="36" align="right" valign="center">
- <var:component className="UIxWinClose" />
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td id="skywinbodycell" class="wincontent">
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr bgcolor="#e8e8e0">
+ <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="year"
+ />
+ </td>
+ <td width="36" align="right" valign="center">
+ <var:component className="UIxWinClose"/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td id="skywinbodycell" class="wincontent">
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr bgcolor="#e8e8e0">
<td align="left" valign="middle" width="80%">TODO: controls</td><!-- 99% -->
<td align="right">
- <var:component className="UIxCalBackForthNavView"
- methodName="ownMethodName"
- prevQueryParameters="prevYearQueryParameters"
- currentQueryParameters="todayQueryParameters"
- nextQueryParameters="nextYearQueryParameters"
- label:label="this year"
- />
+ <var:component className="UIxCalBackForthNavView"
+ methodName="ownMethodName"
+ prevQueryParameters="prevYearQueryParameters"
+ currentQueryParameters="todayQueryParameters"
+ nextQueryParameters="nextYearQueryParameters"
+ label:label="this year"
+ />
</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="UIxCalSelectTab"
- const:selection="year"
- currentDate="selectedDate"
- >
- <table>
- <var:foreach list="arrayOfDateArrays" item="row">
- <tr valign="top">
- <var:foreach list="row" item="month">
- <td>
- <var:component className="UIxCalInlineMonthOverview"
- selectedDate="month"
- const:monthSelectionHref="monthoverview"
- const:showYear="NO"
- const:daySelectionHref="dayoverview"
- const:showWeekColumn="1"
- const:weekSelectionHref="weekoverview"
- const:style="yearoverview"
- const:headerStyle="yearoverview_title"
- const:weekStyle="yearoverview_week"
- const:todayWeekStyle="yearoverview_week_hilite"
- const:dayHeaderStyle="yearoverview_day_header"
- const:dayBodyStyle="yearoverview_content"
- const:todayBodyStyle="yearoverview_content_hilite"
- const:inactiveDayBodyStyle="yearoverview_content_dimmed"
- />
- </td>
- </var:foreach>
- </tr>
- </var:foreach>
- </table>
- </var:component>
- </td>
- </tr>
- <tr bgcolor="#F5F5E9">
- <td align="left" width="10"><var:entity const:name="nbsp"/></td>
- <td align="right"><img border="0"
- alt=""
- src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"
- /></td>
- </tr>
- <tr>
- <td colspan="2" bgcolor="#F5F5E9">
- <table border="0" width="100%" cellpadding="10" cellspacing="0">
- <tr/>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
+ </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="UIxCalSelectTab"
+ const:selection="year"
+ currentDate="selectedDate"
+ >
+ <table>
+ <var:foreach list="arrayOfDateArrays" item="row">
+ <tr valign="top">
+ <var:foreach list="row" item="month">
+ <td>
+ <var:component className="UIxCalInlineMonthOverview"
+ selectedDate="month"
+ const:monthSelectionHref="monthoverview"
+ const:showYear="NO"
+ const:daySelectionHref="dayoverview"
+ const:showWeekColumn="1"
+ const:weekSelectionHref="weekoverview"
+ const:style="yearoverview"
+ const:headerStyle="yearoverview_title"
+ const:weekStyle="yearoverview_week"
+ const:todayWeekStyle="yearoverview_week_hilite"
+ const:dayHeaderStyle="yearoverview_day_header"
+ const:dayBodyStyle="yearoverview_content"
+ const:todayBodyStyle="yearoverview_content_hilite"
+ const:inactiveDayBodyStyle="yearoverview_content_dimmed"
+ />
+ </td>
+ </var:foreach>
+ </tr>
+ </var:foreach>
+ </table>
+ </var:component>
+ </td>
+ </tr>
+ <tr bgcolor="#F5F5E9">
+ <td align="left" width="10">
+ <var:entity const:name="nbsp"/>
+ </td>
+ <td align="right">
+ <img border="0"
+ alt=""
+ src="/sogod.woa/so/ControlPanel/Products/CommonUI/Resources/corner_right.gif"
+ />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" bgcolor="#F5F5E9">
+ <table border="0" width="100%" cellpadding="10" cellspacing="0">
+ <tr/>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
</var:component>
# $Id$
-SUBMINOR_VERSION:=5
+SUBMINOR_VERSION:=6
# 1.1.0 requires NGObjWeb 4.2.202
categories = {
SOGoAppointmentFolder = {
methods = {
+ "dayoverview" = {
+ protectedBy = "View";
+ pageName = "UIxCalDayOverview";
+ };
+ "daychartview" = {
+ protectedBy = "View";
+ pageName = "UIxCalDayOverview";
+ };
+ "daylistview" = {
+ protectedBy = "View";
+ pageName = "UIxCalDayOverview";
+ };
"weekoverview" = {
protectedBy = "View";
pageName = "UIxCalWeekOverview";
projects / scalable-opengroupware.org / commitdiff