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:
Yuchen Wang 2011-10-12 15:18:58 -04:00
commit a317d3904b
9 changed files with 19 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/AddShowRR.php
View file

@ -7,7 +7,7 @@ class Application_Form_AddShowRR extends Zend_Form_SubForm
{
// Add record element
$this->addElement('checkbox', 'add_show_record', array(
'label' => 'Record?',
'label' => 'Record from Line In?',
'required' => false,
));

4
airtime_mvc/application/forms/WatchedDirPreferences.php
View file

@ -11,7 +11,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
$this->addElement('text', 'storageFolder', array(
'class' => 'input_text',
'label' => 'Airtime\'s Storage Folder:',
'label' => 'Import Folder:',
'required' => false,
'filters' => array('StringTrim'),
'value' => '',
@ -22,7 +22,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
$this->addElement('text', 'watchedFolder', array(
'class' => 'input_text',
'label' => 'Choose a Watched Folder:',
'label' => 'Watched Folders:',
'required' => false,
'filters' => array('StringTrim'),
'value' => '',

2
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View file

@ -16,7 +16,7 @@
</ul>
<?php endif; ?>
</dd>
<dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dd class="block-display selected-item"><strong>Current Import Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dt id="watchedFolder-label" class="block-display">
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>

3
airtime_mvc/application/views/scripts/partialviews/header.phtml
View file

@ -30,6 +30,9 @@
<li class="time-zone"><span id="time-zone"></span></li>
</ul>
</div>
<div class="listen-control-block">
<a class="" href="#"><span>Listen</span></a>
</div>
<?php if($this->is_trial){?>
<div class="trial-info-block">
<ul>

32
airtime_mvc/library/propel/generator/bin/propel-gen.bat
View file

@ -1,32 +0,0 @@
@echo off
rem *********************************************************************
rem ** The Propel generator convenience script for Windows based systems
rem ** $Id$
rem *********************************************************************
rem This script will do the following:
rem - check for PHING_COMMAND env, if found, use it.
rem - if not found detect php, if found use it, otherwise err and terminate
rem - check for PROPEL_GEN_HOME env, if found use it
rem - if not found error and leave
if "%OS%"=="Windows_NT" @setlocal
rem %~dp0 is expanded pathname of the current script under NT
set DEFAULT_PROPEL_GEN_HOME=%~dp0..
if "%PROPEL_GEN_HOME%" == "" set PROPEL_GEN_HOME=%DEFAULT_PROPEL_GEN_HOME%
set DEFAULT_PROPEL_GEN_HOME=
if "%PHING_COMMAND%" == "" set PHING_COMMAND=phing.bat
set nbArgs=0
for %%x in (%*) do Set /A nbArgs+=1
if %nbArgs% leq 1 (
%PHING_COMMAND% -f "%PROPEL_GEN_HOME%\build.xml" -Dusing.propel-gen=true -Dproject.dir="%CD%" %*
) else (
%PHING_COMMAND% -f "%PROPEL_GEN_HOME%\build.xml" -Dusing.propel-gen=true -Dproject.dir=%*
)
if "%OS%"=="Windows_NT" @endlocal

2
airtime_mvc/public/js/airtime/dashboard/playlist.js
View file

@ -260,7 +260,7 @@ function init() {
setupQtip();
$('#on-air-info').click(function() {
$('.listen-control-block').click(function() {
if (stream_window == null || stream_window.closed)
stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=216');
stream_window.focus();