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:
James 2013-01-14 14:49:22 -05:00
parent 0eb5fb51b6 9603e7c2fd
commit ed2e25fb29
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/LocaleController.php
View File

@ -210,6 +210,7 @@ class LocaleController extends Zend_Controller_Action
//"Error code: " => _("Error code: "), //"Error code: " => _("Error code: "),
//"Error msg: " => _("Error msg: "), //"Error msg: " => _("Error msg: "),
"This show has no scheduled content." => _("This show has no scheduled content."), "This show has no scheduled content." => _("This show has no scheduled content."),
"This show is not completely filled with content." => _("This show is not completely filled with content."),
//already in schedule/add-show.js //already in schedule/add-show.js
//"The show instance doesn"t exist anymore!" => _("The show instance doesn"t exist anymore!"), //"The show instance doesn"t exist anymore!" => _("The show instance doesn"t exist anymore!"),
//schedule/schedule.js //schedule/schedule.js

7
airtime_mvc/application/forms/AddShowStyle.php
View File

@ -19,9 +19,9 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm
'class' => 'big' 'class' => 'big'
)))); ))));
$stringLengthValidator = Application_Form_Helper_ValidationTypes::overrideStringLengthValidator(6, 6);
$bg->setValidators(array( $bg->setValidators(array(
'Hex', 'Hex', $stringLengthValidator
array('stringLength', false, array(6, 6))
)); ));
// Add show color input // Add show color input
@ -39,8 +39,7 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm
)))); ))));
$c->setValidators(array( $c->setValidators(array(
'Hex', 'Hex', $stringLengthValidator
array('stringLength', false, array(6, 6))
)); ));
} }

2
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View File

@ -85,7 +85,7 @@
<span id="rg_modifier_value" style="border: 0; color: #f6931f; font-weight: bold;"> <span id="rg_modifier_value" style="border: 0; color: #f6931f; font-weight: bold;">
<?php echo $this->form->getElement('replayGainModifier')->getValue() ?> <?php echo $this->form->getElement('replayGainModifier')->getValue() ?>
</span> </span>
dB <?php echo _("dB")?>
</dt> </dt>
<dd id="replayGainModifier-element" class="block-display"> <dd id="replayGainModifier-element" class="block-display">
<?php echo $this->form->getElement('replayGainModifier') ?> <?php echo $this->form->getElement('replayGainModifier') ?>

4
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -41,10 +41,12 @@ var AIRTIME = (function(AIRTIME){
mod.updateCalendarStatusIcon = function(json) { mod.updateCalendarStatusIcon = function(json) {
if (window.location.pathname.toLowerCase() != "/schedule") {
if (window.location.pathname.toLowerCase() != baseUrl+"/schedule") {
return; return;
} }
var instance_id = json.schedule[0].instance; var instance_id = json.schedule[0].instance;
var lastElem = json.schedule[json.schedule.length-1]; var lastElem = json.schedule[json.schedule.length-1];