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

Merge branch 'saas-dev' into saas-3.x-sessionoptimizations

Browse source
This commit is contained in:
Albert Santoni 2015-10-14 14:50:54 -04:00
commit 2713bd7beb
26 changed files with 4349 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/public/js/airtime/common/common.js
View file

@ -79,13 +79,19 @@ function getDatatablesStrings(overrideDict) {
"sSearch": $.i18n._(""),
"sZeroRecords": $.i18n._("No matching records found"),
"oPaginate": {
"sFirst": $.i18n._("First"),
"sLast": $.i18n._("Last"),
"sNext": $.i18n._("Next"),
"sPrevious": $.i18n._("Previous")
"sFirst": "«",
"sLast": "»",
"sNext": "›",
"sPrevious": "‹"
},
//"oPaginate": {
// "sFirst": $.i18n._("First"),
// "sLast": $.i18n._("Last"),
// "sNext": $.i18n._("Next"),
// "sPrevious": $.i18n._("Previous")
//},
"oAria": {
"sSortAscending": $.i18n._(": activate to sort column ascending"),
"sSortAscending": $.i18n._(": activate to sort column ascending"),
"sSortDescending": $.i18n._(": activate to sort column descending")
}
};

5
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -18,6 +18,7 @@ var AIRTIME = (function(AIRTIME) {
check = true;
}
var sortable = $(".spl_sortable");
if ($("#show_builder_table").is(":visible")) {
if (shows.length === 0) {
check = false;
@ -28,13 +29,15 @@ var AIRTIME = (function(AIRTIME) {
} else if (current.length !== 0) {
btnText = $.i18n._('Add to current show');
}
} else {
} else if (sortable.length > 0 && sortable.is(":visible")) {
var objType = $('.active-tab .obj_type').val();
if (objType === 'block') {
btnText = $.i18n._('Add to current smart block');
} else {
btnText = $.i18n._('Add to current playlist');
}
} else {
check = false;
}
if (check) {

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

@ -553,12 +553,6 @@ var AIRTIME = (function(AIRTIME) {
return getDatatablesStrings({
"sEmptyTable": $.i18n._(""),
"sZeroRecords": $.i18n._("No matching results found.")
//"oPaginate": {
// "sFirst": "<<",
// "sLast": ">>",
// "sNext": ">",
// "sPrevious": "<"
//}
});
break;
}

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

@ -537,10 +537,11 @@ var AIRTIME = (function(AIRTIME){
return;
}
newTab.tab.on("click", function() {
var type = newTab.pane.find(".obj_type").val(),
url = baseUrl + ((type === "playlist" || type === "block") ? 'playlist' : 'webstream') + '/edit';
if (!$(this).hasClass('active')) {
AIRTIME.showbuilder.switchTab(newTab.pane, newTab.tab);
$.post(baseUrl+'playlist/edit',
{format: "json", id: newTab.pane.find(".obj_id").val(), type: newTab.pane.find(".obj_type").val()});
$.post(url, {format: "json", id: newTab.pane.find(".obj_id").val(), type: type});
}
});
AIRTIME.playlist.init();

5
airtime_mvc/public/js/airtime/nowplaying/lang-timezone-setup.js
View file

@ -7,8 +7,11 @@ $(document).ready(function() {
width: 500,
resizable: false,
modal: true,
closeOnEscape: false,
position:['center','center'],
dialogClass: 'no-close',
buttons: [
/* Testing removing the Not Now button for higher engagement
{
id: "setup-later",
text: $.i18n._("Not Now"),
@ -16,7 +19,7 @@ $(document).ready(function() {
click: function() {
$(this).dialog("close");
}
},
},*/
{
id: "help_airtime",
text: $.i18n._("OK"),

2
airtime_mvc/public/js/airtime/schedule/schedule.js
View file

@ -224,7 +224,7 @@ function buildScheduleDialog (json, instance_id) {
}
]
});
//set the start end times so the builder datatables knows its time range.
fnServer.start = json.start;
fnServer.end = json.end;

5
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View file

@ -94,8 +94,6 @@ AIRTIME = (function(AIRTIME) {
check = validateTimeRange();
console.log(check);
if (check.isValid) {
//reset timestamp value since input values could have changed.
AIRTIME.showbuilder.resetTimestamp();
@ -111,7 +109,8 @@ AIRTIME = (function(AIRTIME) {
fn.ops = {};
}
fn.ops.showFilter = op.find("#sb_show_filter").val();
fn.ops.myShows = op.find("#sb_my_shows").is(":checked") ? 1 : 0;
// Hacky?
fn.ops.myShows = (fn.ops.showFilter == -1) ? 1 : 0;
}
oTable.fnDraw();