Merge pull request #5360 from pjackson28/datatablesshowing

Tables: Moved showing x to x of x entries to the top of the table (fixes #5215)
wet-boew · May 2, 2014 · 227c68d · 227c68d
2 parents df90cba + 4c64b46
commit 227c68d
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 1 deletion.
diff --git a/.scss-lint.yml b/.scss-lint.yml
@@ -28,6 +28,9 @@ linters:
       - "src/plugins/geomap/_ie8.scss"
       - "src/plugins/geomap/_print.scss"
       - "src/plugins/tables/_base.scss"
+      - "src/plugins/tables/_screen-sm-max.scss"
+      - "src/plugins/tables/_screen-xs-min.scss"
+      - "src/plugins/tables/_screen-xxs-max.scss"
       - "src/polyfills/meter/meter.scss"
       - "src/polyfills/meter/demo/meter.scss"
       - "src/polyfills/progress/demo/progress.scss"

diff --git a/src/base/wet-boew.scss b/src/base/wet-boew.scss
@@ -100,6 +100,7 @@
 /* Small view and under */
 @media screen and (max-width: $screen-sm-max) {
 	@import "views/screen-sm-max";
+	@import "../plugins/tables/screen-sm-max";
 	@import "../plugins/tabs/screen-sm-max";
 }
 
@@ -118,6 +119,7 @@
 	@import "views/screen-xs-min";
 	@import "proximity/screen-xs-min";
 	@import "../plugins/menu/screen-xs-min";
+	@import "../plugins/tables/screen-xs-min";
 }
 
 /* Small view and over */
@@ -143,6 +145,7 @@
 @media screen and (max-width: $screen-xxs-max) {
 	@import "views/screen-xxs-max";
 	@import "../plugins/menu/screen-xxs-max";
+	@import "../plugins/tables/screen-xxs-max";
 	@import "../plugins/tabs/screen-xxs-max";
 }
 

diff --git a/src/plugins/tables/_base.scss b/src/plugins/tables/_base.scss
@@ -336,7 +336,7 @@ table {
 }
 
 %tables-th-padding-right-8-padding-left-15em {
-	padding-left: 15em;
+	padding-left: 1.5em;
 	padding-right: 8px;
 }
 
@@ -380,4 +380,9 @@ table {
 			}
 		}
 	}
+
+	.dataTables_filter {
+		float: left;
+		text-align: left;
+	}
 }
diff --git a/src/plugins/tables/_screen-sm-max.scss b/src/plugins/tables/_screen-sm-max.scss
@@ -0,0 +1,21 @@
+/*
+ * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
+ * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
+ */
+
+.dataTables_info {
+	padding-bottom: 5px;
+}
+
+.dataTables_filter {
+	float: left;
+	text-align: left;
+	width: 100%;
+}
+
+[dir=rtl] {
+	.dataTables_filter {
+		float: right;
+		text-align: right;
+	}
+}
diff --git a/src/plugins/tables/_screen-xs-min.scss b/src/plugins/tables/_screen-xs-min.scss
@@ -0,0 +1,11 @@
+/*
+ * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
+ * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
+ */
+.dataTables_info {
+	&:after {
+		content: "|";
+		font-size: 1.2em;
+		padding: 0 0.25em;
+	}
+}
diff --git a/src/plugins/tables/_screen-xxs-max.scss b/src/plugins/tables/_screen-xxs-max.scss
@@ -0,0 +1,8 @@
+/*
+ * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
+ * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
+ */
+
+.dataTables_length {
+	width: 100%;
+}
diff --git a/src/plugins/tables/tables.js b/src/plugins/tables/tables.js
@@ -76,6 +76,7 @@ var pluginName = "wb-tables",
 			defaults = {
 				asStripeClasses: [],
 				oLanguage: i18nText,
+				sDom: "<'top'ilf>rt<'bottom'p><'clear'>",
 				fnDrawCallback: function() {
 					$( "#" + elmId ).trigger( "tables-draw.wb" );
 				}