Added filter control extension

djhvscf · djhvscf · commit cdbd38695221 · 2015-04-04T23:03:27.000-06:00
diff --git a/extensions/filtercontrol.html b/extensions/filtercontrol.html
@@ -1,26 +1,27 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Filter Control</title>
+    <title>FilterControl</title>
     <meta charset="utf-8">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="../assets/bootstrap-table/src/bootstrap-table.css">
     <link rel="stylesheet" href="../assets/examples.css">
     <script src="../assets/jquery.min.js"></script>
     <script src="../assets/bootstrap/js/bootstrap.min.js"></script>
     <script src="../assets/bootstrap-table/src/bootstrap-table.js"></script>
+    <script src="../assets/bootstrap-table/src/extensions/filtercontrol/bootstrap-table-filtercontrol.js"></script>
     <script src="../ga.js"></script>
 </head>
 <body>
 <div class="container">
     <div class="ribbon">
-        <a href="https://github.com/wenzhixin/bootstrap-table-examples/blob/master/options/filter-control.html" target="_blank">View Source on GitHub</a>
+        <a href="https://github.com/wenzhixin/bootstrap-table-examples/blob/master/extensions/filtercontrol.html" target="_blank">View Source on GitHub</a>
     </div>
-    <h1>Filter Control</h1>
-    <p>Use <code>filterControl</code> option to add an input or select control to the column to filter it.</p>
+    <h1></h1>
     <table id="table"
            data-toggle="table"
-           data-url="../json/data1.json">
+           data-url="../json/data1.json"
+           data-filter-control="true">
         <thead>
         <tr>
             <th data-field="id">ID</th>
diff --git a/index.html b/index.html
@@ -61,7 +61,6 @@
                         <li><a href="options/custom-toolbar.html">Custom Toolbar</a></li>
                         <li><a href="options/client-side-pagination.html">Client Side Pagination</a></li>
                         <li><a href="options/server-side-pagination.html">Server Side Pagination</a></li>
-                        <li><a href="options/filter-control.html">Filter Control</a></li>
                         <li><a href="options/pagination-custom-text.html">Pagination Custom Text</a></li>
                     </ul>
                 </li>
@@ -103,6 +102,7 @@
                         <li><a href="extensions/resizable.html">Resizable</a></li>
                         <li><a href="extensions/keyevents.html">KeyEvents</a></li>
                         <li><a href="extensions/mobile.html">Mobile</a></li>
+                        <li><a href="extensions/filtercontrol.html">Filter Control</a></li>
                     </ul>
                 </li>
                 <li>
diff --git a/index.html.conf b/index.html.conf
@@ -61,7 +61,6 @@
                         <li><a href="options/custom-toolbar.html">Custom Toolbar</a></li>
                         <li><a href="options/client-side-pagination.html">Client Side Pagination</a></li>
                         <li><a href="options/server-side-pagination.html">Server Side Pagination</a></li>
-                        <li><a href="options/filter-control.html">Filter Control</a></li>
                         <li><a href="options/pagination-custom-text.html">Pagination Custom Text</a></li>
                     </ul>
                 </li>
@@ -103,6 +102,7 @@
                         <li><a href="extensions/resizable.html">Resizable</a></li>
                         <li><a href="extensions/keyevents.html">KeyEvents</a></li>
                         <li><a href="extensions/mobile.html">Mobile</a></li>
+                        <li><a href="extensions/filtercontrol.html">Filter Control</a></li>
                     </ul>
                 </li>
                 <li>
