From b12b08f0f4719e4cb161b5b797c6dbba5702c956 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 4 Nov 2015 09:29:03 -0500 Subject: [PATCH 1/3] SAAS-1164 - styling for publishing frontend --- .../scripts/library/publish-dialog.phtml | 26 ++++----- airtime_mvc/public/css/dashboard.css | 4 +- airtime_mvc/public/css/playlist_builder.css | 5 +- airtime_mvc/public/css/styles.css | 56 ++++++++++++------- 4 files changed, 52 insertions(+), 39 deletions(-) diff --git a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml index ff6501997..fd1b463f8 100644 --- a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml +++ b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml @@ -8,23 +8,19 @@
- - - + + + + + + + +
-
+
-
+
" @@ -36,7 +32,7 @@
{{label}} - +
" diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index 55645379f..17e771d2a 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -408,7 +408,7 @@ textarea { .edit-md-dialog .zend_form dt { float: left; - width: 40%; + width: 35%; text-align: right; @@ -419,7 +419,7 @@ textarea { .edit-md-dialog .zend_form dd { float: left; - width: auto; + width: 60%; font-size: 14px; margin: 0 0 10px; diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index 19c3550d8..ecbc60d52 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -14,7 +14,8 @@ } .edit-md-dialog dd input.input_text { - width: auto; + /*width: auto;*/ + width: 100%; } .spl_sortable,.spl_sortable>li,.side_playlist>div,#spl_editor,.spl_artist,.spl_cue_in,.spl_fade_in,.spl_cue_out,.spl_fade_out @@ -48,7 +49,7 @@ } .side_playlist textarea { - height: 3.2em; + /*height: 70px;*/ } .spl_sortable { diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index d04d3f639..4f34e70f7 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1703,7 +1703,12 @@ h2#scheduled_playlist_name span { } .simple-formblock dd .input_text { - width: 97.8%; + /*width: 97.8%;*/ + width: 100%; +} + +.simple-formblock dd textarea { + box-sizing: border-box; } .simple-formblock h2 { @@ -1721,7 +1726,6 @@ h2#scheduled_playlist_name span { padding-right: 8px; } .ui-button-icon-only.crossfade-main-button .ui-button-text, .ui-button-icons-only.crossfade-main-button .ui-button-text { - padding: 0; text-indent: -1e+7px; padding: 0.1em 1em; } @@ -3989,11 +3993,15 @@ li .ui-state-hover { .podcast-metadata p { text-align: center; padding: 0 5%; + margin-top: 0; } .podcast-metadata label, .podcast-metadata input, -.podcast-metadata textarea { +.podcast-metadata textarea, +.media-metadata label, +.media-metadata input, +.media-metadata textarea{ margin: 4px 0; } @@ -4001,19 +4009,23 @@ li .ui-state-hover { margin: 8px 60% 0 0; } -.podcast-metadata label { +.podcast-metadata label, +.media-metadata label { display: block; width: 20%; float: left; } .podcast-metadata input[type="text"], -.podcast-metadata textarea { +.podcast-metadata textarea, +.media-metadata input[type="text"], +.media-metadata textarea { width: 60%; float: left; } /* UI Revamp Video */ + #whatsnew { display: flex; flex-direction: column; @@ -4059,9 +4071,21 @@ li .ui-state-hover { } /* jQuery dialog */ -.no-close .ui-dialog-titlebar-close {display: none } +.no-close .ui-dialog-titlebar-close { + display: none +} /* Publishing Dialog */ + +.source-name { + text-align: left !important; +} + +.publish-sources input[type="checkbox"] { + float: left; + margin: 8px 20px 0 7px; +} + .published-sources { color: #efefef; font-size: 14px; @@ -4073,20 +4097,12 @@ li .ui-state-hover { padding-right: 8px; } +.published-sources > .source-name { + display: inline-block; + width: 15%; + padding: 0 16px; +} + .publish-edit-md { float: right; -} - -.publish-md-field { - text-align: left !important; - display: block; -} - -.publish-md-field > textarea, .publish-md-field > input { - display: block; - width: 50%; -} - -form.media-metadata fieldset { - margin-top: 8px; } \ No newline at end of file From 69da2fa07e54a36b5ef13c9921f0a24e0d992565 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 4 Nov 2015 09:45:16 -0500 Subject: [PATCH 2/3] Style tweaks --- airtime_mvc/public/css/playlist_builder.css | 1 + airtime_mvc/public/css/styles.css | 1 + airtime_mvc/public/js/airtime/library/podcast.js | 14 +++++++------- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index ecbc60d52..85e1c1ec8 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -45,6 +45,7 @@ .playlist_editor input, .playlist_editor textarea { width: 200px; + height: 70px; box-sizing: border-box; } diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 4f34e70f7..ae29e39ce 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1709,6 +1709,7 @@ h2#scheduled_playlist_name span { .simple-formblock dd textarea { box-sizing: border-box; + height: 70px; } .simple-formblock h2 { diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 4bb9e0a04..7a0b00595 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -181,7 +181,7 @@ var AIRTIME = (function (AIRTIME) { self._updatePodcast(); }; - $scope.deleteSelectedEpisodes = function () { + self.deleteSelectedEpisodes = function () { var episodes = self.episodeTable.getSelectedRows(); jQuery.each(episodes, function () { $http.delete(endpoint + $scope.podcast.id + '/episodes/' + this.id + '?csrf_token=' + $scope.csrf) @@ -191,7 +191,7 @@ var AIRTIME = (function (AIRTIME) { }); }; - $scope.openSelectedTabEditors = function () { + self.openSelectedTabEditors = function () { var episodes = self.episodeTable.getSelectedRows(); $.each(episodes, function () { var uid = AIRTIME.library.MediaTypeStringEnum.FILE + "_" + this.file_id; @@ -215,7 +215,7 @@ var AIRTIME = (function (AIRTIME) { * @private */ StationPodcastController.prototype._initTable = function() { - var $scope = this.$scope, + var self = this, $scope = this.$scope, buttons = { editBtn: { title : $.i18n._('Edit Metadata'), @@ -223,8 +223,8 @@ var AIRTIME = (function (AIRTIME) { extraBtnClass : '', elementId : '', eventHandlers : { - click: function(e) { - $scope.openSelectedTabEditors(); + click: function () { + self.openSelectedTabEditors(); } } }, @@ -234,8 +234,8 @@ var AIRTIME = (function (AIRTIME) { extraBtnClass : 'btn-danger', elementId : '', eventHandlers : { - click: function(e) { - $scope.deleteSelectedEpisodes(); + click: function () { + self.deleteSelectedEpisodes(); } } } From b4ec3eeb3f2659a7886d637a78ced31eab878c56 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 4 Nov 2015 10:52:23 -0500 Subject: [PATCH 3/3] Add sharing token/download key to station podcast URL when set to private; tab middle click fix --- .../controllers/PreferenceController.php | 8 ++++++++ .../application/forms/PodcastPreferences.php | 4 ++-- airtime_mvc/public/css/playlist_builder.css | 6 +++--- airtime_mvc/public/css/styles.css | 10 +++++++--- .../public/js/airtime/library/podcast.js | 19 ++++++++++--------- .../public/js/airtime/showbuilder/tabs.js | 16 +++++++++++----- 6 files changed, 41 insertions(+), 22 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 812ece169..02e3c406b 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -55,8 +55,16 @@ class PreferenceController extends Zend_Controller_Action // Refresh the download key when enabling privacy Application_Model_Preference::setStationPodcastDownloadKey(); } + + // Append sharing token (download key) to Station podcast URL + $stationPodcast = PodcastQuery::create()->findOneByDbId(Application_Model_Preference::getStationPodcastId()); + $key = Application_Model_Preference::getStationPodcastDownloadKey(); + $url = Application_Common_HTTPHelper::getStationUrl() . + (((int) $values["stationPodcastPrivacy"]) ? "feeds/station-rss?sharing_token=$key" : "feeds/station-rss"); + $stationPodcast->setDbUrl($url)->save(); Application_Model_Preference::setStationPodcastPrivacy($values["stationPodcastPrivacy"]); + $logoUploadElement = $form->getSubForm('preferences_general')->getElement('stationLogo'); $logoUploadElement->receive(); $imagePath = $logoUploadElement->getFileName(); diff --git a/airtime_mvc/application/forms/PodcastPreferences.php b/airtime_mvc/application/forms/PodcastPreferences.php index 8c6bc0075..5b2060e2f 100644 --- a/airtime_mvc/application/forms/PodcastPreferences.php +++ b/airtime_mvc/application/forms/PodcastPreferences.php @@ -17,8 +17,8 @@ class Application_Form_PodcastPreferences extends Zend_Form_SubForm { $stationPodcastPrivacy->setValue($isPrivate); $this->addElement($stationPodcastPrivacy); - $key = Application_Model_Preference::getStationPodcastDownloadKey(); - $url = Application_Common_HTTPHelper::getStationUrl()."feeds/station-rss".($isPrivate ? "?sharing_token=$key" : ""); + $stationPodcast = PodcastQuery::create()->findOneByDbId(Application_Model_Preference::getStationPodcastId()); + $url = $stationPodcast->getDbUrl(); $feedUrl = new Zend_Form_Element_Text("stationPodcastFeedUrl:"); $feedUrl->setAttrib('class', 'input_text') ->setAttrib('disabled', 'disabled') diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index 85e1c1ec8..41a5304a1 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -14,7 +14,6 @@ } .edit-md-dialog dd input.input_text { - /*width: auto;*/ width: 100%; } @@ -46,8 +45,9 @@ .playlist_editor input, .playlist_editor textarea { width: 200px; height: 70px; - box-sizing: border-box; -} + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box;} .side_playlist textarea { /*height: 70px;*/ diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index ae29e39ce..5f05da839 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1180,8 +1180,11 @@ input[type="checkbox"] { width: 100%; } #pref_form textarea { - width: 98.5%; + width: 100%; padding-left: 5px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } #pref_form select { width: 100%; @@ -1703,12 +1706,13 @@ h2#scheduled_playlist_name span { } .simple-formblock dd .input_text { - /*width: 97.8%;*/ width: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .simple-formblock dd textarea { - box-sizing: border-box; height: 70px; } diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 7a0b00595..3da968a7b 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -12,10 +12,12 @@ var AIRTIME = (function (AIRTIME) { /** * PodcastController constructor. * - * @param {{}} $scope angular scope service object - * @param {{}} $http angular http service object - * @param {{}} podcast podcast metadata object - * @param {Tab} tab Tab object the controller is being bootstrapped in + * @param {Object} $scope angular scope service object + * @param {Object} $http angular http service object + * @param {Object} podcast podcast metadata object + * @param {int} podcast.id podcast unique identifier + * @param {string} podcast.title podcast metadata title + * @param {Tab} tab Tab object the controller is being bootstrapped in * * @constructor */ @@ -57,7 +59,6 @@ var AIRTIME = (function (AIRTIME) { self._updatePodcast = function () { $http.put(endpoint + $scope.podcast.id, {csrf_token: $scope.csrf, podcast: $scope.podcast}) .success(function () { - // episodeTable.reload($scope.podcast.id); self.episodeTable.getDatatable().fnDraw(); AIRTIME.library.podcastDataTable.fnDraw(); tab.setName($scope.podcast.title); @@ -440,10 +441,10 @@ var AIRTIME = (function (AIRTIME) { * * Selection for the internal table represents episodes marked for ingest and is disabled for ingested episodes. * - * @param podcast the podcast data JSON object. - * @param tab Tab object the podcast will be opened in - * @param params JSON object containing datatables parameters to override - * @param buttons JSON object containing datatables button parameters + * @param {Object} podcast the podcast data JSON object. + * @param {Tab} tab Tab object the podcast will be opened in + * @param {Object} params JSON object containing datatables parameters to override + * @param {Object} buttons JSON object containing datatables button parameters * * @returns {*} the created Table object */ diff --git a/airtime_mvc/public/js/airtime/showbuilder/tabs.js b/airtime_mvc/public/js/airtime/showbuilder/tabs.js index fcfd33ff4..0268c390e 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/tabs.js +++ b/airtime_mvc/public/js/airtime/showbuilder/tabs.js @@ -111,10 +111,6 @@ var AIRTIME = (function(AIRTIME){ Tab.prototype._init = function() { var self = this; self.assignTabClickHandler(function(e) { - if (e.which == 2) { // Middle mouse - self.close(); - return; - } if (!$(this).hasClass('active')) { self.switchTo(); } @@ -146,7 +142,17 @@ var AIRTIME = (function(AIRTIME){ * @param {function} f the function to call when the tab is clicked */ Tab.prototype.assignTabClickHandler = function(f) { - this.tab.unbind("click").on("click", f); + var self = this; + self.tab.unbind("click").on("click", function (e) { + // Always close on middle mouse press + if (e.which == 2) { + // Simulate a click on the close tab button so any + // additional on-close behaviour is executed + self.tab.find(".lib_pl_close").click(); + return; + } + f(); + }); }; /**