summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.php14
-rw-r--r--js/istreamdev.js14
2 files changed, 12 insertions, 16 deletions
diff --git a/index.php b/index.php
index 25a5c6e..9873891 100644
--- a/index.php
+++ b/index.php
@@ -237,23 +237,13 @@ include ('bin/auth.php');
</form>
</div>
- <div id="now">
+ <div id="epglist">
<div class="toolbar">
<a href="#" class="back">Back</a>
<a href="#home" id="home_but" class="button">Home</a>
<h1>WHAT'S NOW</h1>
</div>
- <ul class="edgetoedge">
- <li class="sep">TF1</li>
- <li><a href="#"><span class="epgtime">14h00-14h45</span><span class="epgname">Attention à la marche</span></a></li>
- <li><a href="#"><span class="epgtime">14h45-15h20</span><span class="epgname">Tournez manège</span></a></li>
- <li><a href="#"><span class="epgtime">See more...</span></a></li>
- </ul>
- <ul class="edgetoedge">
- <li class="sep">FRANCE 2</li>
- <li><a href="#"><span class="epgtime">13h55-14h20</span><span class="epgname">Bulletin Météo</span></a></li>
- <li><a href="#"><span class="epgtime">14h25-15h30</span><span class="epgname">Envoyé Spécial</span></a></li>
- <li><a href="#"><span class="epgtime">See more...</span></a></li>
+ <ul class="edgetoedge" id="ul_epglist">
</ul>
</div>
</div>
diff --git a/js/istreamdev.js b/js/istreamdev.js
index 3cd0c50..3b6b6fc 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -1024,13 +1024,19 @@ var dayname = new Array( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" );
}
function get_epg(channel,time,day,programs) {
+$('#epglist #ul_epglist').html('');
var dataString = 'action=getEpg&channel=' + channel + '&time=' + time + '&day=' + day + '&programs=' + programs;
- $.getJSON("bin/backend.php",
- dataString,
- function(data) {
+ $.getJSON("bin/backend.php",
+ dataString,
+ function(data) {
$.each(data.channel, function(i,channel){
- //TODO
+ $('#epglist #ul_epglist').append('<li class="sep">' + channel.name + '</li>');
+ $.each(channel.epg, function(j,epg){
+ $('#epglist #ul_epglist').append('<li><a href="#"><span class="epgtime">' + epg.time + '</span><span class="epgname">' + epg.title + '</span></a></li>');
+ });
});
+ json_complete('#epglist','cube');
+ });
}
// [/EPG SECTION]