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

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

This commit is contained in:
Martin Konecny 2011-10-27 14:02:15 -04:00
parent 8cafc52cad 0188dc6c06
commit 7496d26032
7 changed files with 36 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/SupportSettings.php
View File

@ -105,7 +105,7 @@ class Application_Form_SupportSettings extends Zend_Form
'minheight' => 200,
'maxwidth' => 600,
'maxheight' => 600));
$upload->setAttrib('accept', 'image/jpeg');
$upload->setAttrib('accept', 'image/jpeg,image/gif,image/png,image/jpg');
$this->addElement($upload);
//enable support feedback

1
airtime_mvc/application/views/scripts/playlist/index.phtml
View File

@ -4,7 +4,6 @@
<a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button">
<span class="ui-icon crossfade-main-icon"></span><span class="ui-button-text">Playlist crossfade</span>
</a>
<button id="spl_close" class="ui-button right-floated" role="button" aria-disabled="false">Done Editing</button>
<?php endif; ?>
<?php if (isset($this->pl)) : ?>

15
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -338,17 +338,6 @@ function noOpenPL(json) {
.click(newSPL);
}
function closeSPL() {
var url;
// stop playing any preview
$('#jquery_jplayer_1').jPlayer('stop');
url = '/Playlist/close/format/json';
$.post(url, noOpenPL);
}
function createPlaylistMetaForm(json) {
var submit, form;
@ -459,10 +448,6 @@ function setUpSPL() {
.button()
.click(newSPL);
$("#spl_close")
.button()
.click(closeSPL);
$("#spl_crossfade").click(function(){
if($(this).hasClass("ui-state-active")) {

3
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -440,6 +440,9 @@ $(window).resize(function(){
var widthPercent = parseInt(calendarWidth)+"%";
$("#schedule_calendar").css("width", widthPercent);
}
// 200 px for top dashboard and 50 for padding on main content
// this calculation was copied from schedule.js line 326
var mainHeight = document.documentElement.clientHeight - 200 - 50;
$('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight)
$("#schedule_calendar").fullCalendar('render');

27
python_apps/python-virtualenv/virtualenv-check
View File

@ -1,27 +0,0 @@
#!/bin/bash
# Absolute path to this script
SCRIPT=`readlink -f $0`
# Absolute directory this script is in
SCRIPTPATH=`dirname $SCRIPT`
VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
if [ -d $VIRTUAL_ENV_DIR ]; then
virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
if [ -f ${virtualenv_bin}activate ]; then
. ${virtualenv_bin}activate
else
echo 1
exit 0
fi
CHECK=$(python ${SCRIPTPATH}/virtualenv-check.py)
if [ "$CHECK" == "1" ]; then
echo 1
exit 0
fi
echo 0
else
echo 1
fi

11
python_apps/python-virtualenv/virtualenv-check.py
View File

@ -1,11 +0,0 @@
try:
import amqplib
import anyjson
import configobj
import kombu
import mutagen
import poster
import pyinotify
print 0
except ImportError, e:
print 1

12
python_apps/python-virtualenv/virtualenv-install.sh
View File

@ -6,8 +6,13 @@ SCRIPTPATH=`dirname $SCRIPT`
VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
VIRTUAL_ENV_SHARE="/usr/share/python-virtualenv/"
CHECK=$(${SCRIPTPATH}/virtualenv-check)
if [ "$CHECK" == "1" ]; then
if [ -d $VIRTUAL_ENV_DIR ]; then
echo -e "\n*** Existing Airtime Virtualenv Found ***"
rm -rf ${VIRTUAL_ENV_DIR}
echo -e "\n*** Reinstalling Airtime Virtualenv ***"
fi
echo -e "\n*** Creating Virtualenv for Airtime ***"
EXTRAOPTION=$(virtualenv --help | grep extra-search-dir)
@ -35,7 +40,4 @@ if [ "$CHECK" == "1" ]; then
patch -N -p0 -i $file
fi
done
else
echo -e "\n*** Existing Airtime Virtualenv Found ***"
fi
exit 0