diff options
| author | TheTroll <trolldev@gmail.com> | 2010-03-27 17:44:36 +0100 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-03-27 17:44:36 +0100 |
| commit | 59932e007aaffa6a866df65c720f523ae2a21438 (patch) | |
| tree | 7a31907852989bcba6a68e912d7965392b8f01f0 | |
| parent | 055e00fcf619518440df95ee9bcbaa825a77356d (diff) | |
| parent | 39bcbf4db4629aacc23116fb7a473eb44690c4bc (diff) | |
| download | istreamdev-59932e007aaffa6a866df65c720f523ae2a21438.tar.gz istreamdev-59932e007aaffa6a866df65c720f523ae2a21438.tar.bz2 | |
Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery
* 'jquery' of projects.vdr-developer.org:istreamdev:
corrected path for rec and videos
updated css
css fix
| -rw-r--r-- | css/theme.css | 11 | ||||
| -rw-r--r-- | js/istreamdev.js | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/css/theme.css b/css/theme.css index a0c2c74..ced8938 100644 --- a/css/theme.css +++ b/css/theme.css @@ -444,6 +444,17 @@ div#jqt.landscape .toolbar > h1 { padding: 2px 10px; text-shadow: #000 0 1px 0; } +#jqt ul.edgetoedge li.sep a{ + color: #ff8300; + font-size: 16px; + text-shadow: #000 0 1px 0; +} +#jqt ul.edgetoedge li.sep a.active{ + background-color: #ff8300; + color: #fff; + text-shadow: #000 0 1px 0; +} + #jqt ul.edgetoedge li em { font-weight: normal; font-style: normal; diff --git a/js/istreamdev.js b/js/istreamdev.js index 4aae3f8..f36b907 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -452,7 +452,7 @@ function gen_streamchannel(channame,channumber) { }
function gen_streamrec(folder,path) {
- var dataString = "action=getRecInfo&rec=" + encodeURIComponent(path) + "/" + encodeURIComponent(folder);
+ var dataString = "action=getRecInfo&rec=" + encodeURIComponent(path);
//Json call to get rec info
$.getJSON("bin/backend.php",
dataString,
@@ -470,7 +470,7 @@ function gen_streamrec(folder,path) { }
function gen_streamvid(filename,path) {
- var dataString = "action=getVidInfo&file=" + encodeURIComponent(path) + "/" + encodeURIComponent(filename);
+ var dataString = "action=getVidInfo&file=" + encodeURIComponent(path);
//Json call to get rec info
$.getJSON("bin/backend.php",
dataString,
@@ -617,10 +617,12 @@ $('ul[rel="filelist"] li[class="arrow"] a').tap(function(event) { }
else if ( type == "rec" )
{
+ var path = $(this).find('span[class=filepath]').attr('rel');
gen_streamrec(name,path);
}
else if ( type == "video" )
{
+ var path = $(this).find('span[class=filepath]').attr('rel');
gen_streamvid(name,path);
}
return false;
@@ -691,10 +693,10 @@ function gen_browser(path,browser,name,foldertype) { $("#browser" + browser).find('ul').append('<li class="arrow" rel="' + hidetoggle + '"><a href="#" rel="folder"><span class="menuname">' + list.name + '</span></a></li>');
}
else if (list.type == "rec") {
- $("#browser" + browser).find('ul').append('<li class="arrow" rel="' + hidetoggle + '"><a href="#" rel="rec"><img class="menuicon" src="img/record.png" /><span class="menuname">' + list.name + '</span></a></li>');
+ $("#browser" + browser).find('ul').append('<li class="arrow" rel="' + hidetoggle + '"><a href="#" rel="rec"><img class="menuicon" src="img/record.png" /><span class="menuname">' + list.name + '</span><span class="filepath" rel="' + list.path + '"></span></a></li>');
}
else if ( list.type == "video" ) {
- $("#browser" + browser).find('ul').append('<li class="arrow" rel="' + hidetoggle + '"><a href="#" rel="video"><img class="menuicon" src="img/video.png" /><span class="menuname">' + list.name + '</span></a></li>');
+ $("#browser" + browser).find('ul').append('<li class="arrow" rel="' + hidetoggle + '"><a href="#" rel="video"><img class="menuicon" src="img/video.png" /><span class="menuname">' + list.name + '</span><span class="filepath" rel="' + list.path + '"></span></a></li>');
}
else if ( list.type == "audio" ) {
if ( list.trackname != "" ) {
|