+2004-07-28 Marcus Mueller <znek@mulle-kybernetik.com>
+
+ * calendar.css: added CSS for weekcolumnsview (v0.9.3)
+
2004-07-27 Marcus Mueller <znek@mulle-kybernetik.com>
* v0.9.2
text-decoration: none;
}
+
+.weekcolumnsview {
+}
+
+.weekcolumnsview_title {
+ font-size: 10pt;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ letter-spacing: 0pt;
+ color: #000000;
+ background-color: #d2d2cc;
+ padding: 4px;
+}
+
+.weekcolumnsview_title a {
+ color: #0033cc;
+ text-decoration: none;
+}
+
+.weekcolumnsview_title_hilite {
+ font-size: 10pt;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ letter-spacing: 0pt;
+ color: #000000;
+ background-color: #d2d2cc;
+ font-weight: bold;
+ padding: 4px;
+}
+
+.weekcolumnsview_title_hilite a {
+ color: #0033cc;
+ text-decoration: none;
+}
+
+.weekcolumnsview_title_daylink {
+ font-size: 12pt;
+ color: #0033cc;
+ font-weight: bold;
+}
+
+.weekcolumnsview_title_newlink {
+ font-size: 8pt;
+}
+
+.weekcolumnsview_holidayinfo {
+ font-size: 8pt;
+ font-weight: bold;
+}
+
+.weekcolumnsview_content {
+ color: #FFFFFF;
+ background-color: #e8e8e0;
+}
+
+.weekcolumnsview_content a {
+ color: #0000FF;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ letter-spacing: 0pt;
+ text-decoration: none;
+}
+
+.weekcolumnsview_content_hilite {
+ background-color: #fffff0;
+}
+
+.weekcolumnsview_content_hilite a {
+ color: #0000FF;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ letter-spacing: 0pt;
+ text-decoration: none;
+}
+
+.weekcolumnsview_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;
+}
+
+.weekcolumnsview_cal table {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.weekcolumnsview_cal td {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.weekcolumnsview_cal a {
+ color: #000000;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ font-size: 10pt;
+ letter-spacing: 0pt;
+ padding: 0px;
+ text-decoration: none;
+}
+.weekcolumnsview_cal a:hover {
+ text-decoration: underline;
+}
+
+.weekcolumnsview_cal_title {
+ background-color: #d2d2cc;
+ text-align: center;
+ font-size: 10pt;
+ font-weight: bold;
+ letter-spacing: 0pt;
+}
+
+.weekcolumnsview_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;
+}
+
+.weekcolumnsview_cal_content {
+ color: #000000;
+ background-color: #e8e8e0;
+ text-align: center;
+ vertical-align: middle;
+ font-size: 10pt;
+ letter-spacing: 0pt;
+}
+
+.weekcolumnsview_cal_content_hilite {
+ color: #000000;
+ background-color: #fffff0;
+ text-align: center;
+ vertical-align: middle;
+ font-size: 10pt;
+ letter-spacing: 0pt;
+}
+
+.weekcolumnsview_cal_content_dimmed {
+ color: #5a5a5a;
+ background-color: #d2d2cc;
+ text-align: center;
+ vertical-align: middle;
+ font-size: 10pt;
+ letter-spacing: 0pt;
+}
+
+.weekcolumnsview_cal_week {
+ background-color: #d2d2cc;
+ width: 16pt;
+ text-align: center;
+ vertical-align: middle;
+}
+
+
.monthoverview {
color: #000000;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+2004-07-28 Marcus Mueller <znek@mulle-kybernetik.com>
+
+ * v0.9.9
+
+ * UIxCalWeekColumnsview.[m|wox]: implemented.
+
+ * UIxCalWeekCharview.*, UIxCalWeekListview.*, UIxCalDayChartView.*,
+ UIxCalDayListview.*: enhanced templates.
+
+ * UIxCalDayView.[hm]: removed -thisMonth and -nextMonth.
+
+ * UIxCalView.[hm]: added -thisMonth and -nextMonth
+
2004-07-28 Marcus Mueller <znek@mulle-kybernetik.com>
* v0.9.8
// $Id$
-#include <NGObjWeb/NGObjWeb.h>
+#include "UIxCalDayView.h"
+#include "common.h"
-
-@interface UIxCalDayChartview : WOComponent
+@interface UIxCalDayChartview : UIxCalDayView
{
}
<var:component className="UIxCalDateLabel"
startDate="startDate"
endDate="endDate"
- const:selection="year"
+ const:selection="day"
/>
</td>
<td width="36" align="right" valign="center">
// $Id$
-#include <NGObjWeb/NGObjWeb.h>
+#include "UIxCalDayView.h"
+#include "common.h"
-
-@interface UIxCalDayListview : WOComponent
+@interface UIxCalDayListview : UIxCalDayView
{
}
<var:component className="UIxCalDateLabel"
startDate="startDate"
endDate="endDate"
- const:selection="year"
+ const:selection="day"
/>
</td>
<td width="36" align="right" valign="center">
#include "UIxCalDayView.h"
-#include <Foundation/Foundation.h>
-#include <NGExtensions/NGExtensions.h>
-
+#include "common.h"
@interface UIxCalDayOverview : UIxCalDayView
{
<var:component className="UIxCalDateLabel"
startDate="startDate"
endDate="endDate"
- const:selection="year"
+ const:selection="day"
/>
</td>
<td width="36" align="right" valign="center">
</td>
</tr>
</table>
- <table>
+ <table width="100%">
<tr valign="top">
<td>
<table>
</tr>
</table>
</td>
- <td>
+ <td width="100%">
<table class="dayoverview_content" width="100%">
<var:foreach list="dateRange" item="currentDate">
<tr>
><var:string label:value="new" /></a>]
</span>
</td>
- <td class="dayoverview_content_apts">
+ <td class="dayoverview_content_apts" width="90%">
<var:foreach list="aptsForCurrentDate" item="appointment">
<a var:href="appointmentViewURL"
var:queryDictionary="currentDateQueryParameters"
}
-- (NSCalendarDate *)thisMonth;
-- (NSCalendarDate *)nextMonth;
-
@end
#endif /* __UIxCalDayView_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 {
- (BOOL)shouldDisplayWeekend;
- (NSCalendarDate *)referenceDateForFormatter;
-
+
+- (NSCalendarDate *)thisMonth;
+- (NSCalendarDate *)nextMonth;
+
/* URLs */
- (NSString *)appointmentViewURL;
return [self selectedDate];
}
+- (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];
+}
+
+
/* current day related */
- (void)setCurrentDay:(NSCalendarDate *)_day {
// $Id$
-#include <NGObjWeb/NGObjWeb.h>
+#include "UIxCalWeekView.h"
+#include "common.h"
-
-@interface UIxCalWeekChartview : WOComponent
+@interface UIxCalWeekChartview : UIxCalWeekView
{
}
// $Id$
-#include <NGObjWeb/NGObjWeb.h>
+#include "UIxCalWeekView.h"
+#include "common.h"
-
-@interface UIxCalWeekColumnsview : WOComponent
+@interface UIxCalWeekColumnsview : UIxCalWeekView
{
-
+ int dayIndex;
}
@end
@implementation UIxCalWeekColumnsview
+- (NSArray *)appointments {
+ return [self fetchCoreInfos];
+}
+
+- (void)setDayIndex:(char)_idx {
+ NSCalendarDate *d;
+
+ if ((self->dayIndex == _idx) && (self->currentDay != nil))
+ return;
+
+ self->dayIndex = _idx;
+
+ if (_idx > 0) {
+ d = [[self startDate]
+ dateByAddingYears:0 months:0 days:_idx
+ hours:0 minutes:0 seconds:0];
+ }
+ else
+ d = [self startDate];
+
+ [self setCurrentDay:d];
+}
+
+- (int)dayIndex {
+ return self->dayIndex;
+}
+
+
+/* style sheet */
+
+- (NSString *)titleStyle {
+ if([self->currentDay isToday])
+ return @"weekcolumnsview_title_hilite";
+ return @"weekcolumnsview_title";
+}
+
+- (NSString *)contentStyle {
+ if([self->currentDay isToday])
+ return @"weekcolumnsview_content_hilite";
+ return @"weekcolumnsview_content";
+}
+
@end
<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 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>
</td>
</tr>
</table>
-
- <var:week-overview list="appointments"
- item="appointment"
- weekStart="startDate"
- dayIndex="dayIndex"
- const:startDateKey="startDate"
- const:endDateKey="endDate"
- const:titleStyle="weekoverview_title"
- contentStyle="contentStyle"
- >
- <var:week-title>
- <table cellpadding="0" width="100%" border="0" cellspacing="0"
- var:class="titleStyle">
- <tr>
- <td align="left" valign="top">
- <a href="dayoverview"
- var:queryDictionary="currentDayQueryParameters"
- class="weekoverview_title_daylink"
- ><var:string value="currentDay.dayOfMonth" /></a>
+ <table width="100%">
+ <tr valign="top">
+ <td>
+ <table>
+ <tr>
+ <td>
+ <var:component className="UIxCalInlineMonthOverview"
+ selectedDate="thisMonth"
+ const:showYear="YES"
+ const:showWeekColumn="YES"
+ const:weekSelectionHref="weekcolumnsview"
+ const:style="weekcolumnsview_cal"
+ const:headerStyle="weekcolumnsview_cal_title"
+ const:weekStyle="weekcolumnsview_cal_week"
+ const:dayHeaderStyle="weekcolumnsview_cal_day_header"
+ const:dayBodyStyle="weekcolumnsview_cal_content"
+ const:todayBodyStyle="weekcolumnsview_cal_content_hilite"
+ const:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed"
+ />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <var:component className="UIxCalInlineMonthOverview"
+ selectedDate="nextMonth"
+ const:showYear="YES"
+ const:showWeekColumn="YES"
+ const:weekSelectionHref="weekcolumnsview"
+ const:style="weekcolumnsview_cal"
+ const:headerStyle="weekcolumnsview_cal_title"
+ const:weekStyle="weekcolumnsview_cal_week"
+ const:dayHeaderStyle="weekcolumnsview_cal_day_header"
+ const:dayBodyStyle="weekcolumnsview_cal_content"
+ const:todayBodyStyle="weekcolumnsview_cal_content_hilite"
+ const:inactiveDayBodyStyle="weekcolumnsview_cal_content_dimmed"
+ />
+ </td>
+ </tr>
+ </table>
</td>
- <td align="center" valign="top" width="97%">
- <var:string value="currentDayName" /><br />
- [<a href="new"
- var:queryDictionary="currentDayQueryParameters"
- class="weekoverview_title_newlink"
- ><var:string label:value="new" /></a>]
+ <td width="100%">
+ <var:weekcol-view list="appointments"
+ item="appointment"
+ weekStart="startDate"
+ dayIndex="dayIndex"
+ const:startDateKey="startDate"
+ const:endDateKey="endDate"
+ const:titleStyle="weekcolumnsview_title"
+ contentStyle="contentStyle"
+ const:class="weekcolumnsview"
+ const:width="100%"
+ const:contentColor="#e8e8e0"
+ const:cellpadding="0"
+ const:cellspacing="2"
+ >
+ <var:weekcol-title>
+ <table cellpadding="0" width="100%" border="0" cellspacing="0"
+ var:class="titleStyle">
+ <tr>
+ <td align="left" valign="top">
+ <a href="dayoverview"
+ var:queryDictionary="currentDayQueryParameters"
+ class="weekcolumnsview_title_daylink"
+ ><var:string value="currentDay.dayOfMonth" /></a>
+ </td>
+ <td align="center" valign="top" width="97%">
+ <var:string value="currentDayName" /><br />
+ [<a href="new"
+ var:queryDictionary="currentDayQueryParameters"
+ class="weekcolumnsview_title_newlink"
+ ><var:string label:value="new" /></a>]
+ </td>
+ </tr>
+ </table>
+ </var:weekcol-title>
+ <var:if condition="hasDayInfo">
+ <var:weekcol-info>
+ <var:if condition="hasHolidayInfo">
+ <var:string value="holidayInfo"
+ const:class="weekcolumnsview_holidayinfo" />
+ </var:if>
+ <var:foreach list="allDayApts" item="appointment">
+ <a var:href="appointmentViewURL"
+ var:queryDictionary="currentDayQueryParameters"
+ ><var:string value="shortTextForApt" /></a>
+ </var:foreach>
+ </var:weekcol-info>
+ </var:if>
+ <var:weekcol>
+ <a var:href="appointmentViewURL"
+ ><small><var:string value="shortTextForApt" /></small></a><br />
+ </var:weekcol>
+ </var:weekcol-view>
</td>
</tr>
</table>
- </var:week-title>
- <var:if condition="hasDayInfo">
- <var:week-info>
- <var:if condition="hasHolidayInfo">
- <var:string value="holidayInfo"
- const:class="weekoverview_holidayinfo" />
- </var:if>
- <var:foreach list="allDayApts" item="appointment">
- <a var:href="appointmentViewURL"
- var:queryDictionary="currentDayQueryParameters"
- ><var:string value="shortTextForApt" /></a>
- </var:foreach>
- </var:week-info>
- </var:if>
- <var:week>
- <a var:href="appointmentViewURL"
- ><small><var:string value="shortTextForApt" /></small></a><br />
- </var:week>
- </var:week-overview>
+
</var:component>
</td>
</tr>
// $Id$
-#include <NGObjWeb/NGObjWeb.h>
+#include "UIxCalWeekView.h"
+#include "common.h"
-
-@interface UIxCalWeekListview : WOComponent
+@interface UIxCalWeekListview : UIxCalWeekView
{
}
<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 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>
# $Id$
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=9
# 1.1.0 requires NGObjWeb 4.2.202
projects / scalable-opengroupware.org / commitdiff