diff options
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | javascript/guide_view.js (renamed from javascript/settings2.js) | 0 | ||||
| -rw-r--r-- | javascript/main.js | 4 | ||||
| -rw-r--r-- | javascript/settings.js | 3 |
4 files changed, 7 insertions, 2 deletions
@@ -1,7 +1,7 @@ <html> <head> <script type="text/javascript" src="javascript/settings.js"></script> -<script type="text/javascript" src="javascript/settings2.js"></script> +<script type="text/javascript" src="javascript/guide_view.js"></script> <script type="text/javascript" src="languages/lang_eng.js"></script> <script type="text/javascript" src="javascript/channels.js"></script> <script type="text/javascript" src="javascript/main.js"></script> diff --git a/javascript/settings2.js b/javascript/guide_view.js index f20693f..f20693f 100644 --- a/javascript/settings2.js +++ b/javascript/guide_view.js diff --git a/javascript/main.js b/javascript/main.js index a6f241c..fa68151 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -159,6 +159,9 @@ function GetSettings() { lang_nr = Number(is.getObject("vip.OSDlanguage")); loadjs(langfile[lang_nr]); + MACaddress = is.getObject("const.ip.eth0.mac"); + loadjs(conf_dir + MACaddress + ".js"); + experimental = Number(is.getObject("vip.testing"));// Use some experimental code testing2 = Number(is.getObject("vip.testing2"));// Use some experimental code ShowSubs = Number(is.getObject("vip.showsubs")); @@ -2791,6 +2794,7 @@ if(menu == 4) { // INFO Menu htmltext += "\n Product name: " + is.getObject("config.productdisplayname"); htmltext += "\n Build date : " + is.getObject("config.build.date"); htmltext += "\n\n IP address : " + is.getObject("config.ipaddress"); + htmltext += "\n MACaddress : " + MACaddress; var x = is.getObject("cfg.ip.eth0.mode"); if (x == "DHCP") { htmltext += "\n \uE003\uE017 "; } else { htmltext += "\n \uE003\uE016 "; } diff --git a/javascript/settings.js b/javascript/settings.js index b2b5787..ef91256 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -2,7 +2,7 @@ // Default settings // -var Version = "0.26.8"; +var Version = "0.26.9"; server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); @@ -12,6 +12,7 @@ var currChan = 10; // default channel OSDLang = new Array ("English", "Nederlands", "Deutsch"); langfile = new Array ("languages/lang_eng.js", "languages/lang_dut.js","languages/lang_ger.js"); +var conf_dir = "config/"; lang_prio = new Array("dut,eng,und","ger,deu,eng","eng,und","fre,fra,eng"); cssfile = new Array ("blue","black"); |