Merge branch '2.3.x' into 2.3.x-saas
This commit is contained in:
Martin Konecny
commit
6f5ffdc1e7
29 changed files with 7386 additions and 95 deletions
|
|
@ -37,7 +37,7 @@ function createDateInput(el, onSelect) {
|
|||
dayNamesMin: i18n_days_short,
|
||||
closeText: $.i18n._('Close'),
|
||||
//showButtonPanel: true,
|
||||
firstDay: weekStart
|
||||
firstDay: calendarPref.weekStart
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -324,7 +324,7 @@ function setAddShowEvents() {
|
|||
dayNamesMin: i18n_days_short,
|
||||
closeText: 'Close',
|
||||
showButtonPanel: true,
|
||||
firstDay: weekStart
|
||||
firstDay: calendarPref.weekStart
|
||||
});
|
||||
form.find('input[name^="add_show_rebroadcast_time"]').timepicker({
|
||||
amPmText: ['', ''],
|
||||
|
|
|
|||
|
|
@ -326,21 +326,36 @@ function eventResize( event, dayDelta, minuteDelta, revertFunc, jsEvent, ui, vie
|
|||
});
|
||||
}
|
||||
|
||||
function getFullCalendarEvents(start, end, callback) {
|
||||
var url, start_date, end_date;
|
||||
|
||||
start_date = makeTimeStamp(start);
|
||||
end_date = makeTimeStamp(end);
|
||||
|
||||
url = baseUrl+'Schedule/event-feed';
|
||||
|
||||
function preloadEventFeed () {
|
||||
var url = baseUrl+'Schedule/event-feed-preload';
|
||||
var d = new Date();
|
||||
|
||||
$.post(url, {format: "json", start: start_date, end: end_date, cachep: d.getTime()}, function(json){
|
||||
callback(json.events);
|
||||
|
||||
$.post(url, {format: "json", cachep: d.getTime()}, function(json){
|
||||
calendarEvents = json.events;
|
||||
createFullCalendar({calendarInit: calendarPref});
|
||||
});
|
||||
}
|
||||
|
||||
var initialLoad = true;
|
||||
function getFullCalendarEvents(start, end, callback) {
|
||||
|
||||
if (initialLoad) {
|
||||
initialLoad = false;
|
||||
callback(calendarEvents);
|
||||
} else {
|
||||
var url, start_date, end_date;
|
||||
|
||||
start_date = makeTimeStamp(start);
|
||||
end_date = makeTimeStamp(end);
|
||||
url = baseUrl+'Schedule/event-feed';
|
||||
|
||||
var d = new Date();
|
||||
$.post(url, {format: "json", start: start_date, end: end_date, cachep: d.getTime()}, function(json){
|
||||
callback(json.events);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function checkSCUploadStatus(){
|
||||
var url = baseUrl+'Library/get-upload-to-soundcloud-status/format/json';
|
||||
$("span[class*=progress]").each(function(){
|
||||
|
|
@ -541,6 +556,7 @@ function alertShowErrorAndReload(){
|
|||
window.location.reload();
|
||||
}
|
||||
|
||||
preloadEventFeed();
|
||||
$(document).ready(function(){
|
||||
setInterval( "checkSCUploadStatus()", 5000 );
|
||||
setInterval( "getCurrentShow()", 5000 );
|
||||
|
|
|
|||
|
|
@ -328,9 +328,6 @@ function alertShowErrorAndReload(){
|
|||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
$.ajax({ url: baseUrl+"Api/calendar-init/format/json", dataType:"json", success:createFullCalendar
|
||||
, error:function(jqXHR, textStatus, errorThrown){}});
|
||||
|
||||
setInterval(checkCalendarSCUploadStatus, 5000);
|
||||
|
||||
$.contextMenu({
|
||||
|
|
|
|||
18
airtime_mvc/public/js/datatables/i18n/cs_CZ.txt
Normal file
18
airtime_mvc/public/js/datatables/i18n/cs_CZ.txt
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
//Czech
|
||||
{
|
||||
"sProcessing": "Provádím...",
|
||||
"sLengthMenu": "Zobraz záznamů _MENU_",
|
||||
"sZeroRecords": "Žádné záznamy nebyly nalezeny",
|
||||
"sInfo": "Zobrazuji _START_ až _END_ z celkem _TOTAL_ záznamů",
|
||||
"sInfoEmpty": "Zobrazuji 0 až 0 z 0 záznamů",
|
||||
"sInfoFiltered": "(filtrováno z celkem _MAX_ záznamů)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "První",
|
||||
"sPrevious": "Předchozí",
|
||||
"sNext": "Další",
|
||||
"sLast": "Poslední"
|
||||
}
|
||||
}
|
||||
18
airtime_mvc/public/js/datatables/i18n/pt_BR.txt
Normal file
18
airtime_mvc/public/js/datatables/i18n/pt_BR.txt
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
//Portuguese Brasil
|
||||
{
|
||||
"sProcessing": "Processando...",
|
||||
"sLengthMenu": "Mostrar _MENU_ registros",
|
||||
"sZeroRecords": "Não foram encontrados resultados",
|
||||
"sInfo": "Mostrando de _START_ até _END_ de _TOTAL_ registros",
|
||||
"sInfoEmpty": "Mostrando de 0 até 0 de 0 registros",
|
||||
"sInfoFiltered": "(filtrado de _MAX_ registros no total)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Primeiro",
|
||||
"sPrevious": "Anterior",
|
||||
"sNext": "Seguinte",
|
||||
"sLast": "Último"
|
||||
}
|
||||
}
|
||||
27
airtime_mvc/public/js/plupload/i18n/cs_CZ.js
Normal file
27
airtime_mvc/public/js/plupload/i18n/cs_CZ.js
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
//Czech
|
||||
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/pt_BR.js
Normal file
27
airtime_mvc/public/js/plupload/i18n/pt_BR.js
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
//Portuguese Brazilian
|
||||
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