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:
Martin Konecny 2012-04-25 10:11:55 -04:00
commit 09d37ae412
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -39,6 +39,7 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetAllow3rdPartyApi($values["preferences_general"]["thirdPartyApi"]); Application_Model_Preference::SetAllow3rdPartyApi($values["preferences_general"]["thirdPartyApi"]);
Application_Model_Preference::SetTimezone($values["preferences_general"]["timezone"]); Application_Model_Preference::SetTimezone($values["preferences_general"]["timezone"]);
Application_Model_Preference::SetWeekStartDay($values["preferences_general"]["weekStartDay"]); Application_Model_Preference::SetWeekStartDay($values["preferences_general"]["weekStartDay"]);
Application_Model_Preference::SetEnableSystemEmail($values["preferences_general"]["enableSystemEmail"]);
Application_Model_Preference::SetSystemEmail($values["preferences_general"]["systemEmail"]); Application_Model_Preference::SetSystemEmail($values["preferences_general"]["systemEmail"]);
Application_Model_Preference::SetAutoUploadRecordedShowToSoundcloud($values["preferences_soundcloud"]["UseSoundCloud"]); Application_Model_Preference::SetAutoUploadRecordedShowToSoundcloud($values["preferences_soundcloud"]["UseSoundCloud"]);

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

@ -794,7 +794,13 @@ class Application_Model_Preference
} }
public static function GetEnableSystemEmail() { public static function GetEnableSystemEmail() {
return self::GetValue("enable_system_email"); $v = self::GetValue("enable_system_email");
if ($v === "") {
return 0;
}
return $v;
} }
public static function SetSystemEmail($value) { public static function SetSystemEmail($value) {

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

@ -19,10 +19,12 @@
<?php echo $this->element->getElement('password') ?> <?php echo $this->element->getElement('password') ?>
</dd> </dd>
<?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
<dt id="reset-label" class="hidden">&nbsp;</dt> <dt id="reset-label" class="hidden">&nbsp;</dt>
<dd id="reset-element" class="text-right"> <dd id="reset-element" class="text-right">
<a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset">Reset password</a> <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset">Reset password</a>
</dd> </dd>
<?php endif; ?>
<dt id="submit-label">&nbsp;</dt> <dt id="submit-label">&nbsp;</dt>
<dd id="submit-element"> <dd id="submit-element">

3
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -420,6 +420,9 @@ var AIRTIME = (function(AIRTIME){
//remove any selected nodes before the draw. //remove any selected nodes before the draw.
"fnPreDrawCallback": function( oSettings ) { "fnPreDrawCallback": function( oSettings ) {
//make sure any dragging helpers are removed or else they'll be stranded on the screen.
$("#draggingContainer").remove();
//disable jump to current button. //disable jump to current button.
AIRTIME.button.disableButton("sb-button-delete"); AIRTIME.button.disableButton("sb-button-delete");
//disable jump to current button. //disable jump to current button.