Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-01-18 17:14:11 -05:00
commit 210336d20a
8 changed files with 100 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/AudiopreviewController.php
View file

@ -46,7 +46,7 @@ class AudiopreviewController extends Zend_Controller_Action
}
if ($type == "audioclip") {
$uri = "/api/get-media/file/".$audioFileID;
$uri = $baseUrl."/api/get-media/file/".$audioFileID;
$media = Application_Model_StoredFile::Recall($audioFileID);
$mime = $media->getPropelOrm()->getDbMime();
} elseif ($type == "stream") {

4
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

@ -36,8 +36,8 @@
?>
<?php for ($j = 0; $j < $this->modRowMap[$i]; $j++) {
// determine if logic label should be 'and' or 'or'
if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = 'or';
else $logicLabel = 'and';
if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = _('or');
else $logicLabel = _('and');
$disabled = $this->element->getElement("sp_criteria_field_".$i."_".$j)->getAttrib('disabled') == 'disabled'?true:false;
// determine if the next row is disabled and only display the logic label if it isn't

1
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -116,7 +116,6 @@ var AIRTIME = (function(AIRTIME) {
alert($.i18n._("Please select a cursor position on timeline."));
return false;
}
console.log(aMediaIds);
AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
};

1
airtime_mvc/public/js/airtime/library/library.js
View file

@ -1283,6 +1283,7 @@ $(document).ready(function() {
data = $("#edit-md-dialog form").serializeArray();
$.post(baseUrl+'library/edit-file-md', {format: "json", id: file_id, data: data}, function() {
$("#edit-md-dialog").dialog().remove();
oTable.fnStandingRedraw();
});
});

2
airtime_mvc/public/js/airtime/login/password-restore.js
View file

@ -1,3 +1,3 @@
function redirectToLogin(){
window.location = "/Login"
window.location = baseUrl+"/Login"
}