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:
Rudi Grinberg 2012-08-22 14:39:45 -04:00
commit 6a16cf0084
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,11 +54,11 @@
<?php <?php
$titleMaxStrLen = 35; $titleMaxStrLen = 35;
if (mb_strlen($row["track_title"], 'UTF-8') > $titleMaxStrLen) { if (mb_strlen($row["track_title"], 'UTF-8') > $titleMaxStrLen) {
$row["track_title"] = substr($row["track_title"], 0, 34)."..."; $row["track_title"] = mb_substr($row["track_title"], 0, 34, 'UTF-8')."...";
} }
$artistMaxStrLen = 22; $artistMaxStrLen = 22;
if (strlen($row["creator"]) > $artistMaxStrLen) { if (mb_strlen($row["creator"], 'UTF-8') > $artistMaxStrLen) {
$row["creator"] = substr($row["creator"], 0, 21)."..."; $row["creator"] = mb_substr($row["creator"], 0, 21, 'UTF-8')."...";
} }
?> ?>
<?php if ($row["type"] == 2) { <?php if ($row["type"] == 2) {

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

@ -440,31 +440,37 @@ table.library-get-file-md{
table.library-get-file-md.table-small{ table.library-get-file-md.table-small{
width: 290px !important; width: 290px !important;
} }
.file-md-qtip-nowrap{ .file-md-qtip-nowrap{
white-space: nowrap; white-space: nowrap;
overflow: hidden;
} }
.file-md-qtip-criteria-width-small{ .file-md-qtip-criteria-width-small{
width:70px; width:70px;
max-width: 70px;
} }
.file-md-qtip-criteria-width{ .file-md-qtip-criteria-width{
width:110px; width:110px;
max-width: 110px;
} }
.file-md-qtip-row-width-title{ .file-md-qtip-row-width-title{
width:170px; width:170px;
max-width: 170px;
padding-right:5px !important; padding-right:5px !important;
} }
.file-md-qtip-row-width-artist{ .file-md-qtip-row-width-artist{
width:110px; width:110px;
max-width: 110px;
} }
.file-md-qtip-row-width-small{ .file-md-qtip-row-width-small{
width:40x; width:40x;
max-width: 40px;
text-align:right; text-align:right;
} }

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

@ -300,7 +300,7 @@ var AIRTIME = (function(AIRTIME){
.empty() .empty()
.val(json.description); .val(json.description);
$('#spl_sortable').unbind(); $('#spl_sortable').off('focusout keydown');
$('#spl_sortable') $('#spl_sortable')
.empty() .empty()
.append(json.html); .append(json.html);
@ -423,20 +423,20 @@ var AIRTIME = (function(AIRTIME){
//sets events dynamically for the cue editor. //sets events dynamically for the cue editor.
function setCueEvents() { function setCueEvents() {
var temp = $('#spl_sortable'); var temp = $('#spl_sortable');
temp.on("blur", ".spl_cue_in span", changeCueIn); temp.on("focusout", ".spl_cue_in span", changeCueIn);
temp.on("keydown", ".spl_cue_in span", submitOnEnter); temp.on("keydown", ".spl_cue_in span", submitOnEnter);
temp.on("blur", ".spl_cue_out span", changeCueOut); temp.on("focusout", ".spl_cue_out span", changeCueOut);
temp.on("keydown", ".spl_cue_out span", submitOnEnter); temp.on("keydown", ".spl_cue_out span", submitOnEnter);
} }
//sets events dynamically for the fade editor. //sets events dynamically for the fade editor.
function setFadeEvents() { function setFadeEvents() {
var temp = $('#spl_sortable'); var temp = $('#spl_sortable');
temp.on("blur", ".spl_fade_in span", changeFadeIn); temp.on("focusout", ".spl_fade_in span", changeFadeIn);
temp.on("keydown", ".spl_fade_in span", submitOnEnter); temp.on("keydown", ".spl_fade_in span", submitOnEnter);
temp.on("blur", ".spl_fade_out span", changeFadeOut); temp.on("focusout", ".spl_fade_out span", changeFadeOut);
temp.on("keydown", ".spl_fade_out span", submitOnEnter); temp.on("keydown", ".spl_fade_out span", submitOnEnter);
} }