From a1832052ff736a5957dd0215759c3cefad0af3f9 Mon Sep 17 00:00:00 2001 From: Alib Date: Wed, 24 Mar 2010 20:29:51 +0100 Subject: added epg menu form , not complete --- css/istreamdev.css | 8 ++++++-- css/theme.css | 12 ++++-------- index.php | 39 +++++++++++++++++++++------------------ js/istreamdev.js | 44 +++++++++++++++++++++++++++++++++++--------- 4 files changed, 66 insertions(+), 37 deletions(-) diff --git a/css/istreamdev.css b/css/istreamdev.css index 0304bbc..ffcbbf7 100644 --- a/css/istreamdev.css +++ b/css/istreamdev.css @@ -335,11 +335,15 @@ top: 12px; left: 5px; font-size: 14px; } + +.whitetitle { +color: #fff; +} ul.edgetoedge span.epgname { padding-top: 0px; padding-right: 10px; padding-left: 10px; -font-size: 17px; +font-size: 14px; font-weight: bold; display: block; color: white; @@ -349,7 +353,7 @@ ul.edgetoedge span.epgtime { padding-top: 0px; padding-right: 10px; padding-left: 10px; -font-size: 14px; +font-size: 12px; font-weight: bold; display: block; color: #ccc; diff --git a/css/theme.css b/css/theme.css index 659f2ac..7fe4575 100644 --- a/css/theme.css +++ b/css/theme.css @@ -431,19 +431,15 @@ div#jqt.landscape .toolbar > h1 { padding: 0; } #jqt ul.edgetoedge li { - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#1e1f21), to(#272729)); - border-bottom: 2px solid #000; - border-top: 1px solid #4a4b4d; - font-size: 20px; - margin-bottom: -1px; + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142)); + font-size: 14px; + margin-bottom: -3px; } #jqt ul.edgetoedge li.sep { background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0,0,0,0)), to(rgba(0,0,0,.5))); - border-bottom: 1px solid #111113; - border-top: 1px solid #666; color: #ff8300; font-size: 16px; - margin: 1px 0 0 0; + margin: 0px 0 0 0; padding: 2px 10px; text-shadow: #000 0 1px 0; } diff --git a/index.php b/index.php index 31b1186..a994049 100644 --- a/index.php +++ b/index.php @@ -11,13 +11,14 @@ include ('bin/auth.php'); iStreamdev - - + + +
- +
@@ -28,9 +29,9 @@ include ('bin/auth.php');
  • Checking running session
    • - - - + + +
    Home @@ -39,7 +40,7 @@ include ('bin/auth.php');
    - +
    Back @@ -49,9 +50,9 @@ include ('bin/auth.php');
    - - - + + +
    Back @@ -153,8 +154,8 @@ include ('bin/auth.php');
    - - + +
    @@ -216,18 +217,21 @@ include ('bin/auth.php');
    - - +
    Home

    EPG

    +
    @@ -249,7 +253,6 @@ include ('bin/auth.php');
  • See more...
    • -
    \ No newline at end of file diff --git a/js/istreamdev.js b/js/istreamdev.js index 16bc9dc..c745381 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -58,6 +58,7 @@ $.getJSON("bin/backend.php", audio_path = data.audio_path; if (streamdev_server != "" && streamdev_server != "null") { addVdr(); + gen_formchanlist(); } if ( video_path != "" && video_path != "null") { addVideofiles(); @@ -72,7 +73,7 @@ function addVdr() { vdrmenu += '
  • Watch TV
    • '; vdrmenu += '
  • Recordings
    • '; vdrmenu += '
  • Timers
    • '; - vdrmenu += '
  • Program Guide
    • \n'; + vdrmenu += '
  • Program Guide
    • \n'; $('#home #runningsessions').after(vdrmenu); } function addVideofiles() { @@ -215,6 +216,12 @@ $('#timers_but').tap(function(event) { return false; }); +$('#epg_but').tap(function(event) { + event.preventDefault(); + gen_epgmenu(); + return false; +}); + $('#video_but').tap(function(event) { event.preventDefault(); json_start(this); @@ -732,11 +739,6 @@ function addplayer(button) { // [/BROWSER SECTION] // [TIMER SECTION] -//get fullchannel list onload - -$(document).ready(function(e){ -gen_formchanlist(); -}); // buttons $('#timers li[class="arrow"] a').tap(function(event) { @@ -962,21 +964,45 @@ function showStatus( timeout, message ) { // [/TIMER SECTION] // [EPG SECTION] + +function gen_epgmenu() { + jQT.goTo('#epg','cube'); + gen_epgchanlist(); + gen_epgdatelist(); +} + function gen_epgchanlist() { + $('#epg #epg_chan').html(''); data = $('#jqt').data('channellist'); $.each(data.category, function(i,category){ - $('#epg_chan').append(''); + $('#epg #epg_chan').append(''); var catname = category.name; $.each(category.channel, function(j, channel){ - $('#epg_chan optgroup[label="' + catname +'"]').append(''); + $('#epg #epg_chan optgroup[label="' + catname +'"]').append(''); }); $('#epg_chan').append(''); }); } -// check if chan is slected +// check if chan is selected function epg_selectchan() { selectedchan = $('#epg_chan').val(); } +function gen_epgdatelist() { +var daymax = 8; +var date = new Date(); +var date_year = date.getFullYear(); +var date_month = date.getMonth()+1; +var date_day = date.getDate(); +var date_fulldate = date_year + '-' + str_pad(date_month,2,'0','STR_PAD_LEFT') + '-' + str_pad(date_day,2,'0','STR_PAD_LEFT'); +$('#epg #epg_day').html(''); +var dayname = new Array( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ); + for ( i=0;i' + dayname[date.getDay()] + ' ' + date.getDate() + '/' + (date.getMonth()+1) + ''); + } +} + // [/EPG SECTION] -- cgit v1.2.3