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

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

Browse source
This commit is contained in:
Rudi Grinberg 2012-10-09 12:37:29 -04:00
commit 1fbee7a38e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1617,7 +1617,7 @@ div.errors, span.errors{
} }
span.errors.sp-errors{ span.errors.sp-errors{
width: 486px; width: 429px;
display: block; display: block;
} }

4
airtime_mvc/public/js/datatables/plugin/dataTables.columnFilter.js
View file

@ -184,7 +184,7 @@
var label = ""; var label = "";
if (th.attr('id') == "bit_rate") { if (th.attr('id') == "bit_rate") {
label = " bps"; label = " kbps";
} else if (th.attr('id') == "utime" || th.attr('id') == "mtime" || th.attr('id') == "lptime") { } else if (th.attr('id') == "utime" || th.attr('id') == "mtime" || th.attr('id') == "lptime") {
label = " yyyy-mm-dd"; label = " yyyy-mm-dd";
} else if (th.attr('id') == "length") { } else if (th.attr('id') == "length") {
@ -749,4 +749,4 @@
})(jQuery); })(jQuery);