Skip to content

Bidirectional CSS and better Bootstrap 3 integration #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elad wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Bidirectional CSS and better Bootstrap 3 integration #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0adf521
AMD support from Jowin's Datatables-Bootstrap3 plugin.
elad May 1, 2014
1a39b5f
Don't force a small input box.
elad May 1, 2014
1d87cbe
Fix DOM so it works for both LTR and RTL layouts.
elad May 1, 2014
b0f8a5e
Bidirectional CSS (LTR/RTL layout support), Glyphicons/Font Awesome.
elad May 1, 2014
3135739
Let Bootstrap dictate these.
elad May 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 46 additions & 10 deletions integration/bootstrap/3/dataTables.bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ div.dataTables_length label {
float: left;
text-align: left;
}
html[dir='rtl'] div.dataTables_length label {
float: right;
text-align: right;
}

div.dataTables_length select {
width: 75px;
Expand All @@ -12,6 +16,9 @@ div.dataTables_filter label {
font-weight: normal;
float: right;
}
html[dir='rtl'] div.dataTables_filter label {
float: left;
}

div.dataTables_filter input {
width: 16em;
Expand All @@ -25,6 +32,9 @@ div.dataTables_paginate {
float: right;
margin: 0;
}
html[dir='rtl'] div.dataTables_paginate {
float: left;
}

div.dataTables_paginate ul.pagination {
margin: 2px 0;
Expand Down Expand Up @@ -55,17 +65,43 @@ table.dataTable thead .sorting_desc_disabled {
cursor: pointer;
}

table.dataTable thead .sorting { background: url('../images/sort_both.png') no-repeat center right; }
table.dataTable thead .sorting_asc { background: url('../images/sort_asc.png') no-repeat center right; }
table.dataTable thead .sorting_desc { background: url('../images/sort_desc.png') no-repeat center right; }

table.dataTable thead .sorting_asc_disabled { background: url('../images/sort_asc_disabled.png') no-repeat center right; }
table.dataTable thead .sorting_desc_disabled { background: url('../images/sort_desc_disabled.png') no-repeat center right; }

table.dataTable thead > tr > th {
padding-left: 18px;
padding-right: 18px;
/*
* Use Glyphicons Halflings from Bootstrap 3 instead of images.
*
* Relevant icons:
*
* Glyphicons Halflings (default)
* glyphicon-sort '\e150' sort
* glyphicon-sort-by-attributes '\e155' asc
* glyphicon-sort-by-attributes-alt '\e156' desc
*
* Font Awesome
* fa-sort '\f0dc' sort
* fa-caret-up '\f0d8' asc
* fa-caret-down '\f0d7' desc
*/
table.table thead .sorting:after,
table.table thead .sorting_asc:after,
table.table thead .sorting_desc:after,
table.table thead .sorting_asc_disabled:after,
table.table thead .sorting_desc_disabled:after {
font-family: 'Glyphicons Halflings';
text-align: right;
float: right;
}
html[dir='rtl'] table.table thead .sorting:after,
html[dir='rtl'] table.table thead .sorting_asc:after,
html[dir='rtl'] table.table thead .sorting_desc:after,
html[dir='rtl'] table.table thead .sorting_asc_disabled:after,
html[dir='rtl'] table.table thead .sorting_desc_disabled:after {
text-align: left;
float: left;
}
table.table thead .sorting:after { content: '\e150'; opacity: 0.2; }
table.table thead .sorting_asc:after { content: '\e155'; }
table.table thead .sorting_desc:after { content: '\e156'; }
table.table thead .sorting_asc_disabled:after { content: '\e155'; opacity: 0.2; }
table.table thead .sorting_desc_disabled:after { content: '\e156'; opacity: 0.2; }

table.dataTable th:active {
outline: none;
Expand Down
17 changes: 12 additions & 5 deletions integration/bootstrap/3/dataTables.bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
(function (factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery','datatables'], factory);
} else {
factory(jQuery);
}
}(function ($) {
/* Set the defaults for DataTables initialisation */
$.extend( true, $.fn.dataTable.defaults, {
"sDom":
"<'row'<'col-xs-6'l><'col-xs-6'f>r>"+
"<'row'<'col-xs-6'<'pull-left'l>><'col-xs-6'<'pull-right'f>>r>"+
"t"+
"<'row'<'col-xs-6'i><'col-xs-6'p>>",
"<'row'<'col-xs-6'<'pull-left'i>><'col-xs-6'<'pull-right'p>>>",
"oLanguage": {
"sLengthMenu": "_MENU_ records per page"
}
Expand All @@ -13,8 +20,8 @@ $.extend( true, $.fn.dataTable.defaults, {
/* Default class modification */
$.extend( $.fn.dataTableExt.oStdClasses, {
"sWrapper": "dataTables_wrapper form-inline",
"sFilterInput": "form-control input-sm",
"sLengthSelect": "form-control input-sm"
"sFilterInput": "form-control",
"sLengthSelect": "form-control"
} );

// In 1.10 we use the pagination renderers to draw the Bootstrap paging,
Expand Down Expand Up @@ -248,4 +255,4 @@ if ( $.fn.DataTable.TableTools ) {
}
} );
}

}));