diff options
author | M. Voerman <rekordc@gmail.com> | 2013-01-08 12:13:59 +0100 |
---|---|---|
committer | M. Voerman <rekordc@gmail.com> | 2013-01-08 12:13:59 +0100 |
commit | ff09fbf4cf5d054a06cb0f3686f72b97a4a53577 (patch) | |
tree | 4248e18caee5ba9fe8777176bc79f4b518dbda41 /index.html | |
parent | f708d547081388fbd897675792c5400c37506ae6 (diff) | |
download | vdr-vipclient-ff09fbf4cf5d054a06cb0f3686f72b97a4a53577.tar.gz vdr-vipclient-ff09fbf4cf5d054a06cb0f3686f72b97a4a53577.tar.bz2 |
Small changes.
Diffstat (limited to 'index.html')
-rw-r--r-- | index.html | 81 |
1 files changed, 46 insertions, 35 deletions
@@ -1,11 +1,10 @@ <html> <head> <script type="text/javascript" src="settings.js" /> - <script type="text/javascript" src="settings2.js" /> <script type="text/javascript" src="channels.js" /> - <script type="text/javascript" src="channels-rd.js" /> - <script type="text/javascript" src="channels-mc.js" /> - <script type="text/javascript" src="channels-prt.js" /> + <script type="text/javascript" src="channels5.js" /> + <script type="text/javascript" src="channels6.js" /> + <script type="text/javascript" src="channels9.js" /> <script type="text/javascript" src="recordings.js" /> </head> <script language="Javascript"> @@ -138,8 +137,9 @@ function play(uri) { mediaPlayer.close(); } - if (ChanGroup == 5) { - uri = "239.255.0." + (currChan - baseChn[5]).toString() + ":11111"; + if (ServerAdres[ChanGroup] == "MultiCast" ) { + SI=channels[currChan].split("-"); + uri = "239.255." + SI[4] + ":11111"; } else { uri = ServerAdres + uri; } @@ -341,12 +341,12 @@ function onKeyDown(event) { do { ChanGroup = ChanGroup - 1; + if (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1) { + ChanGroup = ChanGroup - 1; + } if (ChanGroup < 0) { ChanGroup = 9; } - if (ChanGroup == 6 && ShowProtectedChannels == 1) { - ChanGroup = ChanGroup + 1; - } } while (!minChan[ChanGroup]); currChan = defChan[ChanGroup]; @@ -373,12 +373,12 @@ function onKeyDown(event) { do { ChanGroup = ChanGroup + 1; + if (protChn[ChanGroup] == 1 && ShowProtectedChannels == 1) { + ChanGroup = ChanGroup + 1; + } if (ChanGroup > 9) { ChanGroup = 0; } - if (ChanGroup == 6 && ShowProtectedChannels == 1) { - ChanGroup = ChanGroup + 1; - } } while (!minChan[ChanGroup]); currChan = defChan[ChanGroup]; @@ -464,13 +464,17 @@ function onKeyDown(event) { if(!epgactive) { if(!isSchedule) { schedule.style.opacity = 1; + schedule.style.width = "50%"; schedule.style.height = "75%"; + schedule.style.left = "25%"; GetSchedule(currChan,15); isSchedule = 1; } else { isSchedule = 0; schedule.style.opacity = 0; schedule.style.height = "48%"; + schedule.style.width = "100%"; + schedule.style.left = "5%"; } } } else { @@ -1160,17 +1164,17 @@ function GetSchedule(schchan,tablelength){ tm = "0"+tm; } - txt = txt + "<td style='font-size:" + fsSchedList + ";'>\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + " (" + (events.infoSequence[i].duration/60).toFixed(0) + ") " + events.infoSequence[i].name + "</td></tr>"; + txt = txt + "<td style='font-size:" + fsSchedList + ";'>\uE003\uE003\uE003\uE003\uE003" + th + ":" + tm + " (" + (events.infoSequence[i].duration/60).toFixed(0) + ") " + Left(events.infoSequence[i].name,30) + "</td></tr>"; } txt = txt + "</table>"; schedule.innerHTML = "<p style='color:white;font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + txt + "</p>"; } else { - schedule.innerHTML = "<p style='font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p>"; + schedule.innerHTML = "<p style='color:white;font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p>"; } } catch(e) { alert("Get EPG problem: " + e); - schedule.innerHTML = "<p style='font-size:" + fsSched + ";'>" + channelsnames[schchan] + "</p><p> NO EPG </p>"; + schedule.innerHTML = "<p style='color:white;font-size:" + fsSched + ";'>" + "\uE003" + schchan + "\uE003" + channelsnames[schchan] + "</p><p> NO EPG </p>"; } } @@ -1485,7 +1489,15 @@ function onKeyMenu(keyCode) { } else if (menu == 1) { ShowSubs = 1 - ShowSubs; videoplane.subtitles = Boolean(ShowSubs); // Enable subtitles or Disable subtitles + } else if (menu == 2) { + clearTimeout(switchtimerID); + switchtimerID = 0; + osdtimer.innerHTML = ""; + switchicon = "\uE003"; + osdca.innerHTML = CAicon + switchicon; + SetLed(0,0,0); } + InitMenu(menu); break; case KEY_2: @@ -1507,7 +1519,9 @@ function onKeyMenu(keyCode) { InitMenu(menu); break; case KEY_3: - if (menu == 1) { + if (menu == 0) { + menu = 2; + } else if (menu == 1) { is = toi.informationService; if(subsmode == 0 ) { is.setObject("cfg.media.subtitling.modepriority","Teletext,DVB",is.STORAGE_VOLATILE); @@ -1516,15 +1530,7 @@ function onKeyMenu(keyCode) { is.setObject("cfg.media.subtitling.modepriority","DVB,Teletext",is.STORAGE_VOLATILE); subsmode = 0; } - } - if (menu == 0) { - clearTimeout(switchtimerID); - switchtimerID = 0; - osdtimer.innerHTML = ""; - switchicon = "\uE003"; - osdca.innerHTML = CAicon + switchicon; - SetLed(0,0,0); - } + } InitMenu(menu); break; case KEY_4: @@ -1575,12 +1581,17 @@ function InitMenu(menu) { if(menu == 0) { // Main Menu - mainmenu.innerHTML = "<pre><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></pre><pre style='color:black;font-size:" + fsMenu + ";'> 1 - SettingsMenu \n 2 - Recordings \n 3 - Switch timer : " + Boolean(switchtimerID) + "\n 4 -\n 5 -\n 6 -\n 7 -\n 8 -\n 9 -\n 0 - Restart Portal </pre>"; + mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></h1><pre style='color:black;font-size:" + fsMenu + ";'> 1 - SettingsMenu \n 2 - Recordings \n 3 - TimersMenu\n 4 -\n 5 -\n 6 -\n 7 -\n 8 -\n 9 -\n 0 - Restart Portal </pre>"; } if(menu == 1) { // settings menu - mainmenu.innerHTML = "<pre><center style='font-size:" + fsMenuMain + ";color:white;'> Settings </center></pre><pre style='color:black;font-size:" + fsMenu + ";'><font style='color:red;font-size:" + fsMenu + ";'> Frontdisplay Clock : " + Boolean(showClock) + "</font><font style='color:green;font-size:" + fsMenu + ";'>\n Prio audio track : " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "</font><font style='color:blue;font-size:" + fsMenu + ";'>\n Preview guide : " + Boolean(SwitchGuide) + "</font>\n 1 - Show Subs : " + Boolean(ShowSubs) + "\n 2 - Subs Type Prio : " + (toi.informationService.getObject("cfg.media.subtitling.typepriority")) + "\n 3 - Subs Mode Prio : " + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n 4 - Audio Type Prio : " + (toi.informationService.getObject("cfg.media.audio.typepriority")) + "\n 5 - Protection : " + Boolean(ShowProtectedChannels) + "\n\n\n\n 0 - MainMenu </pre>"; + mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Settings </center></h1><pre style='color:black;font-size:" + fsMenu + ";'><font style='color:red;font-size:" + fsMenu + ";'> Frontdisplay Clock : " + Boolean(showClock) + "</font><font style='color:green;font-size:" + fsMenu + ";'>\n Prio audio track : " + (toi.informationService.getObject("cfg.media.audio.languagepriority")) + "</font><font style='color:blue;font-size:" + fsMenu + ";'>\n Preview guide : " + Boolean(SwitchGuide) + "</font>\n 1 - Show Subs : " + Boolean(ShowSubs) + "\n 2 - Subs Type Prio : " + (toi.informationService.getObject("cfg.media.subtitling.typepriority")) + "\n 3 - Subs Mode Prio : " + (toi.informationService.getObject("cfg.media.subtitling.modepriority")) + "\n 4 - Audio Type Prio : " + (toi.informationService.getObject("cfg.media.audio.typepriority")) + "\n 5 - Protection : " + Boolean(ShowProtectedChannels) + "\n\n\n\n 0 - MainMenu </pre>"; +} + +if(menu == 2) { +// Timers menu + mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n 1 - Switch timer : " + Boolean(switchtimerID) + "" + "\n\n\n\n 0 - MainMenu </pre>"; } @@ -1862,27 +1873,27 @@ function ShowMediaOSD() { <videoplane id='videoplane' style='position:absolute; left:0px; top:0px; height: 100%; width: 100%; z-index:500;'></videoplane> - <div id="osdvolume" style="width:63%; position:absolute; left:21%; top:87%;z-index:501;fontFamily:VDRSymbolsSans;opacity:0;">Volume : </div> + <div id="osdvolume" style="width:63%; position:absolute; left:10%; top:80%;z-index:501;fontFamily:VDRSymbolsSans;opacity:0;">Volume : </div> <div id="osdmedia" style="width:63%; position:absolute; left:21%; top:69%;z-index:505;fontFamily:VDRSymbolsSans;opacity:0;"></div> - <div id="osdmain" style="background:#3366ff;width:76%; position:absolute; left:10%; top:60%; bottom:9%;z-index:505;"></div> + <div id="osdmain" style="background:#3366ff;width:76%; position:absolute; left:10%; top:60%; bottom:9%;z-index:505;-webkit-border-radius:25px;"></div> <div id="osdtime" style="width:42%; position:absolute; left:52%; top:63%;z-index:505;"></div> <div id="osdname" style="width:69%;height:4%; position:absolute; left:12%; top:65%;z-index:505;"></div> <div id="osdepg" style="width:63%; position:absolute; left:21%; top:69%;z-index:505;"></div> <div id="osdtimer" style="width:7%; position:absolute; left:12%; top:69%;z-index:505;"></div> <div id="osdca" style="width:3%; position:absolute; left:80%; top:67%;z-index:505;fontFamily:VDRSymbolsSans;"></div> - <div id="osdnr" style="background:red;width:10%;height:9%; position:absolute; left:12%; top:56%;z-index:505;opacity:0;"></div> + <div id="osdnr" style="background:red;width:10%;height:9%; position:absolute; left:12%; top:56%;z-index:505;opacity:0;-webkit-border-radius:25px;"></div> - <div id="osdepginfo" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;"></div> - <div id="osdepginfonext" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;"></div> - <div id="schedule" style="background:#3366ff; width:100%; height:48%; position:absolute; left:7%; top:4%;opacity:0;z-index:510;"></div> + <div id="osdepginfo" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;-webkit-border-radius:25px;"></div> + <div id="osdepginfonext" style="background:#3366ff;width:80%; position:absolute; left:10%; top:10%;z-index:510;opacity:0;-webkit-border-radius:25px;"></div> + <div id="schedule" style="background:#3366ff; width:50%; height:48%; position:absolute; left:25%; top:4%;opacity:0;z-index:510;-webkit-border-radius:25px;"></div> <div id="osdmute" style="width:7%; position:absolute; left:76%; top:9%;z-index:515;opacity:0;"><img src="mute.png"></div> <div id="osdlang" style="width:7%; position:absolute; left:76%; top:9%;z-index:515;opacity:0;"></div> - <div id="mainmenu" style="background:#3366ff;width:76%; position:absolute; left:10%; top:9%; bottom:9%;z-index:520;opacity:0;"></div> - <div id="mediaList" style="background:#bbb; width:80%; height:75%; position:absolute; left:10%; top:10%;z-index:520;opacity:0;"></div> + <div id="mainmenu" style="background:#3366ff;width:76%; position:absolute; left:10%; top:9%; bottom:9%;z-index:520;opacity:0;-webkit-border-radius:25px;"></div> + <div id="mediaList" style="background:#bbb; width:80%; height:75%; position:absolute; left:10%; top:10%;z-index:520;opacity:0;-webkit-border-radius:25px;"></div> </body> </html> |