Merge branch '2.3.x' into devel
This commit is contained in:
commit
ec159131a8
57 changed files with 4238 additions and 429 deletions
|
@ -24,7 +24,7 @@ $(document).ready(function(){
|
|||
cssSelectorAncestor: "#jp_container_1"
|
||||
},[], //array of songs will be filled with below's json call
|
||||
{
|
||||
swfPath: "/js/jplayer",
|
||||
swfPath: baseUrl+"js/jplayer",
|
||||
supplied:"oga, mp3, m4v, m4a, wav",
|
||||
size: {
|
||||
width: "0px",
|
||||
|
|
|
@ -776,8 +776,19 @@ var AIRTIME = (function(AIRTIME) {
|
|||
$simpleSearch.addClass("sp-invisible");
|
||||
}
|
||||
else {
|
||||
//clear the advanced search fields and reset datatable
|
||||
$(".filter_column input").val("").keyup();
|
||||
// clear the advanced search fields
|
||||
var divs = $("div#advanced_search").children(':visible');
|
||||
$.each(divs, function(i, div){
|
||||
fields = $(div).children().find('input');
|
||||
$.each(fields, function(i, field){
|
||||
if ($(field).val() !== "") {
|
||||
$(field).val("");
|
||||
// we need to reset the results when removing
|
||||
// an advanced search field
|
||||
$(field).keyup();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//reset datatable with previous simple search results (if any)
|
||||
$(".dataTables_filter input").val(simpleSearchText).keyup();
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
function redirectToLogin(){
|
||||
window.location = baseUrl+"/Login"
|
||||
window.location = baseUrl+"Login"
|
||||
}
|
|
@ -233,55 +233,61 @@ function eventRender(event, element, view) {
|
|||
}
|
||||
|
||||
//add the record/rebroadcast/soundcloud icons if needed
|
||||
if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -1) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span>');
|
||||
} else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id > 0) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
|
||||
} else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -2) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
|
||||
} else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -3) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
|
||||
}
|
||||
|
||||
if(view.name === 'month' && event.record === 1 && event.soundcloud_id === -1) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span>');
|
||||
} else if (view.name === 'month' && event.record === 1 && event.soundcloud_id > 0) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
|
||||
} else if (view.name === 'month' && event.record === 1 && event.soundcloud_id === -2) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
|
||||
} else if (view.name === 'month' && event.record === 1 && event.soundcloud_id === -3) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
|
||||
}
|
||||
|
||||
if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
|
||||
if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
|
||||
$(element)
|
||||
.find(".fc-event-time")
|
||||
.before('<span id="'+event.id+'" class="small-icon show-empty"></span>');
|
||||
} else if (event.show_partial_filled === true) {
|
||||
$(element)
|
||||
.find(".fc-event-time")
|
||||
.before('<span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
|
||||
if (event.record === 1) {
|
||||
if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
|
||||
if (event.soundcloud_id === -1) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span>');
|
||||
} else if ( event.soundcloud_id > 0) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
|
||||
} else if (event.soundcloud_id === -2) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
|
||||
} else if (event.soundcloud_id === -3) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
|
||||
}
|
||||
} else if (view.name === 'month') {
|
||||
if(event.soundcloud_id === -1) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span>');
|
||||
} else if (event.soundcloud_id > 0) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
|
||||
} else if (event.soundcloud_id === -2) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
|
||||
} else if (event.soundcloud_id === -3) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
|
||||
}
|
||||
}
|
||||
} else if (view.name === 'month') {
|
||||
if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
|
||||
$(element)
|
||||
.find(".fc-event-title")
|
||||
.after('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
|
||||
} else if (event.show_partial_filled === true) {
|
||||
$(element)
|
||||
.find(".fc-event-title")
|
||||
.after('<span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
|
||||
}
|
||||
|
||||
if (event.record === 0 && event.rebroadcast === 0) {
|
||||
if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
|
||||
if (event.show_empty === 1) {
|
||||
$(element)
|
||||
.find(".fc-event-time")
|
||||
.before('<span id="'+event.id+'" class="small-icon show-empty"></span>');
|
||||
} else if (event.show_partial_filled === true) {
|
||||
$(element)
|
||||
.find(".fc-event-time")
|
||||
.before('<span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
|
||||
}
|
||||
} else if (view.name === 'month') {
|
||||
if (event.show_empty === 1) {
|
||||
$(element)
|
||||
.find(".fc-event-title")
|
||||
.after('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
|
||||
} else if (event.show_partial_filled === true) {
|
||||
$(element)
|
||||
.find(".fc-event-title")
|
||||
.after('<span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//rebroadcast icon
|
||||
if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
|
||||
}
|
||||
|
||||
if(view.name === 'month' && event.rebroadcast === 1) {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
|
||||
if (event.rebroadcast === 1) {
|
||||
if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
|
||||
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
|
||||
} else if (view.name === 'month') {
|
||||
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
18
airtime_mvc/public/js/datatables/i18n/el_GR.txt
Normal file
18
airtime_mvc/public/js/datatables/i18n/el_GR.txt
Normal file
|
@ -0,0 +1,18 @@
|
|||
// Greek
|
||||
{
|
||||
"sProcessing": "Επεξεργασία...",
|
||||
"sLengthMenu": "Δείξε _MENU_ εγγραφές",
|
||||
"sZeroRecords": "Δεν βρέθηκαν εγγραφές που να ταιριάζουν",
|
||||
"sInfo": "Δείχνοντας _START_ εως _END_ από _TOTAL_ εγγραφές",
|
||||
"sInfoEmpty": "Δείχνοντας 0 εως 0 από 0 εγγραφές",
|
||||
"sInfoFiltered": "(φιλτραρισμένες από _MAX_ συνολικά εγγραφές)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Πρώτη",
|
||||
"sPrevious": "Προηγούμενη",
|
||||
"sNext": "Επόμενη",
|
||||
"sLast": "Τελευταία"
|
||||
}
|
||||
}
|
18
airtime_mvc/public/js/datatables/i18n/pl_PL.txt
Normal file
18
airtime_mvc/public/js/datatables/i18n/pl_PL.txt
Normal file
|
@ -0,0 +1,18 @@
|
|||
//Polish
|
||||
{
|
||||
"sProcessing": "Proszę czekać...",
|
||||
"sLengthMenu": "Pokaż _MENU_ pozycji",
|
||||
"sZeroRecords": "Nie znaleziono żadnych pasujących indeksów",
|
||||
"sInfo": "Pozycje od _START_ do _END_ z _TOTAL_ łącznie",
|
||||
"sInfoEmpty": "Pozycji 0 z 0 dostępnych",
|
||||
"sInfoFiltered": "(filtrowanie spośród _MAX_ dostępnych pozycji)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Pierwsza",
|
||||
"sPrevious": "Poprzednia",
|
||||
"sNext": "Następna",
|
||||
"sLast": "Ostatnia"
|
||||
}
|
||||
}
|
27
airtime_mvc/public/js/plupload/i18n/el_GR.js
Normal file
27
airtime_mvc/public/js/plupload/i18n/el_GR.js
Normal file
|
@ -0,0 +1,27 @@
|
|||
//Greek
|
||||
plupload.addI18n({
|
||||
'Select files' : $.i18n._('Select files'),
|
||||
'Add files to the upload queue and click the start button.' : $.i18n._('Add files to the upload queue and click the start button.'),
|
||||
'Filename' : $.i18n._('Filename'),
|
||||
'Status' : $.i18n._('Status'),
|
||||
'Size' : $.i18n._('Size'),
|
||||
'Add files' : $.i18n._('Add files'),
|
||||
'Stop current upload' : $.i18n._('Stop current upload'),
|
||||
'Start uploading queue' : $.i18n._('Start uploading queue'),
|
||||
'Uploaded %d/%d files': $.i18n._('Uploaded %d/%d files'),
|
||||
'N/A' : $.i18n._('N/A'),
|
||||
'Drag files here.' : $.i18n._('Drag files here.'),
|
||||
'File extension error.': $.i18n._('File extension error.'),
|
||||
'File size error.': $.i18n._('File size error.'),
|
||||
'Init error.': $.i18n._('Init error.'),
|
||||
'HTTP Error.': $.i18n._('HTTP Error.'),
|
||||
'Security error.': $.i18n._('Security error.'),
|
||||
'Generic error.': $.i18n._('Generic error.'),
|
||||
'IO error.': $.i18n._('IO error.'),
|
||||
'Stop Upload': $.i18n._('Stop Upload'),
|
||||
'Add Files': $.i18n._('Add Files'),
|
||||
'Start Upload': $.i18n._('Start Upload'),
|
||||
'Start upload': $.i18n._('Start upload'),
|
||||
'%d files queued': $.i18n._('%d files queued'),
|
||||
"Error: Invalid file extension: " : $.i18n._("Error: Invalid file extension: ")
|
||||
});
|
27
airtime_mvc/public/js/plupload/i18n/pl_PL.js
Normal file
27
airtime_mvc/public/js/plupload/i18n/pl_PL.js
Normal file
|
@ -0,0 +1,27 @@
|
|||
//Polish
|
||||
plupload.addI18n({
|
||||
'Select files' : $.i18n._('Select files'),
|
||||
'Add files to the upload queue and click the start button.' : $.i18n._('Add files to the upload queue and click the start button.'),
|
||||
'Filename' : $.i18n._('Filename'),
|
||||
'Status' : $.i18n._('Status'),
|
||||
'Size' : $.i18n._('Size'),
|
||||
'Add files' : $.i18n._('Add files'),
|
||||
'Stop current upload' : $.i18n._('Stop current upload'),
|
||||
'Start uploading queue' : $.i18n._('Start uploading queue'),
|
||||
'Uploaded %d/%d files': $.i18n._('Uploaded %d/%d files'),
|
||||
'N/A' : $.i18n._('N/A'),
|
||||
'Drag files here.' : $.i18n._('Drag files here.'),
|
||||
'File extension error.': $.i18n._('File extension error.'),
|
||||
'File size error.': $.i18n._('File size error.'),
|
||||
'Init error.': $.i18n._('Init error.'),
|
||||
'HTTP Error.': $.i18n._('HTTP Error.'),
|
||||
'Security error.': $.i18n._('Security error.'),
|
||||
'Generic error.': $.i18n._('Generic error.'),
|
||||
'IO error.': $.i18n._('IO error.'),
|
||||
'Stop Upload': $.i18n._('Stop Upload'),
|
||||
'Add Files': $.i18n._('Add Files'),
|
||||
'Start Upload': $.i18n._('Start Upload'),
|
||||
'Start upload': $.i18n._('Start upload'),
|
||||
'%d files queued': $.i18n._('%d files queued'),
|
||||
"Error: Invalid file extension: " : $.i18n._("Error: Invalid file extension: ")
|
||||
});
|
Loading…
Add table
Add a link
Reference in a new issue