Merge branch 'master' of github.com:DataTables/Plugins

i18n/Mongolian.lang

@@ -0,0 +1,30 @@
+/**
+ * Mongolian - Монгол хэлний орчуулга
+ *  @name Mongolian
+ *  @anchor Mongolian
+ *  @author <a href="http://www.Batmandakh.com/">Batmandakh Erdenebileg</a>
+ */
+
+{
+	"sEmptyTable":     "Хүснэгтэд ямар ч мэдээлэл алга",
+        "sInfo":           "Нийт _TOTAL_ бичлэгийн _START_ - _END_ харуулж байна",
+        "sInfoEmpty":      "Нийт 0 бичлэгийн 0 - 0 харуулж байна",
+        "sInfoFiltered":   "(нийт _MAX_ бичлэгээс шүүв)",
+        "sInfoPostFix":    "",
+        "sInfoThousands":  ",",
+        "sLengthMenu":     "Дэлгэцэд _MENU_ бичлэг харуулна",
+        "sLoadingRecords": "Ачаалж байна...",
+        "sProcessing":     "Боловсруулж байна...",
+        "sSearch":         "Хайлт:",
+        "sZeroRecords":    "Тохирох бичлэг олдсонгүй",
+        "oPaginate": {
+        	"sFirst":    "Эхнийх",
+                "sLast":     "Сүүлийнх",
+                "sNext":     "Өмнөх",
+                "sPrevious": "Дараах"
+        },
+        "oAria": {
+                "sSortAscending":  ": цагаан толгойн дарааллаар эрэмбэлэх",
+                "sSortDescending": ": цагаан толгойн эсрэг дарааллаар эрэмбэлэх"
+        }
+}

integration/bootstrap/3/dataTables.bootstrap.css

@@ -71,18 +71,29 @@ table.dataTable thead .sorting_desc,
 table.dataTable thead .sorting_asc_disabled,
 table.dataTable thead .sorting_desc_disabled {
 	cursor: pointer;
+	position: relative;
 }
 
-table.dataTable thead .sorting { background: url('../images/sort_both.png') no-repeat center right; }
+table.dataTable thead th.sorting:after,
-table.dataTable thead .sorting_asc { background: url('../images/sort_asc.png') no-repeat center right; }
+table.dataTable thead th.sorting_asc:after,
-table.dataTable thead .sorting_desc { background: url('../images/sort_desc.png') no-repeat center right; }
+table.dataTable thead th.sorting_desc:after {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	display: block;
+	font-family: 'Glyphicons Halflings';
+	content: "\e150"; /* sort */
+	color: #999;
+}
+table.dataTable thead th.sorting_asc:after { color: #333; content: "\e155"; /* sort-by-attributes */ }
+table.dataTable thead th.sorting_desc:after { color: #333; content: "\e156"; /* sort-by-attributes-alt */ }
 
-table.dataTable thead .sorting_asc_disabled { background: url('../images/sort_asc_disabled.png') no-repeat center right; }
+table.dataTable thead .sorting_asc_disabled:after,
-table.dataTable thead .sorting_desc_disabled { background: url('../images/sort_desc_disabled.png') no-repeat center right; }
+table.dataTable thead .sorting_desc_disabled:after { color: #eee }
 
 table.dataTable thead > tr > th {
-	padding-left: 18px;
+	padding-left: 8px;
-	padding-right: 18px;
+	padding-right: 30px;
 }
 
 table.dataTable th:active {

sorting/datetime-moment.js

@@ -41,7 +41,7 @@ $.fn.dataTable.moment = function ( format, locale ) {
 	types.order[ 'moment-'+format+'-pre' ] = function ( d ) {
 		return d === '' || d === null ?
 			-Infinity :
-			moment( d, format, locale, true ).unix();
+			parseInt( moment( d, format, locale, true ).format( 'x' ), 10 );
 	};
 };