diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php index dc20adb80..605e85878 100644 --- a/airtime_mvc/application/forms/SupportSettings.php +++ b/airtime_mvc/application/forms/SupportSettings.php @@ -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 diff --git a/airtime_mvc/application/views/scripts/playlist/index.phtml b/airtime_mvc/application/views/scripts/playlist/index.phtml index 7987202c1..134cfa047 100644 --- a/airtime_mvc/application/views/scripts/playlist/index.phtml +++ b/airtime_mvc/application/views/scripts/playlist/index.phtml @@ -4,7 +4,6 @@ Playlist crossfade - pl)) : ?> diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 4187a36a0..d05321740 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -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")) { diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index 4d06704d4..b20ba44d7 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -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'); diff --git a/python_apps/python-virtualenv/virtualenv-check b/python_apps/python-virtualenv/virtualenv-check deleted file mode 100755 index 53f97fff6..000000000 --- a/python_apps/python-virtualenv/virtualenv-check +++ /dev/null @@ -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 \ No newline at end of file diff --git a/python_apps/python-virtualenv/virtualenv-check.py b/python_apps/python-virtualenv/virtualenv-check.py deleted file mode 100644 index 27c491fe1..000000000 --- a/python_apps/python-virtualenv/virtualenv-check.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/python_apps/python-virtualenv/virtualenv-install.sh b/python_apps/python-virtualenv/virtualenv-install.sh index 6eaa9053b..98d527d06 100755 --- a/python_apps/python-virtualenv/virtualenv-install.sh +++ b/python_apps/python-virtualenv/virtualenv-install.sh @@ -6,36 +6,38 @@ 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 - echo -e "\n*** Creating Virtualenv for Airtime ***" - EXTRAOPTION=$(virtualenv --help | grep extra-search-dir) - if [ "$?" -eq "0" ]; then - virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1 - else - # copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/ - # this is due to the bug in virtualenv 1.4.9 - if [ -d "$VIRTUAL_ENV_SHARE" ]; then - cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/ - fi - virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1 - fi - - echo -e "\n*** Installing Python Libraries ***" - /usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv || exit 1 - - echo -e "\n*** Patching Python Libraries ***" - PATCHES=${SCRIPTPATH}/patches/* - for file in $(find $PATCHES -print); do - if [ -d $file ]; then - DIRNAME=$(basename $file) - echo -e "\n ---Applying Patches for $DIRNAME---" - else - patch -N -p0 -i $file - fi - done -else +if [ -d $VIRTUAL_ENV_DIR ]; then echo -e "\n*** Existing Airtime Virtualenv Found ***" -fi + 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) + +if [ "$?" -eq "0" ]; then +virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1 +else +# copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/ +# this is due to the bug in virtualenv 1.4.9 +if [ -d "$VIRTUAL_ENV_SHARE" ]; then + cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/ +fi +virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv || exit 1 +fi + +echo -e "\n*** Installing Python Libraries ***" +/usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv || exit 1 + +echo -e "\n*** Patching Python Libraries ***" +PATCHES=${SCRIPTPATH}/patches/* +for file in $(find $PATCHES -print); do +if [ -d $file ]; then + DIRNAME=$(basename $file) + echo -e "\n ---Applying Patches for $DIRNAME---" +else + patch -N -p0 -i $file +fi +done exit 0