Changes in / [20:30]

Files:

• tags/0.5 (added)
• tags/0.5/J_Freebox.js (added)
• tags/0.5/I_Freebox.xml (added)
• tags/0.5/L_Freebox.lua (added)
• tags/0.5/D_Freebox.json (added)
• tags/0.5/json.lua (added)
• tags/0.5/sha1.lua (added)
• tags/0.5/S_Freebox.xml (added)
• tags/0.5/D_Freebox.xml (added)
• tags/0.5/L_FreeboxTTS.lua (added)
• tags/0.6 (added)
• tags/0.6/J_Freebox.js (added)
• tags/0.6/I_Freebox.xml (added)
• tags/0.6/L_Freebox.lua (added)
• tags/0.6/D_Freebox.json (added)
• tags/0.6/json.lua (added)
• tags/0.6/sha1.lua (added)
• tags/0.6/S_Freebox.xml (added)
• tags/0.6/D_Freebox.xml (added)
• tags/0.6/L_FreeboxTTS.lua (added)
• tags/0.7 (added)
• tags/0.7/J_Freebox.js (added)
• tags/0.7/I_Freebox.xml (added)
• tags/0.7/L_Freebox.lua (added)
• tags/0.7/D_Freebox.json (added)
• tags/0.7/json.lua (added)
• tags/0.7/sha1.lua (added)
• tags/0.7/S_Freebox.xml (added)
• tags/0.7/D_Freebox.xml (added)
• tags/0.7/L_FreeboxTTS.lua (added)
• trunk/J_Freebox.js (modified) (27 diffs)
• trunk/L_Freebox.lua (modified) (5 diffs)
• trunk/D_Freebox.json (modified) (51 diffs)

/trunk/J_Freebox.js

@@ -1 @@
-var Freebox_browserIE = false;
-var Freebox_parseXml = undefined;
-
-var FREEBOX_SID = 'urn:freebox-fr:serviceId:Freebox1';
+var Freebox = {
+    timeoutVar : undefined,
+    timeoutVar2 : undefined,
+    browserIE : false,
+    parseXml : undefined,
+
+    prevNetDevices : undefined,
+    prevPhoneCalls : undefined,
+
+    SID : 'urn:freebox-fr:serviceId:Freebox1',
+
+    buttonBgColor : '#3295F8',
+    offButtonBgColor : '#3295F8',
+    onButtonBgColor : '#025CB6',
+    tableTitleBgColor : '#025CB6'
+};
 
 function Freebox_showNetDevices (device)
 {
+    if (typeof Freebox.timeoutVar != 'undefined') {
+        clearTimeout(Freebox.timeoutVar);
+    }
+
     Freebox_detectBrowser();
+    Freebox_defineUIStyle();
 
     Freebox_initXMLParser();
@@ -16 +33 @@
     html += '<tr>';
     html += '<td>';
-    html += '<select id="filter">';
+    html += '<select id="filter" onChange="Freebox_refreshNetDevices('+device+', true);">';
     html += '<option selected value="ALL">Tous les peripheriques</option>';
     html += '<option value="REACHABLE">Peripheriques joignables</option>';
     html += '<option value="UNREACHABLE">Peripheriques injoignables</option>';
     html += '</select>';
-    html += '<button type="button" style="margin-left: 10px; background-color:lightblue; height: 25px; width: 50px" onclick="Freebox_filterNetDevices('+device+');">Filtrer</button>';
+    html += '<button type="button" style="margin-left: 10px; background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_updateNetDevices('+device+');">Rafraichir</button>';
     html += '</td>';
     html += '</tr>';
@@ -34 +51 @@
     set_panel_html(html);
 
-    Freebox_filterNetDevices(device);
-}
-
-function Freebox_filterNetDevices(device)
-{
-    if ($('filter').selectedIndex >= 0) {
-        var filter = $('filter').options[$('filter').selectedIndex].value;
-        Freebox_updateNetDevicesTable(device, filter);
-    }
-}
-
-function Freebox_updateNetDevicesTable (device, filter)
-{
-    var html = '<table border="1" >';
-    html += '<tr align="center" bgcolor="LightBlue">';
-    html += '<th>Nom</td>';
-    html += '<th>IP</td>';
-    html += '<th>MAC</td>';
-    html += '<th>Wifi</td>';
-    if (filter == 'ALL') {
-        html += '<th>Joignable</td>';
-    }
-    html += '</tr>';
-    html += '<tr>';
-
-    var xmlnetDevices
-    var netDevices = get_device_state(device, FREEBOX_SID, "PeripheriquesReseau", 1);
-    if (netDevices != undefined && netDevices != "") {
-        xmlnetDevices = Freebox_parseXml(netDevices);
-    }
-    if (typeof xmlnetDevices != 'undefined') {
-        var device = xmlnetDevices.getElementsByTagName("device");
-        if (device.length > 0) {
-            for (i=0; i<device.length; i++) {
-                var reachable = Freebox_extractXmlTag(device[i], 'reachable');
-                if (filter == 'ALL'
-                        || (filter == 'REACHABLE' && reachable == 'true')
-                        || (filter == 'UNREACHABLE' && reachable != 'true')) {
-                    var name = Freebox_extractXmlTag(device[i], 'name');
-                    var mac = Freebox_extractXmlTag(device[i], 'mac');
-                    var ip = Freebox_extractXmlTag(device[i], 'ip');
-                    var wifi = Freebox_extractXmlTag(device[i], 'wifi');
-                    if (filter == 'ALL') {
+    Freebox.prevNetDevices = undefined;
+
+    Freebox_refreshNetDevices(device, false);
+}
+
+function Freebox_updateNetDevices(device)
+{
+    Freebox_call_action (device, Freebox.SID, 'RafraichirReseau', {} );
+}
+
+function Freebox_refreshNetDevices (device, force)
+{
+    var netDevices = get_device_state(device, Freebox.SID, "PeripheriquesReseau", 1);
+    if (force || (netDevices != Freebox.prevNetDevices)) {
+        var filter = 'ALL';
+        if (jQuery('#filter option:selected').index() >= 0) {
+            filter = jQuery('#filter').val();
+        }
+
+        var html = '<table border="1" >';
+        html += '<tr align="center" style="background-color: '+ Freebox.tableTitleBgColor + '; color: white">';
+        html += '<th>Nom</td>';
+        html += '<th>IP</td>';
+        html += '<th>MAC</td>';
+        html += '<th>Wifi</td>';
+        if (filter == 'ALL') {
+            html += '<th>Joignable</td>';
+        }
+        html += '</tr>';
+        html += '<tr>';
+
+        var xmlnetDevices
+        if (netDevices != undefined && netDevices != "") {
+            xmlnetDevices = Freebox.parseXml(netDevices);
+        }
+        if (typeof xmlnetDevices != 'undefined') {
+            var devices = xmlnetDevices.getElementsByTagName("device");
+            if (devices.length > 0) {
+                for (i=0; i<devices.length; i++) {
+                    var reachable = Freebox_extractXmlTag(devices[i], 'reachable');
+                    if (filter == 'ALL'
+                            || (filter == 'REACHABLE' && reachable == 'true')
+                            || (filter == 'UNREACHABLE' && reachable != 'true')) {
+                        var name = Freebox_extractXmlTag(devices[i], 'name');
+                        var mac = Freebox_extractXmlTag(devices[i], 'mac');
+                        var ip = Freebox_extractXmlTag(devices[i], 'ip');
+                        var wifi = Freebox_extractXmlTag(devices[i], 'wifi');
+                        if (filter == 'ALL') {
+                            if (reachable == 'true') {
+                                html += '<tr align="center">';
+                            }
+                            else {
+                                html += '<tr align="center" bgcolor="LightGrey">';
+                            }
+                        }
+                        else {
+                            html += '<tr align="center">';
+                        }
+                        html += '<td>' + name + '</td>';
+                        html += '<td>' + ip + '</td>';
+                        html += '<td>' + mac + '</td>';
                         if (reachable == 'true') {
-                            html += '<tr align="center">';
+                            if (wifi == 'true') {
+                                html += '<td>oui</td>';
+                            }
+                            else {
+                                html += '<td>non</td>';
+                            }
                         }
                         else {
-                            html += '<tr align="center" bgcolor="LightGrey">';
-                        }
+                            html += '<td></td>';
+                        }
+                        if (filter == 'ALL') {
+                            if (reachable == 'true') {
+                                html += '<td>oui</td>';
+                            }
+                            else {
+                                html += '<td>non</td>';
+                            }
+                        }
+                        html += '</tr>';
                     }
-                    else {
-                        html += '<tr align="center">';
-                    }
-                    html += '<td>' + name + '</td>';
-                    html += '<td>' + ip + '</td>';
-                    html += '<td>' + mac + '</td>';
-                    if (reachable == 'true') {
-                        if (wifi == 'true') {
-                            html += '<td>oui</td>';
-                        }
-                        else {
-                            html += '<td>non</td>';
-                        }
-                    }
-                    else {
-                        html += '<td></td>';
-                    }
-                    if (filter == 'ALL') {
-                        if (reachable == 'true') {
-                            html += '<td>oui</td>';
-                        }
-                        else {
-                            html += '<td>non</td>';
-                        }
-                    }
-                    html += '</tr>';
                 }
             }
         }
-    }
-    html += '</table>';
-
-    $('devicesTable').innerHTML = html;
+        html += '</table>';
+
+        jQuery('#devicesTable').html(html);
+
+        Freebox.prevNetDevices = netDevices;
+    }
+
+    if (force == false) {
+        Freebox.timeoutVar = setTimeout("Freebox_refreshNetDevices("+device+", false)", 1000);
+    }
 }
 
 function Freebox_showPhoneCalls (device)
 {
+    if (typeof Freebox.timeoutVar2 != 'undefined') {
+        clearTimeout(Freebox.timeoutVar2);
+    }
+
     Freebox_detectBrowser();
+    Freebox_defineUIStyle();
 
     Freebox_initXMLParser();
@@ -131 +165 @@
     html += '<tr>';
     html += '<td>';
-    html += '<select id="filter">';
+    html += '<select id="filter" onChange="Freebox_refreshPhoneCalls('+device+', true);">';
     html += '<option value="ALL">Tous les appels</option>';
     html += '<option selected value="UNREAD">Appels non lus</option>';
@@ -138 +172 @@
     html += '<option value="OUTGOING">Appels sortants</option>';
     html += '</select>';
-    html += '<button type="button" style="margin-left: 10px; background-color:lightblue; height: 25px; width: 50px" onclick="Freebox_filterPhoneCalls('+device+');">Filtrer</button>';
-    html += '<button type="button" style="margin-left: 10px; background-color:lightblue; height: 25px; width: 170px" onclick="Freebox_markPhoneCallsAsRead('+device+');">Tout marquer comme lu</button>';
-    html += '<button type="button" style="margin-left: 10px; background-color:lightblue; height: 25px; width: 120px" onclick="Freebox_removePhoneCalls('+device+');">Vider historique</button>';
+    html += '<button type="button" style="margin-left: 10px; background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 170px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_markPhoneCallsAsRead('+device+');">Tout marquer comme lu</button>';
+    html += '<button type="button" style="margin-left: 10px; background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 120px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_removePhoneCalls('+device+');">Vider historique</button>';
+    html += '<button type="button" style="margin-left: 10px; background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_updatePhoneCalls('+device+');">Rafraichir</button>';
     html += '</td>';
     html += '</tr>';
@@ -153 +187 @@
     set_panel_html(html);
 
-    Freebox_filterPhoneCalls(device);
-}
-
-function Freebox_filterPhoneCalls(device)
-{
-    if ($('filter').selectedIndex >= 0) {
-        var filter = $('filter').options[$('filter').selectedIndex].value;
-        Freebox_updatePhoneCallsTable(device, filter);
-    }
+    Freebox.prevPhoneCalls = undefined;
+
+    Freebox_refreshPhoneCalls(device, false);
+}
+
+function Freebox_updatePhoneCalls(device)
+{
+    Freebox_call_action (device, Freebox.SID, 'RafraichirAppels', {} );
 }
 
 function Freebox_markPhoneCallsAsRead(device)
 {
-    Freebox_call_action (device, FREEBOX_SID, 'MarquerAppelsCommeLus', {} );
+    Freebox_call_action (device, Freebox.SID, 'MarquerAppelsCommeLus', {} );
 }
 
 function Freebox_removePhoneCalls(device)
 {
-    Freebox_call_action (device, FREEBOX_SID, 'ViderHistoriqueAppels', {} );
-}
-
-function Freebox_updatePhoneCallsTable (device, filter)
-{
-    var html = '<table border="1">';
-    html += '<tr align="center" bgcolor="LightBlue">';
-    html += '<th>Numeros</td>';
-    if (filter == 'ALL' || filter == 'UNREAD' || filter == 'IN') {
-        html += '<th>Type</td>';
-    }
-    html += '<th>Date et heure</td>';
-    html += '<th>Duree</td>';
-    html += '</tr>';
-    html += '<tr>';
-
-    var xmlphoneCalls
-    var phoneCalls = get_device_state(device, FREEBOX_SID, "Appels", 1);
-    if (phoneCalls != undefined && phoneCalls != "") {
-        xmlphoneCalls = Freebox_parseXml(phoneCalls);
-    }
-    if (typeof xmlphoneCalls != 'undefined') {
-        var call = xmlphoneCalls.getElementsByTagName("call");
-        if (call.length > 0) {
-            for (i=0; i<call.length; i++) {
-                var type = Freebox_extractXmlTag(call[i], 'type');
-                var unread = Freebox_extractXmlTag(call[i], 'unread');
-                if (filter == 'ALL'
-                        || (filter == 'IN' && (type == 'accepted' || type == 'missed'))
-                        || (filter == 'MISSED' && type == 'missed')
-                        || (filter == 'OUTGOING' && type == 'outgoing')
-                        || (filter == 'UNREAD' && unread == 'true')) {
-                    var number = Freebox_extractXmlTag(call[i], 'number');
-                    if (number == '') {
-                        number = 'Numero masque';
+    Freebox_call_action (device, Freebox.SID, 'ViderHistoriqueAppels', {} );
+}
+
+function Freebox_refreshPhoneCalls (device, force)
+{
+    var phoneCalls = get_device_state(device, Freebox.SID, "Appels", 1);
+    if (force || (phoneCalls != Freebox.prevPhoneCalls)) {
+        var filter = 'ALL';
+        if (jQuery('#filter option:selected').index() >= 0) {
+            filter = jQuery('#filter').val();
+        }
+
+        var html = '<table border="1">';
+        html += '<tr align="center" style="background-color: '+ Freebox.tableTitleBgColor + '; color: white">';
+        html += '<th>Numeros</td>';
+        if (filter == 'ALL' || filter == 'UNREAD' || filter == 'IN') {
+            html += '<th>Type</td>';
+        }
+        html += '<th>Date et heure</td>';
+        html += '<th>Duree</td>';
+        html += '</tr>';
+        html += '<tr>';
+
+        var xmlphoneCalls
+        if (phoneCalls != undefined && phoneCalls != "") {
+            xmlphoneCalls = Freebox.parseXml(phoneCalls);
+        }
+        if (typeof xmlphoneCalls != 'undefined') {
+            var call = xmlphoneCalls.getElementsByTagName("call");
+            if (call.length > 0) {
+                for (i=0; i<call.length; i++) {
+                    var type = Freebox_extractXmlTag(call[i], 'type');
+                    var unread = Freebox_extractXmlTag(call[i], 'unread');
+                    if (filter == 'ALL'
+                            || (filter == 'IN' && (type == 'accepted' || type == 'missed'))
+                            || (filter == 'MISSED' && type == 'missed')
+                            || (filter == 'OUTGOING' && type == 'outgoing')
+                            || (filter == 'UNREAD' && unread == 'true')) {
+                        var number = Freebox_extractXmlTag(call[i], 'number');
+                        if (number == '') {
+                            number = 'Numero masque';
+                        }
+                        var name = Freebox_extractXmlTag(call[i], 'name');
+                        if (name != '') {
+                            number = name + ' (' + number + ')';
+                        }
+                        if (type == 'missed') {
+                            type = 'entrant non decroche';
+                        }
+                        else if (type == 'accepted') {
+                            type = 'entrant decroche';
+                        }
+                        else if (type == 'outgoing') {
+                            type = 'sortant';
+                        }
+                        var datetime = Freebox_extractXmlTag(call[i], 'datetime');
+                        var duration = Freebox_extractXmlTag(call[i], 'duration');
+                        html += '<tr align="center">';
+                        html += '<td>' + number + '</td>';
+                        if (filter == 'ALL' || filter == 'UNREAD' || filter == 'IN') {
+                            html += '<td>' + type + '</td>';
+                        }
+                        html += '<td>' + datetime + '</td>';
+                        html += '<td>' + duration + ' s</td>';
+                        html += '</tr>';
                     }
-                    var name = Freebox_extractXmlTag(call[i], 'name');
-                    if (name != '') {
-                        number = name + ' (' + number + ')';
-                    }
-                    if (type == 'missed') {
-                        type = 'entrant non decroche';
-                    }
-                    else if (type == 'accepted') {
-                        type = 'entrant decroche';
-                    }
-                    else if (type == 'outgoing') {
-                        type = 'sortant';
-                    }
-                    var datetime = Freebox_extractXmlTag(call[i], 'datetime');
-                    var duration = Freebox_extractXmlTag(call[i], 'duration');
-                    html += '<tr align="center">';
-                    html += '<td>' + number + '</td>';
-                    if (filter == 'ALL' || filter == 'UNREAD' || filter == 'IN') {
-                        html += '<td>' + type + '</td>';
-                    }
-                    html += '<td>' + datetime + '</td>';
-                    html += '<td>' + duration + ' s</td>';
-                    html += '</tr>';
                 }
             }
         }
-    }
-    html += '</table>';
-
-    $('callsTable').innerHTML = html;
+        html += '</table>';
+
+        jQuery('#callsTable').html(html);
+
+        Freebox.prevPhoneCalls = phoneCalls;
+    }
+
+    if (force == false) {
+        Freebox.timeoutVar2 = setTimeout("Freebox_refreshPhoneCalls("+device+", false)", 1000);
+    }
 }
 
@@ -242 +288 @@
 {
     Freebox_detectBrowser();
+    Freebox_defineUIStyle();
 
     var players = [ [ "PLAYER1", "Player 1" ],
@@ -255 +302 @@
     ];
 
-    var defaultPlayer = get_device_state(device, FREEBOX_SID, "Player", 1);
+    var defaultPlayer = get_device_state(device, Freebox.SID, "Player", 1);
     if (defaultPlayer == 'hd2.freebox.fr') {
         defaultPlayer = 'PLAYER2';
@@ -263 +310 @@
     }
 
-    var remoteID = get_device_state(device, FREEBOX_SID, "Telecommande", 1);
+    var remoteID = get_device_state(device, Freebox.SID, "Telecommande", 1);
     if (remoteID == undefined) {
         remoteID = '';
@@ -283 +330 @@
     }
     html += '</select>';
-    html += '<button type="button" style="background-color:lightblue; height: 25px; width: 75px" onclick="Freebox_setRemote('+device+');">Sauver</button>';
+    html += '<button type="button" style="background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_setRemote('+device+');">Sauver</button>';
     html += '</DIV>';
 
@@ -313 +360 @@
     html += '<label>Nombre (numero chaine):</label>';
     html += '<input id="number" type="text" size="3" maxlength="3" style="margin-left: 10px"/>';
-    html += '<button type="button" style="margin-left: 10px; background-color:lightblue; height: 25px; width: 75px" onclick="Freebox_runPlayerNumberCmd('+device+');">Envoyer</button>';
+    html += '<button type="button" style="margin-left: 10px; background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_runPlayerNumberCmd('+device+');">Envoyer</button>';
     html += '</DIV>';
 
@@ -323 +370 @@
 function Freebox_setRemote (device)
 {
-    var remoteID = $('remoteID').value;
-    var player = $('player').value;
+    var remoteID = jQuery('#remoteID').val();
+    var player = jQuery('#player').val();
     if (remoteID != '') {
-        Freebox_call_action (device, FREEBOX_SID, 'DefinirTelecommande', {'Player':player, 'Telecommande':remoteID} );
+        Freebox_call_action (device, Freebox.SID, 'DefinirTelecommande', {'Player':player, 'Telecommande':remoteID} );
     }
 }
@@ -332 +379 @@
 function Freebox_runPlayerCmd (device, key, longPress)
 {
-    var remoteID = $('remoteID').value;
-    var player = $('player').value;
+    var remoteID = jQuery('#remoteID').val();
+    var player = jQuery('#player').val();
     if (remoteID != '') {
-        //$('debug').innerHTML = player + ' ' + remoteID + ' ' + key + ' ' + longPress;
-        Freebox_call_action (device, FREEBOX_SID, 'CommanderPlayer', {'Player':player, 'Telecommande':remoteID, 'Touche':key, 'AppuiLong':longPress} );
+        //jQuery('#debug').html(player + ' ' + remoteID + ' ' + key + ' ' + longPress);
+        Freebox_call_action (device, Freebox.SID, 'CommanderPlayer', {'Player':player, 'Telecommande':remoteID, 'Touche':key, 'AppuiLong':longPress} );
     }
 }
@@ -342 +389 @@
 function Freebox_runPlayerNumberCmd (device)
 {
-    var key = $('number').value;
+    var key = jQuery('#number').val();
     if (key != '') {
-        Freebox_call_action (device, FREEBOX_SID, 'CommanderPlayer', {'Touche':key} );
+        Freebox_call_action (device, Freebox.SID, 'CommanderPlayer', {'Touche':key} );
     }
 }
@@ -351 +398 @@
 {
     Freebox_detectBrowser();
+    Freebox_defineUIStyle();
 
     var html = '';
@@ -359 +407 @@
     var engines = [ [ "GOOGLE", "Google" ],
                     [ "OSX_TTS_SERVER", 'OSX TTS server' ] ];
-    var defaultEngine = get_device_state(device, FREEBOX_SID, "MoteurTTS", 1);
+    var defaultEngine = get_device_state(device, Freebox.SID, "MoteurTTS", 1);
     if (defaultEngine == undefined) {
         defaultEngine = 'GOOGLE';
@@ -368 +416 @@
                         [ "es", "Espagnol" ],
                         [ "ru", 'Russe' ] ];
-    var defaultLanguage = get_device_state(device, FREEBOX_SID, "LangueTTS", 1);
+    var defaultLanguage = get_device_state(device, Freebox.SID, "LangueTTS", 1);
     if (defaultLanguage == undefined) {
         defaultLanguage = 'en';
     }
 
-    var serverURL = get_device_state(device, FREEBOX_SID, "URLServeurOSXTTS", 1);
+    var serverURL = get_device_state(device, Freebox.SID, "URLServeurOSXTTS", 1);
     if (serverURL == undefined) {
         serverURL = '';
@@ -399 +447 @@
     }
     html += '</select>';
-    html += '<input id="language" type="text" value="' + defaultLanguage + '" style="margin-left: 5px; width: 20px"/>';
+    html += '<input id="language" type="text" value="' + defaultLanguage + '" style="margin-left: 5px; width: 30px"/>';
     html += '</td>';
     html += '</tr>';
@@ -427 +475 @@
     html += '<tr>';
     html += '<td>';
-    html += '<button id="say" type="button" style="background-color:lightblue; height: 25px; width: 75px" onclick="Freebox_say('+device+');">Dire</button>';
+    html += '<button id="say" type="button" style="background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_say('+device+');">Dire</button>';
     html += '</td>';
     html += '<td></td>';
@@ -435 +483 @@
     html += '<td>Langue par defaut:</td>';
     html += '<td>';
-    html += '<input id="defaultLanguage" type="text" value="' + defaultLanguage + '" style="width: 20px"/>';
+    html += '<input id="defaultLanguage" type="text" value="' + defaultLanguage + '" style="width: 30px"/>';
     html += '</td>';
     html += '</tr>';
@@ -463 +511 @@
     html += '<tr>';
     html += '<td>';
-    html += '<button id="setupTTS" type="button" style="background-color:lightblue; height: 25px; width: 75px" onclick="Freebox_setupTTS('+device+');">Modifier</button>';
+    html += '<button id="setupTTS" type="button" style="background-color:' + Freebox.buttonBgColor + '; color: white; height: 25px; width: 75px; -moz-border-radius: 6px; -webkit-border-radius: 6px; -khtml-border-radius: 6px; border-radius: 6px" onclick="Freebox_setupTTS('+device+');">Modifier</button>';
     html += '</td>';
     html += '<td></td>';
@@ -477 +525 @@
 function Freebox_selectLang()
 {
-    if ($('language1').selectedIndex >= 0) {
-        $('language').value = $('language1').options[$('language1').selectedIndex].value;
+    if (jQuery('#language1 option:selected').index() >= 0) {
+        jQuery('#language').val(jQuery('#language1').val());
     }
 }
@@ -484 +532 @@
 function Freebox_say(device)
 {
-    var text = $('text').value;
-    var language = $('language').value;
-    var engine = $('engine').value;
-    var receiver = $('receiver').value;
-    //$('debug').innerHTML = text + ' ' + language + ' ' + engine + ' ' + receiver;
+    var text = encodeURIComponent(jQuery('#text').val());
+    var language = jQuery('#language').val();
+    var engine = jQuery('#engine').val();
+    var receiver = encodeURIComponent(jQuery('#receiver').val());
+    //jQuery('#debug').html(text + ' ' + language + ' ' + engine + ' ' + receiver);
     if (text != "") {
-        Freebox_call_action (device, FREEBOX_SID, 'Dire', {'Destinataire':receiver, 'Texte':text, 'Langue':language, 'Moteur':engine} );
+        Freebox_call_action (device, Freebox.SID, 'Dire', {'Destinataire':receiver, 'Texte':text, 'Langue':language, 'Moteur':engine} );
     }
 }
@@ -496 +544 @@
 function Freebox_setupTTS(device)
 {
-    var language = $('defaultLanguage').value;
-    var engine = $('defaultEngine').value;
-    var url = $('TTSserverURL').value;
-    Freebox_call_action (device, FREEBOX_SID, 'ConfigurerTTS', {'Langue':language, 'Moteur':engine, 'URLServeurOSX':url} );
+    var language = jQuery('#defaultLanguage').val();
+    var engine = jQuery('#defaultEngine').val();
+    var url = encodeURIComponent(jQuery('#TTSserverURL').val());
+    Freebox_call_action (device, Freebox.SID, 'ConfigurerTTS', {'Langue':language, 'Moteur':engine, 'URLServeurOSX':url} );
 }
 
 function Freebox_detectBrowser()
 {
-    var place = navigator.userAgent.toLowerCase().indexOf('msie');
-    if (place == -1) {
-        Freebox_browserIE = false;
+    if (navigator.userAgent.toLowerCase().indexOf('msie') >= 0
+        || navigator.userAgent.toLowerCase().indexOf('trident') >= 0) {
+        Freebox.browserIE = true;
     }
     else {
-        Freebox_browserIE = true;
+        Freebox.browserIE = false;
+    }
+}
+
+function Freebox_defineUIStyle()
+{
+    if (typeof api !== 'undefined') {
+        Freebox.buttonBgColor = '#006E47';
+        Freebox.offButtonBgColor = '#006E47';
+        Freebox.onButtonBgColor = '#00A652';
+        Freebox.tableTitleBgColor = '#00A652';
+    }
+    else {
+        Freebox.buttonBgColor = '#3295F8';
+        Freebox.offButtonBgColor = '#3295F8';
+        Freebox.onButtonBgColor = '#025CB6';
+        Freebox.tableTitleBgColor = '#025CB6';
     }
 }
@@ -515 +579 @@
 function Freebox_initXMLParser()
 {
-    if (typeof Freebox_parseXml == 'undefined') {
+    if (typeof Freebox.parseXml == 'undefined') {
         if (typeof window.DOMParser != "undefined") {
-            Freebox_parseXml = function(xmlStr) {
+            Freebox.parseXml = function(xmlStr) {
                 return ( new window.DOMParser() ).parseFromString(xmlStr, "text/xml");
             };
         }
         else if (typeof window.ActiveXObject != "undefined" && new window.ActiveXObject("Microsoft.XMLDOM")) {
-            Freebox_parseXml = function(xmlStr) {
+            Freebox.parseXml = function(xmlStr) {
                 var xmlDoc = new window.ActiveXObject("Microsoft.XMLDOM");
                 xmlDoc.async = "false";
@@ -530 +594 @@
         }
         else {
-            Freebox_parseXml = function(xmlStr) {
+            Freebox.parseXml = function(xmlStr) {
                 return undefined;
             };
@@ -557 +621 @@
         'action':actname
     };
-    var key, count = 0;
-    for(key in args) {
-        count++;
-    }
-    if (count > 0) {
-        Object.extend(q, args);
-    }
-    if (Freebox_browserIE) {
-        Object.extend(q, {timestamp: new Date().getTime()}); //we need this to avoid IE caching of the AJAX get
+    var key;
+    for (key in args) {
+        q[key] = args[key];
+    }
+    if (Freebox.browserIE) {
+        q['timestamp'] = new Date().getTime(); //we need this to avoid IE caching of the AJAX get
     }
     new Ajax.Request (command_url+'/data_request', {

/trunk/L_Freebox.lua

@@ -15 +15 @@
 
 
-local PLUGIN_VERSION = "0.5"
+local PLUGIN_VERSION = "0.7"
 
 local THIS_DEVICE = 0
@@ -744 +744 @@
 
     -- Search for the receiver and check its capabilities
+    local receiverNameOk = false
     local receiverOk = false
     local url = string.format(baseUrl, serverIp) .. "/airmedia/receivers/"
@@ -760 +761 @@
                     break
                 end
+                if (data.result[i].name == receiverName) then
+                    receiverNameOk = true
+                end
                 if (mediaLocation ~= nil and mediaLocation ~= ""
                     and data.result[i].name == receiverName
@@ -807 +811 @@
             warning("Echec requête: " .. data.msg .. " ( " .. data.error_code .. " )")
         end
+    elseif (not receiverNameOk) then
+        warning("Nom du destinataire AirMedia inconnu")
+        task("Nom du destinataire AirMedia inconnu", TASK_ERROR)
+    else
+        warning("Type media incompatible avec le destinataire AirMedia")
+        task("Type media incompatible avec le destinataire AirMedia", TASK_ERROR)
     end
 end
@@ -1174 +1184 @@
     task("Démarrage plugin Freebox", TASK_SUCCESS)
     
+    luup.set_failure(false)
+
     THIS_DEVICE = lul_device
 

/trunk/D_Freebox.json

@@ -1 +1 @@
 {
     "flashicon": "http://t0.gstatic.com/images?q=tbn:ANd9GcRGh4fNzwueLZvpdS_F7x6fnc-ybolpFnmVj6csFTFnCojEH5MzZA",
+    "default_icon": "http://t0.gstatic.com/images?q=tbn:ANd9GcRGh4fNzwueLZvpdS_F7x6fnc-ybolpFnmVj6csFTFnCojEH5MzZA",
     "imgIconBody": "",
     "imgIconDimmable": "",
@@ -29 +30 @@
                     "scenegroup": "1",
                     "isSingle": "1"
+                },
+                {
+                    "id": "2",
+                    "scenegroup": "2",
+                    "isSingle": "1"
+                },
+                {
+                    "id": "3",
+                    "scenegroup": "3",
+                    "isSingle": "1"
+                },
+                {
+                    "id": "4",
+                    "scenegroup": "4",
+                    "isSingle": "1"
                 }
             ],
@@ -37 +53 @@
                     "left": "0",
                     "x": "2",
-                    "y": "4"
+                    "y": "1"
+                },
+                {
+                    "id": "2",
+                    "top": "1",
+                    "left": "0",
+                    "x": "2",
+                    "y": "1"
+                },
+                {
+                    "id": "3",
+                    "top": "2",
+                    "left": "0",
+                    "x": "2",
+                    "y": "1"
+                },
+                {
+                    "id": "4",
+                    "top": "3",
+                    "left": "0",
+                    "x": "2",
+                    "y": "1"
                 }
             ],
@@ -51 +88 @@
                     },
                     "Display": {
-                        "Top": 15,
+                        "Top": 10,
                         "Left": 25,
                         "Width": 75,
@@ -65 +102 @@
                         "Service": "urn:freebox-fr:serviceId:Freebox1",
                         "Variable": "PluginVersion",
-                        "Top": 15,
+                        "Top": 10,
                         "Left": 135,
                         "Width": 75,
@@ -72 +109 @@
                 },
                 {
-                    "ControlGroup": "1",
-                    "ControlType": "label",
-                    "top": "1.25",
+                    "ControlGroup": "2",
+                    "ControlType": "label",
+                    "top": "0.25",
                     "left": "0",
                     "Label": {
@@ -81 +118 @@
                     },
                     "Display": {
-                        "Top": 15,
+                        "Top": 10,
                         "Left": 300,
                         "Width": 75,
@@ -88 +125 @@
                 },
                 {
-                    "ControlGroup": "1",
+                    "ControlGroup": "2",
                     "ControlType": "variable",
-                    "top": "1.25",
+                    "top": "0.25",
                     "left": "1",
                     "Display": {
                         "Service": "urn:freebox-fr:serviceId:Freebox1",
                         "Variable": "EtatConnexion",
-                        "Top": 15,
+                        "Top": 10,
                         "Left": 400,
                         "Width": 75,
@@ -108 +145 @@
                     },
                     "Display": {
-                        "Top": 40,
+                        "Top": 38,
                         "Left": 25,
                         "Width": 100,
@@ -126 +163 @@
                         "Service": "urn:freebox-fr:serviceId:Freebox1",
                         "Variable": "StatusAuthentification",
-                        "Top": 35,
+                        "Top": 30,
                         "Left": 135,
                         "Width": 200,
@@ -141 +178 @@
                     },
                     "Display": {
-                        "Top": 50,
+                        "Top": 45,
                         "Left": 135,
                         "Width": 200,
@@ -154 +191 @@
                     },
                     "Display": {
-                        "Top": 75,
+                        "Top": 66,
                         "Left": 25,
                         "Width": 75,
@@ -165 +202 @@
                         "Service": "urn:freebox-fr:serviceId:Freebox1",
                         "Variable": "FrequenceMiseAJourReseau",
-                        "Top": 75,
+                        "Top": 66,
                         "Left": 300,
                         "Width": 25,
@@ -178 +215 @@
                     },
                     "Display": {
-                        "Top": 75,
+                        "Top": 66,
                         "Left": 340,
                         "Width": 40,
@@ -189 +226 @@
                     "Style": "numeric",
                     "Display":{
-                        "Top": 70,
+                        "Top": 65,
                         "Left": 410,
                         "Width": 30,
@@ -202 +239 @@
                     },
                     "Display": {
-                        "Top": 70,
+                        "Top": 65,
                         "Left": 450,
                         "Width": 75,
@@ -225 +262 @@
                     },
                     "Display": {
-                        "Top": 105,
+                        "Top": 96,
                         "Left": 25,
                         "Width": 75,
@@ -236 +273 @@
                         "Service": "urn:freebox-fr:serviceId:Freebox1",
                         "Variable": "FrequenceMiseAJourAppels",
-                        "Top": 105,
+                        "Top": 96,
                         "Left": 300,
                         "Width": 25,
@@ -249 +286 @@
                     },
                     "Display": {
-                        "Top": 105,
+                        "Top": 96,
                         "Left": 340,
                         "Width": 40,
@@ -260 +297 @@
                     "Style": "numeric",
                     "Display":{
-                        "Top": 100,
+                        "Top": 95,
                         "Left": 410,
                         "Width": 30,
@@ -273 +310 @@
                     },
                     "Display": {
-                        "Top": 100,
+                        "Top": 95,
                         "Left": 450,
                         "Width": 75,
@@ -296 +333 @@
                     },
                     "Display": {
-                        "Top": 135,
+                        "Top": 126,
                         "Left": 25,
                         "Width": 75,
@@ -307 +344 @@
                         "Service": "urn:freebox-fr:serviceId:Freebox1",
                         "Variable": "StatusConfigFreebox",
-                        "Top": 135,
+                        "Top": 126,
                         "Left": 300,
                         "Width": 100,
@@ -320 +357 @@
                     },
                     "Display": {
-                        "Top": 130,
+                        "Top": 125,
                         "Left": 400,
                         "Width": 85,
@@ -338 +375 @@
                     },
                     "Display": {
-                        "Top": 165,
+                        "Top": 156,
                         "Left": 25,
                         "Width": 75,
@@ -354 +391 @@
                         "Variable": "WifiActif",
                         "Value": "1",
-                        "Top": 160,
+                        "Top": 155,
                         "Left": 100,
                         "Width": 85,
@@ -375 +412 @@
                         "Variable": "WifiActif",
                         "Value": "0",
-                        "Top": 160,
+                        "Top": 155,
                         "Left": 200,
                         "Width": 85,
@@ -393 +430 @@
                     },
                     "Display": {
-                        "Top": 165,
+                        "Top": 156,
                         "Left": 300,
                         "Width": 75,
@@ -409 +446 @@
                         "Variable": "FtpActif",
                         "Value": "1",
-                        "Top": 160,
+                        "Top": 155,
                         "Left": 400,
                         "Width": 85,
@@ -430 +467 @@
                         "Variable": "FtpActif",
                         "Value": "0",
-                        "Top": 160,
+                        "Top": 155,
                         "Left": 500,
                         "Width": 85,
@@ -448 +485 @@
                     },
                     "Display": {
-                        "Top": 195,
+                        "Top": 186,
                         "Left": 25,
                         "Width": 75,
@@ -464 +501 @@
                         "Variable": "UPnPAVActif",
                         "Value": "1",
-                        "Top": 190,
+                        "Top": 185,
                         "Left": 100,
                         "Width": 85,
@@ -485 +522 @@
                         "Variable": "UPnPAVActif",
                         "Value": "0",
-                        "Top": 190,
+                        "Top": 185,
                         "Left": 200,
                         "Width": 85,
@@ -503 +540 @@
                     },
                     "Display": {
-                        "Top": 195,
+                        "Top": 186,
                         "Left": 300,
                         "Width": 75,
@@ -519 +556 @@
                         "Variable": "AirMediaActif",
                         "Value": "1",
-                        "Top": 190,
+                        "Top": 185,
                         "Left": 400,
                         "Width": 85,
@@ -540 +577 @@
                         "Variable": "AirMediaActif",
                         "Value": "0",
-                        "Top": 190,
+                        "Top": 185,
                         "Left": 500,
                         "Width": 85,
@@ -558 +595 @@
                     },
                     "Display": {
-                        "Top": 225,
+                        "Top": 216,
                         "Left": 25,
                         "Width": 75,
@@ -574 +611 @@
                         "Variable": "PartageFichiersWinActif",
                         "Value": "1",
-                        "Top": 220,
+                        "Top": 215,
                         "Left": 300,
                         "Width": 85,
@@ -595 +632 @@
                         "Variable": "PartageFichiersWinActif",
                         "Value": "0",
-                        "Top": 220,
+                        "Top": 215,
                         "Left": 400,
                         "Width": 85,
@@ -613 +650 @@
                     },
                     "Display": {
-                        "Top": 255,
+                        "Top": 246,
                         "Left": 25,
                         "Width": 75,
@@ -629 +666 @@
                         "Variable": "PartageImprimantesWinActif",
                         "Value": "1",
-                        "Top": 250,
+                        "Top": 245,
                         "Left": 300,
                         "Width": 85,
@@ -650 +687 @@
                         "Variable": "PartageImprimantesWinActif",
                         "Value": "0",
-                        "Top": 250,
+                        "Top": 245,
                         "Left": 400,
                         "Width": 85,
@@ -662 +699 @@
                 },
                 {
-                    "ControlGroup": "1",
-                    "ControlType": "label",
-                    "top": "2.25",
+                    "ControlGroup": "3",
+                    "ControlType": "label",
+                    "top": "0.25",
                     "left": "0",
                     "Label": {
@@ -671 +708 @@
                     },
                     "Display": {
-                        "Top": 315,
+                        "Top": 276,
                         "Left": 25,
                         "Width": 75,
@@ -678 +715 @@
                 },
                 {
-                    "ControlGroup": "1",
-                    "ControlType": "button",
-                    "top": "2",
+                    "ControlGroup": "3",
+                    "ControlType": "button",
+                    "top": "0",
                     "left": "1",
                     "Label": {
@@ -687 +724 @@
                     },
                     "Display": {
-                        "Top": 310,
+                        "Service": "urn:freebox-fr:serviceId:Freebox1", 
+                        "Top": 275,
                         "Left": 135,
                         "Width": 85,
@@ -699 +737 @@
                 },
                 {
-                    "ControlGroup": "1",
-                    "ControlType": "label",
-                    "top": "3.25",
+                    "ControlGroup": "4",
+                    "ControlType": "label",
+                    "top": "0.25",
                     "left": "0",
                     "Label": {
@@ -708 +746 @@
                     },
                     "Display": {
-                        "Top": 315,
+                        "Top": 276,
                         "Left": 300,
                         "Width": 75,
@@ -715 +753 @@
                 },
                 {
-                    "ControlGroup": "1",
-                    "ControlType": "button",
-                    "top": "3",
+                    "ControlGroup": "4",
+                    "ControlType": "button",
+                    "top": "0",
                     "left": "1",
                     "Label": {
@@ -724 +762 @@
                     },
                     "Display": {
-                        "Top": 310,
+                        "Service": "urn:freebox-fr:serviceId:Freebox1", 
+                        "Top": 275,
                         "Left": 400,
                         "Width": 85,
@@ -794 +833 @@
         {
             "Label": {
-                "lang_tag": "logs",
-                "text": "Logs"
-            },
-            "Position": "6",
-            "TabType": "javascript",
-            "ScriptName": "shared.js",
-            "Function": "device_logs"
-        },
-        {
-            "Label": {
                 "lang_tag": "notifications",
                 "text": "Notifications"
             },
-            "Position": "7",
+            "Position": "6",
             "TabType": "javascript",
             "ScriptName": "shared.js",