added option to specify the max number of events shown in fullscreen mode. Default...

[comingnext] / comingNext / index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 6a4ec989adb87a936535d473676bc8fcf7a42628..a11e029f1514f01257f6b66dad75a0b36c394d7c 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -34,6 +34,7 @@ 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'],},\r
        eventsPerWidget: { Type: 'Int', Default: 4, Value: 4,},\r
        monthRange: { Type: 'Int', Default: 2, Value: 2,},\r
+       maxNumberOfEventsOnFullscreen: { Type: 'Int', Default: 30, Value: 30,},\r
        includeTodos: { Type: 'Bool', Default: true, Value: true,},\r
        useBackgroundImage: { Type: 'Bool', Default: true, Value: true,},\r
        backgroundImageLocation: { Type: 'Enum', Default: 'internal', Value: 'internal', ValidValues: ['internal', 'external']},\r
@@ -60,6 +61,7 @@ var config = {
        showCalendarIndicator: { Type: 'Bool', Default: true, Value: true,},\r
        excludedCalendars: { Type: 'Array', Default: [], Value: [],},\r
        enableLogging: { Type: 'Bool', Default: false, Value: false,},\r
+       anonymizeLogging: { Type: 'Bool', Default: false, Value: false,},\r
        cssStyle_background: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},\r
        cssStyle_backgroundFullscreen: { Type: 'String', Default: 'color:#ffffff; background-color:#000000', Value: 'color:#ffffff; background-color:#000000',},\r
        cssStyle_weekDay: { Type: 'String', Default: '', Value: '',},\r
@@ -741,14 +743,14 @@ function updateData()
                if (mode == 0) {\r
                        if (config['fontsize'].Value == config['fontsize'].ValidValues[0]) {\r
                                fontsize = parseInt(72 / config['eventsPerWidget'].Value) + 'px';\r
-                               lineheight = parseInt(82 / config['eventsPerWidget'].Value) + 'px';\r
+                               lineheight = parseInt(72 / config['eventsPerWidget'].Value) + 'px';\r
                        }\r
                }\r
                if (config['fontsize'].Value != config['fontsize'].ValidValues[0]) {\r
                        fontsize = config['fontsize'].Value + 'px';\r
                        lineheight = fontsize;\r
                }\r
-               changeCssClass('.icon', config['cssStyle_icon'].Value + '; width:' + lineheight + '; height:' + lineheight + ';');\r
+               changeCssClass('.icon', config['cssStyle_icon'].Value + '; width:' + fontsize + '; height:' + fontsize + ';');\r
                var entriesHtml = '<table style="font-size:' + fontsize + '; line-height:' + lineheight + ';">';\r
                if (mode == 0)\r
                        entriesHtml = '<table width="307" height="82"><tr><td>' + entriesHtml; // this is needed to center the actual content vertically\r
@@ -757,7 +759,7 @@ function updateData()
                if (mode == 0)\r
                        max = (panelNum + 1) * config['eventsPerWidget'].Value;\r
                else\r
-                       max = 30; // we can display a lot more events in fullscreen mode\r
+                       max = config["maxNumberOfEventsOnFullscreen"].Value; // we can display a lot more events in fullscreen mode\r
 \r
                if (config['enableLogging'].Value) {\r
                        var listinfo = "";\r
@@ -893,7 +895,7 @@ function updateData()
                                // generate html output\r
                                entriesHtml += '<tr>';\r
                                if (config['showCalendarIndicator'].Value && calendarList.length - config['excludedCalendars'].Value.length > 1) {\r
-                                       entriesHtml += '<td><span class="calendar' + calendarColors[entry.CalendarName] + '">&nbsp;</span></td>';\r
+                                       entriesHtml += '<td><div class="calendar' + calendarColors[entry.CalendarName] + '" style="height:' + (lineheight.split("px")[0] - 1) + 'px; width:4px;"></div></td>';\r
                                }\r
                                if (config['showIcons'].Value)\r
                                        entriesHtml += '<td><img class="icon" align="top" src="' + entry.Type + '.png" /></td>';\r
@@ -1618,6 +1620,12 @@ function listToArray(list, calendarName)
                if (!itemCopy['CalendarName']) {\r
                        itemCopy['CalendarName'] = calendarName;\r
                }\r
+               if (config['anonymizeLogging'].Value && config['enableLogging'].Value) {\r
+                       if (itemCopy['Summary'])\r
+                               itemCopy['Summary'] = getHashForString(itemCopy['Summary']);\r
+                       if (itemCopy['Location'])\r
+                               itemCopy['Location'] = getHashForString(itemCopy['Location']);\r
+               }\r
                array.push(itemCopy);\r
                txt += array[array.length - 1].Summary + ", ";\r
        }\r
@@ -1752,6 +1760,17 @@ function getDefaultFontSize()
        return defaultFontSize;\r
 }\r
 \r
+function getHashForString(string)\r
+{\r
+       // cheap hashing, loosly based on Java's String.hashCode()\r
+       for (var hash = 0, i = 0; i < string.length; i++)\r
+               hash = (hash << 5) - hash + string.charCodeAt(i);\r
+       hash = hash & hash; // Convert to 32bit integer\r
+       if (hash < 0)\r
+               hash = -hash;\r
+       return hash.toString(16).toUpperCase();\r
+}\r
+\r
 </script>\r
 \r
 <style type="text/css">\r