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-08-09 14:39:42 -04:00
commit 952f18dc3c
8 changed files with 105 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

28
airtime_mvc/public/css/styles.css
View file

@ -446,11 +446,7 @@ table.library-get-file-md.table-small{
white-space: nowrap;
}
.file-md-qtip-criteria-width-crit{
width:70px;
}
.file-md-qtip-criteria-width-mod{
.file-md-qtip-criteria-width-small{
width:70px;
}
@ -477,13 +473,29 @@ table.library-get-file-md.table-small{
font-style: italic;
}
.file-md-qtip-playlist.dynamic td{
color: #63a2f0;
.file-md-qtip-left{
float: left;
width: 60%;
}
.file-md-qtip-playlist.static td{
.file-md-qtip-legend {
float: right;
width: 30%;
font-size: 9px;
padding: 0px;
vertical-align:top;
line-height: 13px;
}
.static {
color: #f09839;
}
.dynamic {
color: #63a2f0;
}
.webstream {
color: #4eba70;
}
/***** LIBRARY QTIP METADATA SPECIFIC STYLES END *****/

31
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -296,7 +296,7 @@ var AIRTIME = (function(AIRTIME){
$('#spl_name > a')
.empty()
.append(json.name);
$('#spl_length')
$('#obj_length')
.empty()
.append(json.length);
$('#fieldset-metadate_change textarea')
@ -379,7 +379,6 @@ var AIRTIME = (function(AIRTIME){
var isStatic = data.isStatic;
delete data.type;
if (isStatic) {
console.log(data);
$.each(data, function(index, ele){
if (ele.track_title !== undefined) {
$html += "<div>"+ele.track_title+" "+ele.creator+" "+ele.length+"</div>";
@ -452,14 +451,26 @@ var AIRTIME = (function(AIRTIME){
playlistError(json);
}
else {
$pl.find("span.spl_main_fade_in")
.empty()
.append(json.fadeIn);
$pl.find("span.spl_main_fade_out")
.empty()
.append(json.fadeOut);
var fadeIn = $pl.find("span.spl_main_fade_in");
var fadeOut = $pl.find("span.spl_main_fade_out");
console.log(json);
if (json.fadeIn == null) {
console.log("fadein is null");
fadeIn.parent().prev().hide();
fadeIn.hide();
} else {
fadeIn.parent().prev().show();
fadeIn.show();
fadeIn.empty().append(json.fadeIn);
}
if (json.fadeOut == null) {
fadeOut.parent().prev().hide();
fadeOut.hide();
} else {
fadeOut.parent().prev().show();
fadeOut.show();
fadeOut.empty().append(json.fadeOut);
}
$pl.find("#crossfade_main").show();
}
});