Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
This commit is contained in:
Naomi Aro 2012-03-07 10:33:00 +01:00
commit a4d07b3060
8 changed files with 24 additions and 73 deletions

View file

@ -660,7 +660,7 @@ Logging::log("getting media! - 2");
if($type == "au"){//&& isset( $audioResults )) {
$row['audioFile'] = $row['gunid'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION);
$row['image'] = '<div class="big_play"><span class="ui-icon ui-icon-play"></span></div>';
$row['image'] = '<div class="big_play"><img src="/css/images/icon_audioclip.png"></div>';
}
else {
$row['image'] = '<img src="/css/images/icon_playlist.png">';