timezone that has no DST, you should use this option\r
- some code cleanup (by Paul Moore)\r
- fixed alignment when calendar entries have very long description\r
+1.22 (2009-12-07) by Michael Prager\r
+ - show "Tomorrow" instead of date if "showNowAsText" is enabled
\ No newline at end of file
@echo off\r
\r
-set VERSION=1.21\r
+set VERSION=1.22\r
\r
del *.wgz\r
del *.zip\r
<!DOCTYPE plist PUBLIC "-//Nokia//DTD PLIST 1.0//EN" "http://www.nokia.com/NOKIA_COM_1/DTDs/plist-1.0.dtd">\r
<plist version="1.0">\r
<dict>\r
- <key>DisplayName</key> <string>Coming Next 1.21</string>\r
+ <key>DisplayName</key> <string>Coming Next 1.22</string>\r
<key>Identifier</key> <string>ar.com.cochambre.symbian.wrt.comingnext</string>\r
- <key>Version</key> <string>1.21</string>\r
+ <key>Version</key> <string>1.22</string>\r
<key>MainHTML</key> <string>index.html</string>\r
<key>AllowNetworkAccess</key> <false />\r
<key>MiniViewEnabled</key> <true/> \r
.weekDay { } /* Defines the appearance of all week day texts */\r
.date { } /* Defines the appearance of all date texts */\r
.today { color:#ff0000; } /* Defines the appearance of "Today" text */\r
+.tomorrow { color:#0000ff; } /* Defines the appearance of "Tomorrow" text */\r
.time { } /* Defines the appearance of all time texts */\r
.now { color:#ff00ff; } /* Defines the appearance of "Now" text */\r
.description { } /* Defines the appearance of all event descriptions */\r
var showLocation = true; // show the location for meeting events\r
var showTodayAsText = true; // if enabled, the current date will be shown as "Today" instead of "31.12"\r
var todayText = 'Today'; // text to display for "Today"\r
+var tomorrowText = 'Tomorrow'; // text to display for "Tomorrow"\r
var showNowAsText = true; // if enabled, the appointment time will be shown as "Now" instead of "12:00"\r
var nowText = 'Now'; // text to display for "Now"\r
var dateSeparator = '.'; // separator for dates. e.g. "31.12" or "31/12"\r
return false;\r
}\r
\r
+function isTomorrow(date)\r
+{\r
+ if ((date.getDate() == now.getDate() + 1 && date.getMonth() == now.getMonth()) ||\r
+ (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1) ||\r
+ (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1 && date.getYear() == now.getYear() + 1))\r
+ return true;\r
+ return false;\r
+}\r
+\r
function collectLocales()\r
{\r
var tmpyear = ((panelNum == 0) ? 2000 : 2001);\r
\r
if (showTodayAsText && isToday(date))\r
return '<span class="today">' + todayText + '</span>';\r
+ if (showTodayAsText && isTomorrow(date))\r
+ return '<span class="tomorrow">' + tomorrowText + '</span>';\r
\r
var dateArr = format.replace(/,/g,'').replace(/\./g,':').replace(/ /g,' ').split(' ');\r
if (dateArr.length != 5 && dateArr.length != 6) {\r
var time = formatTime(date);\r
var dateStr = formatDate(date, entryDate);\r
if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
- if (isToday(date) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise\r
+ if ((isToday(date) || isTomorrow(date)) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise\r
entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';\r
else\r
entriesHtml += '<td class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';\r
} else if (entry.Type == 'Meeting') {\r
if (showCombinedDateTime) {\r
- if (isToday(date))\r
+ if (isToday(date) || isTomorrow(date))\r
entriesHtml += '<td width="1px" colspan="4"><span class="today">' + time + '</span> ';\r
else\r
entriesHtml += '<td width="1px" class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';\r
} else {\r
- if (isToday(date) && showTodayAsText)\r
+ if ((isToday(date) || isTomorrow(date)) && showTodayAsText)\r
entriesHtml += '<td colspan="4"><span class="today">' + dateStr + '</span> <span class="time">' + time + '</span> ';\r
else\r
entriesHtml += '<td width="1px" class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td width="1px" class="time">' + time + '</td><td>';\r
<!DOCTYPE plist PUBLIC "-//Nokia//DTD PLIST 1.0//EN" "http://www.nokia.com/NOKIA_COM_1/DTDs/plist-1.0.dtd">\r
<plist version="1.0">\r
<dict>\r
- <key>DisplayName</key> <string>Coming Next B 1.21</string>\r
+ <key>DisplayName</key> <string>Coming Next B 1.22</string>\r
<key>Identifier</key> <string>ar.com.cochambre.symbian.wrt.comingnextb</string>\r
- <key>Version</key> <string>1.21</string>\r
+ <key>Version</key> <string>1.22</string>\r
<key>MainHTML</key> <string>index.html</string>\r
<key>AllowNetworkAccess</key> <false />\r
<key>MiniViewEnabled</key> <true/> \r
.weekDay { } /* Defines the appearance of all week day texts */\r
.date { } /* Defines the appearance of all date texts */\r
.today { color:#ff0000; } /* Defines the appearance of "Today" text */\r
+.tomorrow { color:#0000ff; } /* Defines the appearance of "Tomorrow" text */\r
.time { } /* Defines the appearance of all time texts */\r
.now { color:#ff00ff; } /* Defines the appearance of "Now" text */\r
.description { } /* Defines the appearance of all event descriptions */\r
var showLocation = true; // show the location for meeting events\r
var showTodayAsText = true; // if enabled, the current date will be shown as "Today" instead of "31.12"\r
var todayText = 'Today'; // text to display for "Today"\r
+var tomorrowText = 'Tomorrow'; // text to display for "Tomorrow"\r
var showNowAsText = true; // if enabled, the appointment time will be shown as "Now" instead of "12:00"\r
var nowText = 'Now'; // text to display for "Now"\r
var dateSeparator = '.'; // separator for dates. e.g. "31.12" or "31/12"\r
return false;\r
}\r
\r
+function isTomorrow(date)\r
+{\r
+ if ((date.getDate() == now.getDate() + 1 && date.getMonth() == now.getMonth()) ||\r
+ (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1) ||\r
+ (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1 && date.getYear() == now.getYear() + 1))\r
+ return true;\r
+ return false;\r
+}\r
+\r
function collectLocales()\r
{\r
var tmpyear = ((panelNum == 0) ? 2000 : 2001);\r
\r
if (showTodayAsText && isToday(date))\r
return '<span class="today">' + todayText + '</span>';\r
+ if (showTodayAsText && isTomorrow(date))\r
+ return '<span class="tomorrow">' + tomorrowText + '</span>';\r
\r
var dateArr = format.replace(/,/g,'').replace(/\./g,':').replace(/ /g,' ').split(' ');\r
if (dateArr.length != 5 && dateArr.length != 6) {\r
var time = formatTime(date);\r
var dateStr = formatDate(date, entryDate);\r
if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
- if (isToday(date) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise\r
+ if ((isToday(date) || isTomorrow(date)) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise\r
entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';\r
else\r
entriesHtml += '<td class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';\r
} else if (entry.Type == 'Meeting') {\r
if (showCombinedDateTime) {\r
- if (isToday(date))\r
+ if (isToday(date) || isTomorrow(date))\r
entriesHtml += '<td width="1px" colspan="4"><span class="today">' + time + '</span> ';\r
else\r
entriesHtml += '<td width="1px" class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td colspan="2">';\r
} else {\r
- if (isToday(date) && showTodayAsText)\r
+ if ((isToday(date) || isTomorrow(date)) && showTodayAsText)\r
entriesHtml += '<td colspan="4"><span class="today">' + dateStr + '</span> <span class="time">' + time + '</span> ';\r
else\r
entriesHtml += '<td width="1px" class="weekDay">' + weekDay + '</td><td width="1px" class="date">' + dateStr + '</td><td width="1px" class="time">' + time + '</td><td>';\r