From 02aa40e6f7d5fe8042f22c78b6f27fbd590635dc Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Fri, 11 Oct 2013 12:33:42 +0200 Subject: Colorkeyinfo shown on menu/ timer/ searchtimer --- index.html | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'index.html') diff --git a/index.html b/index.html index 34ab6e9..1931292 100644 --- a/index.html +++ b/index.html @@ -751,10 +751,10 @@ function onKeyDown(event) { if(isFullscreen) { //SHOW epg info if(!epgactive) { - SetOsdInfo(); - osdepginfo.style.opacity = 1; - osdepginfonext.style.opacity = 0; - epgactive = 1; +// SetOsdInfo(); +// osdepginfo.style.opacity = 1; +// osdepginfonext.style.opacity = 0; +// epgactive = 1; } else { osdepginfo.style.opacity = 0; osdepginfonext.style.opacity = 0; @@ -2397,19 +2397,19 @@ osdepginfo.style.opacity = 0; if(menu == 0) { // Main Menu MainMenu = 0; - mainmenu.innerHTML = "

" + Lang[9] + "\n ( " + Version + " )

   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n   3 -" + Lang[11] + "\n   4 -" + Lang[12] + "\n   5 -" + Lang[13] + "\n   6 -" + Lang[14] + "\n   7 -" + Lang[15] + "\n   8 -" + Lang[16] + "\n   9 -" + Lang[17] + "\n\n   \u25CF -" + Lang[28] + "   \u25CF -" + Lang[18] + "
"; + mainmenu.innerHTML = "

" + Lang[9] + "\n ( " + Version + " )

   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n   3 -" + Lang[11] + "\n   4 -" + Lang[12] + "\n   5 -" + Lang[13] + "\n   6 -" + Lang[14] + "\n   7 -" + Lang[15] + "\n   8 -" + Lang[16] + "\n   9 -" + Lang[17] + "\n\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[18] + "
"; } if(menu == 6) { // Main Menu when watching recording MainMenu = 6; - mainmenu.innerHTML = "

" + Lang[9] + "\n ( " + Version + " )

   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n\n\n   5 -" + Lang[13] + "\n\n\n   8 -" + Lang[16] + "\n\n\n   \u25CF -" + Lang[28] + "
"; + mainmenu.innerHTML = "

" + Lang[9] + "\n ( " + Version + " )

   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n\n\n   5 -" + Lang[13] + "\n\n\n   8 -" + Lang[16] + "\n\n\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[19] + "
"; } if(menu == 1) { // settings menu var htmltext = "

" + Lang[10] + "

   1 - ";
 	if (ShowSubs) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
-	htmltext += Lang[20] + "\n   2 - \uE003" + Lang[22] + "\uE003\uE003\uE003: " + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n   3 - \uE003" + Lang[24] + "\uE003\uE003\uE003: " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "\n   4 - " + Lang[82] + "\n   5 - VDR : " + server_ip + "\n   6 - ";
+	htmltext += Lang[20] + "\n   2 - \uE003" + Lang[22] + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n   3 - \uE003" + Lang[24] + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "\n   4 - " + Lang[82] + "\n   5 - VDR : " + server_ip + "\n   6 - ";
 	if (showClock) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
 	htmltext += Lang[25] + "\n   7 - ";
 	if (ShowProtectedChannels) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
@@ -2426,7 +2426,8 @@ if(menu == 1) { // settings menu
 }
 
 if(menu == 2) { // Timers menu
-	booking = "
" + Lang[32] + "
"; +// booking = "
" + Lang[32] + "
"; + booking = ""; var x = timerID - 1; var y = toi.schedulerService.getBookingIds("*", 0, 0); if (y.length !== 0) { @@ -2448,7 +2449,7 @@ if(menu == 2) { // Timers menu } - mainmenu.innerHTML = "

" + Lang[7] + "

\n   0 -" + Lang[9] + "\n" + booking + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n   0 -" + Lang[9] + "\n" + booking + "\n   \u25CF -" + Lang[48] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[19] + "
"; } if(menu == 3) { // MPD Menu @@ -2487,12 +2488,12 @@ if(menu == 5) { // Timers from Server // booking = "
" + Lang[32] + "
"; booking = ""; var x = timerID - 1; - for (var i=0;i<11;i++) { + for (var i=0;i<10;i++) { if (maxTimers !== 0) { do { x = x + 1; } while (!timers[x] && (x < maxTimers)) } if (maxTimers > x) { booking = booking + timers[x]; } else { booking = booking +"\n"; } if (i == 0) { booking = booking + ""; } } - mainmenu.innerHTML = "

" + Lang[7] + "

\n" + booking + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n" + booking + "\n   \u25CF -" + Lang[48] + "\u25CF -" + Lang[49] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; } } @@ -2503,12 +2504,12 @@ if(menu == 7) { // SearchTimers from Server // booking = "
" + Lang[32] + "
"; booking = ""; var x = timerID - 1; - for (var i=0;i<11;i++) { + for (var i=0;i<10;i++) { if (maxTimers !== 0) { do { x = x + 1; } while (!searchtimers[x] && (x < maxTimers)) } if (maxTimers > x) { booking = booking + searchtimers[x]; } else { booking = booking +"\n"; } if (i == 0) { booking = booking + ""; } } - mainmenu.innerHTML = "

" + Lang[8] + "

\n" + booking + "
"; + mainmenu.innerHTML = "

" + Lang[8] + "

\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; } } @@ -3073,8 +3074,8 @@ if (DelisOK) { } else { switch(keyCode) { case "BrowserBack": - ShowInfo(); - osdepginfo.style.opacity = 1 - osdepginfo.style.opacity; +// ShowInfo(); +// osdepginfo.style.opacity = 1 - osdepginfo.style.opacity; break; case "TV": setResume(); -- cgit v1.2.3