summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--css/istreamdev.css16
-rw-r--r--css/theme.css1
-rw-r--r--index.html9
-rw-r--r--js/istreamdev.js57
-rw-r--r--min/config.php4
-rw-r--r--min/lib/Minify/Controller/Base.php2
6 files changed, 69 insertions, 20 deletions
diff --git a/css/istreamdev.css b/css/istreamdev.css
index 5d48d98..a2995ef 100644
--- a/css/istreamdev.css
+++ b/css/istreamdev.css
@@ -15,6 +15,19 @@ div.loader {
position: absolute;
}
+#status_box {
+z-index: 102;
+background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ccc), to(#aaa), color-stop(.6,#CCCCCC));
+line-height: 16px;
+text-align: center;
+text-shadow: rgba(255,255,255,.8) 0 1px 0;
+color: #444;
+padding: 15px;
+border-top: 1px solid rgba(255,255,255,.2);
+display: none;
+font: bold 12px "Helvetica Neue", Helvetica;
+}
+
ul li img.menuicon {
vertical-align: middle;
}
@@ -249,9 +262,6 @@ font-size: 12px;
color: #FF8300;
}
-#timers .info {
-display: none;
-}
a.cat_but {
diff --git a/css/theme.css b/css/theme.css
index a7d7a34..1e1111f 100644
--- a/css/theme.css
+++ b/css/theme.css
@@ -23,6 +23,7 @@ body > *, div#jqt > * {
#jqt .black-translucent .toolbar {
margin-top: 20px;
}
+
div#jqt .toolbar > h1 {
position: absolute;
overflow: hidden;
diff --git a/index.html b/index.html
index 51afd67..516c42a 100644
--- a/index.html
+++ b/index.html
@@ -3,11 +3,12 @@
<head>
<meta charset="UTF-8" />
<title>iStreamdev</title>
- <style type="text/css" media="screen">@import "min/?b=./css&f=jqtouch.css,theme.css,istreamdev.css,spinningwheel.css";</style>
- <script src="min/?b=./js&f=jquery-1.4.2.min.js,jqtouch.js,jqtouch.transitions.js,istreamdev.js,functions.js,spinningwheel.js" type="text/javascript" charset="utf-8"></script>
+ <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" 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) ---------------------------------->
@@ -67,6 +68,8 @@
<div rel="dataholder" style="visibility:hidden">
<span rel="type"></span>
<span rel="url"></span>
+ <span rel="number"></span>
+ <span rel="channame"></span>
</div>
</div>
@@ -151,7 +154,7 @@
<a href="#" class="back">Home</a>
<h1><img class="menuicon" src="img/timers.png" /> TIMERS</h1>
</div>
- <div class="info" id="timer_status"></div>
+
<ul class="rounded" rel="timers">
</ul>
<ul class="rounded">
diff --git a/js/istreamdev.js b/js/istreamdev.js
index cf49cbc..1ce37e9 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -56,13 +56,13 @@ $.getJSON("bin/backend.php",
rec_path = data.rec_path;
video_path = data.video_path;
audio_path = data.audio_path;
- if (streamdev_server != "") {
+ if (streamdev_server != "" && streamdev_server != "null") {
addVdr();
}
- if ( video_path != "" ) {
+ if ( video_path != "" && video_path != "null") {
addVideofiles();
}
- if ( audio_path != "" ) {
+ if ( audio_path != "" && audio_path != "null" ) {
addAudiofiles();
}
});
@@ -363,6 +363,28 @@ $('#streamchannel span.streamButton a').tap(function(event) {
start_broadcast(type,url,mode);
return false;
});
+$('#streamchannel span.recButton a').tap(function(event) {
+ event.preventDefault();
+ json_start(this);
+ var id = "new";
+ var active= 1;
+ var name = $("#streamchannel").find('span[class="name_now"]').text();
+ name = name.substr(4,name.length);
+ var channumber = $("#streamchannel").find('span[rel="number"]').text();
+ var channame = $("#streamchannel").find('span[rel="channame"]').text();
+ date = new Date();
+ var rec_year = date.getFullYear();
+ var rec_month = date.getMonth()+1;
+ rec_month = str_pad(rec_month,2,'0','STR_PAD_LEFT');
+ var rec_day = date.getDate();
+ rec_day = str_pad(rec_day,2,'0','STR_PAD_LEFT');
+ var rec_date = rec_year + "-" + rec_month + "-" + rec_day;
+ var epgtime = $("#streamchannel").find('span[class="epgtime_now"]').text();
+ var starttime = epgtime.substr(0,2) + epgtime.substr(3,2);
+ var endtime = epgtime.substr(6,2) + epgtime.substr(9,2);
+ gen_edittimer(id,name,active,channumber,channame,rec_date,starttime,endtime);
+ return false;
+});
$('#streamrec span.streamButton a').tap(function(event) {
event.preventDefault();
json_start(this);
@@ -405,6 +427,8 @@ function gen_streamchannel(channame,channumber) {
$("#streamchannel").find('span[class="epgtime_next"]').html( program.next_time );
$("#streamchannel").find('span[rel="url"]').html(streamdev_server + channumber);
$("#streamchannel").find('span[rel="type"]').html('tv');
+ $("#streamchannel").find('span[rel="number"]').html(channumber);
+ $("#streamchannel").find('span[rel="channame"]').html(channame);
json_complete('#streamchannel','cube');
});
}
@@ -796,7 +820,21 @@ function gen_timers(edit) {
function gen_edittimer(id,name,active,channumber,channame,date,starttime,endtime) {
$('ul[ref="submitbut"]').remove();
if (id) {
+ if (id=="new") {
+ $('#edittimer h1').html('<img class="menuicon" src="img/timers.png" / > NEW TIMER');
+ id="";
+ submitbutton = '<ul ref="submitbut" class="rounded">';
+ submitbutton += '<li><center><a class="submit_form" href="#">Create</a></center></li></ul>';
+ $('#timer').append(submitbutton);
+ }
+ else
+ {
$('#edittimer h1').html('<img class="menuicon" src="img/timers.png" / > EDIT TIMER');
+ submitbuttons = '<ul ref="submitbut" class="individual">';
+ submitbuttons += '<li><a class="submit_form" href="#">Edit</a></li>';
+ submitbuttons += '<li><a class="abutton" rel="deletetimer" href="#">Delete</a></li></ul>';
+ $('#timer').append(submitbuttons);
+ }
if (active == 1)
{
$('#timer_active').attr('checked', true);
@@ -825,10 +863,7 @@ function gen_edittimer(id,name,active,channumber,channame,date,starttime,endtime
wheelend_m = endtime.substring(2,4);
$('#layer_endtime').html(wheelend_h + 'h' + wheelend_m);
$('#a_endtime').attr('href', "javascript:openSelectTime('layer_endtime','" + wheelend_h + "','" + wheelend_m + "')");
- submitbuttons = '<ul ref="submitbut" class="individual">';
- submitbuttons += '<li><a class="submit_form" href="#">Edit</a></li>';
- submitbuttons += '<li><a class="abutton" rel="deletetimer" href="#">Delete</a></li></ul>';
- $('#timer').append(submitbuttons);
+
}
else {
$('#edittimer h1').html('<img class="menuicon" src="img/timers.png" / > NEW TIMER');
@@ -922,11 +957,11 @@ function checktimerform() {
function showStatus( timeout, message ) {
if( timeout == 0 ) {
- $('#timer_status').html(message);
- $('#timer_status').show();
- setTimeout( function() { showStatus( 1, message ); }, 4000 );
+ $('#status_box').html(message);
+ $('#status_box').show();
+ setTimeout( function() { showStatus( 1, message ); }, 5000 );
} else if( timeout == 1 ) {
- $('#timer_status').hide();
+ $('#status_box').hide();
}
}
// [/TIMER SECTION]
diff --git a/min/config.php b/min/config.php
index 78fadc0..12dce09 100644
--- a/min/config.php
+++ b/min/config.php
@@ -13,7 +13,7 @@
* a URI. E.g. /min/?f=script1.js,script2.js&debug=1
*/
$min_allowDebugFlag = false;
-
+$rewriteCssUris = false;
/**
* Set to true to log messages to FirePHP (Firefox Firebug addon).
@@ -123,7 +123,7 @@ $min_serveOptions['minApp']['maxFiles'] = 10;
* array('//static' => 'D:\\staticStorage') // Windows
* </code>
*/
-$min_symlinks = array();
+//$min_symlinks = array();
/**
diff --git a/min/lib/Minify/Controller/Base.php b/min/lib/Minify/Controller/Base.php
index 84889b3..247c780 100644
--- a/min/lib/Minify/Controller/Base.php
+++ b/min/lib/Minify/Controller/Base.php
@@ -47,7 +47,7 @@ abstract class Minify_Controller_Base {
,'minifierOptions' => array() // no minifier options
,'contentTypeCharset' => 'utf-8'
,'maxAge' => 1800 // 30 minutes
- ,'rewriteCssUris' => true
+ ,'rewriteCssUris' => false
,'bubbleCssImports' => false
,'quiet' => false // serve() will send headers and output
,'debug' => false
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 16:43:44 +0000