X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/7462eb0578c84056fb0934aa0cbd1acb4873a993..19eb00692717db01ea65d25bd4a8c0f1eb1ec5f7:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index f30cb7d..1d45580 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -26,17 +26,21 @@
 .calendar6 { background-color:#9fdf57 }
 </style>
 
-<script type="text/javascript" src="localizedTextStrings.js" charset="utf-8" />
-
-<script>
+<script type="text/javascript" src="localizedTextStrings.js" charset="utf-8"></script>
+<script type="text/javascript" src="../debug.js" charset="utf-8"></script>
+<script type="text/javascript">
 // valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID', 'Array'
 var config = {
+	fontsize: { Type: 'Enum', Default: 'auto', Value: 'auto', ValidValues: ['auto', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28'],},
+	eventsPerWidget: { Type: 'Int', Default: 4, Value: 4,},
 	monthRange: { Type: 'Int', Default: 2, Value: 2,},
+	maxNumberOfEventsOnFullscreen: { Type: 'Int', Default: 30, Value: 30,},
 	includeTodos: { Type: 'Bool', Default: true, Value: true,},
 	useBackgroundImage: { Type: 'Bool', Default: true, Value: true,},
 	backgroundImageLocation: { Type: 'Enum', Default: 'internal', Value: 'internal', ValidValues: ['internal', 'external']},
 	showCombinedDateTime: { Type: 'Bool', Default: false, Value: false,},
 	showLocation: { Type: 'Bool', Default: true, Value: true,},
+	showIcons: { Type: 'Bool', Default: true, Value: true,},
 	showTodayAsText: { Type: 'Bool', Default: true, Value: true,},
 	todayText: { Type: 'String', Default: getLocalizedText('settings.default.todayText'), Value: getLocalizedText('settings.default.todayText'),},
 	tomorrowText: { Type: 'String', Default: getLocalizedText('settings.default.tomorrowText'), Value: getLocalizedText('settings.default.tomorrowText'),},
@@ -49,7 +53,6 @@ var config = {
 	weekDayLength: { Type: 'Int', Default: 2, Value: 2,},
 	updateDataInterval: { Type: 'Int', Default: 5, Value: 5,},
 	calendarApp: { Type: 'UID', Default: 0x10005901, Value: 0x10005901,},
-	eventsPerWidget: { Type: 'Int', Default: 4, Value: 4,},
 	showNothingText: { Type: 'Bool', Default: true, Value: true,},
 	nothingText: { Type: 'String', Default: getLocalizedText('settings.default.nothingText'), Value: getLocalizedText('settings.default.nothingText'),},
 	enableDaylightSaving: { Type: 'Bool', Default: true, Value: true,},
@@ -58,6 +61,7 @@ var config = {
 	showCalendarIndicator: { Type: 'Bool', Default: true, Value: true,},
 	excludedCalendars: { Type: 'Array', Default: [], Value: [],},
 	enableLogging: { Type: 'Bool', Default: false, Value: false,},
+	anonymizeLogging: { Type: 'Bool', Default: false, Value: false,},
 	cssStyle_background: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},
 	cssStyle_backgroundFullscreen: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},
 	cssStyle_weekDay: { Type: 'String', Default: '', Value: '',},
@@ -67,7 +71,7 @@ var config = {
 	cssStyle_time: { Type: 'String', Default: '', Value: '',},
 	cssStyle_now: { Type: 'String', Default: 'color:#ff00ff', Value: 'color:#ff00ff',},
 	cssStyle_description: { Type: 'String', Default: '', Value: '',},
-	cssStyle_icon: { Type: 'String', Default: 'width:15px; height:15px', Value: 'width:15px; height:15px',},
+	cssStyle_icon: { Type: 'String', Default: '', Value: '',},
 	cssStyle_overdue: { Type: 'String', Default: 'color:#ffff00', Value: 'color:#ffff00',},
 	cssStyle_calendar1: { Type: 'String', Default: 'background-color:#0757cf', Value: 'background-color:#0757cf',},
 	cssStyle_calendar2: { Type: 'String', Default: 'background-color:#579f37', Value: 'background-color:#579f37',},
@@ -82,6 +86,18 @@ var config = {
 //-------------------------------------------------------
 // Nothing of interest from here on...
 //-------------------------------------------------------
+
+function fixDate(d) {
+	if (d.getTimezoneOffset() < -12*60) {
+		d = new Date((new Date(d.getTime()-24*3600*1000)).toLocaleString());
+	}
+	return d
+}
+
+function newDate() {
+	return fixDate(new Date());
+}
+
 var panelNum = 0; // use 1 for second panel
 var version = "1.37";
 var versionURL = "http://comingnext.sourceforge.net/version.xml";
@@ -90,7 +106,7 @@ var cacheEntriesHtml = [];
 var months_translated = [];
 var weekdays_translated = [];
 var orientation = '';
-var now = new Date();
+var now = newDate();
 var mode = 0; // 0 = homescreen, 1 = fullscreen, 2 = settings, 3 = about, 4 = check for update
 var reqV = null; 
 var settingsCalEntryId = null;
@@ -108,6 +124,7 @@ var entryLists = null; // stores all fetched calendar entries until data is refr
 var statupSuccessful = false; // indicates if everything started up wihtout errors. If we detect an error after that, it might just be a temporary problem e.g. by a backup process.
 var use12hoursTimeFormat = false; // defines how time should be formated: 19:00 or 07:00 pm
 var timeFormatSeparator = ":"; // format time 19:00 or 19.00 depending on system setting
+var defaultFontSize = null; // default browser font size will be set by init
 
 // vars for daylight saving time
 var summertime = false; // true, if current date is in summer, false if in winter
@@ -250,7 +267,7 @@ function collectLocales()
 		}
 	}
 	for (weekday = 0; weekday < 7; weekday++) {
-		var startDate = new Date(2000, 0, 2 + weekday); // date that we know for sure is a sunday
+		var startDate = new Date(2000, 0, 2 + weekday, 12); // date that we know for sure is a sunday
 
 		var item = new Object();
 		item.Type = "DayEvent";
@@ -663,7 +680,7 @@ function updateData()
 		lastReloadTime = null; // force calendar data reload on this update
 	}
 
-	now = new Date();
+	now = newDate();
 	
 	// only reload calendar data every 6 hours, visual updates occure more often
 	if (!lastReloadTime || now.getTime() - lastReloadTime.getTime() > reloadInterval) {
@@ -721,7 +738,7 @@ function updateData()
 			} else {
 				entryLists = [meetingList];
 			}
-			lastReloadTime = new Date();
+			lastReloadTime = newDate();
 		} catch(e) {
 			error('loading Calendar items list:' + e + ', line ' + e.line);
 			return;
@@ -733,24 +750,19 @@ function updateData()
 		var counter = 0;
 		var entryDate = '';
 		var dateArr = [];
-		var fontsize = 'normal';
-		var lineheight = 'normal';
+		var fontsize = getDefaultFontSize()[1] + 'px';
+		var lineheight = fontsize;
 		if (mode == 0) {
-			fontsize = parseInt(72 / config['eventsPerWidget'].Value) + 'px';
-			lineheight = parseInt(82 / config['eventsPerWidget'].Value) + 'px';
-			
-			if (config['eventsPerWidget'].Value == 3) {
-				changeCssClass('.icon', 'width:20px; height:20px');
-			}
-			else if (config['eventsPerWidget'].Value == 5) {
-				changeCssClass('.icon', 'width:10px; height:10px');
-			}
-			else if (config['eventsPerWidget'].Value == 6) {
-				changeCssClass('.icon', 'width:8px; height:8px');
+			if (config['fontsize'].Value == config['fontsize'].ValidValues[0]) {
+				fontsize = parseInt(72 / config['eventsPerWidget'].Value) + 'px';
+				lineheight = parseInt(72 / config['eventsPerWidget'].Value) + 'px';
 			}
 		}
-		else
-			changeCssClass('.icon', config['cssStyle_icon'].Value);
+		if (config['fontsize'].Value != config['fontsize'].ValidValues[0]) {
+			fontsize = config['fontsize'].Value + 'px';
+			lineheight = fontsize;
+		}
+		changeCssClass('.icon', config['cssStyle_icon'].Value + '; width:' + fontsize + '; height:' + fontsize + ';');
 		var entriesHtml = '<table style="font-size:' + fontsize + '; line-height:' + lineheight + ';">';
 		if (mode == 0)
 			entriesHtml = '<table width="307" height="82"><tr><td>' + entriesHtml; // this is needed to center the actual content vertically
@@ -759,7 +771,7 @@ function updateData()
 		if (mode == 0)
 			max = (panelNum + 1) * config['eventsPerWidget'].Value;
 		else
-			max = 30; // we can display a lot more events in fullscreen mode
+			max = config["maxNumberOfEventsOnFullscreen"].Value; // we can display a lot more events in fullscreen mode
 
 		if (config['enableLogging'].Value) {
 			var listinfo = "";
@@ -895,9 +907,12 @@ function updateData()
 				// generate html output
 				entriesHtml += '<tr>';
 				if (config['showCalendarIndicator'].Value && calendarList.length - config['excludedCalendars'].Value.length > 1) {
-					entriesHtml += '<td><span class="calendar' + calendarColors[entry.CalendarName] + '">&nbsp;</span></td>';
+					entriesHtml += '<td><div class="calendar' + calendarColors[entry.CalendarName] + '" style="height:' + (lineheight.split("px")[0] - 1) + 'px; width:4px;"></div></td>';
 				}
-				entriesHtml += '<td><img class="icon" src="' + entry.Type + '.png" /></td>';
+				if (config['showIcons'].Value)
+					entriesHtml += '<td><img class="icon" align="top" src="' + entry.Type + '.png" /></td>';
+				else
+					entriesHtml += '<td style="padding:0px;"></td>';
 				if(date == null) {
 					// some languages have very strange locale date formats, can't parse all those. Also some todos don't have dates at all.
 					entriesHtml += '<td colspan="4"><span class="date">' + entryDate + '</span> ';
@@ -950,7 +965,7 @@ function updateData()
 			cacheEntriesHtml = entriesHtml;
 		}
 		
-		lastUpdateTime = new Date();
+		lastUpdateTime = newDate();
 	} catch(e) {
 		error('displaying list:' + e + ', line ' + e.line);
 		return;
@@ -990,7 +1005,7 @@ function handleOnShow()
 {
 	updateScreen();
 
-	var time = new Date();
+	var time = newDate();
 	if (time.getTime() - lastUpdateTime.getTime() > config['updateDataInterval'].Value * 60 * 1000) {
 		log('updateScreen(): force updateData() because last update was too long ago (' + (time.getTime() - lastUpdateTime.getTime()) / 1000 + 's)');
 		clearUpdateTimer();
@@ -1170,8 +1185,12 @@ function showSettings()
 			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><input class="textInput" name="settings.' + key + '" type="text" value="0x' + config[key].Value.toString(16) + '" /></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
 		else if (config[key].Type == 'Enum') {
 			settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><select name="settings.' + key + '" size="1">';
-			for(var i = 0; i < config[key].ValidValues.length; i++)
-				settingsHtml += '<option value="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + getLocalizedText('settings.validValues.' + key + '.' + config[key].ValidValues[i]) + '</option>';
+			for(var i = 0; i < config[key].ValidValues.length; i++)	{
+				var text = getLocalizedText('settings.validValues.' + key + '.' + config[key].ValidValues[i]);
+				if (text.indexOf('ERROR') == 0)
+					text = config[key].ValidValues[i];
+				settingsHtml += '<option value="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + text + '</option>';
+			}
 			settingsHtml += '</select></div></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';
 		}
 		else if (config[key].Type == 'Array') {
@@ -1527,7 +1546,6 @@ function checkForUpdate()
 	reqV.onreadystatechange = checkForUpdateCallback;
 	document.getElementById("updateDiv").innerHTML = getLocalizedText("update.checking");
 	reqV.open("GET", versionURL, true);
-	reqV.setRequestHeader( "If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT" ); // disable caching
 	reqV.send(null);
 }
 
@@ -1614,6 +1632,12 @@ function listToArray(list, calendarName)
 		if (!itemCopy['CalendarName']) {
 			itemCopy['CalendarName'] = calendarName;
 		}
+		if (config['anonymizeLogging'].Value && config['enableLogging'].Value) {
+			if (itemCopy['Summary'])
+				itemCopy['Summary'] = getHashForString(itemCopy['Summary']);
+			if (itemCopy['Location'])
+				itemCopy['Location'] = getHashForString(itemCopy['Location']);
+		}
 		array.push(itemCopy);
 		txt += array[array.length - 1].Summary + ", ";
 	}
@@ -1733,12 +1757,38 @@ function log(message)
 	}
 }
 
+function getDefaultFontSize()
+{
+	if (defaultFontSize == null) {
+		var pa = document.body;
+		var who = document.createElement('div');
+		who.className = 'defaultEm';
+		who.appendChild(document.createTextNode('M'));
+		pa.appendChild(who);
+		var fs = [who.offsetWidth, who.offsetHeight];
+		pa.removeChild(who);
+		defaultFontSize = fs;
+	}
+	return defaultFontSize;
+}
+
+function getHashForString(string)
+{
+	// cheap hashing, loosly based on Java's String.hashCode()
+	for (var hash = 0, i = 0; i < string.length; i++)
+		hash = (hash << 5) - hash + string.charCodeAt(i);
+	hash = hash & hash; // Convert to 32bit integer
+	if (hash < 0)
+		hash = -hash;
+	return hash.toString(16).toUpperCase();
+}
+
 </script>
 
 <style type="text/css">
 a { color:#aaccff }
 table { margin:0px; padding:0px; border-spacing:0px; border-collapse: collapse; }
-td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; margin:0px; }
+td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:visible; margin:0px; }
 hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; border-style:none; }
 .settingsInfo { display:none; font-style:italic; }
 .title { font-weight:bold; font-size:14pt; }
@@ -1749,6 +1799,7 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
 #name { text-align:center; }
 #appicon { display: block; margin-left: auto; margin-right: auto; margin-top: 10px; }
 #smallappicon { width:22px; height:22px; margin-right:10px; float:left; }
+.defaultEm { font-size:1em; position:absolute; line-height:1; padding:0; visibility:hidden; } 
 </style>
 
 </head>