From b1804c55d88de0ac28c5c04b3eab1383926f4d2e Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Thu, 13 Nov 2014 13:46:33 +0100 Subject: Moved more to blue.css --- blue.css | 142 +++++++++++++++++++++++++++++++++++++++- index.html | 5 +- main.js | 211 ++++++++++++++++++++++++++++------------------------------- settings.js | 3 + settings2.js | 60 ++--------------- 5 files changed, 251 insertions(+), 170 deletions(-) diff --git a/blue.css b/blue.css index 1e899d7..4f93b70 100644 --- a/blue.css +++ b/blue.css @@ -1,3 +1,81 @@ + body{ + backgroundColor : #ccc; + } + + .bluekey { + color : blue; + } + .redkey { + color : red; + } + .yellowkey { + color :yellow; + } + .greenkey { + color :green; + } + .mainfont { + font-size:49px; + color:black; + } + + .notset { + color :grey; + } + + .select { + background :#fc5; + -webkit-border-radius:25px; + color:black; + font-size:49px; + } + + .mediaselect { + background :#fc5; + -webkit-border-radius:25px; + color:black; + font-size:38px; + } + + pre.mediamenu { + font-size:38px; + color:black; + } + + p.epg_head { + color:white; + text-align: center; + } + + p.epg_avinfo { + color:black; + text-align: center; + } + + p.epg_title { + color:white; + text-align: center; + } + + p.epg_info { + color:yellow; + text-align: center; + } + + pre.color_switchtimer { + background : #660066; + } + + pre.color_default { + background : green; + } + + pre.color_error { + background : red; + } + + + videoplane#videoplane { position:absolute; left:0px; @@ -7,6 +85,40 @@ z-index:500; } + h1.mainmenu { + font-size:66px; + color:white; + text-align: center; + } + + pre.mmenu { + font-size:49px; + color:black; + } + + pre.media { + color:white; + font-size:49px; + } + + p.epg { + font-size:36px; + color:black; + text-align: center; + } + + p.list { + font-size:34px; + color:black; + text-align: center; + } + + p.osdtimer { + font-size:34px; + color:black; + } + + div#osdmain { position : absolute; z-index : 505; @@ -28,6 +140,7 @@ -webkit-border-radius : 25px; background : red; color : black; + font-size:81px; } div#osdname { @@ -38,6 +151,7 @@ left : 3%; top : 20%; color : black; + font-size:51px; } @@ -53,9 +167,11 @@ z-index : 505; position : absolute; width : 42%; - left : 58%; + right : 5%; top : 7%; color : white; + font-size:35px; + text-align: right; } @@ -66,6 +182,7 @@ left : 17%; top : 30%; color : white; + font-size:36px; } div#osdca { @@ -75,6 +192,7 @@ left : 75%; top : 20%; color : black; + font-size:60px; } @@ -94,6 +212,7 @@ width : 100%; left : 10%; top : 84%; + font-size:36px; } div#chanlistepg { @@ -112,6 +231,7 @@ top : 80%; opacity : 0; color : green; + font-size:36px; } div#osdmedia { @@ -119,12 +239,25 @@ position :absolute; left :10%; top :60%; - z-index :505; + z-index :506; opacity :0; -webkit-border-radius:50px; background : #3366ff; } + div#osdmediatime { + z-index : 506; + position : absolute; + width : 42%; + right : 15%; + top : 63%; + color : white; + font-size:35px; + text-align: right; + } + + + div#schedule { width :50%; height :75%; @@ -154,6 +287,7 @@ z-index :515; opacity :0; color :white; + font-size:30px; } div#mainmenu { @@ -189,6 +323,8 @@ opacity :0; -webkit-border-radius:25px; color :white; + font-size:36px; + background :green; } div#osdepginfo { @@ -200,6 +336,7 @@ opacity :0; -webkit-border-radius:50px; background : #3366ff; + font-size:39px; } div#osdepginfonext { @@ -211,5 +348,6 @@ opacity :0; -webkit-border-radius:50px; background : #3366ff; + font-size:39px; } diff --git a/index.html b/index.html index 300f3cc..7cf869e 100644 --- a/index.html +++ b/index.html @@ -30,10 +30,11 @@
Volume :
-
-
+
+
+
diff --git a/main.js b/main.js index 983d56d..d050798 100644 --- a/main.js +++ b/main.js @@ -62,13 +62,11 @@ function onLoad() { ss.setCategorySubscription(onScheduledStop, "*"); setOSDscale(); - SetupFonts(); - setOSDtimer(); showOSD(); videoplane.subtitles = Boolean(ShowSubs); - colorkeys.innerHTML = " " + NN[4] + " " + NN[1] + " " + NN[2] + " " + NN[5] + " "; - medialist.innerHTML = "

" + Lang[0] + "

"; + colorkeys.innerHTML = " " + NN[4] + " " + NN[1] + " " + NN[2] + " " + NN[5] + " "; + medialist.innerHTML = "

" + Lang[0] + "

"; } @@ -587,7 +585,6 @@ videoConfig = vos.getVideoConfiguration(); } setOSDscale(); -SetupFonts(); } @@ -793,7 +790,7 @@ function onKeyDown(event) { } } } else if(isSchedule == 0 && !epgactive){ - colorkeys.innerHTML = " " + NN[3 + NowNext] + " " + NN[NowNext] + " " + NN[2] + " " + NN[5] + " "; + colorkeys.innerHTML = " " + NN[3 + NowNext] + " " + NN[NowNext] + " " + NN[2] + " " + NN[5] + " "; NowNext = 1 - NowNext; showChannelList(); } @@ -821,9 +818,9 @@ function onKeyDown(event) { schedule.style.opacity = 1 - schedule.style.opacity; isSchedule = schedule.style.opacity; if(isSchedule == 1){ - colorkeys.innerHTML = " " + NN[4] + " " + NN[4] + " " + NN[6] + " " + NN[4] + " "; + colorkeys.innerHTML = " " + NN[4] + " " + NN[4] + " " + NN[6] + " " + NN[4] + " "; } else { - colorkeys.innerHTML = " " + NN[3 + (1 - NowNext)] + " " + NN[1 - NowNext] + " " + NN[2] + " " + NN[5] + " "; + colorkeys.innerHTML = " " + NN[3 + (1 - NowNext)] + " " + NN[1 - NowNext] + " " + NN[2] + " " + NN[5] + " "; } } break; @@ -867,9 +864,9 @@ function onKeyDown(event) { if(isSchedule) { isSchedule = 0; schedule.style.opacity = 0; - colorkeys.innerHTML = " " + NN[3 + (1 - NowNext)] + " " - + NN[1 - NowNext] + " " + NN[2] + " " - + NN[5] + " "; + colorkeys.innerHTML = " " + NN[3 + (1 - NowNext)] + " " + + NN[1 - NowNext] + " " + NN[2] + " " + + NN[5] + " "; break; } @@ -971,7 +968,9 @@ function onKeyDown(event) { isFullscreen = 0; ClearScreen(); channellist.style.opacity = 1; - colorkeys.innerHTML = " " + NN[3 + (1 - NowNext)] + " " + NN[1 - NowNext] + " " + NN[2] + " " + NN[5] + " "; + colorkeys.innerHTML = " " + NN[3 + (1 - NowNext)] + " " + + NN[1 - NowNext] + " " + NN[2] + " " + + NN[5] + " "; colorkeys.style.opacity = 1; showChannelList(); if(!SwitchGuide) { @@ -1408,8 +1407,8 @@ function OSDhtml(){ osdname.innerHTML = Left(channelsnames[currChan],30); } osdepg.innerHTML = "

" + EPG[0][7][currChan] + "

\n

" + EPG[1][7][currChan] + "

"; - osdepginfo.innerHTML = "

" + currChan + "\uE003" + channelsnames[currChan] + "

" + AvInfo[currChan] + "

" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "

\n

" + EPG[0][4][currChan] + "

\n

" + Left(EPG[0][5][currChan],750) + "

"; - osdepginfonext.innerHTML = "

" + currChan + "\uE003" + channelsnames[currChan] + "

" + EPG[1][7][currChan] + EPG[1][9][currChan] + EPG[1][8][currChan] + "

\n

" + EPG[1][4][currChan] + "

\n

" + Left(EPG[1][5][currChan],750) + "

"; + osdepginfo.innerHTML = "

" + currChan + "\uE003" + channelsnames[currChan] + "

" + AvInfo[currChan] + "

" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "

\n

" + EPG[0][4][currChan] + "

\n

" + Left(EPG[0][5][currChan],750) + "

"; + osdepginfonext.innerHTML = "

" + currChan + "\uE003" + channelsnames[currChan] + "

" + EPG[1][7][currChan] + EPG[1][9][currChan] + EPG[1][8][currChan] + "

\n

" + EPG[1][4][currChan] + "

\n

" + Left(EPG[1][5][currChan],750) + "

"; } function updateOSDtime(timchan) { @@ -1455,7 +1454,7 @@ if (!BackGroundColor) { BackGroundColor = DefaultBGColor;} } catch (e) { ProgName = "ERROR" ; - BackGroundColor = "red"; + BackGroundColor = "color_error"; } } else if(SwitchTimer == 3) { ProgTime -= preRecTime; @@ -1478,7 +1477,7 @@ if (!BackGroundColor) { BackGroundColor = DefaultBGColor;} ss.setParameter(x, "Eventid", ProgEvID); } else { ProgName = "ERROR" ; - BackGroundColor = "red"; + BackGroundColor = "color_error"; } } catch (e) { alert(e); @@ -1501,8 +1500,8 @@ if (!BackGroundColor) { BackGroundColor = DefaultBGColor;} var x = Lang[4] + th + ":" + tm + ""; } - switchtimer.style.background = BackGroundColor; - switchtimer.innerHTML = "
" + Lang[2] + Left(ProgName,30) + "\n" + Lang[3] + channelsnames[currChan] + "\n" + x;
+//	switchtimer.style.background = BackGroundColor;
+	switchtimer.innerHTML = "
" + Lang[2] + Left(ProgName,30) + "\n" + Lang[3] + channelsnames[currChan] + "\n" + x;
 	setOSDtimer();
 
 	switchtimer.style.opacity = 1;
@@ -1525,7 +1524,7 @@ function setOSDtimer() {
 		var th = tijd.getHours();
 		th=addzero(th);
 		tm=addzero(tm);
-		osdtimer.innerHTML = "
" + th + ":" + tm + "
";
+		osdtimer.innerHTML = "
" + th + ":" + tm + "
";
 		SetLed(0,2,1);
 		switchicon = "\uE00C";
 		osdca.innerHTML = CAicon + switchicon + RECicon;
@@ -2125,7 +2124,7 @@ function showChannelList() {
 	}
 	htmlstring = htmlstring + "";
 	channellist.innerHTML = htmlstring;
-        chanlistepg.innerHTML = "
" + EPG[NowNext][1][currChan] + "
" + Left(EPG[NowNext][4][currChan],250) + "
" ;
+        chanlistepg.innerHTML = "
" + EPG[NowNext][1][currChan] + "
" + Left(EPG[NowNext][4][currChan],250) + "
" ;
 
 }
 
@@ -2335,7 +2334,7 @@ function onKeyMenu(keyCode) {
 	if (menu == 7) {
 		// Show more info Current SearchTimer
 		osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
-	       	osdepginfo.innerHTML = "
" + searchtimersSearch[timerID] + "\n\n\n\n
" + Lang[0] + "
" ;
+	       	osdepginfo.innerHTML = "
" + searchtimersSearch[timerID] + "\n\n\n\n" + Lang[0] + "
" ;
 		setTimeout("ShowSearchTimerInfo();",100);
 	}
 
@@ -2383,7 +2382,7 @@ function onKeyMenu(keyCode) {
 		}
 	} else 	if (menu == 5 && smartTVplugin) {
 		osdepginfo.style.opacity = 0;
-		mainmenu.innerHTML = "
" + Lang[7] + "
\n\n\n
" + Lang[0] + "
";
+		mainmenu.innerHTML = "
" + Lang[7] + "
\n\n\n
" + Lang[0] + "
";
 		DeleteTimers();
 		setTimeout("LoadTimersServer();InitMenu(menu);",100);
 	} else 	if (menu == 10) {
@@ -2486,7 +2485,7 @@ function onKeyMenu(keyCode) {
 		var x = ss.getBookingIds("*", 0, 0);
 		var y = Number(ss.getParameter(x[timerID-1], "Channel"));
 		osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
-	       	osdepginfo.innerHTML = "
" + ss.getParameter(x[timerID-1], "Title") + "\n " + "\n" + y + " - " + channelsnames[y] + "(" + ss.getParameter(x[timerID-1], "Eventid") + ")" + "\n 
" + ss.getParameter(x[timerID-1], "Info") + "
" ;
+	       	osdepginfo.innerHTML = "
" + ss.getParameter(x[timerID-1], "Title") + "\n " + "\n" + y + " - " + channelsnames[y] + "(" + ss.getParameter(x[timerID-1], "Eventid") + ")" + "\n 
" + ss.getParameter(x[timerID-1], "Info") + "
" ;
 	} else 	if (menu == 5) {
 		// Show EPG info Timer
 		osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
@@ -2614,7 +2613,7 @@ function onKeyMenu(keyCode) {
 	break;
 	case KEY_5:
 		if (menu == MainMenu && (Restfulapiplugin || smartTVplugin)) {
-			mainmenu.innerHTML = "
" + Lang[7] + "
\n\n\n
" + Lang[0] + "
";
+			mainmenu.innerHTML = "
" + Lang[7] + "
\n\n\n
" + Lang[0] + "
";
 			timerID = 0;
 			menu = 5;
 			setTimeout("LoadTimersServer();InitMenu(menu);",200);
@@ -2690,7 +2689,7 @@ function onKeyMenu(keyCode) {
 	break;
 	case KEY_8:
 	if (menu == MainMenu && Restfulapiplugin) {
-			mainmenu.innerHTML = "
" + Lang[8] + "
\n\n\n
" + Lang[0] + "
";
+			mainmenu.innerHTML = "
" + Lang[8] + "
\n\n\n
" + Lang[0] + "
";
 			timerID = 0;
 			menu = 7;
 			setTimeout("LoadSearchTimersServer();InitMenu(menu);",200);
@@ -2787,46 +2786,46 @@ osdepginfo.style.opacity = 0;
 
 if(menu == 0) { // Main Menu
 	MainMenu = 0;
-	var htmltext = "
" + Lang[9] + "\n ( " + Version + " )
   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n   3 -" + Lang[11];
+	var htmltext = "
" + Lang[9] + "\n ( " + Version + " )
   1 -" + Lang[10] + "\n   2 -" + Lang[7] + "\n   3 -" + Lang[11];
 	htmltext += "\n   4 -" + Lang[12]; 
 	if (Restfulapiplugin) { 
 		htmltext += "\n   5 -" + Lang[13]; 
 	} else { 
-		htmltext += "" + "\n   5 -" + Lang[13] + "" ;
+		htmltext += "" + "\n   5 -" + Lang[13] + "" ;
 	}
 	if (Restfulapiplugin) { 
 		htmltext += "\n   6 -" + Lang[14]; 
 	} else {
-		htmltext += "" + "\n   6 -" + Lang[14] + "" ;  
+		htmltext += "" + "\n   6 -" + Lang[14] + "" ;  
 	}
 	if (smartTVplugin) { 
 		htmltext += "\n   7 -" + Lang[15]; 
 	} else { 
-		htmltext += "" + "\n   7 -" + Lang[15] + "" ; 
+		htmltext += "" + "\n   7 -" + Lang[15] + "" ; 
 	}
 	if (Restfulapiplugin) { 
 		htmltext += "\n   8 -" + Lang[16];
 	} else {
-		htmltext += "" + "\n   8 -" + Lang[16] + "" ;  
+		htmltext += "" + "\n   8 -" + Lang[16] + "" ;  
 	}
 	if (ShowMPD) { 
 		htmltext += "\n   9 -" + Lang[17]; 
 	} else { 
-		htmltext += "" + "\n   9 -" + Lang[17] + "" ; 
+		htmltext += "" + "\n   9 -" + Lang[17] + "" ; 
 	}
 
-	htmltext += "\n   0 - " + Lang[83] + "\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[18] + "
";
+	htmltext += "\n   0 - " + Lang[83] + "\n\n   \u25CF -" + Lang[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[18] + "
";
 	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[19] + "\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[19] + "\u25CF -" + Lang[19] + "\u25CF -" + Lang[35] + "   \u25CF -" + Lang[19] + "
";
 }
 
 
 if(menu == 1) { // settings menu
-	var htmltext = "
" + Lang[10] + "
   1 - ";
+	var htmltext = "
" + Lang[10] + "
   1 - ";
 	if (ShowSubs) { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
 	htmltext += Lang[20] + ": " + (is.getObject("cfg.media.subtitling.languagepriority"));
 	if (subs_prio_dyn.length > 0) { htmltext += " (" + (subs_dyn + 1 ) + "/" + subs_prio_dyn.length + ") "; }
@@ -2842,10 +2841,10 @@ if(menu == 1) { // settings menu
 
 	if (SleepTimer) { htmltext += SleepTimer + Lang[30]; } else { htmltext += Lang[31]; }
 
-	htmltext += "\n\n   \u25CF -" + Lang[20];
-	htmltext += "\u25CF - " + VideoOutputModes_txt[VideoOutputModes[Set_Res]] + " ";  
-	htmltext += "\u25CF -" + Lang[35];
-	htmltext += "\u25CF - " + Left(cssfile[css_nr].split(".")[0],8) +"
";
+	htmltext += "\n\n   \u25CF -" + Lang[20];
+	htmltext += "\u25CF - " + VideoOutputModes_txt[VideoOutputModes[Set_Res]] + " ";  
+	htmltext += "\u25CF -" + Lang[35];
+	htmltext += "\u25CF - " + Left(cssfile[css_nr].split(".")[0],8) +"
";
 //	htmltext += "\n   0 -" + Lang[9] +"
";
 	mainmenu.innerHTML = htmltext;
 }
@@ -2859,9 +2858,9 @@ if(menu == 2) { // Timers menu
 		if (timer.length !== 0) { do { x += 1; } while (!timer[x] && (x < timer.length)) }
 
 			if (i == 0) {
-			booking += "";
+			booking += "";
 			} else if (i == 1) {
-			booking += "";
+			booking += "";
 			} 
 
 		if (timer.length > x) {
@@ -2885,15 +2884,15 @@ 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
-	mainmenu.innerHTML = "
" + Lang[33] + "
" + Lang[34] + "\n 0 -" + Lang[9] + "
";
+	mainmenu.innerHTML = "
" + Lang[33] + "
" + Lang[34] + "\n 0 -" + Lang[9] + "
";
 }
 
 if(menu == 4) { // INFO Menu
-	var htmltext = "
" + Lang[35] + "
";
+	var htmltext = "
" + Lang[35] + "
";
 	try {
 		htmltext += "\n   Product name: " + is.getObject("config.productdisplayname");
 		htmltext += "\n   Build date : " + is.getObject("config.build.date");
@@ -2920,17 +2919,17 @@ if(menu == 4) { // INFO Menu
 if(menu == 5) { // Timers from Server
 	if (timerOK) {
 	//	booking = "
" + Lang[32] + "
";
-	booking = "";
+	booking = "";
 	var x = timerID - 1;
 	for (var i=0;i<10;i++) {
 		if (maxTimers !== 0) { do { x += 1; } while (!timers[x] && (x < maxTimers)) }
 		if (maxTimers > x) { booking += timers[x]; } else { booking += "\n"; }
-		if (i == 0) { booking += ""; } 
+		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] + "
";
 	 }
 	}
 }
@@ -2939,37 +2938,33 @@ if(menu == 5) { // Timers from Server
 if(menu == 7) { // SearchTimers from Server
 	if (timerOK) {
 	// 	booking = "
" + Lang[32] + "
";
-	booking = "";
+	booking = "";
 	var x = timerID - 1;
 	for (var i=0;i<10;i++) {
 		if (maxTimers !== 0) { do { x += 1; } while (!searchtimers[x] && (x < maxTimers)) }
 		if (maxTimers > x) { booking += searchtimers[x]; } else { booking += "\n"; }
-		if (i == 0) { booking += ""; } 
+		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] + "
";
 
 	}
 }
 
 if(menu == 8) { // ChannelGroups enable/disable
-	var htmltext = "
" + Lang[80] + "
\n";
+	var htmltext = "
" + Lang[80] + "
\n";
 	for (var i=0;i<10;i++) {
-		if (maxChan[i]) { 
-			htmltext += ""; 
-		} else { 
-			htmltext += ""; 
-		}
-
+		if (maxChan[i]) { } else { htmltext += ""; }
 		htmltext += "\uE003" + i + "\uE003-\uE003";
 		if (is.getObject(("vip.group." + i)) == "1") { htmltext += "\uE017"; } else { htmltext += "\uE016"; }
 		htmltext += "\uE003" + Lang[81] + i + "\n";
+		if (maxChan[i]) { } else { htmltext += ""; }
 	}
 	htmltext += "
";
 	mainmenu.innerHTML = htmltext;
 	}
 
 if(menu == 9) { // INFO2 Menu
-	var htmltext = "
" + Lang[35] + "
";
+	var htmltext = "
" + Lang[35] + "
";
 	try {
 		if (fullupdate !== 0) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; }
 		htmltext += "Full EPG Update ";
@@ -3011,21 +3006,21 @@ if(menu == 9) { // INFO2 Menu
 }
 
 if(menu == 10) { // Favorite edit Menu
-	var htmltext = "
" + Lang[83]
-	htmltext += "
\n"
-	htmltext += "";
+	var htmltext = "
" + Lang[83]
+	htmltext += "
\n"
+	htmltext += "";
 	var x = timerID;
 	for (var i=0;i<10;i++) {
 		if (maxTimers !== 0) { x += 1;}
 		if (maxTimers >= x && x !== 0) { htmltext += " \u0003\u0003 " + x + " \u0003\u0003 " + channelsnames[(x + Fav_base)] + " \u0003\u0003\u0003 \n"; } else { htmltext += "\n"; }
-		if (i == 0) { htmltext += ""; } 
+		if (i == 0) { htmltext += ""; } 
 	}
-	htmltext += "\n   \u25CF -" + Lang[87]; 
-	htmltext += "\u25CF -"
+	htmltext += "\n   \u25CF -" + Lang[87]; 
+	htmltext += "\u25CF -"
 	if (timerID == 0) { htmltext += Lang[19] } else { htmltext += Lang[84] } //no move up
-	htmltext += "\u25CF -"
+	htmltext += "\u25CF -"
 	if (timerID == (maxTimers - 1) || x == 0) { htmltext += Lang[19] } else { htmltext += Lang[85] } //no move down
-	htmltext += "\u25CF -" + Fav_key1 + "
";
+	htmltext += "\u25CF -" + Fav_key1 + "
";
 	mainmenu.innerHTML = htmltext;
 }
 
@@ -3151,7 +3146,7 @@ try {
   } catch(e) {
     timerOK = 0;
     alert("Get Timers problem: " + e);
-    mainmenu.innerHTML = "
" + Lang[7] + "
\n  " + Lang[36] + ": \n " + server_ip + "
";
+    mainmenu.innerHTML = "
" + Lang[7] + "
\n  " + Lang[36] + ": \n " + server_ip + "
";
   }
 }
 
@@ -3310,7 +3305,7 @@ try {
   } catch(e) {
     timerOK = 0;
     alert("Get SearchTimers problem: " + e);
-    mainmenu.innerHTML = "
" + Lang[8] + "
\n  " + Lang[43] + ": \n " + server_ip + RestFulAPI + "
";
+    mainmenu.innerHTML = "
" + Lang[8] + "
\n  " + Lang[43] + ": \n " + server_ip + RestFulAPI + "
";
   }
 }
 
@@ -3399,16 +3394,16 @@ if (MPDListener == 0) {
 } else {
 	if ( ev.state == 6 && ev.reason == "HostUnreachable" ) {
 	    showDisplay("ERRR", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[61] + "\n\n
" + Lang[62] + ": \n" + server_ip + MPDAddress + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[61] + "\n\n
" + Lang[62] + ": \n" + server_ip + MPDAddress + "
";
 	  } else if ( ev.state == 2 ) { // && ev.reason == "PositionEnd" ) {
 	    showDisplay("STOP", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "\n" + Lang[65] + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "\n" + Lang[65] + "
";
 	  } else if ( ev.state == 3 && ev.reason == "CommandPlay" ) {
 	showDisplay("MPD", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n\n\n
" + Lang[64] + ": \n" + server_ip + MPDAddress + "
";
 	  } else {
 	    showDisplay("ERRR", false, 100, 0 );
-	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
Error : " + ev.state + "\n" + Lang[66] + ": " + ev.reason + "
";
+	mainmenu.innerHTML = "
" + Lang[60] + "
" + Lang[34] + "\n   0 -" + Lang[9] + "\n   9 -" + Lang[63] + "\n\n
Error : " + ev.state + "\n" + Lang[66] + ": " + ev.reason + "
";
 	}
 }
 
@@ -3450,9 +3445,9 @@ function UnloadMediaSettings() {
 	mediaPlayer.removeEventListener(mediaPlayer.ON_STATE_CHANGED, onStateChanged);
 	medialist.style.opacity = 0;
 	osdmedia.style.opacity = 0;
-	osdtime.style.opacity = 0;
+	osdmediatime.style.opacity = 0;
 	osdepginfo.style.opacity = 0;
-	medialist.innerHTML = "
" + Lang[0] + "
";
+	medialist.innerHTML = "
" + Lang[0] + "
";
 	showDisplay(currChan.toString(), false, 100, 0 );
 	isMediaMenu = 0;
 	isFullscreen = 1;
@@ -3470,7 +3465,7 @@ function onKeyMedia(keyCode) {
 if (DelisOK) {
 	switch(keyCode) {
 	case KEY_OK:
-	  medialist.innerHTML = "
" + Lang[0] + "
";
+	  medialist.innerHTML = "
" + Lang[0] + "
";
 	  switchtimer.style.opacity = 0;
 	  setTimeout("DelRec2(); getRecList(); showMediaList();",100)
 	default:
@@ -3722,7 +3717,7 @@ if (DelisOK) {
 	break;
   case KEY_OK:
 	osdmedia.style.opacity = 1 - osdmedia.style.opacity;
-	osdtime.style.opacity = osdmedia.style.opacity;
+	osdmediatime.style.opacity = osdmedia.style.opacity;
 	ShowMediaOSD();
         break;
    case "Green":
@@ -4132,13 +4127,13 @@ try {
 	}
 	if (nrMedia!==0) { getRecOK = 1; } else {
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[37] + "
";
+	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[37] + "
";
 	}
 
   } catch(e) {
     alert("Get Recordings problem: " + e);
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[39] + "
";
+	medialist.innerHTML = "
" + Lang[38] + "
\n\n\n" + Lang[39] + "
";
   }
 }
 
@@ -4577,16 +4572,16 @@ function AddInfo(info) {
 function showMediaList() {
 	if (osdepginfo.style.opacity == 1) {osdepginfo.style.opacity = 0;}
 	osdmedia.style.opacity = 0;
-	osdtime.style.opacity = 0;
+	osdmediatime.style.opacity = 0;
 	var liststyle = "";
 	listMed = currMed - 1;
 	var MaxMed = -1;
 
 	if (getRecOK == 1) {
-		var htmlstring = "
" + Lang[38] + "(" + Lang[46] + (100 - perc_space) + "%, " + (free_space/1024).toFixed(0) + " GB) 
";
+		var htmlstring = "
" + Lang[38] + "(" + Lang[46] + (100 - perc_space) + "%, " + (free_space/1024).toFixed(0) + " GB) 
";
 
 		if (subgroup) {
-			htmlstring = "
" + Group_Header[Number(recGroup[currMed])] + "
";
+			htmlstring = "
" + Group_Header[Number(recGroup[currMed])] + "
";
 			if (MaxInGroup < 14){ MaxMed = MaxInGroup; } else {MaxMed = 14; }
 		}
 		if (!subgroup) { 
@@ -4598,7 +4593,7 @@ function showMediaList() {
 	} else {
 
 		if (nrMedia < 14) {MaxMed = nrMedia; } else {MaxMed = 14; }
-		var htmlstring = "
" + Lang[11] + channelsnames[currChan] + " 
";
+		var htmlstring = "
" + Lang[11] + channelsnames[currChan] + " 
";
 	}
 
 	if (MaxMed > 14) { MaxMed = 14; }
@@ -4615,22 +4610,16 @@ function showMediaList() {
 			}
 		while (!recList[listMed] && (listMed<=nrMedia));
 
-		if ( listMed == currMed) { 
-			liststyle = " style='background:" + color_bg + ";-webkit-border-radius:25px;";
-		}  else {
-			liststyle = " style='";
-		}
-		
-//		alert(recList[listMed]);
-//		alert(listMed + " : " + nrMedia);
 		if (listMed > nrMedia) { recList[listMed] = ""; }
 
-		if (recList[listMed]) {
-		//Solves empty string at the end.
-		htmlstring += "\uE003" + Left(recList[listMed],60) + "\uE003\uE003
";
+		if (recList[listMed]) { //Solves empty string at the end.
+			if ( listMed == currMed) { htmlstring += ""; }
+			htmlstring += "\uE003" + Left(recList[listMed],60) + "\uE003\uE003\n";
+			if ( listMed == currMed) { htmlstring += "";}
 		}
+
 	}
-	medialist.innerHTML = htmlstring + "
";
+	medialist.innerHTML = htmlstring + "
";
 	//ShowInfo();
 }
 
@@ -4699,7 +4688,7 @@ try {
   } catch(e) {
     alert("Get EPG problem: " + e);
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[50] + "
\n\n\n" + Lang[51] + "
";
+	medialist.innerHTML = "
" + Lang[50] + "
\n\n\n" + Lang[51] + "
";
   }
 }
 
@@ -4753,7 +4742,7 @@ function getSchedule(schchan){
 	} else {
 	getRecOK = 0;
 
-	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[52] + "
";
+	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[52] + "
";
 
 	if (experimental) {
 	medialist.innerHTML += "";
@@ -4762,7 +4751,7 @@ function getSchedule(schchan){
 	}
   } catch(e) {
 	getRecOK = 0;
-	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[53] + "
";
+	medialist.innerHTML = "
" + Lang[11] + "
\n\n\n" + Lang[53] + "
";
   }
 
 }
@@ -5009,14 +4998,14 @@ if (get_recordings == 1) {
 	var x = (Number(recDura[currMed])/60).toFixed(0);
 	if (pos/60 > x) { x = (pos/60).toFixed(0);}
 	date_time();
-	osdtime.innerHTML = result;
+	osdmediatime.innerHTML = result;
 	date_time_rec();
-	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + "\n " + result + " 
";
+	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + "\n " + result + " 
";
 } else if ( get_recordings == 2) {
 	var pos = position + (mediaPlayer.getPosition()/1000);
 	date_time();
-	osdtime.innerHTML = result;
-	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " \n " + Left(recTitl[currMed],40) + "\n  \n " + recStrt[currMed] + " 
";
+	osdmediatime.innerHTML = result;
+	osdmedia.innerHTML = "
 \n  " + (pos/60).toFixed(0) + " \n " + Left(recTitl[currMed],40) + "\n  \n " + recStrt[currMed] + " 
";
 }
 }
 
@@ -5025,11 +5014,11 @@ function ShowInfo() {
   if ( medialist.style.opacity == 0 ) { updateStreamInfo(currMed);} else { AvInfo[currMed] = "";}
   if (get_recordings == 2) {
 	result = recStrt[currMed]
-       	osdepginfo.innerHTML = "
" + Left(recTitl[currMed],60) 
-				+ "\n 
" + AvInfo[currMed] 
-				+ "
 " + result + "\n " 
+       	osdepginfo.innerHTML = "
" + Left(recTitl[currMed],60) 
+				+ "\n 
" + AvInfo[currMed] 
+				+ "
 " + result + "\n " 
 				+ "???" + Lang[54]
-				+ "
 Sorry STREAMDEV-plugin : " + Lang[37] + "
";
+				+ "
 Sorry STREAMDEV-plugin : " + Lang[37] + "
";
   } else {
         date = new Date(Number(recStrt[currMed])*1000);
         year = date.getFullYear();
@@ -5043,15 +5032,15 @@ function ShowInfo() {
         result = '' + days[day] + ' ' + d + ' ' + months[month] + ' ' + year + ' ' + h + ':' + m;
 
 	if (year!==1970) { 	
-       		osdepginfo.innerHTML = "
" + Left(recTitl[currMed],60) 
-					+ "
" + AvInfo[currMed] 
-					+ "
 " + result + "\n " 
+       		osdepginfo.innerHTML = "
" + Left(recTitl[currMed],60) 
+					+ "
" + AvInfo[currMed] 
+					+ "
 " + result + "\n " 
 					+ (recDura[currMed] / 60).toFixed(0) + Lang[54] + "\n " + recChan[currMed] + "  "
-					+ "\n 
" + Left(recDesc[currMed],750) + "
";
+					+ "\n 
" + Left(recDesc[currMed],750) + "
";
 	} else {
 		//info for non-vdr recordings
-	       	osdepginfo.innerHTML = "
" + Left(recTitl[currMed],60) 
-					+ "\n 
" + AvInfo[currMed] + " " + "\n \n 
";
+	       	osdepginfo.innerHTML = "
" + Left(recTitl[currMed],60) 
+					+ "\n 
" + AvInfo[currMed] + " " + "\n \n 
";
 	}
   }
 }
diff --git a/settings.js b/settings.js
index 48ffd62..14ebf05 100644
--- a/settings.js
+++ b/settings.js
@@ -365,4 +365,7 @@ var localRecording = 0;
 var box_ip; // Used for testing plugins
 var test_ip; // Used for testing plugins
 
+var color_switchtimer = "color_switchtimer";
+var color_default = "color_default";
+var color_error = "color_error";
 
diff --git a/settings2.js b/settings2.js
index ee09507..c53c7b7 100644
--- a/settings2.js
+++ b/settings2.js
@@ -1,70 +1,20 @@
 
-var fsAudio; var fsTime; var fsName; var fsMenu; var fsChan; var fsCA; var fsMenuMain; var fsEpg;
-var fsEpginfo; var fsList; var fsSchedList; var fsSched; var fsRec; var fsReclist; var fsMedia; var fsKeys;
+var fsList; var fsSchedList; var fsSched;
 
 var color_bg = "#fc5";
 var color_main_head = "color:white";
-var color_main_font = "color:black";
-//var color_main_font = "color:lightgreen";
-var color_epg_head = "color:white";
-var color_epg_title = "color:white";
-var color_epg_avinfo = "color:black";
-//var color_epg_avinfo = "color:lightgreen";
-var color_epg_info = "color:yellow";
 var color_sched_head = "color:white";
 var color_sched_font = "color:black";
-//var color_sched_font = "color:lightgreen";
-var color_chan_epg = "color:black";
-//var color_chan_epg = "color:lightgreen";
-var color_osdtimer = "color:black";
-//var color_osdtimer = "color:lightgreen";
 var color_timerinfo = "color:white";
-var color_media_osd = "color:white";
+
 var color_progress1 = "";
 var color_progress2 = "";
-var color_notset = "color:grey";
-//var color_notset = "color:black";
-var color_switchtimer = "#660066";
-var DefaultBGColor = "green";
-var ErrorColor = "red";
-
 
-function SetupFonts() {
-//setup fontsize
-	colorkeys.style.fontSize = fsKeys;
-	osdvolume.style.fontSize = fsCA;
-	osdtime.style.fontSize = fsTime;
-	osdname.style.fontSize = fsName;
-	osdepg.style.fontSize = fsEpg;
-	osdca.style.fontSize = fsCA;
-	switchtimer.style.fontSize = fsEpg;
-	osdepginfo.style.fontSize = fsEpginfo;
-	osdepginfonext.style.fontSize = fsEpginfo;
-	osdnr.style.fontSize = fsChan;
-	osdlang.style.fontSize = fsAudio;
-
-//setup fontcolors/ backgroundcolor
-	document.body.style.backgroundColor = "#ccc";
-	switchtimer.style.background = DefaultBGColor;
-}
 
 function setOSDscale() {
-	fsAudio = (16*Yfactor[Set_Res]) + "px";
-	fsTime = (16*Yfactor[Set_Res]) + "px";
-	fsName = (27*Yfactor[Set_Res]) + "px";
-	fsMenu = (27*Yfactor[Set_Res]) + "px";
-	fsChan = (43*Yfactor[Set_Res]) + "px"; 
-	fsCA = (32*Yfactor[Set_Res]) + "px";
-	fsMenuMain = (35*Yfactor[Set_Res]) + "px";
-	fsEpg = (19*Yfactor[Set_Res]) + "px";
-	fsEpginfo = (21*Yfactor[Set_Res]) + "px";
-	fsList = (18*Yfactor[Set_Res]) + "px";
-	fsSchedList = (18*Yfactor[Set_Res]) + "px";
-	fsSched = (26*Yfactor[Set_Res]) + "px";
-	fsRec = (35*Yfactor[Set_Res]) + "px";
-	fsReclist = (19*Yfactor[Set_Res]) + "px";
-	fsMedia = (27*Yfactor[Set_Res]) + "px";
-	fsKeys = (19*Yfactor[Set_Res]) + "px";
+	fsList = (18*Yfactor[Set_Res]) + "px"; //1080 = 34, 720 = 23, 576 = 18
+	fsSchedList = (18*Yfactor[Set_Res]) + "px"; //1080 = 34, 720 = 23, 576 = 18
+	fsSched = (26*Yfactor[Set_Res]) + "px"; //1080 = 49, 720 = 33, 576 = 26
 }
 
 
-- 
cgit v1.2.3