reduced overall widget height available for text (72 instead of 82 pixels) to give...

[comingnext] / comingNext / index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index ccb19f6831f7d1a125f13fd6f62c322e3f9aa582..5f845372823a4eb7173b99a7b7ce8e7ec362f2ab 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -32,6 +32,7 @@
 // valid types for the config object are 'Int', 'Bool', 'String', 'Enum', 'UID', 'Array'\r
 var config = {\r
        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
        includeTodos: { Type: 'Bool', Default: true, Value: true,},\r
        useBackgroundImage: { Type: 'Bool', Default: true, Value: true,},\r
@@ -51,7 +52,6 @@ var config = {
        weekDayLength: { Type: 'Int', Default: 2, Value: 2,},\r
        updateDataInterval: { Type: 'Int', Default: 5, Value: 5,},\r
        calendarApp: { Type: 'UID', Default: 0x10005901, Value: 0x10005901,},\r
-       eventsPerWidget: { Type: 'Int', Default: 4, Value: 4,},\r
        showNothingText: { Type: 'Bool', Default: true, Value: true,},\r
        nothingText: { Type: 'String', Default: getLocalizedText('settings.default.nothingText'), Value: getLocalizedText('settings.default.nothingText'),},\r
        enableDaylightSaving: { Type: 'Bool', Default: true, Value: true,},\r
@@ -741,14 +741,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
@@ -893,7 +893,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
@@ -1757,7 +1757,7 @@ function getDefaultFontSize()
 <style type="text/css">\r
 a { color:#aaccff }\r
 table { margin:0px; padding:0px; border-spacing:0px; border-collapse: collapse; }\r
-td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:hidden; margin:0px; }\r
+td { padding:0px 5px 0px 0px; white-space:nowrap; overflow:visible; margin:0px; }\r
 hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; border-style:none; }\r
 .settingsInfo { display:none; font-style:italic; }\r
 .title { font-weight:bold; font-size:14pt; }\r