From 06dbcfbcf8debd937da28dd1c872a06dba609582 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 14 Feb 2013 17:18:45 +0000 Subject: [PATCH 1/2] Shorten Greek translation of 'Scheduled Play' (CC-4947) --- .../locale/el_GR/LC_MESSAGES/airtime.mo | Bin 83258 -> 83221 bytes .../locale/el_GR/LC_MESSAGES/airtime.po | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo index 98a3e9ae6906ce82467d0647d9cc044af4d1b273..81ea07d40772d415547a6327b20dee6717f7508e 100644 GIT binary patch delta 2256 zcmXZdeN5F=9LMo=e%ng|;(chP8zuqGBef_C8p#6!V&7PSCRq+3`rrV{64HEu?|{|;8+FzN&5 zQ4@KhtjWi?71d#xNN#VIA|EIT~Sf6ee1;7|Spp>rn&0gc@J~ zm9mqlOr1uh_#Eo}ix`4eQ8jf9^#Q-2KIjju#OS5g|Db9kvcNspipp3g>iHhj7F-C>P>K^*S+fo|qR#KZpx3dC*uUD{ zfV)r&?MDqX5%h0VRp%ADls}G2^)}S0*?~IddoTujP_-2}PD3f2N2M%&joYg#)bZJX z%E)Ha#4q9v`~XAn^&)rt-at(_fVv-sa2I|X{Jpf;Jy(m`q6VZc1Lj#8N>#t#nr58C zhw=Wk)->TD*5IG0ttcvSzwbspKZ%DhqtqR@F?@nJYn?T%*p2$qzi=zol(||sj_Y*( zXJ~ZtLt42zUMKM|v8Te_-2tOAu1!MQJEM+T~y~$MSdmd z4C=Uhs<;7}-_+A6#6DCle1{tFKMcc&YFDlCsAH9dnxGW5Wp${Ox1&x+AL_WCMU8U_ z7vMB%fxn`z=9?JMK(@vW7>?TWIMm8hgYjzg5LaUfu1CH1D#qdg)W7TZ@kzWL>~E}f zHPeDx&_UFD$57*cQfrfpj@21Dw9=nY1J0uEe9ve?fq!dQL7}gpxTL^8+T8cr9`9uL V<ycm&h&qhLINsl?aOhf&kqdkfJ+ zyb9-H8;)WR7U8;R8!-3K=!&)`0S^WJ03ReC3&t@qZUH{j!fG%J*WxnVfqMTeR^s=l z=RC1)A|K`xKaM%L54F%wVguHs(D;cCKi&zNALj;YK`;HsP%n&PCSJp5F>bmw(YO<} z;4U1&A2AFM#=9>+in+vJVJP0h`|wVHh87Sp!%&WM{%>)ntgZFdje^&lPOInEPD{H{x@|owx>VmNmUtk5?4?tT~0hU=zNT z?P|;9SW`>fiUIb(4AQ8;+o;qnnd4GijoR}y7>ln4`wyeG>Rk*aBZH_tJvG;wd3YIB zq>;HUlPRci(@{m4jU8B!%lX%Z(o07xo=2r9XP&!gp2r2mU8w3lk6Ac{i}Bw1uIQ>! z3)qA@C3{d?+KVdY?@(LvH+peNo~x-R@;Lu`U<(~O->;+MGpLkLVI@ZAy9sJh3*L&l z**dWVkKt0h6#PBa?`mTq>bbqBj2%ZkKY-eTYXKTc@zMp>l;L*N`RxxHUSLf*aTDqa zK8#xEFlwNwpvi@8+FW&;tU)>)mGpFjZ7Mzg)U{~sJ(g;b$p&d zWn>3x;y3VT`~o%6`$g{fokUGIg1R5Za6A4Q{Jpu@J+~3HMO%=%44C~ibc}{etZBr! zMbbBxB)bB@7&;N<9;mXDCxJ_a+@#->b+VDfvmnN0F8?X(lh%aE7 z&VTe0Yj)D{5H{dAcB5~pySqnFFI+`sCbz;}%>}rbxCwQ$eTmA*MN}pxQ5V&3sG7MM zG`i9qcOTX;ziFpYh(oAa_yaXy#xj?(LevddjyhJWQ4=(ys(dpl)~ zz`M~dcMA+fUCj{~&_G!}2*wR~7x7bAiknc+zk>J?;ztElj aPyE5O92*ug\n" "POT-Creation-Date: 2013-02-07 16:22-0500\n" -"PO-Revision-Date: 2013-02-08 11:13+0100\n" +"PO-Revision-Date: 2013-02-14 17:18+0100\n" "Last-Translator: Daniel James \n" "Language-Team: Greek Localization \n" "Language: el_GR\n" @@ -2867,7 +2867,7 @@ msgstr "Εμφάνιση Πηγής " #: airtime_mvc/application/views/scripts/partialviews/header.phtml:45 msgid "Scheduled Play" -msgstr "Προγραμματισμένη Αναπαραγωγή" +msgstr "Πρόγραμμα" #: airtime_mvc/application/views/scripts/partialviews/header.phtml:54 msgid "ON AIR" From bb7e56e39e8a8bb0a05c371581236a50d133b6d8 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 14 Feb 2013 12:58:31 -0500 Subject: [PATCH 2/2] CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned -fixed --- airtime_mvc/public/js/airtime/dashboard/dashboard.js | 6 ++++-- airtime_mvc/public/js/airtime/library/library.js | 5 +++-- .../public/js/airtime/preferences/streamsetting.js | 8 +++++--- .../public/js/airtime/schedule/full-calendar-functions.js | 6 ++++-- airtime_mvc/public/js/airtime/schedule/schedule.js | 4 +++- airtime_mvc/public/js/airtime/showbuilder/main_builder.js | 3 ++- airtime_mvc/public/js/airtime/status/status.js | 2 +- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 3b2cad458..38d357523 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -360,13 +360,15 @@ function controlSwitchLight(){ } function getScheduleFromServer(){ - $.ajax({ url: baseUrl+"Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){ + $.ajax({ url: baseUrl+"Schedule/get-current-playlist/format/json", + dataType:"json", + success:function(data){ parseItems(data.entries); parseSourceStatus(data.source_status); parseSwitchStatus(data.switch_status); showName = data.show_name; + setTimeout(getScheduleFromServer, serverUpdateInterval); }, error:function(jqXHR, textStatus, errorThrown){}}); - setTimeout(getScheduleFromServer, serverUpdateInterval); } function setupQtip(){ diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index aae972017..dd0574a03 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -768,8 +768,7 @@ var AIRTIME = (function(AIRTIME) { }); checkImportStatus(); - setInterval(checkImportStatus, 5000); - setInterval(checkLibrarySCUploadStatus, 5000); + checkLibrarySCUploadStatus(); addQtipToSCIcons(); @@ -997,6 +996,7 @@ function checkImportStatus() { } div.hide(); } + setTimeout(checkImportStatus, 5000); }); } @@ -1030,6 +1030,7 @@ function checkLibrarySCUploadStatus(){ else if (json.sc_id == "-3") { span.removeClass("progress").addClass("sc-error"); } + setTimeout(checkLibrarySCUploadStatus, 5000); } function checkSCUploadStatusRequest() { diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 6e76b693c..31724ac8d 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -103,6 +103,8 @@ function checkLiquidsoapStatus(){ } $("#s"+id+"Liquidsoap-error-msg-element").html(html); } + + setTimeout(checkLiquidsoapStatus, 2000); }); } @@ -242,10 +244,10 @@ function setupEventListeners() { return false; }) - setLiveSourceConnectionOverrideListener() + setLiveSourceConnectionOverrideListener(); - showErrorSections() - setInterval('checkLiquidsoapStatus()', 1000) + showErrorSections(); + checkLiquidsoapStatus(); // qtip for help text $(".override_help_icon").qtip({ diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 192d811fe..0dd4a5484 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -372,6 +372,7 @@ function checkSCUploadStatus(){ }else if(json.sc_id == "-3"){ $("span[id="+id+"]:not(.recording)").removeClass("progress").addClass("sc-error"); } + setTimeout(checkSCUploadStatus, 5000); }); }); } @@ -424,6 +425,7 @@ function getCurrentShow(){ $(this).remove("span[small-icon now-playing]"); } }); + setTimeout(getCurrentShow, 5000); }); } @@ -564,8 +566,8 @@ function alertShowErrorAndReload(){ preloadEventFeed(); $(document).ready(function(){ - setInterval( "checkSCUploadStatus()", 5000 ); - setInterval( "getCurrentShow()", 5000 ); + checkSCUploadStatus(); + getCurrentShow(); }); var view_name; diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index 3c4f9fd3b..edcf183f0 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -93,6 +93,8 @@ function checkCalendarSCUploadStatus(){ else if (json.sc_id == "-3") { span.removeClass("progress").addClass("sc-error"); } + + setTimeout(checkCalendarSCUploadStatus, 5000); } function checkSCUploadStatusRequest() { @@ -328,7 +330,7 @@ function alertShowErrorAndReload(){ } $(document).ready(function() { - setInterval(checkCalendarSCUploadStatus, 5000); + checkCalendarSCUploadStatus(); $.contextMenu({ selector: 'div.fc-event', diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index 214bc9714..98a1915a5 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -277,12 +277,13 @@ AIRTIME = (function(AIRTIME) { if (json.update === true) { oTable.fnDraw(); } + setTimeout(checkScheduleUpdates, 5000); } }); } //check if the timeline view needs updating. - setInterval(checkScheduleUpdates, 5 * 1000); //need refresh in milliseconds + checkScheduleUpdates(); }; mod.onResize = function() { diff --git a/airtime_mvc/public/js/airtime/status/status.js b/airtime_mvc/public/js/airtime/status/status.js index 9b5e4d3ea..ef3358e7a 100644 --- a/airtime_mvc/public/js/airtime/status/status.js +++ b/airtime_mvc/public/js/airtime/status/status.js @@ -66,6 +66,7 @@ function success(data, textStatus, jqXHR){ if (data.status.partitions){ generatePartitions(data.status.partitions); } + setTimeout(function(){updateStatus(false);}, 5000); } function updateStatus(getDiskInfo){ @@ -75,5 +76,4 @@ function updateStatus(getDiskInfo){ $(document).ready(function() { updateStatus(true); - setInterval(function(){updateStatus(false);}, 5000); });