diff options
| -rw-r--r-- | css/istreamdev.css | 8 | ||||
| -rw-r--r-- | css/theme.css | 12 | ||||
| -rw-r--r-- | index.php | 39 | ||||
| -rw-r--r-- | 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; } @@ -11,13 +11,14 @@ include ('bin/auth.php'); <meta charset="UTF-8" /> <title>iStreamdev</title> <link rel="stylesheet" href="min/?b=css&f=jqtouch.css,theme.css,istreamdev.css,spinningwheel.css" type="text/css" media="screen" /> - <script src="min/?b=js&f=jquery-1.4.2.min.js,jqtouch.js,jqtouch.transitions.js,istreamdev.js,functions.js,spinningwheel.js,jquery.scrollTo-1.4.2.js" type="text/javascript" charset="utf-8"></script> - </head> + <script src="min/?b=js&f=jquery-1.4.2.min.js,jqtouch.js,jqtouch.transitions.js,functions.js,spinningwheel.js,jquery.scrollTo-1.4.2.js" type="text/javascript" charset="utf-8"></script> + <script src="js/istreamdev.js" type="text/javascript" charset="utf-8"></script> + </head> <body> <div id="loader"></div> <div id="status_box"></div> <div id="jqt"> - <!---------------------------------- HOME SCREEN (always present) ----------------------------------> + <!-- HOME SCREEN (always present) --> <div id="home" class="current"> <div class="toolbar"> @@ -28,9 +29,9 @@ include ('bin/auth.php'); <li>Checking running session</li> </ul> </div> - <!----------------------------------/ HOME SCREEN ----------------------------------> - <!---------------------------------- CHAN CATEGORY SCREEN ----------------------------------> - <!----------------------------------categories------------------------------> + <!-- / HOME SCREEN --> + <!-- CHAN CATEGORY SCREEN --> + <div id="categories"> <div class="toolbar"> <a href="#" class="back">Home</a> @@ -39,7 +40,7 @@ include ('bin/auth.php'); <ul id="cat_menu" class="rounded"> </ul> </div> - <!----------------------------------channels------------------------------> + <div id="channels"> <div class="toolbar"> <a href="#" class="back">Back</a> @@ -49,9 +50,9 @@ include ('bin/auth.php'); <ul id="chan_menu" class="rounded"> </ul> </div> - <!---------------------------------- /CHAN CATEGORY SCREEN ----------------------------------> - <!---------------------------------- STREAM SCREEN ----------------------------------> - <!------------------------ tv start stream -----------------------------------------> + <!--/CHAN CATEGORY SCREEN --> + <!-- STREAM SCREEN --> + <div id="streamchannel"> <div class="toolbar"> <a href="#" class="back">Back</a> @@ -153,8 +154,8 @@ include ('bin/auth.php'); </div> </div> - <!---------------------------------- /STREAM SCREEN ----------------------------------> - <!---------------------------------- TIMERS SCREEN ----------------------------------> + <!-- /STREAM SCREEN --> + <!-- TIMERS SCREEN --> <div id="timers"> <div class="toolbar"> @@ -216,18 +217,21 @@ include ('bin/auth.php'); <input name="timer_endtime" type="hidden" id="timer_endtime" value="" /> </form> </div> - <!---------------------------------- /TIMERS SCREEN ----------------------------------> - <!------------------------------------ EPG -------------------------------------------> + <!-- EPG --> <div id="epg"> <div class="toolbar"> <a href="#" class="back">Home</a> <h1>EPG</h1> </div> <ul class="rounded"> - <li class="arrow"><a href="#now"><span class="menuname">What's Now</span></a></li> - <li class="arrow"><a href="#at"><span class="menuname">What's At</span></a></li> - <li class="arrow"><a href="#on"><span class="menuname">What's On</span></a></li> + <li><span class="timertitle">Select 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><select id="epg_day"><option value="today">Today</option></select> + <li><span class="timertitle">Select Time:</span></li> + <li class="arrow"><a onclick="$('#timer_starttime_error').hide();" href="javascript:openSelectTime('layer_epgtime')" class="abutton" id="a_starttime"><span id="layer_epgtime" class="menuname">Now</span></a></li> </ul> + <ul class="rounded" ref="submitbut"><li><center><a href="#" class="submit_form">Get Programs</a></center></li></ul> </div> <div id="now"> @@ -249,7 +253,6 @@ include ('bin/auth.php'); <li><a href="#"><span class="epgtime">See more...</span></a></li> </ul> </div> - <!------------------------------------ /EPG -------------------------------------------> </div> </body> </html>
\ 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 += ' <li class="arrow"><a id="categories_but" href="#"><img class="menuicon" src="img/tv.png" /><span class="menuname">Watch TV</span></a></li>';
vdrmenu += ' <li class="arrow"><a id="recording_but" href="#"><img class="menuicon" src="img/record.png" /><span class="menuname">Recordings</span></a></li>';
vdrmenu += ' <li class="arrow"><a id="timers_but" href="#"><img class="menuicon" src="img/timers.png" /><span class="menuname">Timers</span></a></li>';
- vdrmenu += ' <li class="arrow"><a id="epg_but" href="#epg"><img class="menuicon" src="img/epg.png" /><span class="menuname">Program Guide</span></a></li>\n</ul>';
+ vdrmenu += ' <li class="arrow"><a id="epg_but" href="#"><img class="menuicon" src="img/epg.png" /><span class="menuname">Program Guide</span></a></li>\n</ul>';
$('#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('<option value="all">All channels</option>');
data = $('#jqt').data('channellist');
$.each(data.category, function(i,category){
- $('#epg_chan').append('<optgroup label="' + category.name + '">');
+ $('#epg #epg_chan').append('<optgroup label="' + category.name + '">');
var catname = category.name;
$.each(category.channel, function(j, channel){
- $('#epg_chan optgroup[label="' + catname +'"]').append('<option value="' + channel.number + '">' + channel.name +'</option>');
+ $('#epg #epg_chan optgroup[label="' + catname +'"]').append('<option value="' + channel.number + '">' + channel.name +'</option>');
});
$('#epg_chan').append('</optgroup>');
});
}
-// 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('<option value="' + date_fulldate + '">Today</option>');
+var dayname = new Array( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" );
+ for ( i=0;i<daymax;i++ ) {
+ date_milli=date.getTime();
+ date.setTime(date_milli+86400000);
+ $('#epg #epg_day').append('<option value="' + date.getFullYear() + '-' + str_pad(date.getMonth()+1,2,'0','STR_PAD_LEFT') + '-' + str_pad(date.getDate(),2,'0','STR_PAD_LEFT') + '">' + dayname[date.getDay()] + ' ' + date.getDate() + '/' + (date.getMonth()+1) + '</option>');
+ }
+}
+
// [/EPG SECTION]
|