From 258500f65030ccdb4788a781fd64d55f9729b87d Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 30 Sep 2015 11:24:29 -0400 Subject: [PATCH] SAAS-1102 - fix datatables pagination layout issues --- airtime_mvc/public/css/dashboard.css | 7 ------- airtime_mvc/public/css/styles.css | 2 +- airtime_mvc/public/js/airtime/common/common.js | 16 +++++++++++----- airtime_mvc/public/js/airtime/library/library.js | 6 ------ 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index 84c424065..c70981309 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -42,13 +42,6 @@ } } -@media screen and (max-width: 1260px) { - #library_display_length > label { - /* Hacky, but datatables dumps the select inside the label for some reason... */ - font-size: 0 !important; - } -} - @media screen and (max-width: 1200px) { .wrapper { -webkit-flex-flow: column !important; diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 41fa21846..9749d7b9f 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -981,7 +981,7 @@ div.blockOverlay { font-size:12px; font-weight:normal; padding: 0.2em 1em; - margin-right:3px; + margin-right:0; } .dataTables_filter input { background: url("images/search_auto_bg.png") no-repeat scroll 0 0 #DDDDDD; diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js index 70d931ae5..f3a5cea91 100644 --- a/airtime_mvc/public/js/airtime/common/common.js +++ b/airtime_mvc/public/js/airtime/common/common.js @@ -79,13 +79,19 @@ function getDatatablesStrings(overrideDict) { "sSearch": $.i18n._(""), "sZeroRecords": $.i18n._("No matching records found"), "oPaginate": { - "sFirst": $.i18n._("First"), - "sLast": $.i18n._("Last"), - "sNext": $.i18n._("Next"), - "sPrevious": $.i18n._("Previous") + "sFirst": "«", + "sLast": "»", + "sNext": "›", + "sPrevious": "‹" }, + //"oPaginate": { + // "sFirst": $.i18n._("First"), + // "sLast": $.i18n._("Last"), + // "sNext": $.i18n._("Next"), + // "sPrevious": $.i18n._("Previous") + //}, "oAria": { - "sSortAscending": $.i18n._(": activate to sort column ascending"), + "sSortAscending": $.i18n._(": activate to sort column ascending"), "sSortDescending": $.i18n._(": activate to sort column descending") } }; diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 680c7816c..f0da5c841 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -553,12 +553,6 @@ var AIRTIME = (function(AIRTIME) { return getDatatablesStrings({ "sEmptyTable": $.i18n._(""), "sZeroRecords": $.i18n._("No matching results found.") - //"oPaginate": { - // "sFirst": "<<", - // "sLast": ">>", - // "sNext": ">", - // "sPrevious": "<" - //} }); break; }