From cb62cff2779003131cffad3b79e02577b99d9081 Mon Sep 17 00:00:00 2001 From: Robbt Date: Wed, 12 Dec 2018 17:17:37 -0500 Subject: [PATCH 01/11] give user ability to edit podcast name --- airtime_mvc/application/views/scripts/podcast/podcast.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/podcast/podcast.phtml b/airtime_mvc/application/views/scripts/podcast/podcast.phtml index 1472bc78b..aa2a07603 100644 --- a/airtime_mvc/application/views/scripts/podcast/podcast.phtml +++ b/airtime_mvc/application/views/scripts/podcast/podcast.phtml @@ -9,7 +9,7 @@
- {{podcast.title}} +
From 6cd5550721df91ae3865c4aa261e43ddea8d40e7 Mon Sep 17 00:00:00 2001 From: Robbt Date: Wed, 12 Dec 2018 22:53:28 -0500 Subject: [PATCH 02/11] added button to generate smartblock and playlist for podcast --- .../application/modules/rest/Bootstrap.php | 11 +++++++++++ .../rest/controllers/PodcastController.php | 19 +++++++++++++++++++ .../application/services/PodcastService.php | 6 ++++++ .../views/scripts/podcast/podcast.phtml | 5 +++++ .../public/js/airtime/library/podcast.js | 11 +++++++++++ 5 files changed, 52 insertions(+) diff --git a/airtime_mvc/application/modules/rest/Bootstrap.php b/airtime_mvc/application/modules/rest/Bootstrap.php index b8575a2cf..3ac5a1891 100644 --- a/airtime_mvc/application/modules/rest/Bootstrap.php +++ b/airtime_mvc/application/modules/rest/Bootstrap.php @@ -21,6 +21,17 @@ class Rest_Bootstrap extends Zend_Application_Module_Bootstrap ); $router->addRoute('podcast-bulk', $podcastBulkRoute); + + $smartblockPodcastRoute = new Zend_Controller_Router_Route( + 'rest/podcast/smartblock', + array( + 'controller' => 'podcast', + 'action' => 'smartblock', + 'module' => 'rest' + ) + ); + $router->addRoute('podcast-smartblock', $smartblockPodcastRoute); + $stationPodcastRoute = new Zend_Controller_Router_Route( 'rest/podcast/station', array( diff --git a/airtime_mvc/application/modules/rest/controllers/PodcastController.php b/airtime_mvc/application/modules/rest/controllers/PodcastController.php index f80b16c34..b3fc38832 100644 --- a/airtime_mvc/application/modules/rest/controllers/PodcastController.php +++ b/airtime_mvc/application/modules/rest/controllers/PodcastController.php @@ -191,6 +191,25 @@ class Rest_PodcastController extends Zend_Rest_Controller $this->_helper->json->sendJson($responseBody); } + + /** + * Endpoint for triggering the generation of a smartblock and playlist to match the podcast name + */ + + public function smartblockAction() { + + $id = $this->_getParam('id', []); + if (!$id) { + return; + } + $podcast = Application_Service_PodcastService::getPodcastById($id); + + logging::info($podcast); + Application_Service_PodcastService::createPodcastSmartblockAndPlaylist($podcast); + } + + + /** * @throws PodcastNotFoundException * diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php index b9aecb389..f5abb8590 100644 --- a/airtime_mvc/application/services/PodcastService.php +++ b/airtime_mvc/application/services/PodcastService.php @@ -167,6 +167,12 @@ class Application_Service_PodcastService public static function createPodcastSmartblockAndPlaylist($podcast) { + if (is_array($podcast)) { + $newpodcast = new Podcast(); + $newpodcast->fromArray($podcast, BasePeer::TYPE_FIELDNAME); + $podcast = $newpodcast; + } + // Base class $newBl = new Application_Model_Block(); $newBl->setCreator(Application_Model_User::getCurrentUser()->getId()); $newBl->setName($podcast->getDbTitle()); diff --git a/airtime_mvc/application/views/scripts/podcast/podcast.phtml b/airtime_mvc/application/views/scripts/podcast/podcast.phtml index aa2a07603..6c715d8b3 100644 --- a/airtime_mvc/application/views/scripts/podcast/podcast.phtml +++ b/airtime_mvc/application/views/scripts/podcast/podcast.phtml @@ -25,6 +25,11 @@
+
+ +
diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 1f23c9cf8..1e578fdb3 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -49,6 +49,14 @@ var AIRTIME = (function (AIRTIME) { }); }; + + /** + * Generate a smartblock and playlist for this smartblock. + */ + $scope.createSmartblock = function () { + console.log($scope.podcast.id); + $.post(endpoint + "smartblock", {csrf_token: $("#csrf").val(), id: $scope.podcast.id}, callback); + /** * Close the tab and discard any changes made to the podcast data. */ @@ -64,6 +72,9 @@ var AIRTIME = (function (AIRTIME) { return self; } + + + /** * Initialize the controller. * From ac10de50909370a210feb3864ab18a9e6a6c79f9 Mon Sep 17 00:00:00 2001 From: Robbt Date: Thu, 13 Dec 2018 21:26:08 -0500 Subject: [PATCH 03/11] fixed missing closing bracket and removed debugging log --- airtime_mvc/public/js/airtime/library/podcast.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 1e578fdb3..38d5728db 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -54,9 +54,8 @@ var AIRTIME = (function (AIRTIME) { * Generate a smartblock and playlist for this smartblock. */ $scope.createSmartblock = function () { - console.log($scope.podcast.id); $.post(endpoint + "smartblock", {csrf_token: $("#csrf").val(), id: $scope.podcast.id}, callback); - + }; /** * Close the tab and discard any changes made to the podcast data. */ From 15b73580c11f242dfe0d56ccf1bdc3aea9640518 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 14 Dec 2018 05:40:47 -0600 Subject: [PATCH 04/11] podcasts: change icon from cog to edit pencil --- airtime_mvc/public/js/airtime/library/library.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 351c71e57..b1e3b5075 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -1379,8 +1379,8 @@ var AIRTIME = (function(AIRTIME) { }); $.extend(true, podcastToolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.EDIT], { - title: $.i18n._('Settings'), - iconClass : "icon-cog", + title: $.i18n._('Edit'), + iconClass : "icon-pencil", eventHandlers: { click: AIRTIME.podcast.editSelectedPodcasts }, From 15cf291bc990c081018ffa8a55bbad0ed684d9c0 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 14 Dec 2018 15:24:28 -0600 Subject: [PATCH 05/11] set auto-generated smartblock and playlist title directly from input --- .../rest/controllers/PodcastController.php | 5 +- .../application/services/PodcastService.php | 75 ++++++++++--------- .../public/js/airtime/library/podcast.js | 13 +++- 3 files changed, 53 insertions(+), 40 deletions(-) diff --git a/airtime_mvc/application/modules/rest/controllers/PodcastController.php b/airtime_mvc/application/modules/rest/controllers/PodcastController.php index b3fc38832..eb454cb94 100644 --- a/airtime_mvc/application/modules/rest/controllers/PodcastController.php +++ b/airtime_mvc/application/modules/rest/controllers/PodcastController.php @@ -198,14 +198,15 @@ class Rest_PodcastController extends Zend_Rest_Controller public function smartblockAction() { + $title = $this->_getParam('title', []); $id = $this->_getParam('id', []); if (!$id) { return; } $podcast = Application_Service_PodcastService::getPodcastById($id); - logging::info($podcast); - Application_Service_PodcastService::createPodcastSmartblockAndPlaylist($podcast); + // logging::info($podcast); + Application_Service_PodcastService::createPodcastSmartblockAndPlaylist($podcast, $title); } diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php index f5abb8590..b67028a8c 100644 --- a/airtime_mvc/application/services/PodcastService.php +++ b/airtime_mvc/application/services/PodcastService.php @@ -162,55 +162,56 @@ class Application_Service_PodcastService /** * @param $podcast + * @param $title passed in directly from web UI input * This will automatically create a smartblock and playlist for this podcast. */ - public static function createPodcastSmartblockAndPlaylist($podcast) + public static function createPodcastSmartblockAndPlaylist($podcast, $title) { if (is_array($podcast)) { $newpodcast = new Podcast(); $newpodcast->fromArray($podcast, BasePeer::TYPE_FIELDNAME); $podcast = $newpodcast; } - // Base class - $newBl = new Application_Model_Block(); - $newBl->setCreator(Application_Model_User::getCurrentUser()->getId()); - $newBl->setName($podcast->getDbTitle()); - $newBl->setDescription('Auto-generated smartblock for podcast'); - $newBl->saveType('dynamic'); - // limit the smartblock to 1 item - $row = new CcBlockcriteria(); - $row->setDbCriteria('limit'); - $row->setDbModifier('items'); - $row->setDbValue(1); - $row->setDbBlockId($newBl->getId()); - $row->save(); + // Base class + $newBl = new Application_Model_Block(); + $newBl->setCreator(Application_Model_User::getCurrentUser()->getId()); + $newBl->setName($title); + $newBl->setDescription('Auto-generated smartblock for podcast'); + $newBl->saveType('dynamic'); + // limit the smartblock to 1 item + $row = new CcBlockcriteria(); + $row->setDbCriteria('limit'); + $row->setDbModifier('items'); + $row->setDbValue(1); + $row->setDbBlockId($newBl->getId()); + $row->save(); - // sort so that it is the newest item - $row = new CcBlockcriteria(); - $row->setDbCriteria('sort'); - $row->setDbModifier('N/A'); - $row->setDbValue('newest'); - $row->setDbBlockId($newBl->getId()); - $row->save(); + // sort so that it is the newest item + $row = new CcBlockcriteria(); + $row->setDbCriteria('sort'); + $row->setDbModifier('N/A'); + $row->setDbValue('newest'); + $row->setDbBlockId($newBl->getId()); + $row->save(); - // match the track by ensuring the album title matches the podcast - $row = new CcBlockcriteria(); - $row->setDbCriteria('album_title'); - $row->setDbModifier('is'); - $row->setDbValue($newBl->getName()); - $row->setDbBlockId($newBl->getId()); - $row->save(); + // match the track by ensuring the album title matches the podcast + $row = new CcBlockcriteria(); + $row->setDbCriteria('album_title'); + $row->setDbModifier('is'); + $row->setDbValue($title); + $row->setDbBlockId($newBl->getId()); + $row->save(); - $newPl = new Application_Model_Playlist(); - $newPl->setName($podcast->getDbTitle()); - $newPl->setCreator(Application_Model_User::getCurrentUser()->getId()); - $row = new CcPlaylistcontents(); - $row->setDbBlockId($newBl->getId()); - $row->setDbPlaylistId($newPl->getId()); - $row->setDbType(2); - $row->save(); - } + $newPl = new Application_Model_Playlist(); + $newPl->setName($title); + $newPl->setCreator(Application_Model_User::getCurrentUser()->getId()); + $row = new CcPlaylistcontents(); + $row->setDbBlockId($newBl->getId()); + $row->setDbPlaylistId($newPl->getId()); + $row->setDbType(2); + $row->save(); + } public static function createStationPodcast() diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 38d5728db..70a125eb1 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -54,7 +54,18 @@ var AIRTIME = (function (AIRTIME) { * Generate a smartblock and playlist for this smartblock. */ $scope.createSmartblock = function () { - $.post(endpoint + "smartblock", {csrf_token: $("#csrf").val(), id: $scope.podcast.id}, callback); + // send smarblock creation instruction to API + $.post( + endpoint + "smartblock", + { + csrf_token: $("#csrf").val(), + id: $scope.podcast.id, + title: $scope.podcast.title + }, + callback + ); + // save podcast + $scope.savePodcast(); }; /** * Close the tab and discard any changes made to the podcast data. From 58299962023342027aeed50d85a629cb7eb92dc7 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 14 Dec 2018 15:26:37 -0600 Subject: [PATCH 06/11] remove podcast pane close upon save --- airtime_mvc/public/js/airtime/library/podcast.js | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 70a125eb1..b4aad6219 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -36,7 +36,6 @@ var AIRTIME = (function (AIRTIME) { self.onSaveCallback = function () { AIRTIME.library.podcastDataTable.fnDraw(); - tab.close(); }; /** From bde87c7afb50dd5f736b828cd5388811d203a32d Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 15 Dec 2018 05:09:19 -0600 Subject: [PATCH 07/11] podcast smartblock generation: add success message and conditional hide --- .../views/scripts/podcast/podcast.phtml | 40 ++++---- airtime_mvc/public/css/styles.css | 95 +++++++------------ .../public/js/airtime/library/podcast.js | 11 ++- 3 files changed, 65 insertions(+), 81 deletions(-) diff --git a/airtime_mvc/application/views/scripts/podcast/podcast.phtml b/airtime_mvc/application/views/scripts/podcast/podcast.phtml index 6c715d8b3..b13d88f3f 100644 --- a/airtime_mvc/application/views/scripts/podcast/podcast.phtml +++ b/airtime_mvc/application/views/scripts/podcast/podcast.phtml @@ -7,28 +7,34 @@
-
+
- +
-
+
- - {{podcast.url}} - + {{podcast.url}}
-
- - +
+
+ +
+
-
- - +
+
+ +
+
-
- +
+
+
+ + +
@@ -46,6 +52,6 @@
- +
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 3cab8afd2..2658c7c23 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -4137,66 +4137,34 @@ li .ui-state-hover { padding: 5px 0 0 5px; } -.podcast-metadata p { - text-align: center; - padding: 0 10px; - margin-top: 0; +.podcast-metadata-row { + margin: 10px 0; + display: flex; + align-items: center; } - -.podcast-metadata label, -.podcast-metadata input:not([type="checkbox"]), -.podcast-metadata select, -.podcast-metadata textarea, -.media-metadata label, -.media-metadata input:not([type="checkbox"]), -.media-metadata select, -.media-metadata textarea { - margin: 4px 0; -} - -.podcast-metadata input[type="checkbox"] { - float: left; - margin: 8px 0 0; -} - -.podcast-metadata input[type="checkbox"].no-float { +.podcast-metadata .podcast-metadata-row * { + line-height: 1.3; + position: static; float: none; - margin: 8px 0 0; +} +.podcast-metadata-row > *:first-child { + flex: 0 0 25%; + max-width: 25%; + text-align: right; + padding-right: 2%; + box-sizing: border-box; +} +.podcast-metadata-row > *:last-child { + flex: 0 0 75%; + max-width: 75%; + box-sizing: border-box; + text-align: left; } -.podcast-metadata input[type="checkbox"].float-right { - float:right; - margin: 8px 0 0; - -} - -.podcast-metadata label, -.media-metadata label { - display: block; - width: 20%; - float: left; -} - -.podcast-metadata input:not([type="checkbox"]), -.podcast-metadata select, -.podcast-metadata textarea, -.media-metadata input:not([type="checkbox"]), -.media-metadata select, -.media-metadata textarea { - width: 60%; - float: left; -} - -.podcast-metadata-field { - display: inline-block; - width: 60%; - min-width: 60%; - max-width: 60%; +.podcast-url { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - margin: 4px 0; - line-height: 24px; } .podcast_episodes_imported { @@ -4221,6 +4189,17 @@ li .ui-state-hover { overflow: auto; } + +#podcast_url_dialog table tr td { + padding: 0; +} + +#podcast_url_dialog .errors { + display: inline-block; + float: right; + width: 50%; +} + /* UI Revamp Video */ #whatsnew { @@ -4336,16 +4315,6 @@ li .ui-state-hover { float: right; } -#podcast_url_dialog table tr td { - padding: 0; -} - -#podcast_url_dialog .errors { - display: inline-block; - float: right; - width: 50%; -} - #upgrade-feature-locked { margin: 0 auto; width: 50%; diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index b4aad6219..52e35736d 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -61,7 +61,16 @@ var AIRTIME = (function (AIRTIME) { id: $scope.podcast.id, title: $scope.podcast.title }, - callback + function() { + var successMsg = $('.active-tab .pc-sb-success') + successMsg.text($.i18n._('Smartblock and playlist generated')); + successMsg.show(); + setTimeout(function(){ + successMsg.hide(); + }, 5000); + dt = $('table[id="library_display"]').dataTable(); + dt.fnStandingRedraw(); + } ); // save podcast $scope.savePodcast(); From 91e3bdfd2f2f71c1a761cdf2de341c781367d630 Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 15 Dec 2018 06:09:31 -0600 Subject: [PATCH 08/11] add success indication to podcast settings save --- airtime_mvc/public/css/styles.css | 4 +- .../public/js/airtime/library/podcast.js | 53 ++++++++++++------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 2658c7c23..347b6397a 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -4166,7 +4166,9 @@ li .ui-state-hover { overflow: hidden; text-overflow: ellipsis; } - +.podcast-metadata-row .success { + margin-top: 10px; +} .podcast_episodes_imported { text-align: center !important; } diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 52e35736d..309b258fd 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -35,6 +35,11 @@ var AIRTIME = (function (AIRTIME) { view.find("table").attr("id", "podcast_episodes_" + podcast.id); self.onSaveCallback = function () { + var successMsg = $('.active-tab .btn-toolbar .success') + successMsg.text($.i18n._("Podcast settings saved")).show("fast"); + setTimeout(function () { + successMsg.hide("fast"); + }, 5000); AIRTIME.library.podcastDataTable.fnDraw(); }; @@ -62,18 +67,29 @@ var AIRTIME = (function (AIRTIME) { title: $scope.podcast.title }, function() { + // show success message var successMsg = $('.active-tab .pc-sb-success') successMsg.text($.i18n._('Smartblock and playlist generated')); - successMsg.show(); + successMsg.show("fast"); setTimeout(function(){ - successMsg.hide(); + successMsg.hide("fast"); }, 5000); + + // save podcast but do not display notification beside save button below + $http.put(endpoint + $scope.podcast.id, + { + csrf_token: $scope.csrf, + podcast: $scope.podcast + }) + .success(function () { + AIRTIME.library.podcastDataTable.fnDraw(); + }); + + // redraw list of smartblocks just in case they have it visible on the left dt = $('table[id="library_display"]').dataTable(); dt.fnStandingRedraw(); } ); - // save podcast - $scope.savePodcast(); }; /** * Close the tab and discard any changes made to the podcast data. @@ -129,20 +145,21 @@ var AIRTIME = (function (AIRTIME) { function StationPodcastController($scope, $http, podcast, tab) { // Super call to parent controller PodcastController.call(this, $scope, $http, podcast, tab); - this.onSaveCallback = function () { - $http({ - method: 'POST', - url: '/preference/station-podcast-settings', - headers: {'Content-Type': 'application/x-www-form-urlencoded'}, - data: { stationPodcastPrivacy: $("#podcast-settings").find("input:checked").val() } - }).success(function (data) { - jQuery.extend($scope.podcast, data); - $(".success").text($.i18n._("Podcast settings saved")).slideDown("fast"); - setTimeout(function () { - $(".success").slideUp("fast"); - }, 2000); - }); - }; + // @frecuencialibre commenting this out since i think it is never called. @todo delete once confirmed + // this.onSaveCallback = function () { + // $http({ + // method: 'POST', + // url: '/preference/station-podcast-settings', + // headers: {'Content-Type': 'application/x-www-form-urlencoded'}, + // data: { stationPodcastPrivacy: $("#podcast-settings").find("input:checked").val() } + // }).success(function (data) { + // jQuery.extend($scope.podcast, data); + // $(".success").text($.i18n._("Podcast settings saved")).slideDown("fast"); + // setTimeout(function () { + // $(".success").slideUp("fast"); + // }, 2000); + // }); + // }; return this; } From 29501528a92a54c06395db0363a3337401b932e1 Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 15 Dec 2018 06:54:03 -0600 Subject: [PATCH 09/11] provide fallback podcast name for smartblock creation from popup --- airtime_mvc/application/services/PodcastService.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php index b67028a8c..9f5be9ead 100644 --- a/airtime_mvc/application/services/PodcastService.php +++ b/airtime_mvc/application/services/PodcastService.php @@ -166,12 +166,15 @@ class Application_Service_PodcastService * This will automatically create a smartblock and playlist for this podcast. */ - public static function createPodcastSmartblockAndPlaylist($podcast, $title) + public static function createPodcastSmartblockAndPlaylist($podcast, $title = "Podcast") { if (is_array($podcast)) { $newpodcast = new Podcast(); $newpodcast->fromArray($podcast, BasePeer::TYPE_FIELDNAME); $podcast = $newpodcast; + if ($title == "Podcast") { + $title = $podcast->getDbTitle(); + } } // Base class $newBl = new Application_Model_Block(); From 6bbaa88b0f4e78a55e825e9f2c863ebf22d85a2f Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 15 Dec 2018 06:58:36 -0600 Subject: [PATCH 10/11] add podcast "overwrite album..." setting tooltip --- .../views/scripts/podcast/podcast.phtml | 4 +++- airtime_mvc/public/css/styles.css | 2 +- .../public/js/airtime/library/podcast.js | 22 +++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/views/scripts/podcast/podcast.phtml b/airtime_mvc/application/views/scripts/podcast/podcast.phtml index b13d88f3f..2a2c8122e 100644 --- a/airtime_mvc/application/views/scripts/podcast/podcast.phtml +++ b/airtime_mvc/application/views/scripts/podcast/podcast.phtml @@ -25,7 +25,9 @@
- +
+ +
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 347b6397a..08d86810b 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -204,7 +204,7 @@ img.logo .airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon, .playlist_type_help_icon, .repeat_tracks_help_icon, .show_linking_help_icon, .admin_username_help_icon, .stream_type_help_icon, .overflow_tracks_help_icon, -.show_timezone_help_icon, .show_autoplaylist_help_icon { +.show_timezone_help_icon, .show_autoplaylist_help_icon, .help_icon { cursor: help; position: relative; display:inline-block; zoom:1; diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 309b258fd..ac90eb588 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -324,6 +324,28 @@ var AIRTIME = (function (AIRTIME) { uid = AIRTIME.library.MediaTypeStringEnum.PODCAST+"_"+podcast.id, tab = AIRTIME.tabs.openTab(data.html, uid, null); _bootstrapAngularApp(podcast, tab); + + $(".album_names.help_icon").qtip({ + content: { + text: $.i18n._('Overwrite downloaded podcast episodes\' "Album" metadata tag with the Podcast Name specified above. This album name can then be used as a search criteria by a smartblock.') + }, + hide: { + delay: 500, + fixed: true + }, + style: { + border: { + width: 0, + radius: 4 + }, + classes: "ui-tooltip-dark ui-tooltip-rounded" + }, + position: { + my: "left bottom", + at: "right center" + } + }); + } /** From f803b69fddd50810ffc9dadb6d9f3957e3e26fad Mon Sep 17 00:00:00 2001 From: Robbt Date: Mon, 17 Dec 2018 11:19:16 -0500 Subject: [PATCH 11/11] fixed default behavior of podcast autogenerated smartblocks and playlists --- airtime_mvc/application/services/PodcastService.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php index 9f5be9ead..8ea319772 100644 --- a/airtime_mvc/application/services/PodcastService.php +++ b/airtime_mvc/application/services/PodcastService.php @@ -166,15 +166,15 @@ class Application_Service_PodcastService * This will automatically create a smartblock and playlist for this podcast. */ - public static function createPodcastSmartblockAndPlaylist($podcast, $title = "Podcast") + public static function createPodcastSmartblockAndPlaylist($podcast, $title = null) { if (is_array($podcast)) { $newpodcast = new Podcast(); $newpodcast->fromArray($podcast, BasePeer::TYPE_FIELDNAME); $podcast = $newpodcast; - if ($title == "Podcast") { - $title = $podcast->getDbTitle(); - } + } + if ($title == null) { + $title = $podcast->getDbTitle(); } // Base class $newBl = new Application_Model_Block();