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-08-09 18:15:03 -04:00
parent 65cb34db4a 321e6c6524
commit 200eec37f6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
View File

@ -53,7 +53,7 @@
<?php foreach($this->contents as $row) : ?> <?php foreach($this->contents as $row) : ?>
<?php <?php
$titleMaxStrLen = 35; $titleMaxStrLen = 35;
if (strlen($row["track_title"]) > $titleMaxStrLen) { if (mb_strlen($row["track_title"], 'UTF-8') > $titleMaxStrLen) {
$row["track_title"] = substr($row["track_title"], 0, 34)."..."; $row["track_title"] = substr($row["track_title"], 0, 34)."...";
} }
$artistMaxStrLen = 22; $artistMaxStrLen = 22;

1
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View File

@ -24,6 +24,7 @@ if (isset($this->obj)) {
</h3> </h3>
<h4 id="obj_length"><?php echo $this->length; ?></h4> <h4 id="obj_length"><?php echo $this->length; ?></h4>
</div> </div>
<div id='sp-success-saved' class='success' style='display:none'></div>
<fieldset class="toggle closed" id="fieldset-metadate_change"> <fieldset class="toggle closed" id="fieldset-metadate_change">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend> <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>

6
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View File

@ -475,7 +475,7 @@ function callback(data, type) {
AIRTIME.playlist.fnOpenPlaylist(json); AIRTIME.playlist.fnOpenPlaylist(json);
form = $('#smart-playlist-form'); form = $('#smart-playlist-form');
if (type == 'shuffle') { if (type == 'shuffle') {
form.find('.success').text('Playlist shuffled'); form.find('.success').text('Smart playlist shuffled');
} else if (type == 'generate') { } else if (type == 'generate') {
form.find('.success').text('Smart playlist generated and saved'); form.find('.success').text('Smart playlist generated and saved');
//redraw library table so the length gets updated //redraw library table so the length gets updated
@ -484,8 +484,8 @@ function callback(data, type) {
form.find('.success').show(); form.find('.success').show();
form.find('#smart_playlist_options').removeClass("closed"); form.find('#smart_playlist_options').removeClass("closed");
} else { } else {
form.find('.success').text('Smart Playlist saved'); $('#sp-success-saved').text('Smart playlist saved');
form.find('.success').show(); $('#sp-success-saved').show();
/* Update number of files that meet criteria and change icon to success/warning /* Update number of files that meet criteria and change icon to success/warning
* as appropriate. This is also done in the form but we do not pass the form * as appropriate. This is also done in the form but we do not pass the form