diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index fbb212b43..161d18d45 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -378,16 +378,6 @@ var AIRTIME = (function(AIRTIME) {
$.each(aoCols, function(i,ele){
if (ele.bSearchable) {
var currentColId = ele._ColReorder_iOrigCol;
- var label = "";
- if (ele.mDataProp == "bit_rate") {
- label = " (bps)";
- } else if (ele.mDataProp == "utime" || ele.mDataProp == "mtime" || ele.mDataProp == "lptime") {
- label = " (yyyy-mm-dd)";
- } else if (ele.mDataProp == "length") {
- label = " (hh:mm:ss.t)";
- } else if (ele.mDataProp == "sample_rate") {
- label = " (Hz)";
- }
var inputClass = 'filter_column filter_number_text';
var labelStyle = "style='margin-right:35px;'";
@@ -397,9 +387,17 @@ var AIRTIME = (function(AIRTIME) {
}
if (ele.bVisible) {
- advanceSearchDiv.append("
");
+ advanceSearchDiv.append(
+ "" +
+ "
" +
+ "
" +
+ "
");
} else {
- advanceSearchDiv.append("");
+ advanceSearchDiv.append(
+ "" +
+ "
" +
+ "
" +
+ "
");
}
if (criteriaTypes[ele.mDataProp] == "s") {
diff --git a/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COLUMN_FILTER b/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COLUMN_FILTER
index a86836562..f3a31a667 100644
--- a/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COLUMN_FILTER
+++ b/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COLUMN_FILTER
@@ -5,8 +5,8 @@ Running a diff between the original column filter plugin (dataTables.columnFilte
our modified one (dataTables.columnFilter.js):
denise@denise-DX4860:~/airtime/airtime_mvc/public/js/datatables/plugin$ diff -u dataTables.columnFilter_orig.js dataTables.columnFilter.js
---- dataTables.columnFilter_orig.js 2012-09-10 14:26:30.041095663 -0400
-+++ dataTables.columnFilter.js 2012-09-10 17:04:21.017464447 -0400
+--- dataTables.columnFilter_orig.js 2012-09-11 11:53:16.476101955 -0400
++++ dataTables.columnFilter.js 2012-10-04 12:15:13.270199949 -0400
@@ -103,7 +103,8 @@
label = label.replace(/(^\s*)|(\s*$)/g, "");
var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
@@ -32,7 +32,7 @@ denise@denise-DX4860:~/airtime/airtime_mvc/public/js/datatables/plugin$ diff -u
- var iCurrentFilterLength = this.value.length;
- if (Math.abs(iCurrentFilterLength - iLastFilterLength) < iFilterLength
- //&& currentFilter.length == 0 //Why this?
-- ) {
+- ) {
- //Cancel the filtering
- return;
- }
@@ -52,7 +52,7 @@ denise@denise-DX4860:~/airtime/airtime_mvc/public/js/datatables/plugin$ diff -u
+ var iCurrentFilterLength = this.value.length;
+ if (Math.abs(iCurrentFilterLength - iLastFilterLength) < iFilterLength
+ //&& currentFilter.length == 0 //Why this?
-+ ) {
++ ) {
+ //Cancel the filtering
+ return;
+ }
@@ -81,7 +81,35 @@ denise@denise-DX4860:~/airtime/airtime_mvc/public/js/datatables/plugin$ diff -u
}
});
}
-@@ -228,14 +233,16 @@
+@@ -176,13 +181,25 @@
+ function fnCreateRangeInput(oTable) {
+
+ //var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
++
++ var label = "";
++ if (th.attr('id') == "bit_rate") {
++ label = " bps";
++ } else if (th.attr('id') == "utime" || th.attr('id') == "mtime" || th.attr('id') == "lptime") {
++ label = " yyyy-mm-dd";
++ } else if (th.attr('id') == "length") {
++ label = " hh:mm:ss.t";
++ } else if (th.attr('id') == "sample_rate") {
++ label = " Hz";
++ }
++
+ th.html(_fnRangeLabelPart(0));
+ var sFromId = oTable.attr("id") + '_range_from_' + i;
+- var from = $('');
++ var from = $('');
+ th.append(from);
+ th.append(_fnRangeLabelPart(1));
+ var sToId = oTable.attr("id") + '_range_to_' + i;
+- var to = $('');
++ var to = $('');
+ th.append(to);
+ th.append(_fnRangeLabelPart(2));
+ th.wrapInner('');
+@@ -228,14 +245,16 @@
$('#' + sFromId + ',#' + sToId, th).keyup(function () {
@@ -106,3 +134,6 @@ denise@denise-DX4860:~/airtime/airtime_mvc/public/js/datatables/plugin$ diff -u
});
+
+
+
diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.columnFilter.js b/airtime_mvc/public/js/datatables/plugin/dataTables.columnFilter.js
index 1bab38a3c..748a64c21 100644
--- a/airtime_mvc/public/js/datatables/plugin/dataTables.columnFilter.js
+++ b/airtime_mvc/public/js/datatables/plugin/dataTables.columnFilter.js
@@ -181,13 +181,25 @@
function fnCreateRangeInput(oTable) {
//var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
+
+ var label = "";
+ if (th.attr('id') == "bit_rate") {
+ label = " bps";
+ } else if (th.attr('id') == "utime" || th.attr('id') == "mtime" || th.attr('id') == "lptime") {
+ label = " yyyy-mm-dd";
+ } else if (th.attr('id') == "length") {
+ label = " hh:mm:ss.t";
+ } else if (th.attr('id') == "sample_rate") {
+ label = " Hz";
+ }
+
th.html(_fnRangeLabelPart(0));
var sFromId = oTable.attr("id") + '_range_from_' + i;
- var from = $('');
+ var from = $('');
th.append(from);
th.append(_fnRangeLabelPart(1));
var sToId = oTable.attr("id") + '_range_to_' + i;
- var to = $('');
+ var to = $('');
th.append(to);
th.append(_fnRangeLabelPart(2));
th.wrapInner('');