Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery

* 'jquery' of projects.vdr-developer.org:istreamdev:
  epg works
  div name fix

2 files changed, 6 insertions, 6 deletions

diff --git a/index.php b/index.php
index 9873891..9e4fae8 100644
--- a/index.php
+++ b/index.php
@@ -230,9 +230,9 @@ include ('bin/auth.php');
 				<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 href="javascript:openSelectTime('layer_epgtime')" class="abutton" id="a_starttime"><span id="layer_epgtime" class="menuname">Now</span></a></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="" />
+			 <input name="epg_time" type="hidden" id="epg_time" value="all" />
 			<ul class="rounded" ref="submitbut"><li><center><a href="#" class="submit_epg">Get Programs</a></center></li></ul>
 			</form>
 		</div>
@@ -241,7 +241,7 @@ include ('bin/auth.php');
 			<div class="toolbar">
 				<a href="#" class="back">Back</a>
 				<a href="#home" id="home_but" class="button">Home</a>
-                <h1>WHAT'S NOW</h1>
+                <h1>EPG</h1>
 			</div>
 			<ul class="edgetoedge" id="ul_epglist">
 			</ul>	
diff --git a/js/istreamdev.js b/js/istreamdev.js
index 3b6b6fc..315ebff 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -1010,9 +1010,9 @@ var date = new Date();
 var date_year = date.getFullYear();

 var date_month = date.getMonth()+1;

 var date_day = date.getDate();

-var date_hour = str_pad(date.getHours(),2,'0','STR_PAD_LEFT');

-var date_min = str_pad(date.getMinutes(),2,'0','STR_PAD_LEFT');

-$('#epg #epg_time').val(date_hour + '' + date_min);

+//var date_hour = str_pad(date.getHours(),2,'0','STR_PAD_LEFT');

+//var date_min = str_pad(date.getMinutes(),2,'0','STR_PAD_LEFT');

+//$('#epg #epg_time').val(date_hour + '' + date_min);

 //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="0">Today</option>');

 var dayname = new Array( "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" );