fixed 'overdue' text setting not beeing used

[comingnext] / comingNext / index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index ce0d15dbdf65b1fe4ee64e3e481336569de0b66b..6ac4e420a9893798f25185e8bcae17c764120cec 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -175,7 +175,7 @@ function isToday(date)
 \r
 function collectLocales()\r
 {\r
-       var tmpyear = ((panelNum == 0) ? 2000 : 2001);\r
+       var tmpyear = 2000 + panelNum;\r
        var month = 0;\r
 \r
        if (months_translated.length > 0)\r
@@ -472,11 +472,28 @@ function updateData()
                var counter = 0;\r
                var entryDate = '';\r
                var dateArr = [];\r
-               var entriesHtml = '<table>';\r
+               var fontsize = 'normal';\r
+               if (mode == 0) {\r
+                       if (config['eventsPerWidget'].Value == 3) {\r
+                               fontsize = '17pt';\r
+                               changeCssClass('.icon', 'width:20px; height:20px');\r
+                       }\r
+                       else if (config['eventsPerWidget'].Value == 5) {\r
+                               fontsize = '10pt';\r
+                               changeCssClass('.icon', 'width:10px; height:10px');\r
+                       }\r
+                       else if (config['eventsPerWidget'].Value == 6) {\r
+                               fontsize = '8pt';\r
+                               changeCssClass('.icon', 'width:8px; height:8px');\r
+                       }\r
+               }\r
+               else\r
+                       changeCssClass('.icon', config['cssStyle_icon'].Value);\r
+               var entriesHtml = '<table style="font-size:' + fontsize + ';">';\r
                var eventIds = [];\r
                var max;\r
                if (mode == 0)\r
-                       max = ((panelNum == 0) ? config['eventsPerWidget'].Value : 2 * config['eventsPerWidget'].Value);\r
+                       max = (panelNum + 1) * config['eventsPerWidget'].Value;\r
                else\r
                        max = 30; // we can display a lot more events in fullscreen mode\r
 \r
@@ -578,7 +595,7 @@ function updateData()
                                }\r
 \r
                                // skip events for the first panel in case this is the second one and we're not in fullscreen mode\r
-                               if (mode == 0 && panelNum == 1 && counter < config['eventsPerWidget'].Value + 1) {\r
+                               if (mode == 0 && panelNum > 0 && counter < panelNum * config['eventsPerWidget'].Value + 1) {\r
                                        console.info('skipping (already in first widget) ' + entry.id);\r
                                        continue;\r
                                }\r
@@ -603,7 +620,7 @@ function updateData()
                                        var time = formatTime(date);\r
                                        var dateStr = formatDate(date, entryDate);\r
                                        if (entry.Type == 'ToDo' && overdue && config['markOverdueTodos'].Value) {\r
-                                               dateStr = '<span class="overdue">Overdue</span>';\r
+                                               dateStr = '<span class="overdue">' + config['overdueText'].Value + '</span>';\r
                                                entriesHtml += '<td colspan="4" width="1px"><span class="date">' + dateStr + '</span> ';\r
                                        } else if (entry.Type == 'ToDo' || entry.Type == 'Anniversary' || entry.Type == 'DayEvent' || entry.Type == 'Reminder') {\r
                                                if ((isToday(date) || isTomorrow(date)) && config['showTodayAsText'].Value) // show weekday if the date string is not text. looks odd otherwise\r