From 35fbecf572543cbd48a9fbaf735c2faa04c1ab2e Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Sun, 29 Mar 2015 11:53:10 +0200 Subject: moved Box-info to settings menu. Box-info 2 is moved to 1st boxinfo menu --- javascript/main.js | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/javascript/main.js b/javascript/main.js index 3d25365..79869a5 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -2415,7 +2415,7 @@ function onKeyMenu(keyCode) { case "Red": if (menu == MainMenu) { mainmenu.innerHTML = "

" + Lang[0] + "

"; - menu = 12; // Weather menu + menu = 12; // News menu setTimeout("InitMenu(menu);",100); } else if (menu == 1) { if (subs_dyn < (subs_prio_dyn.length -1)) { subs_dyn += 1} else { subs_dyn = 0 } @@ -2522,12 +2522,16 @@ function onKeyMenu(keyCode) { } break; case "Yellow": - if (menu == MainMenu) { + if (menu == 1) { menu = 4; // INFO menu InitMenu(menu); - } else if (menu == 1) { + } else if (menu == 4) { menu = 9; // INFO2 menu InitMenu(menu); + break; + } else if (menu == 9) { + menu = 4; // back to INFO menu + InitMenu(menu); } else if (menu == 10) { //move down if (timerID !== (maxTimers - 1)) { @@ -2905,19 +2909,19 @@ if(menu == 0) { // Main Menu htmltext += "" + "\n 9 -" + Lang[17] + "" ; } - htmltext += "\n 0 - " + Lang[83] + "\n\n \u25CF - " + Lang[120] + "\u25CF -" + Lang[99] + "\u25CF -" + Lang[35] + " \u25CF -" + htmltext += "\n 0 - " + Lang[83] + "\n\n \u25CF - " + Lang[120] + "\u25CF -" + Lang[99] + "\u25CF -" + Lang[19] + " \u25CF -" if (PowerDownServer) { htmltext += Lang[31] + Left(Lang[19],Lang[31].length); } else { htmltext += Lang[18]; } - htmltext += ""; + htmltext += ""; mainmenu.innerHTML = htmltext; } 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\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[99] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[19] + "
"; + 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[120] + "\u25CF -" + Lang[99] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[19] + "
"; } @@ -2945,7 +2949,7 @@ if(menu == 1) { // settings menu htmltext += "\n\n \u25CF -" + Lang[20]; htmltext += "\u25CF - " + VideoOutputModes_txt[VideoOutputModes[Set_Res]] + " "; htmltext += "\u25CF -" + Lang[35]; - htmltext += "\u25CF - " + Left(cssfile[css_nr],8) +""; + htmltext += "\u25CF - " + Left(cssfile[css_nr],8) +""; // htmltext += "\n 0 -" + Lang[9] +""; mainmenu.innerHTML = htmltext; } @@ -2985,7 +2989,7 @@ if(menu == 2) { // Timers menu } } if (mediaRecorder) { var x = NN[3]; } else { var x = Lang[19]; } - mainmenu.innerHTML = "

" + Lang[7] + "

\n   0 -" + Lang[9] + "\n" + booking + "   \u25CF -" + Lang[48] + "\u25CF - " + x + "  \u25CF -" + Lang[19] + "\u25CF - " + NN[5] + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n   0 -" + Lang[9] + "\n" + booking + "   \u25CF -" + Lang[48] + "\u25CF - " + x + "  \u25CF -" + Lang[19] + "\u25CF - " + NN[5] + "
"; } if(menu == 3) { // MPD Menu @@ -3017,7 +3021,11 @@ if(menu == 4) { // INFO Menu } catch(e) { alert("Error : " + e); } - htmltext += "\n\n 0 -" + Lang[9] + ""; + + htmltext += "\n\n 0 -" + Lang[9]; +// htmltext += "\n\n"; + htmltext += "\n \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + " 2 \u25CF -" + Lang[19] + ""; + mainmenu.innerHTML = htmltext; } @@ -3032,9 +3040,9 @@ if(menu == 5) { // Timers from Server if (i == 0) { booking += ""; } } if (get_timer) { - mainmenu.innerHTML = "

" + Lang[7] + "

\n" + booking + "\n   \u25CF -" + Lang[48] + "\u25CF -" + Lang[49] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n" + booking + "\n   \u25CF -" + Lang[48] + "\u25CF -" + Lang[49] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; } else { - mainmenu.innerHTML = "

" + Lang[7] + "

\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; + mainmenu.innerHTML = "

" + Lang[7] + "

\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; } } } @@ -3049,7 +3057,7 @@ if(menu == 7) { // SearchTimers from Server if (maxTimers > x) { booking += searchtimers[x]; } else { booking += "\n"; } if (i == 0) { booking += ""; } } - mainmenu.innerHTML = "

" + Lang[8] + "

\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; + mainmenu.innerHTML = "

" + Lang[8] + "

\n" + booking + "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "   \u25CF -" + Lang[28] + "
"; } } @@ -3068,7 +3076,7 @@ if(menu == 8) { // ChannelGroups enable/disable } if(menu == 9) { // INFO2 Menu - var htmltext = "

" + Lang[35] + "

";
+	var htmltext = "
" + Lang[35] + "2 
";
 	try {
 		if (fullupdate !== 0) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Full EPG Update ";
@@ -3107,7 +3115,10 @@ if(menu == 9) { // INFO2 Menu
 	} catch(e) {
 		alert("Error : " + e);
 	}
-	htmltext += "\n\n   0 -" + Lang[9] + "
";
+	htmltext += "\n   0 -" + Lang[9];
+//	htmltext += "\n";
+	htmltext += "\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + " 1  \u25CF -" + Lang[19] + "
"; + mainmenu.innerHTML = htmltext; } -- cgit v1.2.3