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

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

Browse source
This commit is contained in:
Martin Konecny 2013-05-17 13:20:40 -04:00
commit 01d16348db
44 changed files with 34420 additions and 34571 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
airtime_mvc/public/css/images/is_playlist.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 801 B

BIN
airtime_mvc/public/css/images/is_scheduled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 543 B

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

@ -2006,6 +2006,14 @@ span.errors.sp-errors{
.small-icon.show-partial-filled, .small-icon.media-item-in-use {
background:url(images/icon_alert_cal_alt2.png) no-repeat 0 0;
}
.small-icon.is_scheduled {
background:url(images/is_scheduled.png) no-repeat 0 0;
height: 16px !important;
}
.small-icon.is_playlist {
background:url(images/is_playlist.png) no-repeat 0 0;
height: 16px !important;
}
.medium-icon {
display:block;
width:25px;

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

@ -468,7 +468,7 @@ var AIRTIME = (function(AIRTIME) {
/* Checkbox */ { "sTitle" : "" , "mDataProp" : "checkbox" , "bSortable" : false , "bSearchable" : false , "sWidth" : "25px" , "sClass" : "library_checkbox" } ,
/* Type */ { "sTitle" : "" , "mDataProp" : "image" , "bSearchable" : false , "sWidth" : "25px" , "sClass" : "library_type" , "iDataSort" : 0 } ,
/* Is Scheduled */ { "sTitle" : $.i18n._("Scheduled") , "mDataProp" : "is_scheduled" , "bSearchable" : false , "sWidth" : "90px" , "sClass" : "library_is_scheduled"} ,
/* Is Playlist */ { "sTitle" : $.i18n._("Playlist") , "mDataProp" : "is_playlist" , "bSearchable" : false , "sWidth" : "70px" , "sClass" : "library_is_playlist"} ,
/* Is Playlist */ { "sTitle" : $.i18n._("Playlist / Block") , "mDataProp" : "is_playlist" , "bSearchable" : false , "sWidth" : "110px" , "sClass" : "library_is_playlist"} ,
/* Title */ { "sTitle" : $.i18n._("Title") , "mDataProp" : "track_title" , "sClass" : "library_title" , "sWidth" : "170px" } ,
/* Creator */ { "sTitle" : $.i18n._("Creator") , "mDataProp" : "artist_name" , "sClass" : "library_creator" , "sWidth" : "160px" } ,
/* Album */ { "sTitle" : $.i18n._("Album") , "mDataProp" : "album_title" , "sClass" : "library_album" , "sWidth" : "150px" } ,
@ -618,12 +618,12 @@ var AIRTIME = (function(AIRTIME) {
}
if (aData.is_scheduled) {
$(nRow).find("td.library_is_scheduled").html('<span class="small-icon media-item-in-use"></span>');
$(nRow).find("td.library_is_scheduled").html('<span class="small-icon is_scheduled"></span>');
} else if (!aData.is_scheduled) {
$(nRow).find("td.library_is_scheduled").html('');
}
if (aData.is_playlist) {
$(nRow).find("td.library_is_playlist").html('<span class="small-icon media-item-in-use"></span>');
$(nRow).find("td.library_is_playlist").html('<span class="small-icon is_playlist"></span>');
} else if (!aData.is_playlist) {
$(nRow).find("td.library_is_playlist").html('');
}