From a189caa11f906365f0a65dc58123551282e82069 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Thu, 13 Nov 2014 14:56:37 +0100 Subject: More css work --- blue.css | 4 +- main.js | 150 +++++++++++------------------------------------------------ settings2.js | 95 +++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 125 deletions(-) diff --git a/blue.css b/blue.css index 4f93b70..7a173f1 100644 --- a/blue.css +++ b/blue.css @@ -91,7 +91,7 @@ text-align: center; } - pre.mmenu { + pre.mainmenu { font-size:49px; color:black; } @@ -231,7 +231,7 @@ top : 80%; opacity : 0; color : green; - font-size:36px; + font-size:66px; } div#osdmedia { diff --git a/main.js b/main.js index d050798..49e5ee3 100644 --- a/main.js +++ b/main.js @@ -1368,7 +1368,7 @@ function showVolume() { if (osdVolumetimeout) { clearTimeout(osdVolumetimeout); } - osdvolume.innerHTML = Lang[1] + " : " + Volume + "% \uE007" + (new Array(Volume)).join("\uE008") + (new Array(100 - Volume)).join("\uE009") + "\uE00A"; + osdvolume.innerHTML = Lang[1] + " : " + Volume + "% \n\uE007" + (new Array(Volume)).join("\uE008") + (new Array(100 - Volume)).join("\uE009") + "\uE00A"; osdvolume.style.opacity = 1; osdVolumetimeout = setTimeout("osdvolume.style.opacity = 0;", ShowOsdTime); } @@ -1438,7 +1438,7 @@ function updateOSDtime(timchan) { function settimer(ProgTime,ProgName,ProgDura,SwitchTimer,BackGroundColor,ProgDesc,ProgEvID) { -if (!BackGroundColor) { BackGroundColor = DefaultBGColor;} +if (!BackGroundColor) { BackGroundColor = color_default;} // 1 - switchonly, 2 - record on server (display info only), 3 - record local if(SwitchTimer == 1) { try { @@ -1789,56 +1789,6 @@ function Nibbles() { } -function GetSchedule(schchan,tablelength){ - //Old style Schedule, used in Guide View. - SI = ""; - try { - StreamInfo(schchan); - - eitService = toi.statics.ToiDvbEitCacheServiceItem.create(SI[1],SI[2],SI[3]); - eitCache.addService(eitService); - event = eitCache.getPresentEvent(eitService); - events = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000); - - if (event.name) { - if (events.more) { - var t = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000); - events.infoSequence.concat(t.infoSequence); - events.more = t.more; - } - - var txt = ""; - var i = 0; - for (i = 0; i < events.infoSequence.length && i < tablelength; i++) { - - while ((i > 0) && (events.infoSequence[i].eventId == events.infoSequence[(i-1)].eventId)) { - i = i + 1; - } - - tijd = events.infoSequence[i].time; - date = new Date(tijd*1000); - tijd = date.toUTCString(); - tijd = new Date(tijd); - var tm = tijd.getMinutes(); - var th = tijd.getHours(); - th=addzero(th); - tm=addzero(tm); - - txt = txt + ""; - } - txt = txt + "
\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + " (" + (events.infoSequence[i].duration/60).toFixed(0) + ") " + Left(events.infoSequence[i].name,30) + "
"; - schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + txt + "

"; - } else { - schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "

"; - } - - } catch(e) { - alert("Get EPG problem: " + e); - schedule.innerHTML = "

" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "

" + Lang[6] + "

"; - } - -} - function StreamInfo(si) { // EPG Filter @@ -2085,52 +2035,6 @@ function StreamInfo(si) { // End of EPG section - -// Channelslist / EPG Guide -// -// show currchan - 5 -// highlite currchan -// show currchan + 5 -// -// check if chan is OK -// -function showChannelList() { - var liststyle = ""; - var htmlstring = ""; - listChan = currChan-5; - for(var i=currChan-5; i<=currChan+5; i++) { - do - { - listChan += 1; - if (listChanmaxChan[ChanGroup]) { - listChan=minChan[ChanGroup]; - } - } - - while (!channels[listChan] && (listChan\uE003\uE003" + listChan + "\uE003"; - } - htmlstring = htmlstring + "
" + Left(channelsnames[listChan],15) + "\uE003" + Left(EpgInfo[NowNext],64) + "
"; - channellist.innerHTML = htmlstring; - chanlistepg.innerHTML = "

" + EPG[NowNext][1][currChan] + "

" + Left(EPG[NowNext][4][currChan],250) + "

" ; - -} - - -// END of Channelslist / EPG Guide - // TeleTXT section function embedTeletextPlugin() { @@ -2382,7 +2286,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) { @@ -2613,7 +2517,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); @@ -2689,7 +2593,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); @@ -2786,7 +2690,7 @@ 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]; 
@@ -2820,12 +2724,12 @@ if(menu == 0) { // Main Menu
 
 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 + ") "; }
@@ -2884,15 +2788,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");
@@ -2927,9 +2831,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] + "
";
 	 }
 	}
 }
@@ -2945,13 +2849,13 @@ 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] + "
";
 
 	}
 }
 
 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]) { } else { htmltext += ""; }
 		htmltext += "\uE003" + i + "\uE003-\uE003";
@@ -2964,7 +2868,7 @@ if(menu == 8) { // ChannelGroups enable/disable
 	}
 
 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 ";
@@ -3007,7 +2911,7 @@ if(menu == 9) { // INFO2 Menu
 
 if(menu == 10) { // Favorite edit Menu
 	var htmltext = "
" + Lang[83]
-	htmltext += "
\n"
+	htmltext += "
\n"
 	htmltext += "";
 	var x = timerID;
 	for (var i=0;i<10;i++) {
@@ -3146,7 +3050,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 + "
";
   }
 }
 
@@ -3305,7 +3209,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 + "
";
   }
 }
 
@@ -3384,9 +3288,9 @@ if (MPDListener == 0) {
 			alert("Media player state changed: state=" + ev.state + ", reason=" + ev.reason + ", code=" + ev.code);
 			showDisplay("ERRR", false, 100, 0 ); 
 			if (experimental) {
-				settimer(0,ev.reason,0,2,ErrorColor);
+				settimer(0,ev.reason,0,2,color_error);
 			} else {
-				settimer(0,Lang[67],0,2,ErrorColor);
+				settimer(0,Lang[67],0,2,color_error);
 			}
 		}
 	}
@@ -3394,16 +3298,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 + "
";
 	}
 }
 
@@ -4848,7 +4752,7 @@ function ServerRecordStart() {
 
 	  } catch(e) {
 	    alert("Sending Timers to server problem: " + e);
-	    settimer(0,Lang[55],0,2,ErrorColor);
+	    settimer(0,Lang[55],0,2,color_error);
 	  }
 
 }
@@ -4866,7 +4770,7 @@ function ServerRecord() {
 	setTimeout("xmlhttp.open('POST',(server_ip + RestFulAPI + '/remote/Record'),false);xmlhttp.send();",5000);
   } catch(e) {
    alert("Sending key to server problem: " + e);
-   settimer(0,Lang[55],0,2,ErrorColor);
+   settimer(0,Lang[55],0,2,color_error);
   }
 
 //end of function
diff --git a/settings2.js b/settings2.js
index c53c7b7..513582e 100644
--- a/settings2.js
+++ b/settings2.js
@@ -17,4 +17,99 @@ function setOSDscale() {
 	fsSched = (26*Yfactor[Set_Res]) + "px"; //1080 = 49, 720 = 33, 576 = 26
 }
 
+function GetSchedule(schchan,tablelength){
+	//Old style Schedule, used in Guide View.
+	SI = "";
+  try {
+	 StreamInfo(schchan);
+
+	 eitService = toi.statics.ToiDvbEitCacheServiceItem.create(SI[1],SI[2],SI[3]);
+	 eitCache.addService(eitService);
+	 event = eitCache.getPresentEvent(eitService);
+	 events = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000);
+
+	if (event.name)	{
+	    if (events.more) {
+	      var t = eitCache.getEvents(eitService, (Math.round(new Date().getTime()/1000.0)), 2000000000);
+	      events.infoSequence.concat(t.infoSequence);
+	      events.more = t.more;
+	    }
+
+	    var txt = "";
+	    var i = 0;
+	    for (i = 0; i < events.infoSequence.length && i < tablelength; i++) {
+
+		while ((i > 0) && (events.infoSequence[i].eventId == events.infoSequence[(i-1)].eventId)) {
+			i = i + 1;
+		}
+
+		tijd = events.infoSequence[i].time;
+		date = new Date(tijd*1000); 
+		tijd = date.toUTCString();
+		tijd = new Date(tijd);
+		var tm = tijd.getMinutes();
+		var th = tijd.getHours();
+		th=addzero(th);
+		tm=addzero(tm);
+
+	      txt = txt + "";
+	    }
+	   txt = txt + "
\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + "     (" + (events.infoSequence[i].duration/60).toFixed(0) + ")  " + Left(events.infoSequence[i].name,30) + "
";
+	   schedule.innerHTML = "
" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + txt + "
";
+	} else {
+	  schedule.innerHTML = "
" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "
";
+	}
+
+  } catch(e) {
+    alert("Get EPG problem: " + e);
+    schedule.innerHTML = "
" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "
" + Lang[6] + "
";
+  }
+
+}
+
+
+// Channelslist / EPG Guide
+//
+// show currchan - 5
+// highlite currchan
+// show currchan + 5
+// 
+// check if chan is OK
+// 
+function showChannelList() {
+	var liststyle = "";
+	var htmlstring = "";
+	listChan = currChan-5;
+	for(var i=currChan-5; i<=currChan+5; i++) {
+		do
+			{
+				listChan += 1;
+				if (listChanmaxChan[ChanGroup]) {
+					listChan=minChan[ChanGroup];
+				}
+			}
+
+		while (!channels[listChan] && (listChan\uE003\uE003" + listChan + "\uE003";
+	}
+	htmlstring = htmlstring + "
" + Left(channelsnames[listChan],15) + "\uE003"  + Left(EpgInfo[NowNext],64) + "
";
+	channellist.innerHTML = htmlstring;
+        chanlistepg.innerHTML = "
" + EPG[NowNext][1][currChan] + "
" + Left(EPG[NowNext][4][currChan],250) + "
" ;
+
+}
+
+
+// END of Channelslist / EPG Guide
 
-- 
cgit v1.2.3