diff options
-rw-r--r-- | css/istreamdev.css | 3 | ||||
-rw-r--r-- | css/theme.css | 3 | ||||
-rw-r--r-- | js/istreamdev.js | 20 |
3 files changed, 22 insertions, 4 deletions
diff --git a/css/istreamdev.css b/css/istreamdev.css index ffcbbf7..63cdba8 100644 --- a/css/istreamdev.css +++ b/css/istreamdev.css @@ -347,6 +347,9 @@ font-size: 14px; font-weight: bold; display: block; color: white; +text-overflow: ellipsis; +overflow: hidden; +white-space: nowrap; text-shadow: rgba(0,0,0,.8) 0 1px 0; } ul.edgetoedge span.epgtime { diff --git a/css/theme.css b/css/theme.css index 7fe4575..a0c2c74 100644 --- a/css/theme.css +++ b/css/theme.css @@ -433,7 +433,8 @@ div#jqt.landscape .toolbar > h1 { #jqt ul.edgetoedge li { background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142)); font-size: 14px; - margin-bottom: -3px; + margin-bottom: -1px; + border-bottom: 2px solid #333333; } #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))); diff --git a/js/istreamdev.js b/js/istreamdev.js index 4785d12..20b89ed 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -1002,13 +1002,27 @@ get_epg("all","now","0","2"); $('#epglist #ul_epglist a').tap(function(event) {
event.preventDefault();
json_start(this);
-channum = $(this).find('span[rel="channum"]').text();
+channum = $(this).attr("rel");
epgtime = $(this).find('span[class="epgtime"]').text();
startingtime = epgtime.substring(0,2) + '' + epgtime.substring(3);
day = $('#epglist div[rel="dataholder"] span[rel="day"]').text();
get_epgdetails(channum,startingtime,day);
});
+$('#epgdetails span.recButton a').tap(function(event) {
+ event.preventDefault();
+ json_start(this);
+ var id = "new";
+ var active= 1;
+ var name = $("#epgdetails").find('span[class="name_now"]').text();
+ var channumber = $("#epgdetails" ).find('span[rel="number"]').text();
+ var channame = $("#epgdetails").find('span[rel="channame"]').text();
+ var rec_date = $("#epgdetails").find('span[rel="date"]').text();
+ var starttime = $("#epgdetails").find('span[rel="stime"]').text();
+ var endtime = $("#epgdetails").find('span[rel="etime"]').text();
+ gen_edittimer(id,name,active,channumber,channame,rec_date,starttime,endtime);
+ return false;
+});
//functions
function gen_epgmenu() {
gen_epgchanlist();
@@ -1091,7 +1105,7 @@ function parse_epg(data,selectedvalue,type,day){ var date_month = str_pad(date.getMonth()+1,2,'0','STR_PAD_LEFT');
var date_day = str_pad(date.getDate(),2,'0','STR_PAD_LEFT');
var epgdate = date_year + "-" + date_month + "-" + date_day;
- $('#epglist #ul_epglist').append('<li rel="epgdate" class="sep">' + epgdate + '</li>');
+ $('#epglist h1').html(epgdate);
if ( data.category.length > 1 )
{
$('#epglist #epg_selector').append('<select id="epglist_cat"></select>');
@@ -1137,7 +1151,7 @@ function parse_epg(data,selectedvalue,type,day){ {
togglestatus = '';
}
- $('#epglist #ul_epglist').append('<li rel="' + togglestatus + '"><a href="#"><span class="epgtime">' + epg.time + '</span><span class="epgname">' + epg.title + '</span><span style="visibility:hidden" rel="channum">' + channel.number + '</span></a></li>');
+ $('#epglist #ul_epglist').append('<li rel="' + togglestatus + '"><a href="#" rel="' + channel.number + '"><span class="epgtime">' + epg.time + '</span><span class="epgname">' + epg.title + '</span></a></li>');
k++;
});
|