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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Naomi Aro 2011-08-03 11:16:31 +02:00
commit c718f6950a
3 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/application/models/Preference.php
View file

@ -315,12 +315,14 @@ class Application_Model_Preference
$outputArray['STATION_DESCRIPTION'] = Application_Model_Preference::GetStationDescription(); $outputArray['STATION_DESCRIPTION'] = Application_Model_Preference::GetStationDescription();
// get web server info // get web server info
$url = $systemInfoArray["AIRTIME_VERSION_URL"]; if(isset($systemInfoArray["AIRTIME_VERSION_URL"])){
$index = strpos($url,'/api/'); $url = $systemInfoArray["AIRTIME_VERSION_URL"];
$url = substr($url, 0, $index); $index = strpos($url,'/api/');
$url = substr($url, 0, $index);
$headerInfo = get_headers(trim($url),1); $headerInfo = get_headers(trim($url),1);
$outputArray['WEB_SERVER'] = $headerInfo['Server'][0]; $outputArray['WEB_SERVER'] = $headerInfo['Server'][0];
}
$outputArray['NUM_OF_USERS'] = User::getUserCount(); $outputArray['NUM_OF_USERS'] = User::getUserCount();
$outputArray['NUM_OF_SONGS'] = StoredFile::getFileCount(); $outputArray['NUM_OF_SONGS'] = StoredFile::getFileCount();

14
airtime_mvc/public/js/airtime/library/plupload.js
View file

@ -3,7 +3,7 @@ $(document).ready(function() {
$("#plupload_files").pluploadQueue({ $("#plupload_files").pluploadQueue({
// General settings // General settings
runtimes : 'html5,html4', runtimes : 'gears, html5, html4',
url : '/Plupload/upload/format/json', url : '/Plupload/upload/format/json',
chunk_size: '5mb', chunk_size: '5mb',
multiple_queues : 'true', multiple_queues : 'true',
@ -24,8 +24,18 @@ $(document).ready(function() {
.append('<td>' + j.error.message + '</td>'); .append('<td>' + j.error.message + '</td>');
$("#plupload_error").find("table").append(row); $("#plupload_error").find("table").append(row);
}else{
$.get('/Plupload/copyfile/format/json/name/'+file.name, function(json){
var jr = jQuery.parseJSON(json);
if(jr.error !== undefined) {
var row = $("<tr/>")
.append('<td>' + file.name +'</td>')
.append('<td>' + jr.error.message + '</td>');
$("#plupload_error").find("table").append(row);
}
});
} }
$.get('/Plupload/copyfile/format/json/name/'+file.name);
}); });
var uploadProgress = false; var uploadProgress = false;

4
install_minimal/airtime-install
View file

@ -9,7 +9,7 @@ SCRIPTPATH=`dirname $SCRIPT`
VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv" VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
if [ ! -d "$VIRTUAL_ENV_DIR" ]; then if [ ! -d "$VIRTUAL_ENV_DIR" ]; then
echo -e "\n*** Creating Vitualenv for Airtime ***" echo -e "\n*** Creating Virtualenv for Airtime ***"
EXTRAOPTION=$(virtualenv --help | grep extra-search-dir) EXTRAOPTION=$(virtualenv --help | grep extra-search-dir)
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
@ -35,7 +35,7 @@ if [ ! -d "$VIRTUAL_ENV_DIR" ]; then
fi fi
done done
else else
echo -e "\n*** Existing Airtime Virturalenv Found ***" echo -e "\n*** Existing Airtime Virtualenv Found ***"
fi fi
virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"