Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin Konecny 2012-04-25 10:11:55 -04:00
parent 80d0f8f4f3 7e0e631740
commit 09d37ae412
4 changed files with 17 additions and 5 deletions
Show Stats 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::SetTimezone($values["preferences_general"]["timezone"]);
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::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() {
return self::GetValue("enable_system_email");
$v = self::GetValue("enable_system_email");
if ($v === "") {
return 0;
}
return $v;
}
public static function SetSystemEmail($value) {

10
airtime_mvc/application/views/scripts/form/login.phtml
View File

@ -19,10 +19,12 @@
<?php echo $this->element->getElement('password') ?>
</dd>
<dt id="reset-label" class="hidden">&nbsp;</dt>
<dd id="reset-element" class="text-right">
<a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset">Reset password</a>
</dd>
<?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
<dt id="reset-label" class="hidden">&nbsp;</dt>
<dd id="reset-element" class="text-right">
<a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset">Reset password</a>
</dd>
<?php endif; ?>
<dt id="submit-label">&nbsp;</dt>
<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.
"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.
AIRTIME.button.disableButton("sb-button-delete");
//disable jump to current button.