refactoring isToday() and isTomorrow() methods

[comingnext] / comingNext / index.html

diff --git a/comingNext/index.html b/comingNext/index.html
index 09e6658c292496d2854fac8d9592ab70d23ec7f5..7077a4eaf15802ad5c720590845f46383fbdcad8 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -27,6 +27,7 @@ var config = {
        monthRange: { Type: 'Int', Default: 2, Value: 2,},\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
        showCombinedDateTime: { Type: 'Bool', Default: false, Value: false,},\r
        showLocation: { Type: 'Bool', Default: true, Value: true,},\r
        showTodayAsText: { Type: 'Bool', Default: true, Value: true,},\r
@@ -62,7 +63,7 @@ var config = {
 // Nothing of interest from here on...\r
 //-------------------------------------------------------\r
 var panelNum = 0; // use 1 for second panel\r
-var version = "1.25";\r
+var version = "1.26";\r
 var versionURL = "http://comingnext.sourceforge.net/version.xml";\r
 var calendarService = null;\r
 var cacheEntriesHtml = [];\r
@@ -149,20 +150,23 @@ function error(message)
        document.getElementById("calendarList").innerHTML = 'Error: ' + message;\r
 }\r
 \r
-function isToday(date)\r
+function areDatesEqual(date1, date2)\r
 {\r
-       if (date.getDate() == now.getDate() && date.getMonth() == now.getMonth())\r
-               return true;\r
-       return false;\r
+       return (date1.getFullYear() == date2.getFullYear() && \r
+                       date1.getMonth() == date2.getMonth() && \r
+                       date1.getDate() == date2.getDate());\r
 }\r
 \r
 function isTomorrow(date)\r
 {\r
-       if ((date.getDate() == now.getDate() + 1 && date.getMonth() == now.getMonth()) ||\r
-           (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1) ||\r
-           (date.getDate() == 0 && date.getMonth() == now.getMonth() + 1 && date.getYear() == now.getYear() + 1))\r
-               return true;\r
-       return false;\r
+       // tommorow = now + 1 day\r
+       // ToDo: some days can be shorter as 24 hours(daylight saving change day)\r
+       return areDatesEqual(date, new Date (now.getTime() + 24*60*60*1000));\r
+}\r
+\r
+function isToday(date)\r
+{\r
+       return areDatesEqual(date, now);\r
 }\r
 \r
 function collectLocales()\r
@@ -763,7 +767,7 @@ function showSettings()
                else if (config[key].Type == 'Enum') {\r
                        settingsHtml += '<table><tr><td>' + getLocalizedText('settings.name.' + key) + '<br /><select name="settings.' + key + '" size="1">';\r
                        for(var i = 0; i < config[key].ValidValues.length; i++)\r
-                               settingsHtml += '<option label="' + config[key].ValidValues[i] + '"' + (config[key].Value == config[key].ValidValues[i] ? ' selected="selected"' : '') + '>' + config[key].ValidValues[i] + '</option>';\r
+                               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>';\r
                        settingsHtml += '</select></div></td>' + printHintBox(getLocalizedText('settings.info.' + key)) + '<hr />';\r
                }\r
        }\r
@@ -882,6 +886,16 @@ function showFullscreen()
        updateData();\r
 }\r
 \r
+function getBackgroundImage()\r
+{\r
+       var bgImage;\r
+       if (config['backgroundImageLocation'].Value == config['backgroundImageLocation'].ValidValues[0]) // internal\r
+               bgImage = 'background_' + orientation + '.png';\r
+       else\r
+               bgImage = 'C:/Data/background_' + panelNum + '_' + orientation + '.png';\r
+       return bgImage;\r
+}\r
+\r
 function updateHomescreen()\r
 {\r
        if (config['useBackgroundImage'].Value) {\r
@@ -889,19 +903,19 @@ function updateHomescreen()
                if (orientation != 'portrait' && screen.width == 360 && screen.height == 640) {\r
                        window.widget.prepareForTransition("fade");\r
                        orientation = 'portrait';\r
-                       document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
+                       document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';\r
                        document.getElementById('body').style.backgroundColor = 'none';\r
                        window.widget.performTransition();\r
                } else if (orientation != 'landscape' && screen.width == 640 && screen.height == 360) {\r
                        window.widget.prepareForTransition("fade");\r
                        orientation = 'landscape';\r
-                       document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
+                       document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';\r
                        document.getElementById('body').style.backgroundColor = 'none';\r
                        window.widget.performTransition();\r
                }\r
                else if (document.getElementById('body').style.backgroundImage == "")\r
                {\r
-                       document.getElementById('body').style.backgroundImage = 'url(background_' + orientation + '.png)';\r
+                       document.getElementById('body').style.backgroundImage = 'url(' + getBackgroundImage() + ')';\r
                }\r
        }\r
 }\r
@@ -958,7 +972,6 @@ function checkForUpdateCallback()
 { \r
        if (reqV.readyState == 4) {\r
                if (reqV.status == 200) {\r
-                       // little overhead here, one could use also string for version info\r
                        var resultXml = reqV.responseText;\r
                        if (resultXml) {\r
                                var div = document.getElementById("tmp");\r
@@ -1032,6 +1045,7 @@ hr { color:#ffffff; background-color:#ffffff; height:1px; text-align:left; borde
                <p class="credits">Paul Moore (bug fixes, new features and code cleanup)</p>\r
                <p class="credits">Manfred Hanselmann (DST support)</p>\r
                <p class="credits">Christophe Milsent (translation support & french translation</p>\r
+               <p class="credits">Flavio Nathan (portuguese-brazilian translation</p>\r
        <p>This software is open source and licensed under the GPLv3.</p>\r
        <p>Visit sourceforge.net/projects/comingnext for free updates.</p>\r
        <hr />\r