Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #637 from Robbt/podcastname-edit

Browse source 
Make podcast name editable
This commit is contained in:
frecuencialibre 2018-12-17 12:28:28 -06:00 • committed by GitHub
commit 0ccf4da1e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 226 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

101
airtime_mvc/public/css/styles.css
View file

@ -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;
@ -4137,68 +4137,38 @@ 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-metadata-row .success {
margin-top: 10px;
}
.podcast_episodes_imported {
text-align: center !important;
}
@ -4221,6 +4191,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 +4317,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%;

4
airtime_mvc/public/js/airtime/library/library.js
View file

@ -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
},

98
airtime_mvc/public/js/airtime/library/podcast.js
View file

@ -35,8 +35,12 @@ 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();
tab.close();
};
/**
@ -49,6 +53,44 @@ var AIRTIME = (function (AIRTIME) {
});
};
/**
* Generate a smartblock and playlist for this smartblock.
*/
$scope.createSmartblock = function () {
// send smarblock creation instruction to API
$.post(
endpoint + "smartblock",
{
csrf_token: $("#csrf").val(),
id: $scope.podcast.id,
title: $scope.podcast.title
},
function() {
// show success message
var successMsg = $('.active-tab .pc-sb-success')
successMsg.text($.i18n._('Smartblock and playlist generated'));
successMsg.show("fast");
setTimeout(function(){
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();
}
);
};
/**
* Close the tab and discard any changes made to the podcast data.
*/
@ -64,6 +106,9 @@ var AIRTIME = (function (AIRTIME) {
return self;
}
/**
* Initialize the controller.
*
@ -100,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;
}
@ -278,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"
}
});
}
/**