summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--History3
-rw-r--r--index.html1
-rw-r--r--javascript/main.js93
-rw-r--r--javascript/news.js39
-rw-r--r--javascript/settings.js6
-rw-r--r--javascript/weather.js2
-rw-r--r--languages/lang_dut.js2
-rw-r--r--languages/lang_eng.js1
-rw-r--r--languages/lang_ger.js1
-rw-r--r--skins/blue.css40
10 files changed, 159 insertions, 29 deletions
diff --git a/History b/History
index 831b6bf..37263e7 100644
--- a/History
+++ b/History
@@ -13,6 +13,9 @@ VDR 1.7.29+
Get server ip from flash
Bugfix, removed delayed play (in case of error) when you already start to play a recording
Save old position before jump forward. In case of ongoing recording and jump position isn't recorded yet you don't start replay at 0
+ News info from nu.nl (nl), dw.de (en/de), spiegel.de (en/de)
+ Powerserverdown shares now blue button with restart script (almost nobody uses powerserverdown)
+
0.26 Fix for [undefined] in (search)timer menu when there are no (search)timers on server
Changed Plugin check, only check if digit 1,2,3 from server ip & box ip are the same.
diff --git a/index.html b/index.html
index d00bedb..1c6ede7 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,7 @@
<script type="text/javascript" src="config/custom.js"></script>
<script type="text/javascript" src="javascript/main.js"></script>
<script type="text/javascript" src="javascript/weather.js"></script>
+<script type="text/javascript" src="javascript/news.js"></script>
<script type="text/javascript">
/***********************************************************/
diff --git a/javascript/main.js b/javascript/main.js
index 8261288..a76f984 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -2034,10 +2034,6 @@ function StreamInfo(si) {
is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
}
- if(SI[0]=="S19.2E" && SI[2]=="1048" && SI[3]=="4320" ) {
- //BVN
- is.setObject("cfg.locale.ui","dut",is.STORAGE_VOLATILE);
- }
if(SI[1]=="54") {
@@ -2165,12 +2161,20 @@ function StreamInfo(si) {
is.setObject("cfg.locale.ui","spa",is.STORAGE_VOLATILE);
}
+ if(SI[0]=="S19.2E" && SI[2]=="1048" && SI[3]=="4320" ) {
+ //BVN
+ is.setObject("cfg.locale.ui","nld",is.STORAGE_VOLATILE);
+ //doesn't work but dvbsnoop does show 'ISO639_2_language_code: nld'
+
+ }
+
//Russian
if(SI[0]=="S13.0E" && SI[2]=="8100") {
is.setObject("cfg.locale.ui","ger",is.STORAGE_VOLATILE);
//doesn't work but dvbsnoop does show 'ISO639_2_language_code: ger'
}
+ //alert("TAAL : " + is.getObject("cfg.locale.ui"));// Show what is set by the script
}
@@ -2391,12 +2395,10 @@ function onKeyMenu(keyCode) {
break;
case "Red":
- if (menu == 0 && PowerDownServer) {
- ServerPowerDown();
- isSetupMenu = 0;
- mainmenu.style.opacity = 0;
- epg_unactive();
- break;
+ if (menu == MainMenu) {
+ mainmenu.innerHTML = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[0] + "</h1>";
+ menu = 12; // Weather menu
+ setTimeout("InitMenu(menu);",100);
} else if (menu == 1) {
if (subs_dyn < (subs_prio_dyn.length -1)) { subs_dyn += 1} else { subs_dyn = 0 }
if (subs_prio_dyn.length > 0) {
@@ -2530,7 +2532,13 @@ function onKeyMenu(keyCode) {
}
break;
case "Blue":
- if (menu == 0) {
+ if (menu == 0 && PowerDownServer) {
+ ServerPowerDown();
+ isSetupMenu = 0;
+ mainmenu.style.opacity = 0;
+ epg_unactive();
+ break;
+ } else if (menu == 0) {
RestartPortal();
} else if (menu == 1) {
css_nr++;
@@ -2615,8 +2623,9 @@ function onKeyMenu(keyCode) {
is.setObject("vip.showsubs",ShowSubs.toString(),is.STORAGE_PERMANENT);
} else if (menu == 8) {
SetGroup(1);
+ } else if (menu == 12) {
+ newsID = 1;
}
-
InitMenu(menu);
break;
case KEY_2:
@@ -2638,7 +2647,10 @@ function onKeyMenu(keyCode) {
}
if (menu == 8) {
- SetGroup(2);
+ SetGroup(2);
+ }
+ if (menu == 12) {
+ newsID = 2;
}
InitMenu(menu);
break;
@@ -2656,6 +2668,9 @@ function onKeyMenu(keyCode) {
} else if (menu == 8) {
SetGroup(3);
InitMenu(menu);
+ } else if (menu == 12) {
+ newsID = 3;
+ InitMenu(menu);
}
break;
@@ -2673,6 +2688,9 @@ function onKeyMenu(keyCode) {
} else if (menu == 8) {
SetGroup(4);
InitMenu(menu);
+ } else if (menu == 12) {
+ newsID = 4;
+ InitMenu(menu);
}
break;
@@ -2694,12 +2712,18 @@ function onKeyMenu(keyCode) {
if (ServerAdres[i] !== "FullURL" && ServerAdres[i] !== "MultiCast") {ServerAdres[i] = server_ip + StreamPort;}
}
InitMenu(menu);
- }
+ }
- if (menu == 8) {
+ if (menu == 8) {
SetGroup(5);
InitMenu(menu);
- }
+ }
+
+ if (menu == 12) {
+ newsID = 5;
+ InitMenu(menu);
+ }
+
break;
case KEY_6:
if (menu == 0 && Restfulapiplugin) {
@@ -2719,10 +2743,14 @@ function onKeyMenu(keyCode) {
}
InitMenu(menu);
}
- if (menu == 8) {
+ if (menu == 8) {
SetGroup(6);
InitMenu(menu);
- }
+ }
+ if (menu == 12) {
+ newsID = 6;
+ InitMenu(menu);
+ }
break;
case KEY_7:
@@ -2749,6 +2777,10 @@ function onKeyMenu(keyCode) {
SetGroup(7);
InitMenu(menu);
}
+ if (menu == 12) {
+ newsID = 7;
+ InitMenu(menu);
+ }
break;
case KEY_8:
@@ -2770,6 +2802,10 @@ function onKeyMenu(keyCode) {
SetGroup(8);
InitMenu(menu);
}
+ if (menu == 12) {
+ newsID = 8;
+ InitMenu(menu);
+ }
break;
@@ -2784,8 +2820,9 @@ function onKeyMenu(keyCode) {
setTimeout("InitMenu(menu);",100);
} else if (menu == 8) {
SetGroup(9);
+ } else if (menu == 12) {
+ newsID = 9;
}
-
InitMenu(menu);
break;
case KEY_0:
@@ -2846,6 +2883,7 @@ function InitMenu(menu) {
// 9 = INFO2 menu
// 10 = Favorite Edit menu
// 11 = Weather
+// 12 = News
epg_unactive;
@@ -2880,14 +2918,13 @@ if(menu == 0) { // Main Menu
htmltext += "<span class=notset>" + "\n 9 -" + Lang[17] + "</span>" ;
}
- htmltext += "\n 0 - " + Lang[83] + "\n\n <span class=redkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> - ";
+ htmltext += "\n 0 - " + Lang[83] + "\n\n <span class=redkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> - " + Lang[120] + "</span><span class=greenkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Lang[99] + "</span><span class=yellowkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Lang[35] + " </span><span class=bluekey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -"
if (PowerDownServer) {
htmltext += Lang[31] + Left(Lang[19],Lang[31].length);
} else {
- htmltext += Lang[19];
+ htmltext += Lang[18];
}
-
- htmltext += "</span><span class=greenkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Lang[99] + "</span><span class=yellowkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Lang[35] + " </span><span class=bluekey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Lang[18] + "</pre>";
+ htmltext += "</pre>";
mainmenu.innerHTML = htmltext;
}
@@ -3089,8 +3126,8 @@ if(menu == 9) { // INFO2 Menu
}
if(menu == 10) { // Favorite edit Menu
- var htmltext = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[83]
- htmltext += "</h1><pre class=mainmenu" + cssres[css_nr][Set_Res] + ">\n"
+ var htmltext = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[83];
+ htmltext += "</h1><pre class=mainmenu" + cssres[css_nr][Set_Res] + ">\n";
htmltext += "<span class=select" + cssres[css_nr][Set_Res] + ">";
var x = timerID;
for (var i=0;i<10;i++) {
@@ -3103,7 +3140,7 @@ if(menu == 10) { // Favorite edit Menu
if (timerID == 0) { htmltext += Lang[19] } else { htmltext += Lang[84] } //no move up
htmltext += "</span><span class=yellowkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -"
if (timerID == (maxTimers - 1) || x == 0) { htmltext += Lang[19] } else { htmltext += Lang[85] } //no move down
- htmltext += "</span><span class=bluekey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Fav_key1 + "</pre>";
+ htmltext += "</span><span class=bluekey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Fav_key1 + "</span></pre>";
mainmenu.innerHTML = htmltext;
}
@@ -3111,6 +3148,10 @@ if(menu == 11) { // Weather info
WeatherInfo();
}
+if(menu == 12) { // News
+ NewsInfo();
+}
+
} // end of initmenu
diff --git a/javascript/news.js b/javascript/news.js
index e69de29..be89b79 100644
--- a/javascript/news.js
+++ b/javascript/news.js
@@ -0,0 +1,39 @@
+
+function NewsInfo() {
+ var htmltext = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">";
+
+ xmlhttp=new XMLHttpRequest();
+ xmlhttp.open('GET',newssite[newssiteID],false);
+
+ xmlhttp.send();
+ try {
+ xmlDoc=xmlhttp.responseXML;
+ htmltext += xmlDoc.getElementsByTagName("channel")[0].getElementsByTagName("title")[0].childNodes[0].nodeValue;
+ htmltext += "</h1><pre class=newsmenu" + cssres[css_nr][Set_Res] + ">\n";
+ var x=xmlDoc.getElementsByTagName("item");
+ for (var i=0;i<x.length && i<10;i++) {
+ if (x.length !== 0) {
+ if (i !== 0) {
+ htmltext += " \u0003 " + i;
+ } else {
+ htmltext += " \u0003 - ";
+ }
+ htmltext += " \u0003 " + x[i].getElementsByTagName("title")[0].childNodes[0].nodeValue + " \u0003 \n";
+ } else {
+ htmltext += "\n";
+ }
+ }
+ htmltext += "<table class='center newsinfo" + cssres[css_nr][Set_Res] + "'><tr>";
+ htmltext += "<th>";
+ htmltext += xmlDoc.getElementsByTagName("item")[newsID].getElementsByTagName("description")[0].childNodes[0].nodeValue;
+ htmltext += "</th></tr></table>";
+ htmltext += "</pre>";
+ } catch(e) {
+ htmltext = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + "><pre>\n\n\n" + Lang[67] + "\n\n\n</pre></h1>";
+ alert(e);
+ }
+ mainmenu.innerHTML = htmltext;
+}
+
+
+
diff --git a/javascript/settings.js b/javascript/settings.js
index c439d27..c8753ef 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,10 +2,14 @@
// Default settings
//
-var Version = "0.27.4";
+var Version = "0.27.5";
//weather
var city = "Almelo";
+//news
+newssite = new Array("http://www.nu.nl/rss/Algemeen","http://www.spiegel.de/international/index.rss","http://www.spiegel.de/schlagzeilen/index.rss","http://rss.dw.de/rdf/rss-en-all","http://rss.dw.de/rdf/rss-de-all");
+var newssiteID = 0;
+var newsID = 0;
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.3.225");
//server_ip_array[0] isn't used, when set to 0 script tries to find the server
diff --git a/javascript/weather.js b/javascript/weather.js
index 911a5ba..eca30d8 100644
--- a/javascript/weather.js
+++ b/javascript/weather.js
@@ -51,7 +51,7 @@ function WeatherInfo1() {
function WeatherInfo() {
var htmltext = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[100] + "</h1>";
- htmltext += "\n\n"
+ htmltext += "\n\n";
xmlhttp=new XMLHttpRequest();
xmlhttp.open('GET','http://api.openweathermap.org/data/2.5/forecast/daily?q=' + city + '&type=accurate&mode=xml&units=metric&cnt=7',false);
diff --git a/languages/lang_dut.js b/languages/lang_dut.js
index 4ed38b8..b279bdd 100644
--- a/languages/lang_dut.js
+++ b/languages/lang_dut.js
@@ -133,3 +133,5 @@ Lang[109] = "Luchtvochtigheid";
Lang[110] = "Wolken";
Lang[111] = "Temperatuur";
Lang[112] = "Min/Max";
+
+Lang[120] = " Nieuws ";
diff --git a/languages/lang_eng.js b/languages/lang_eng.js
index d49e185..4cf0938 100644
--- a/languages/lang_eng.js
+++ b/languages/lang_eng.js
@@ -134,3 +134,4 @@ Lang[110] = "Clouds";
Lang[111] = "Temperature";
Lang[112] = "Min/Max";
+Lang[120] = " News ";
diff --git a/languages/lang_ger.js b/languages/lang_ger.js
index c190dc1..c65d332 100644
--- a/languages/lang_ger.js
+++ b/languages/lang_ger.js
@@ -133,3 +133,4 @@ Lang[110] = "Wolken";
Lang[111] = "Temperatur";
Lang[112] = "Min/Max";
+Lang[120] = " Nachrichten ";
diff --git a/skins/blue.css b/skins/blue.css
index 791ddec..ce6e2f9 100644
--- a/skins/blue.css
+++ b/skins/blue.css
@@ -206,11 +206,29 @@
color :grey;
}
+ .newsinfo576 {
+ font-size:20px;
+ color :white;
+ overflow:hidden;
+ }
+
+ .newsinfo720 {
+ font-size:27px;
+ color :white;
+ overflow:hidden;
+ }
+
+ .newsinfo1080 {
+ font-size:40px;
+ color :white;
+ overflow:hidden;
+ }
+
.select576 {
background :#fc5;
-webkit-border-radius:25px;
color:black;
- font-size:26px;
+ font-size:25px;
}
.select720 {
@@ -472,6 +490,26 @@
text-align: center;
}
+ pre.newsmenu576 {
+ font-size:20px;
+ color:black;
+ overflow:hidden;
+ }
+
+ pre.newsmenu720 {
+ font-size:27px;
+ color:black;
+ overflow:hidden;
+ }
+
+ pre.newsmenu1080 {
+ font-size:40px;
+ color:black;
+ overflow:hidden;
+ }
+
+
+
pre.media576 {
color:white;
font-size:18px;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 03:49:46 +0000