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

Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder

Browse source
This commit is contained in:
Albert Santoni 2015-08-10 12:23:30 -04:00
commit 974f979bef
7 changed files with 39 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,8 @@ class NewPlaylistController extends Zend_Controller_Action
$modified = $this->_getParam('modified', null);
if ($obj->getLastModified("U") !== $modified) {
$this->createFullResponse($obj);
Logging::info($obj->getLastModified("U"));
Logging::info($modified);
throw new PlaylistOutDatedException(sprintf(_("You are viewing an older version of %s"), $obj->getName()));
}
}

6
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -78,9 +78,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<?php endif; //suspended ?>
</div>
<?php $hint = Application_Common_UsabilityHints::getUsabilityHint(); ?>
<div class="usability_hint" <?php if ($hint == "") { echo "style='display:none'"; } ?>><?php echo $hint; ?></div>
<div id="media_type_nav"> <!-- class="content-pane" -->
<div class="btn-group">
<button id="new_media_selector" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
@ -104,6 +101,9 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<div class="media_type_selector" selection_id="4"><?php echo _("Webstreams") ?></div>
</div>
<?php $hint = Application_Common_UsabilityHints::getUsabilityHint(); ?>
<div class="usability_hint" <?php if ($hint == "") { echo "style='display:none'"; } ?>><?php echo $hint; ?></div>
<div class="wrapper dropzone" id="content">
<?php echo $this->layout()->content ?>
</div>

6
airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
View file

@ -34,7 +34,7 @@ if (isset($this->obj)) {
</dl>
<?php echo $this->form; ?>
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-toolbar spl-no-margin clearfix left-floated">
<div class='btn-group pull-right'>
<button class="btn btn-inverse" title='<?php echo _("Empty smart block content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>
</div>
@ -45,7 +45,7 @@ if (isset($this->obj)) {
</div>
</div>
<div id="crossfade_main" class="crossfade-main clearfix left-floated" style="display:none;">
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick"></span>
<dl id="spl_editor-main" class="inline-list">
<dt><?php echo _("Fade in: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt>
@ -61,7 +61,7 @@ if (isset($this->obj)) {
<?php $this->contents = $contents;
echo $this->render('playlist/update.phtml') ?>
</ul>
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-toolbar spl-no-margin clearfix">
<div class='btn-group pull-right'>
<button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
</div>

5
airtime_mvc/public/css/_showbuilder.css
View file

@ -38,6 +38,7 @@ div.ColVis_collectionBackground {
/* Usability hint */
.usability_hint {
left: 130px;
flex: 0 100%;
width: 100%;
}
@ -491,6 +492,10 @@ textarea {
left: 4px;
}
.inner_editor_wrapper {
width: 100%;
}
.spl-no-margin {
margin: 0;
}

28
airtime_mvc/public/js/airtime/library/_spl.js
View file

@ -34,8 +34,8 @@ var AIRTIME = (function(AIRTIME){
function playlistError(json) {
alert(json.error);
closeTab();
openPlaylist(json);
//closeTab();
//openPlaylist(json);
}
function stopAudioPreview() {
@ -827,7 +827,10 @@ var AIRTIME = (function(AIRTIME){
if (json.error !== undefined) {
alert(json.error);
}
$pl.find(".editor_pane_wrapper").empty().append(json.html);
if (json.html !== undefined) {
closeTab();
openPlaylist(json);
}
if (json.result == "0") {
$pl.find('.success').text($.i18n._('Playlist shuffled'));
$pl.find('.success').show();
@ -964,7 +967,8 @@ var AIRTIME = (function(AIRTIME){
alert(json.error);
}
if (json.html !== undefined) {
AIRTIME.playlist.fnOpenPlaylist(json);
closeTab();
openPlaylist(json);
}
setModified(json.modified);
if (obj_type == "block") {
@ -981,7 +985,7 @@ var AIRTIME = (function(AIRTIME){
);
});
$pl.find("#pl-bl-clear-content").live("click", function(event) {
$pl.find("#pl-bl-clear-content").unbind().on("click", function(event) {
var sUrl = baseUrl+"new-playlist/empty-content",
oData = {};
playlistRequest(sUrl, oData);
@ -1483,13 +1487,13 @@ var AIRTIME = (function(AIRTIME){
mod.init = function() {
AIRTIME.playlist.setAsActive();
$pl.delegate("#spl_delete", {"click": function(ev){
AIRTIME.playlist.fnDelete();
}});
$pl.delegate("#ws_delete", {"click": function(ev){
AIRTIME.playlist.fnWsDelete();
}});
//$pl.delegate("#spl_delete", {"click": function(ev){
// AIRTIME.playlist.fnDelete();
//}});
//
//$pl.delegate("#ws_delete", {"click": function(ev){
// AIRTIME.playlist.fnWsDelete();
//}});
$pl.delegate(".pl-waveform-cues-btn", {"click": function(ev){
AIRTIME.playlist.showCuesWaveform(ev);

18
airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js
View file

@ -102,10 +102,11 @@ var AIRTIME = (function(AIRTIME) {
return container;
},
cursor: 'pointer',
cursorAt: {
top: 30,
left: 100
},
//cursorAt: {
// top: 30,
// right: 10
//},
distance: 25, // min-distance for dragging
connectToSortable: '#show_builder_table'
});
} else {
@ -142,10 +143,11 @@ var AIRTIME = (function(AIRTIME) {
return container;
},
cursor: 'pointer',
cursorAt: {
top: 30,
left: 100
},
//cursorAt: {
// top: 30,
// right: 10
//},
distance: 25, // min-distance for dragging
connectToSortable: '.active-tab .spl_sortable'
});
}

45
airtime_mvc/public/js/airtime/showbuilder/_builder.js
View file

@ -775,51 +775,6 @@ var AIRTIME = (function(AIRTIME){
"bScrollCollapseY": false
});
//$sbTable.find("tbody").on("mousedown", "tr:not(.sb-past, .sb-empty)", function(ev) {
//
// var $tr = $(this),
// // Get the ID of the selected row
// $rowId = $tr.attr("id");
//
// if (ev.shiftKey && $previouslySelected !== undefined) {
// if ($previouslySelected.attr("id") == $rowId) {
// return;
// }
//
// // If the selected row comes before the previously selected row,
// // we want to select previous rows, otherwise we select next
// if ($previouslySelected.prevAll("#"+$rowId).length !== 0) {
// $previouslySelected.prevUntil($tr).each(function(i, el){
// $(el).addClass(SB_SELECTED_CLASS);
// });
// } else {
// $previouslySelected.nextUntil($tr).each(function(i, el){
// $(el).addClass(SB_SELECTED_CLASS);
// });
// }
// $tr.addClass(SB_SELECTED_CLASS);
// } else if (ev.ctrlKey && $previouslySelected !== undefined) {
// $tr.addClass(SB_SELECTED_CLASS);
// } else {
// if (!$tr.hasClass(SB_SELECTED_CLASS)) {
// $("."+SB_SELECTED_CLASS).removeClass(SB_SELECTED_CLASS);
// }
// $tr.addClass(SB_SELECTED_CLASS);
// }
//
// // Remember this row so we can properly multiselect
// $previouslySelected = $tr;
//
// mod.checkToolBarIcons();
//});
//
//$sbTable.find("tbody").on("click", "tr:not(.sb-past, .sb-empty)", function(ev) {
// if (!ev.ctrlKey && !ev.shiftKey) {
// $("."+SB_SELECTED_CLASS).removeClass(SB_SELECTED_CLASS);
// $(this).addClass(SB_SELECTED_CLASS);
// }
//});
$sbTable.find("tbody").on("mousedown", "tr:not(.sb-past, .sb-empty)", function(ev) {
var $tr = $(this),
// Get the ID of the selected row