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

* SAAS-1168, SAAS-1153 - work on station podcast frontend

Browse source 
* SAAS-1164 - Styling fixes for publishing and podcast editors
This commit is contained in:
Duncan Sommerville 2015-11-03 13:18:55 -05:00
parent 4cd00b50ee
commit c0d8b8b39c
14 changed files with 246 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1264,9 +1264,9 @@ var AIRTIME = (function(AIRTIME) {
podcastToolbarButtons[AIRTIME.widgets.Table.TOOLBAR_BUTTON_ROLES.DELETE].eventHandlers.click = AIRTIME.podcast.deleteSelectedPodcasts;
// Add a button to view the station podcast
podcastToolbarButtons["StationPodcast"] = {
'title' : $.i18n._("My Station Podcast"),
'iconClass' : "icon-music",
extraBtnClass : "",
title : $.i18n._("My Station Podcast"),
iconClass : "icon-music",
extraBtnClass : "btn-small",
elementId : "",
eventHandlers : {
click: AIRTIME.podcast.openStationPodcast
@ -1279,10 +1279,10 @@ var AIRTIME = (function(AIRTIME) {
true, //Enable item selection
podcastToolbarButtons, //Toolbar buttons
{ //Datatables overrides.
'aoColumns' : aoColumns,
'sAjaxSource' : ajaxSourceURL,
'oColReorder': {
'iFixedColumns': 1 // Checkbox
aoColumns : aoColumns,
sAjaxSource : ajaxSourceURL,
oColReorder: {
iFixedColumns: 1 // Checkbox
}
});

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

@ -16,7 +16,7 @@ var AIRTIME = (function (AIRTIME) {
* @param {{}} $http angular http service object
* @param {{}} podcast podcast metadata object
* @param {Tab} tab Tab object the controller is being bootstrapped in
*
*
* @constructor
*/
function PodcastController($scope, $http, podcast, tab) {
@ -186,9 +186,9 @@ var AIRTIME = (function (AIRTIME) {
var $scope = this.$scope,
buttons = {
deleteBtn: {
'title' : $.i18n._('Delete'),
'iconClass' : "icon-trash",
extraBtnClass : "btn-danger",
title : $.i18n._('Delete'),
iconClass : 'icon-trash',
extraBtnClass : 'btn-small btn-danger',
elementId : '',
eventHandlers : {
click: $scope.deleteSelectedEpisodes
@ -213,7 +213,7 @@ var AIRTIME = (function (AIRTIME) {
* @override
*/
StationPodcastController.prototype.reloadEpisodeTable = function() {
self.episodeTable.getDatatable().fnDraw();
this.episodeTable.getDatatable().fnDraw();
};
/**
@ -397,14 +397,23 @@ var AIRTIME = (function (AIRTIME) {
* @returns {*} the created Table object
*/
mod.initPodcastEpisodeDatatable = function(podcast, tab, params, buttons) {
buttons = $.extend({
slideToggle: {
title : '',
iconClass : 'spl-no-r-margin icon-chevron-up',
extraBtnClass : 'toggle-editor-form',
elementId : '',
eventHandlers : {}
}
}, buttons);
params = $.extend(params,
{
oColVis : {
sAlign: "right",
aiExclude: [0, 1],
buttonText: $.i18n._("Columns"),
oColVis: {
sAlign : 'right',
aiExclude : [0, 1],
buttonText : $.i18n._("Columns"),
iOverlayFade: 0,
oColReorder: {
oColReorder : {
iFixedColumns: 1 // Checkbox
}
}

3
airtime_mvc/public/js/airtime/library/publish.js
View file

@ -99,8 +99,7 @@ var AIRTIME = (function (AIRTIME) {
function _bootstrapAngularApp(mediaId, tab) {
publishApp.value('mediaId', mediaId);
publishApp.value('tab', tab);
var wrapper = AIRTIME.tabs.getActiveTab().contents.find(".editor_pane_wrapper");
wrapper.attr("ng-controller", "Publish");
var wrapper = AIRTIME.tabs.getActiveTab().contents.find(".angular_wrapper");
angular.bootstrap(wrapper.get(0), [PUBLISH_APP_NAME]);
}

10
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -912,13 +912,6 @@ var AIRTIME = (function(AIRTIME){
oData = {};
playlistRequest(sUrl, oData);
});
$pl.find(".toggle-editor-form").unbind().on("click", function(event) {
$pl.find(".inner_editor_wrapper").slideToggle(200);
var buttonIcon = $(this).find('span.icon-white');
buttonIcon.toggleClass('icon-chevron-up');
buttonIcon.toggleClass('icon-chevron-down');
});
}
function setUpPlaylist() {
@ -1138,9 +1131,6 @@ var AIRTIME = (function(AIRTIME){
type = pl.find('.obj_type').val();
url = baseUrl+'playlist/delete';
console.log(id);
console.log(type);
$.post(url,
{format: "json", ids: id, modified: lastMod, type: type},
function(json) {