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:
Martin Konecny 2012-09-17 12:32:54 -04:00
parent 5d0592c729 fd72e20d83
commit 5bbc815a78
7 changed files with 91 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/models/Soundcloud.php
View File

@ -8,8 +8,9 @@ class Application_Model_Soundcloud
public function __construct()
{
global $CC_CONFIG;
$this->_soundcloud = new Services_Soundcloud($CC_CONFIG['soundcloud-client-id'], $CC_CONFIG['soundcloud-client-secret']);
$this->_soundcloud = new Services_Soundcloud(
$CC_CONFIG['soundcloud-client-id'],
$CC_CONFIG['soundcloud-client-secret']);
}
private function getToken()
@ -51,9 +52,9 @@ class Application_Model_Soundcloud
//YYYY-MM-DD-HH-mm-SS
$release = explode("-", $release);
$track_data['track[release_year]'] = $release[0];
$track_data['track[release_year]'] = $release[0];
$track_data['track[release_month]'] = $release[1];
$track_data['track[release_day]'] = $release[2];
$track_data['track[release_day]'] = $release[2];
}
if (isset($genre) && $genre != "") {
@ -81,7 +82,10 @@ class Application_Model_Soundcloud
);
return $response;
} else {
throw new NoSoundCloundToken();
}
}
}
class NoSoundCloundToken extends Exception {}

5
airtime_mvc/application/views/scripts/library/library.phtml
View File

@ -1,4 +1,7 @@
<div id="import_status" class="library_import" style="display:none">File import in progress... <img src="/css/images/file_import_loader.gif"></img></div>
<div id="advanced_search"></div>
<fieldset class="toggle" id="filter_options">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Advanced Search Options</legend>
<div id="advanced_search" class="advanced_search form-horizontal"></div>
</fieldset>
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable">
</table>

2
airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div id="import_status" style="display:none">File import in progress...</div>
<div id="advanced_search"></div>
<div id="advanced_search" class="advanced_search form-horizontal"></div>
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>
<div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">

2
airtime_mvc/public/css/media_library.css
View File

@ -38,7 +38,7 @@
#library_content {
float: left;
width: 50%;
overflow: hidden;
overflow: auto;
}
#library_display {

32
airtime_mvc/public/css/playlist_builder.css
View File

@ -84,15 +84,27 @@
text-align:right;
}
.spl_block_expand {
.spl_block_expand, .spl_block_expand.close {
float:right;
font-size: 9px;
height: 15px;
right: 35px;
width: 100px;
/*right: 35px;*/
width: 120px;
margin-top:2px;
cursor:pointer;
}
color:#fff;
font-weight: normal;
text-shadow:none;
opacity:1;
}
.spl_block_expand:hover, .spl_block_expand.close:hover {
color:#FF611F;
text-shadow:none;
opacity:1;
}
.spl_block_expand .ui-icon {
float:left;
}
.spl_artist {
font-size:12px;
@ -495,11 +507,21 @@ li.spl_empty {
float: none;
margin-bottom: 4px;
width: 100%;
font-size: 13px;
}
.smart-block-info > li span {
.smart-block-info > li span.block-item-time {
text-align: right;
float: right;
color: #D5D5D5;
font-size: 12px;
}
.smart-block-info > li span.block-item-title {
font-weight: bold;
display: inline-block;
padding-right: 6px;
}
.smart-block-info > li span.block-item-author {
font-weight: normal;
display: inline-block;
}

30
airtime_mvc/public/js/airtime/library/library.js
View File

@ -51,8 +51,6 @@ var AIRTIME = (function(AIRTIME) {
$trs;
// TODO : hack, get rid of this crap library
if (!$libTable) { return ; }
// Get visible items and check if any chosenItems are visible
$trs = $libTable.find("tbody input:checkbox").parents("tr");
$trs.each(function(i){
@ -363,6 +361,8 @@ var AIRTIME = (function(AIRTIME) {
var tableHeight = $libContent.height() - 130;
function setColumnFilter(oTable){
// TODO : remove this dirty hack once js is refactored
if (!oTable.fnSettings()) { return ; }
var aoCols = oTable.fnSettings().aoColumns;
var colsForAdvancedSearch = new Array();
var advanceSearchDiv = $("div#advanced_search");
@ -381,11 +381,17 @@ var AIRTIME = (function(AIRTIME) {
label = " (Hz)";
}
if (ele.bVisible) {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"'><span>"+ele.sTitle+label+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
} else {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"' style='display:none;'><span>"+ele.sTitle+label+"</span> : <span id='"+ele.mDataProp+"'></span></div>");
var inputClass = 'filter_column filter_number_text';
if (criteriaTypes[ele.mDataProp] != "s") {
inputClass = 'filterColumn filter_number_range';
}
if (ele.bVisible) {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+" class='control-group'><label class='control-label'>"+ele.sTitle+label+" : </label><div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div></div>");
} else {
advanceSearchDiv.append("<div id='advanced_search_col_"+currentColId+"' class='control-group' style='display:none;'><label class='control-label'>"+ele.sTitle+label+"</label><div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div></div>");
}
if (criteriaTypes[ele.mDataProp] == "s") {
var obj = { sSelector: "#"+ele.mDataProp }
} else {
@ -647,8 +653,20 @@ var AIRTIME = (function(AIRTIME) {
}
});
setColumnFilter(oTable);
oTable.fnSetFilteringDelay(350);
$libContent.on("click", "legend", function(){
var $fs = $(this).parents("fieldset");
if ($fs.hasClass("closed")) {
$fs.removeClass("closed");
}
else {
$fs.addClass("closed");
}
});
$libContent.find(".dataTables_scrolling").css("max-height", tableHeight);

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

@ -71,6 +71,11 @@ var AIRTIME = (function(AIRTIME){
else {
AIRTIME.button.disableButton("btn-group #timeline-select", true);
}
//need to check if the 'Select' button is disabled
if ($(".btn-group #timeline-select").is(":disabled")) {
$(".btn-group #timeline-select").removeAttr("disabled");
}
};
mod.checkTrimButton = function() {
@ -330,28 +335,6 @@ var AIRTIME = (function(AIRTIME){
$lib = $("#library_content"),
$sbTable = $sbContent.find('table');
/*
* Icon hover states in the toolbar.
*/
$sbContent.on("mouseenter", "#timeline-select .dropdown-toggle", function(ev) {
$el = $(this);
if (!$el.hasClass("ui-state-disabled")) {
$el.addClass("ui-state-hover");
$("#timeline-select .caret").contextMenu(true);
}
else {
$("#timeline-select .caret").contextMenu(false);
}
});
$sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
$el = $(this);
if (!$el.hasClass("ui-state-disabled")) {
$el.removeClass("ui-state-hover");
}
});
oSchedTable = $sbTable.dataTable( {
"aoColumns": [
/* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
@ -989,7 +972,7 @@ var AIRTIME = (function(AIRTIME){
$('#timeline-sn').click(function(){mod.selectNone();});
//cancel current show
$toolbar.find('.icon-ban-circle')
$toolbar.find('.icon-ban-circle').parent()
.click(function() {
var $tr,
data,
@ -1023,7 +1006,7 @@ var AIRTIME = (function(AIRTIME){
});
//jump to current
$toolbar.find('.icon-step-forward')
$toolbar.find('.icon-step-forward').parent()
.click(function() {
if (AIRTIME.button.isDisabled('icon-step-forward') === true) {
@ -1040,7 +1023,7 @@ var AIRTIME = (function(AIRTIME){
});
//delete overbooked tracks.
$toolbar.find('.icon-cut')
$toolbar.find('.icon-cut').parent()
.click(function() {
if (AIRTIME.button.isDisabled('icon-cut') === true) {
@ -1060,7 +1043,7 @@ var AIRTIME = (function(AIRTIME){
});
//delete selected tracks
$toolbar.find('.icon-trash')
$toolbar.find('.icon-trash').parent()
.click(function() {
if (AIRTIME.button.isDisabled('icon-trash') === true) {
@ -1090,6 +1073,22 @@ var AIRTIME = (function(AIRTIME){
return false;
});
/*
* Icon hover states in the toolbar.
*/
$sbContent.on("mouseenter", ".btn-group #timeline-select", function(ev) {
$el = $(this).parent(),
$ch = $el.children('#timeline-select');
if ($el.hasClass("ui-state-disabled")) {
$ch.attr("disabled", "disabled");
}
else {
$ch.removeAttr("disabled");
}
});
//begin context menu initialization.
$.contextMenu({
selector: '.sb-content table tbody tr:not(.sb-empty, .sb-footer, .sb-header, .sb-record) td:not(.sb-checkbox, .sb-image)',