Skip to content

Commit

Permalink
add "open as new window" feature for TV EPG
Browse files Browse the repository at this point in the history 
minimize js
minimize css
  • Loading branch information
@jbleyel
jbleyel committed Oct 27, 2012
1 parent 1e04584 commit 697c3fb
Show file tree
Hide file tree
Showing 6 changed files with 807 additions and 696 deletions.
96 changes: 48 additions & 48 deletions plugin/controllers/views/ajax/current.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
<!-- OSD -->
<div style="width:100%;height:137px;background-image:url(/images/osd/osd_back.png);"></div>
<div style="position:absolute;top:225px;left:220px;color:#FFF;font-size:13px;font-weight:bold;">$info.date</div>
<div style="position:absolute;top:254px;left:212px"><img border='0' width="100px" height="60px" src='$getVar("info.picon", "/images/default_picon.png")' onclick="open_epg_pop('$info.ref');" href="#" title="Show EPG for $info.name" border="0" alt='' /></div>
<div style="position:absolute;top:220px;left:300px;color:#FFF;width:500px;text-align:center;font-size:18px;"><a style="color:#FFF" target="_blank" title="Stream $getVar('now.title', '') from $info.name" href='/web/stream.m3u?ref=$info.ref&name=$info.name'>$info.name</a></div>
<div style="position:absolute;top:248px;left:330px;color:#FFF;font-size:14px;">$getVar("now.begin", " ")</div>
<div style="position:absolute;top:248px;left:380px;color:#FFF;font-size:14px;">$getVar("now.title", " ")</div>
<div style="position:absolute;top:248px;left:780px;color:#FFF;font-size:14px;">+$getVar("now.tleft", " ") min</div>
<div style="position:absolute;top:265px;left:380px;"><img border='0' height='14px' src='/images/osd/chan_bar_back.png' alt='' /></div>
<div style="position:absolute;top:265px;left:380px;"><img border='0' height='14px' width='${getVar("now.progress", "0")}px' src='/images/osd/chan_bar.png' alt='' /></div>
<div style="position:absolute;top:276px;left:330px;color:#FFF;font-size:14px;">$getVar("next.begin", " ")</div>
<div style="position:absolute;top:276px;left:380px;color:#FFF;font-size:14px;">$getVar("next.title", " ")</div>
<div style="position:absolute;top:276px;left:780px;color:#FFF;font-size:14px;">&nbsp; $getVar("next.duration", " ") min</div>
<div style="position:absolute;top:299px;left:330px;color:#FFF;font-size:14px;">$getVar("info.tunertype", " ")</div>
<div style="position:absolute;top:298px;left:500px;color:#FFF">Snr: $getVar("info.snr", "0") % <img border='0' height='14px' src='/images/osd/snr_bar_back.png' alt='' /> Ber: $getVar("info.ber", "N/A") </div>
<div style="position:absolute;top:298px;left:572px;"><img border='0' height='14px' width='${getVar("info.snr", "0")}px' src='/images/osd/chan_bar.png' alt='' /></div>
<div style="position:absolute;top:320px;left:190px;color:#FFF;width:140px;text-align:center;font-size:13px;font-weight:bold;">$info.provider</div>
<div style="position:absolute;top:320px;left:330px;color:#FFF;font-size:14px;"> $info.width x $info.height </div>
<div class="OSD" style="width:100%;height:137px;background-image:url(/images/osd/osd_back.png);background-repeat: no-repeat;">
<div style="top:16px;left:28px;color:#FFF;font-size:13px;font-weight:bold;">$info.date</div>
<div style="top:29px;left:20px"><img border='0' width="100px" height="60px" src='$getVar("info.picon", "/images/default_picon.png")' onclick="open_epg_pop('$info.ref');" href="#" title="Show EPG for $info.name" border="0" alt='' /></div>
<div style="top:-65px;color:#FFF;width:500px;text-align:center;font-size:18px;"><a style="color:#FFF" target="_blank" title="Stream $getVar('now.title', '') from $info.name" href='/web/stream.m3u?ref=$info.ref&name=$info.name'>$info.name</a></div>
<div style="top:-59px;left:138px;color:#FFF;font-size:14px;">$getVar("now.begin", " ")</div>
<div style="top:-76px;left:188px;color:#FFF;font-size:14px;">$getVar("now.title", " ")</div>
<div style="top:-95px;left:585px;color:#FFF;font-size:14px;">+$getVar("now.tleft", " ") min</div>
<div style="top:-93px;left:188px;"><img border='0' height='14px' src='/images/osd/chan_bar_back.png' alt='' /></div>
<div style="top:-107px;left:188px;"><img border='0' height='14px' width='${getVar("now.progress", "0")}px' src='/images/osd/chan_bar.png' alt='' /></div>
<div style="top:-110px;left:138px;color:#FFF;font-size:14px;">$getVar("next.begin", " ")</div>
<div style="top:-127px;left:188px;color:#FFF;font-size:14px;">$getVar("next.title", " ")</div>
<div style="top:-145px;left:580px;color:#FFF;font-size:14px;">&nbsp; $getVar("next.duration", " ") min</div>
<div style="top:-138px;left:138px;color:#FFF;font-size:14px;">$getVar("info.tunertype", " ")</div>
<div style="top:-155px;left:300px;color:#FFF">Snr: $getVar("info.snr", "0") % <img border='0' height='14px' src='/images/osd/snr_bar_back.png' alt='' /> Ber: $getVar("info.ber", "N/A") </div>
<div style="top:-172px;left:372px;"><img border='0' height='14px' width='${getVar("info.snr", "0")}px' src='/images/osd/chan_bar.png' alt='' /></div>
<div id="currentprovider" style="top:-166px;color:#FFF;width:140px;text-align:center;font-size:13px;font-weight:bold;">$info.provider</div>
<div style="top:-180px;left:138px;color:#FFF;font-size:14px;"> $info.width x $info.height </div>
#if $info.tunernumber == 0
<div style="position:absolute;top:319px;left:431px"><img border='0' src='/images/osd/icon_a.png' alt='' /></div>
<div style="position:absolute;top:319px;left:451px"><img border='0' src='/images/osd/icon_b_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:472px"><img border='0' src='/images/osd/icon_c_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:493px"><img border='0' src='/images/osd/icon_d_off.png' alt='' /></div>
<div style="top:-200px;left:231px"><img border='0' src='/images/osd/icon_a.png' alt='' /></div>
<div style="top:-226px;left:251px"><img border='0' src='/images/osd/icon_b_off.png' alt='' /></div>
<div style="top:-252px;left:272px"><img border='0' src='/images/osd/icon_c_off.png' alt='' /></div>
<div style="top:-278px;left:293px"><img border='0' src='/images/osd/icon_d_off.png' alt='' /></div>
#else if $info.tunernumber == 1
<div style="position:absolute;top:319px;left:431px"><img border='0' src='/images/osd/icon_a_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:451px"><img border='0' src='/images/osd/icon_b.png' alt='' /></div>
<div style="position:absolute;top:319px;left:472px"><img border='0' src='/images/osd/icon_c_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:493px"><img border='0' src='/images/osd/icon_d_off.png' alt='' /></div>
<div style="top:-200px;left:231px"><img border='0' src='/images/osd/icon_a_off.png' alt='' /></div>
<div style="top:-226px;left:251px"><img border='0' src='/images/osd/icon_b.png' alt='' /></div>
<div style="top:-252px;left:272px"><img border='0' src='/images/osd/icon_c_off.png' alt='' /></div>
<div style="top:-278px;left:293px"><img border='0' src='/images/osd/icon_d_off.png' alt='' /></div>
#else if $info.tunernumber == 2
<div style="position:absolute;top:319px;left:431px"><img border='0' src='/images/osd/icon_a_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:451px"><img border='0' src='/images/osd/icon_b_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:472px"><img border='0' src='/images/osd/icon_c.png' alt='' /></div>
<div style="position:absolute;top:319px;left:493px"><img border='0' src='/images/osd/icon_d_off.png' alt='' /></div>
<div style="top:-200px;left:231px"><img border='0' src='/images/osd/icon_a_off.png' alt='' /></div>
<div style="top:-226px;left:251px"><img border='0' src='/images/osd/icon_b_off.png' alt='' /></div>
<div style="top:-252px;left:272px"><img border='0' src='/images/osd/icon_c.png' alt='' /></div>
<div style="top:-278px;left:293px"><img border='0' src='/images/osd/icon_d_off.png' alt='' /></div>
#else if $info.tunernumber == 3
<div style="position:absolute;top:319px;left:431px"><img border='0' src='/images/osd/icon_a_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:451px"><img border='0' src='/images/osd/icon_b_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:472px"><img border='0' src='/images/osd/icon_c_off.png' alt='' /></div>
<div style="position:absolute;top:319px;left:493px"><img border='0' src='/images/osd/icon_d.png' alt='' /></div>
<div style="top:-200px;left:231px"><img border='0' src='/images/osd/icon_a_off.png' alt='' /></div>
<div style="top:-226px;left:251px"><img border='0' src='/images/osd/icon_b_off.png' alt='' /></div>
<div style="top:-252px;left:272px"><img border='0' src='/images/osd/icon_c_off.png' alt='' /></div>
<div style="top:-278px;left:293px"><img border='0' src='/images/osd/icon_d.png' alt='' /></div>
#end if
#if $info.crypt == 1
<div style="position:absolute;top:317px;left:515px"><img border='0' src='/images/osd/icon_crypt.png' alt='' /></div>
<div style="top:-305px;left:315px"><img border='0' src='/images/osd/icon_crypt.png' alt='' /></div>
#else
<div style="position:absolute;top:317px;left:515px"><img border='0' src='/images/osd/icon_crypt_off.png' alt='' /></div>
<div style="top:-305px;left:315px"><img border='0' src='/images/osd/icon_crypt_off.png' alt='' /></div>
#end if
#if $info.dolby == True
<div style="position:absolute;top:317px;left:561px"><img border='0' src='/images/osd/icon_dolby.png' alt='' /></div>
<div style="top:-331px;left:361px"><img border='0' src='/images/osd/icon_dolby.png' alt='' /></div>
#else
<div style="position:absolute;top:317px;left:561px"><img border='0' src='/images/osd/icon_dolby_off.png' alt='' /></div>
<div style="top:-331px;left:361px"><img border='0' src='/images/osd/icon_dolby_off.png' alt='' /></div>
#end if
#if $info.wide == True
<div style="position:absolute;top:317px;left:627px"><img border='0' src='/images/osd/icon_format.png' alt='' /></div>
<div style="top:-357px;left:427px"><img border='0' src='/images/osd/icon_format.png' alt='' /></div>
#else
<div style="position:absolute;top:317px;left:627px"><img border='0' src='/images/osd/icon_format_off.png' alt='' /></div>
<div style="top:-357px;left:427px"><img border='0' src='/images/osd/icon_format_off.png' alt='' /></div>
#end if
#if $info.width > 1900
<div style="position:absolute;top:317px;left:673px"><img border='0' src='/images/osd/icon_hd.png' alt='' /></div>
<div style="top:-383px;left:473px"><img border='0' src='/images/osd/icon_hd.png' alt='' /></div>
#else
<div style="position:absolute;top:317px;left:673px"><img border='0' src='/images/osd/icon_sd.png' alt='' /></div>
<div style="top:-383px;left:473px"><img border='0' src='/images/osd/icon_sd.png' alt='' /></div>
#end if
#if $info.txtpid != "N/A"
<div style="position:absolute;top:317px;left:719px"><img border='0' src='/images/osd/icon_txt.png' alt='' /></div>
<div style="top:-409px;left:519px"><img border='0' src='/images/osd/icon_txt.png' alt='' /></div>
#else
<div style="position:absolute;top:317px;left:719px"><img border='0' src='/images/osd/icon_txt_off.png' alt='' /></div>
<div style="top:-409px;left:519px"><img border='0' src='/images/osd/icon_txt_off.png' alt='' /></div>
#end if
#if $info.subs == True
<div style="position:absolute;top:317px;left:765px"><img border='0' src='/images/osd/icon_sub.png' alt='' /></div>
<div style="top:-435px;left:565px"><img border='0' src='/images/osd/icon_sub.png' alt='' /></div>
#else
<div style="position:absolute;top:317px;left:765px"><img border='0' src='/images/osd/icon_sub_off.png' alt='' /></div>
<div style="top:-435px;left:565px"><img border='0' src='/images/osd/icon_sub_off.png' alt='' /></div>
#end if
#if $info.rec_state == True
<div style="position:absolute;top:317px;left:811px"><img border='0' src='/images/osd/icon_rec.png' alt='' /></div>
<div style="top:-461px;left:611px"><img border='0' src='/images/osd/icon_rec.png' alt='' /></div>
#else
<div style="position:absolute;top:317px;left:811px"><img border='0' src='/images/osd/icon_rec_off.png' alt='' /></div>
<div style="top:-461px;left:611px"><img border='0' src='/images/osd/icon_rec_off.png' alt='' /></div>
#end if
</div>
<!-- /END OSD -->


<br />
<table style="background: #1C478E;font-size:12px;" width="100%" border="0" cellspacing="1" cellpadding="5">
Expand Down
11 changes: 9 additions & 2 deletions plugin/controllers/views/main.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="/images/favicon.png">
<link rel="stylesheet" type="text/css" href="/css/style.css" />
<link rel="stylesheet" type="text/css" href="/css/style-min.css" />
<link type="text/css" href="/css/jquery-ui-1.8.18.custom.css" rel="stylesheet" />
<script type="text/javascript" src="/js/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/js/jquery-ui-1.8.18.custom.min.js"></script>
<script type="text/javascript" src="/js/openwebif.js"></script>
<script type="text/javascript" src="/js/openwebif-min.js"></script>
<script type="text/javascript">
var paramss = getParams();
if (paramss["open"] == 'ajax/tv') {
document.write('<style type="text/css">#header, #leftmenu, #osd, #osd_bottom, #footer {display:none;} #content { float:none; width:initial;} #content_main { width:initial;} #tvcontent { height:initial;width:initial;min-height:680px;} #tvcontentmain { height:initial;} #currentprovider { left:-382px;}</style>');
}
</script>

<title>Open Webif</title>
</head>
Expand Down Expand Up @@ -55,6 +61,7 @@
<ul>
<li><a href='#' onclick="load_maincontent('ajax/tv'); return false;">Television</a></li>
<li><a href='#' onclick="load_maincontent('ajax/radio'); return false;">Radio</a></li>
<li><a href='#' onclick="load_maincontent_newwindow('ajax/tv'); return false;">TV new Window</a></li>
</ul>
#end def

Expand Down
Loading

4 comments on commit 697c3fb

@happysat
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry this function is not available and the channel bouqets window is gone and the IF dont respond.

@jbleyel
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please tell me what browser and browser version do you use.

@happysat
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest Chrome version on a dreambox 800se with PLi 2.1 but i dont think its a chrome browser problem, see the PLi Board.

@jbleyel
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have checked the change again on firefox, ie, safari and crome for my 800se with merlin 3 and oe 2.0 and i have only a design bug but no errors. But i have removed the change for more time to find the bug.

Please sign in to comment.