From: Michael Prager <michael@pragers.de>
Date: Wed, 9 Sep 2009 14:53:16 +0000 (+0200)
Subject: fixed boken table columns, reintroduced some of the <span> tags, only remove weedDay... 
X-Git-Url: https://code.delx.au/comingnext/commitdiff_plain/5cfab3c9286466626c52598e589e6b4b88e19865

fixed boken table columns, reintroduced some of the <span> tags, only remove weedDay if showTodayAsText == true

Note that isToday(date) will not produce the same result as date.search(/Today/). If using isToday(), an additional check for showTodayAsText needs to be performed.

Some <span> tags were reintroduced because with only the date showing, there is a huge wast of space because of the table cells beeing 50% empty.
---

diff --git a/comingNext/index.html b/comingNext/index.html
index 7fa1d5d..35d1632 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -471,25 +471,25 @@ function updateData()
 					var time = formatTime(date);
 					var dateStr = formatDate(date, entryDate);
 					if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {
-						if (isToday(date))
-							entriesHtml += '<td colspan="2" class="date">' + dateStr + '</td><td colspan="2" class="description">';
+						if (isToday(date) && showTodayAsText) // show weekday if the date string is not text. looks odd otherwise
+							entriesHtml += '<td colspan="4"><span class="date">' + dateStr + '</span> ';
 						else
-							entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2" class="description">';
+							entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2">';
 					} else if (entry.Type == 'Meeting') {
 						if (showCombinedDateTime) {
 							if (isToday(date))
-								entriesHtml += '<td colspan="2" class="today">' + time + '</td><td colspan="2" class="description">';
+								entriesHtml += '<td colspan="4"><span class="today">' + time + '</span> ';
 							else
-								entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2" class="description">';
+								entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td colspan="2">';
 						} else {
-							if (isToday(date))
-								entriesHtml += '<td class="date">' + dateStr + '</td><td class="time">' + time + '</td><td colspan="2" class="description">';
+							if (isToday(date) && showTodayAsText)
+								entriesHtml += '<td colspan="4"><span class="today">' + dateStr + '</span> <span class="time">' + time + '</span> ';
 							else
-								entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td>&nbsp;<span class="time">' + time + '</span></td><td colspan="2" class="description">';
+								entriesHtml += '<td class="weekDay">' + weekDay + '</td><td class="date">' + dateStr + '</td><td width="1px" class="time">' + time + '</td><td>';
 						}
 					}
 				}
-				entriesHtml += Summary + '</td></tr>';
+				entriesHtml += '<span class="description">' + Summary + '</span></td></tr>';
 			}
 		}
 		entriesHtml += '</table>';