From 778904fdb55699501a6a2137d2c0f625d3e66646 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Fri, 13 Nov 2015 07:48:14 -0500
Subject: [PATCH] Radio page css fixes

---
 .../views/scripts/index/index.phtml           | 27 ++++-----
 .../public/css/radio-page/station-podcast.css | 60 +++++++++++++++----
 2 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml
index b2bdc386f..d1677cf63 100644
--- a/airtime_mvc/application/views/scripts/index/index.phtml
+++ b/airtime_mvc/application/views/scripts/index/index.phtml
@@ -56,6 +56,8 @@
     if ($this->displayRssTab) {?>
         <div id="tab-4" class="podcast tab_content">
             <h2><?php echo _("Radio Podcast") ?><a target="_blank" href="<?php echo $this->stationPodcastRssUrl ?>" class="rss_icon"><span>Subscribe </span><img src="css/radio-page/img/rss.png"></a></h2>
+
+
             <div id="jquery_jplayer_1" class="jp-player">
             </div>
             <div class="podcast_bck">
@@ -64,11 +66,8 @@
 
                     <div class="current-track">Now Playing: <span></span></div>
                     <div class="jp-gui jp-interface">
+                        <div class="playbar playbar-buttons">
                         <ul class="jp-controls rss-buttons">
-                            <!--<li class="ui-corner-all jp-previous">
-                                <span class="icon-fast-backward icon-white" tabindex="1"><?php /*echo _("previous") */?></span>
-                            </li>-->
-
                             <li class="ui-corner-all jp-play">
                                 <span class="icon-play icon-white" tabindex="1"><?php /*echo _("play") */?></span>
                             </li>
@@ -76,15 +75,12 @@
                             <li class="ui-corner-all jp-pause">
                                 <span class="icon-pause icon-white" tabindex="1"><?php /*echo _("pause") */?></span>
                             </li>
-
-                            <!--<li class="ui-corner-all jp-next">
-                                <span class="icon-fast-forward icon-white" tabindex="1"><?php /*echo _("next") */?></span>
-                            </li>-->
-
                             <li class="ui-corner-all jp-stop">
                                 <span class="icon-stop icon-white" tabindex="1"><?php /*echo _("stop") */?></span>
                             </li>
                         </ul>
+                        </div>
+                        <div class="playbar playbar-progress">
                         <div class="jp-time-block">
                             <div class="jp-progress">
                                 <div class="jp-seek-bar">
@@ -95,7 +91,9 @@
                                 <div class="jp-current-time"></div>
                             </div>
                         </div>
+                        </div>
 
+                        <div class="playbar playbar-progress">
                         <div class="jp-volume-block">
                             <div class="jp-mute">
                                 <span class="ui-icon" tabindex="1" title="mute"><?php /*echo _("mute") */?></span>
@@ -110,6 +108,8 @@
                                 <span class="ui-icon" tabindex="1" title="max volume"><?php /*echo _("max volume") */?></span>
                             </div>
                         </div>
+                        </div>
+                        </ul>
 
                     </div>
 
@@ -159,7 +159,6 @@
                         "<div class='podcast_desc'>"+value.CcFiles.description+"</div>";
 
                         if (media_mime_supported) {
-                            // we only add the track to the jPlayer playlist if it can be played by jPlayer
                             playlist.push(media);
 
                             var playlist_item = "<li class='jp-playlist-item'><div class='podcast_info'>";
@@ -171,7 +170,10 @@
                             "<span class='podcast_download podcast_action_btn'><a id='rss-download-link' href='"+value.download_url+"'><img src='css/radio-page/img/podcast_download.png'></a></span> </div></div></li>";
 
                         } else {
+                            // add empty media item to playlist so indexes stay inline with the corret
+                            // audio and metadata
                             playlist.push({});
+
                             var playlist_item = "<div class='playlist-item-no-preview podcast_info'>";
                             playlist_item += podcast_title_no_link + playlist_metadata;
                             playlist_item += "<div class='podcast_btn_group'>"+
@@ -192,13 +194,8 @@
                         // jPlayer is not currently playing
                         _playlist_jplayer.play(0);
                         $("#jquery_jplayer_1").jPlayer("stop");
-                        //TODO why doesn't this work??
-                        $(".current-track span").empty();
                     }
 
-                    //$(".podcast_info>a.jp-playlist-current").removeClass('jp-playlist-current');
-                    //$(".jp-playlist>li.jp-playlist-current").removeClass('jp-playlist-current');
-
                     $('.podcast_play').on('click', function() {
                         _playlist_jplayer.play($(this).find('#rss-track').attr('data-rss-playlist-id'));
 
diff --git a/airtime_mvc/public/css/radio-page/station-podcast.css b/airtime_mvc/public/css/radio-page/station-podcast.css
index e6702f7ef..1a8ea38f9 100644
--- a/airtime_mvc/public/css/radio-page/station-podcast.css
+++ b/airtime_mvc/public/css/radio-page/station-podcast.css
@@ -29,9 +29,10 @@ span.showIndex {
 	color: #FF6F01;
 }
 
-/*.current-track {
-	color: #FF6F01;
-}*/
+.current-track {
+	padding-left: 5px;
+	margin-bottom: 5px;
+}
 
 div.jp-audio,
 div.jp-video {
@@ -67,18 +68,19 @@ div.jp-interface {
     background: -moz-linear-gradient(top, #6E6E6E 0, #3a3a3a 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #6E6E6E), color-stop(100%, #3a3a3a));
     width: 100%;*/
-	max-width: 600px;
+	/*max-width: 600px;*/
 	text-align:center;
-    /*border-top: 1px solid #5a5a5a;*/
-    border-bottom: 1px solid #5a5a5a;
+	background: rgba(0, 0, 0, 0.3);
 }
 
 div.jp-audio div.jp-type-single div.jp-interface {
 	height:80px;
 }
 div.jp-audio div.jp-type-playlist div.jp-interface {
-	height:60px;
-	margin-top: 10px;
+	height:45px;
+	padding-top: 10px;
+	display: inline-block;
+	width: 100%;
 }
 
 .rss-buttons {
@@ -143,6 +145,7 @@ div.jp-time-block {
 	display: inline;
 	left: 0;
     /*left: 230px;*/
+	/*margin-left: -150px;*/
 }
 
 div.jp-time-holder {
@@ -215,8 +218,9 @@ div.jp-audio div.jp-type-single a.jp-unmute {
 
 div.jp-volume-block {
 	position: absolute;
-	top: 33px;
-    left: 500px;
+	top: 53px;
+    /*left: 500px;*/
+	right: 0;
     width: 120px;
 }
 
@@ -552,4 +556,40 @@ div.jp-jplayer {
 	font-weight:bold;
 }
 
+.playbar {
+	display: block;
+	width: 33%;
+	float: left;
+}
+
 /* @end */
+
+@media (max-width: 780px) {
+	div.jp-audio div.jp-type-playlist div.jp-interface {
+		height: 60px;
+	}
+}
+
+@media (max-width: 590px) {
+	.jp-time-block {
+		display:block !important;
+	}
+	.playbar {
+		width: 50%;
+		clear:both;
+	}
+	.playbar-progress {
+
+		margin-left: 10px;
+	}
+	div.jp-audio div.jp-type-playlist div.jp-interface {
+		height: 100px;
+	}
+}
+
+@media (max-width: 430px) {
+
+	.jp-volume-block {
+		display:none;
+	}
+}
\ No newline at end of file