Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing

airtime_mvc/application/views/scripts/index/index.phtml

@@ -70,7 +70,7 @@
             <div id="jp_container_1" class="jp-audio">
                 <div class="jp-type-playlist">
 
-                    <div class="current-track">Now Playing: <span></span></div>
+                    <div class="current-track track-overflow">Now Playing: <span class="track-overflow"></span></div>
                     <div class="jp-gui jp-interface">
                         <div class="playbar playbar-buttons">
                         <ul class="jp-controls rss-buttons">

airtime_mvc/public/css/radio-page/premium_player.css

@@ -64,6 +64,7 @@ body {
 
 .bottom_bar .button {
     width: 50px;
+    min-width: 50px;
     height: 50px;
     display: inline-block;
     margin: 35px 40px;

airtime_mvc/public/css/radio-page/radio-page.css

@@ -80,22 +80,20 @@ span.login-img {
     transition-delay: 2s;
 }
 
-#schedule_iframe.schedule, .about_us, .login, .podcast {
+.tab_content {
     /*	-webkit-transition-delay: 1s;
         transition-delay: 1s;*/
-    transition: all 0.4s ease;
+    transition: opacity 0.4s ease 0.4s;
     opacity: 0;
 }
 
-.about_us.current, .login.current, .schedule.current, .podcast.current {
+.current {
     opacity: 1;
-    -webkit-transition-delay: 0.4s;
-    transition-delay: 0.4s;
+    -webkit-transition: opacity 0.4s ease 0.0s;
+    transition: opacity 0.4s ease 0.0s;
 }
 
-#schedule_iframe.schedule.current {
-    opacity: 1;
-}
+
 
 .about_us h1 {
     font-size: 80px; /** Fallback if vw is not suppoted */
@@ -164,9 +162,6 @@ span.login-img {
         width:auto;
         border:0;
     }
-    #rss-title, #rss-subscribe {
-        text-align: center;
-    }
 }
 
 

airtime_mvc/public/css/radio-page/station-podcast.css

@@ -369,16 +369,27 @@ div.jp-title,
 	display: block;
 	text-transform: uppercase;
 	clear: both;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	word-wrap: break-word;
 }
 
 .current-track span {
-	display: inline-block;
+	display: inline;
 	margin-left:10px;
 	color: #FF6F01;
+	width: 90%;
+}
+
+.track-overflow {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
 
 .podcast ul li .podcast_info {
 	display: inline-block;
+	width: 99%;
 }
 
 .podcast ul li span, .playlist-item-no-preview span {
@@ -570,6 +581,7 @@ div.jp-jplayer {
 	}
 }
 
+
 @media (max-width: 590px) {
 	.jp-time-block {
 		display:block !important;