diff options
| -rw-r--r-- | index.php | 10 | ||||
| -rw-r--r-- | js/istreamdev.js | 50 |
2 files changed, 39 insertions, 21 deletions
@@ -223,13 +223,17 @@ include ('bin/auth.php'); <a href="#" class="back">Home</a> <h1>EPG</h1> </div> + <ul class="rounded"> + <li class="arrow"><a href="#" rel="whatsnow"><span class="menuname">WHAT'S NOW</span></a></li> + </ul> <form name="epgform" id="epgform" action="#"> <ul class="rounded"> - <li><span class="timertitle">Select Channel:</span></li> + <li><span class="menuname" style="color:white">WHAT'S:</span></li> + <li><span class="timertitle">IN Channel:</span></li> <li><select id="epg_chan"><option value="all">All channels</option></select></li> - <li><span class="timertitle">Select Day:</span></li> + <li><span class="timertitle">ON Day:</span></li> <li><select id="epg_day"><option value="today">Today</option></select> - <li><span class="timertitle">Select Time:</span></li> + <li><span class="timertitle">AT Time:</span></li> <li class="arrow"><a href="javascript:openSelectTime('layer_epgtime')" class="abutton" id="a_starttime"><span id="layer_epgtime" class="menuname"></span></a></li> </ul> <input name="epg_time" type="hidden" id="epg_time" value="" /> diff --git a/js/istreamdev.js b/js/istreamdev.js index 80c51f0..ecac8b2 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -152,7 +152,7 @@ $('a[class="back"]').tap(function(event) { // show active sessions
$(document).ready(function(e){
getRunningSessions();
-preloadLogos();
+//preloadLogos();
});
//reinit RunningSessions when going to Home:
@@ -968,22 +968,28 @@ function showStatus( timeout, message ) { // [EPG SECTION]
//buttons
$('.submit_epg').tap(function(event) {
- event.preventDefault();
- channel = $('#epgform #epg_chan').val();
- time = $('#epgform #epg_time').val();
- day = $('#epgform select##epg_day').val();
- if ( channel == "all" ) {
- programs = 2;
- }
- else if ( time == "" ) {
- programs = "day";
- } else {
- programs = 20;
- }
- get_epg(channel,time,day,programs);
- $(this).removeClass('active');
- });
+event.preventDefault();
+json_start(this);
+channel = $('#epgform #epg_chan').val();
+time = $('#epgform #epg_time').val();
+day = $('#epgform select##epg_day').val();
+ if ( channel == "all" ) {
+ programs = 2;
+ }
+ else if ( time == "" ) {
+ programs = "day";
+ } else {
+ programs = 20;
+ }
+get_epg(channel,time,day,programs);
+$(this).removeClass('active');
+});
+$('#epg ul li a[rel="whatsnow"]').tap(function(event) {
+event.preventDefault();
+json_start(this);
+get_epg("all","now","0","2");
+});
//functions
@@ -1033,8 +1039,15 @@ var dataString = 'action=getEpg&channel=' + channel + '&time=' + time + '&day=' function(data) {
var k=1;
$.each(data.channel, function(i,channel){
+ if ( k > 10 ) {
+ togglestatus = 'toggle';
+ }
+ else
+ {
+ togglestatus = '';
+ }
k++;
- $('#epglist #ul_epglist').append('<li class="sep">' + channel.name + '</li>');
+ $('#epglist #ul_epglist').append('<li rel="' + togglestatus + '" class="sep">' + channel.name + '</li>');
$.each(channel.epg, function(j,epg){
if ( k > 10 ) {
togglestatus = 'toggle';
@@ -1043,11 +1056,12 @@ var dataString = 'action=getEpg&channel=' + channel + '&time=' + time + '&day=' {
togglestatus = '';
}
- $('#epglist #ul_epglist').append('<li rel="' + togglestatus + '><a href="#"><span class="epgtime">' + epg.time + '</span><span class="epgname">' + epg.title + '</span></a></li>');
+ $('#epglist #ul_epglist').append('<li rel="' + togglestatus + '"><a href="#"><span class="epgtime">' + epg.time + '</span><span class="epgname">' + epg.title + '</span></a></li>');
k++;
});
});
+ $('#epglist li[rel="toggle"]').hide();
json_complete('#epglist','cube');
});
}
|