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

* 'jquery' of projects.vdr-developer.org:istreamdev:
  playlist/
  added max width for chanel list & categories

2 files changed, 15 insertions, 4 deletions

diff --git a/css/istreamdev.css b/css/istreamdev.css
index e1da055..3f37884 100644
--- a/css/istreamdev.css
+++ b/css/istreamdev.css
@@ -40,7 +40,7 @@ vertical-align: middle;
 }
 li.channellist {
 height: 55px;
-background-image: url(../img/chevron.png), -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142));
+background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#4c4d4e), to(#404142));
 background-position: right center;
 background-repeat: no-repeat;
 }
@@ -59,12 +59,15 @@ margin: 10px 0 0 0px;
 left: 90px;
 text-overflow: ellipsis;
 overflow: hidden;
+text-overflow: ellipsis;
+white-space: nowrap;
 max-width: 80%!important;
 white-space: nowrap;
 font-size: 17px;
 line-height: normal;
 position: absolute;
 font-weight: bold;
+width: 50%;
 
 }
 li.channellist span.comment {
@@ -77,12 +80,20 @@ position: absolute;
 top: 15 px;
 font-style: italic;
 font-weight: normal;
+overflow: hidden;
+text-overflow: ellipsis;
+white-space: nowrap;
+width: 50%;
+
+}
+li.channellist small {
+margin-right: 0px;
 }
 
 li.channellist small.counter {
-    margin-right: 15px;
+    margin-right: 0px;
 	position: relative;
-	top: 36px;
+	top: 40px;
 	font-size: 17px;
     line-height: 13px;
     font-weight: bold;
diff --git a/js/istreamdev.js b/js/istreamdev.js
index 0a70ebd..2000c83 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -175,7 +175,7 @@ function gen_channels(category) {
 			$.each(data.channel,function(i,channel){

 				$("#chan_menu").append('<li class="channellist"><a class="chan_but" href="#"><img src="logos/' + channel.name + '.png"/><small class="counter">' + channel.number + '</small><span class="name">' + channel.name + '</span><span class="comment">' + channel.now_title + '</span></a></li>');

 				});

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

+			json_complete('#channels','slide');

 		})

 }