X-Git-Url: https://code.delx.au/comingnext/blobdiff_plain/0a6280623b4716939f1c1b50fa066a84f8e43bb9..a4b0671b585a25871fac3f23b69b2fbe1ad3b7fa:/comingNext/index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index e5b472c..5f84537 100644
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -31,6 +31,8 @@
 <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,},
 	includeTodos: { Type: 'Bool', Default: true, Value: true,},
 	useBackgroundImage: { Type: 'Bool', Default: true, Value: true,},
@@ -50,7 +52,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,},
@@ -109,6 +110,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
@@ -734,24 +736,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
@@ -896,7 +893,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>';
@@ -1174,8 +1171,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') {
@@ -1736,12 +1737,27 @@ 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;
+}
+
 </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; }
@@ -1752,6 +1768,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>