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

* 'jquery' of projects.vdr-developer.org:istreamdev:
  cleaned audio playlist page
  default pic when no logo for channel list

3 files changed, 8 insertions, 6 deletions

diff --git a/css/istreamdev.css b/css/istreamdev.css
index c53769d..f6a393d 100644
--- a/css/istreamdev.css
+++ b/css/istreamdev.css
@@ -52,8 +52,7 @@ vertical-align: middle;
 position: relative;
 -webkit-mask-box-image: url(../img/mask.png) 80 stretch;
 top: 0px;
-background-image: url('../img/nologoTV.png') ;
-background-size: 55px;
+background-image: url('../img/nologoTV-mini.png') ;
 }
 
 li.channellist span.name {
@@ -303,18 +302,20 @@ left: 2px;
 }
 li.track a span.tracktitle {
 position: relative;
-left: 32px;
+left: 0px;
 padding-left: 4px;
 top: -3px;
+display:block; 
 text-overflow: ellipsis;
 overflow: hidden;
-width: 60%;
+white-space: nowrap;
+width: 70%;
 }
 li.track a div.timebox {
 position: relative;
 width: 30px;
 height: 42px;
-top: -12px;
+top: -36px;
 display: block;
 float: right;
 margin-left: 3px;
diff --git a/img/nologoTV-mini.jpg b/img/nologoTV-mini.jpg
new file mode 100644
index 0000000..c8e93d3
--- /dev/null
+++ b/img/nologoTV-mini.jpg
diff --git a/js/istreamdev.js b/js/istreamdev.js
index ca3c672..9998f53 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -251,7 +251,9 @@ function gen_channels(category) {
 					}

 				});

 				$('li[rel="toggle"]').hide();

+				if ( data.channel.length > 10 ) {

 				$("#chan_menu").append('<li rel="showbut"><a href="#" class="toggleLink">Show all</a></li>');

+				}

 				json_complete('#channels','cube');

 		})

 }

@@ -529,7 +531,6 @@ $('div[rel="browser"] #home_but').tap(function(event) {
 	$('#home').bind('pageAnimationEnd', function(event, info){ 

 			$('#jqt div[rel="browser"]').remove();

 			$('#home').unbind('pageAnimationEnd');

-			

 		});

 });