X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/3038ef977c0f2363bebeb7cb75fffb4210af5ed8..0de0747a82526fd3d8e3ddf40249eadd55278c52:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index ccb19f6..a11e029 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -32,7 +32,9 @@
 // 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']},
@@ -51,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,},
@@ -60,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: '',},
@@ -741,14 +743,14 @@ function updateData()
 		if (mode == 0) {
 			if (config['fontsize'].Value == config['fontsize'].ValidValues[0]) {
 				fontsize = parseInt(72 / config['eventsPerWidget'].Value) + 'px';
-				lineheight = parseInt(82 / config['eventsPerWidget'].Value) + 'px';
+				lineheight = parseInt(72 / config['eventsPerWidget'].Value) + 'px';
 			}
 		}
 		if (config['fontsize'].Value != config['fontsize'].ValidValues[0]) {
 			fontsize = config['fontsize'].Value + 'px';
 			lineheight = fontsize;
 		}
-		changeCssClass('.icon', config['cssStyle_icon'].Value + '; width:' + lineheight + '; height:' + lineheight + ';');
+		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
@@ -757,7 +759,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 = "";
@@ -893,7 +895,7 @@ 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>';
 				}
 				if (config['showIcons'].Value)
 					entriesHtml += '<td><img class="icon" align="top" src="' + entry.Type + '.png" /></td>';
@@ -1618,6 +1620,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 + ", ";
 	}
@@ -1752,12 +1760,23 @@ function getDefaultFontSize()
 	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; }