Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing

This commit is contained in:
Duncan Sommerville 2015-11-16 11:36:24 -05:00
commit 610d860d6a
19 changed files with 271 additions and 200 deletions

View file

@ -1405,6 +1405,7 @@ var AIRTIME = (function(AIRTIME) {
};
// Add a button to view the station podcast
/* Moved to a separate top-level menu item
podcastToolbarButtons["StationPodcast"] = {
title : $.i18n._("My Podcast"),
iconClass : "icon-music",
@ -1415,6 +1416,7 @@ var AIRTIME = (function(AIRTIME) {
},
validateConstraints: function () { return true; }
};
*/
//Set up the div with id "podcast_table" as a datatable.
mod.podcastTableWidget = new AIRTIME.widgets.Table(
@ -1586,6 +1588,8 @@ var AIRTIME = (function(AIRTIME) {
// If we load sequentially there's a delay before the table appears
aaData : {},
oColVis : {
buttonText: $.i18n._("Columns"),
iOverlayFade: 0,
aiExclude: [0, 1, 2]
},
oColReorder: {