diff --git a/airtime_mvc/application/controllers/IndexController.php b/airtime_mvc/application/controllers/IndexController.php index d65eecec0..f6dda5132 100644 --- a/airtime_mvc/application/controllers/IndexController.php +++ b/airtime_mvc/application/controllers/IndexController.php @@ -27,6 +27,7 @@ class IndexController extends Zend_Controller_Action $this->view->headLink()->setStylesheet($baseUrl.'css/radio-page/radio-page.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/embed/weekly-schedule-widget.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/radio-page/station-podcast.css?'.$CC_CONFIG['airtime_version']); + $this->view->headLink()->appendStylesheet($baseUrl.'css/bootstrap.css?'.$CC_CONFIG['airtime_version']); //jplayer control buttons $this->view->headLink()->appendStylesheet($baseUrl.'css/redmond/jquery-ui-1.8.8.custom.css?'.$CC_CONFIG['airtime_version']); @@ -62,6 +63,8 @@ class IndexController extends Zend_Controller_Action $length = explode(".", $v["CcFiles"]["length"]); $episodes[$e]["CcFiles"]["length"] = $length[0]; + + $episodes[$e]["mime"] = FileDataHelper::getAudioMimeTypeArray()[$v["CcFiles"]["mime"]]; } $episodePages = array_chunk($episodes, 10); diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml index e3f71fdcd..e38b39d91 100644 --- a/airtime_mvc/application/views/scripts/index/index.phtml +++ b/airtime_mvc/application/views/scripts/index/index.phtml @@ -61,26 +61,28 @@
"; + } + + $('.rss-tracks ul').append(playlist_item); playlist.push(media); }); @@ -161,7 +179,10 @@ _playlist_jplayer.play($(this).find('#rss-track').attr('data-rss-playlist-id')); }); - + $('.podcast_desc_btn').click(function(){ + $(this).toggleClass('current'); + $(this).next('.podcast_desc').slideToggle(); + }); } //buildPlaylist @@ -193,12 +214,13 @@ buildJplayerPlaylist(0, episodes); // build pagination menu - var pages = "
  • <
    • "; + var pages = "
  • <
    • "; $.each(episodes, function(index, value) { var page_number = +index + 1; pages += "
  • "+page_number+"
    • "; }); - pages += "
  • >
    • "; + var last_index = Object.keys(episodes).length -1; + pages += "
  • >
    • "; $("ul.pagination").append(pages); $("ul.pagination").find("li:contains('1')").addClass('current'); @@ -221,10 +243,6 @@ $(this).next('.podcast_desc').slideToggle(); }); - $('.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 f760e1233..1c6affe0c 100644 --- a/airtime_mvc/public/css/radio-page/station-podcast.css +++ b/airtime_mvc/public/css/radio-page/station-podcast.css @@ -55,12 +55,12 @@ div.jp-video-360p { div.jp-interface { position: relative; - background-color: #3D3D3D; + /*background-color: #3D3D3D; 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%; - border-top: 1px solid #5a5a5a; - border-bottom: 1px solid #1a1a1a; + */width: 100%; + /*border-top: 1px solid #5a5a5a;*/ + border-bottom: 1px solid #5a5a5a; } div.jp-audio div.jp-type-single div.jp-interface { @@ -78,7 +78,6 @@ div.jp-interface ul.jp-controls { margin: 0; cursor: pointer; position: relative; - top: 30px; left: 10px; } @@ -87,6 +86,7 @@ div.jp-interface ul.jp-controls li { float: left; padding: 1px 2px; margin-right: 5px; + border: none; } div.jp-interface ul.jp-controls li.jp-play, @@ -122,9 +122,17 @@ div.jp-volume-max span:hover { /* @group progress bar */ div.jp-time-block { - position: absolute; - top: 32px; - left: 230px; + position: relative; + top: 8px; + display: inline; + left: 0; + /*left: 230px;*/ +} + +div.jp-time-holder { + position: relative; + display: inline; + top: -3px; } div.jp-progress { @@ -132,8 +140,8 @@ div.jp-progress { background-color: #393939; } div.jp-audio div.jp-progress { - height: 10px; - border-color: #262526 #262526 #5E5E5E; + height: 15px; + border-color: #262526 #262526 #262526; border-style: solid; border-width: 1px; } @@ -145,6 +153,7 @@ div.jp-audio div.jp-type-single div.jp-progress { */ div.jp-audio div.jp-type-playlist div.jp-progress { width: 170px; + display:inline-block; } div.jp-seek-bar { @@ -239,8 +248,9 @@ div.jp-duration { font-size: 1em; } div.jp-current-time { - float: left; + /*float: left;*/ display: inline; + padding-top: 3px; color: #FF6F01; } div.jp-duration { @@ -370,6 +380,11 @@ div.jp-title, opacity: 1; } +.podcast .podcast_no_play { + margin-right: 15px; + opacity: 0.4; +} + .podcast .podcast_desc_btn { cursor: pointer; background: url('img/arrow.png') no-repeat center right; @@ -408,6 +423,9 @@ ul.pagination li.current { border-bottom: 1px solid #FD8913; } +.current-track { + text-align: left; +} div.jp-type-single div.jp-title,