wpDataTables Lite - Version 2.1.11

Version Description

  • BugFix: Fixed issue with not showing simple editor on Safari browser
  • BugFix: Fixed issue with welcome page on bulk plugin activation
  • BugFix: Fixed some PHP Notice messages
  • BugFix: Fixed issue with table borders in simple table
  • Other small bug fixes and stability improvements.
Download this release

Release Info

Developer wpDataTables
Plugin Icon 128x128 wpDataTables Lite
Version 2.1.11
Comparing to
See all releases

Code changes from version 2.1.10 to 2.1.11

Files changed (14) hide show
  1. assets/css/bootstrap/bootstrap-datetimepicker/wdt-bootstrap-datetimepicker.css +29 -17
  2. assets/js/wpdatatables/admin/common.js +1 -1
  3. assets/js/wpdatatables/admin/constructor/wdt.simpleTable.js +0 -8
  4. assets/js/wpdatatables/admin/table-settings/table_config_object.js +1 -0
  5. assets/js/wpdatatables/wdt.funcs.js +7 -3
  6. config/config.inc.php +1 -1
  7. controllers/wdt_functions.php +6 -4
  8. readme.txt +8 -1
  9. source/class.wpdatatable.php +1 -1
  10. source/class.wpdatatablerows.php +2 -2
  11. templates/admin/dashboard/dashboard.inc.php +4 -8
  12. templates/frontend/simple_table_html.inc.php +8 -2
  13. templates/frontend/style_block.inc.php +40 -2
  14. wpdatatables.php +1 -3
assets/css/bootstrap/bootstrap-datetimepicker/wdt-bootstrap-datetimepicker.css CHANGED
@@ -6,6 +6,9 @@
6
  -webkit-transition: 0s;
7
  transition: 0s;
8
  }
 
 
 
9
 
10
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget {
11
  padding: 0 !important;
@@ -22,9 +25,9 @@
22
  }
23
 
24
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget table {
25
- border: 0 !important;
26
- font-size: inherit;
27
- line-height: inherit;
28
  table-layout: auto;
29
  }
30
 
@@ -45,36 +48,44 @@
45
  }
46
 
47
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon {
48
- font-family: 'Material-Design-Iconic-Font';
49
  font-size: 18px;
50
  }
51
 
52
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-left:before {
53
- content: "\f2ff";
54
  }
55
 
56
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-right:before {
57
- content: "\f301";
58
  }
59
 
60
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-time:before {
61
- content: "\f337";
62
  }
63
 
64
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-trash:before {
65
- content: "\f330";
66
  }
67
 
68
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-calendar:before {
69
- content: "\f32e";
70
  }
71
 
72
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-up:before {
73
- content: "\f1e5";
 
 
 
 
74
  }
75
 
76
- .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-down:before {
77
- content: "\f1e4";
 
 
 
 
78
  }
79
 
80
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget a[data-action] {
@@ -83,17 +94,17 @@
83
  }
84
 
85
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .datepicker-decades .decade {
86
- line-height: 1.8em !important;
87
- background: none;
88
- color: inherit;
89
  }
90
 
91
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .datepicker-decades span {
92
- height: auto;
93
  }
94
 
95
  .wpdt-c .wdt-datetimepicker-modal .timepicker-picker .table-condensed > tbody > tr > td {
96
- padding: 10px;
97
  background: transparent;
98
  }
99
 
@@ -134,6 +145,7 @@
134
  height: 30px;
135
  border-radius: 50%;
136
  line-height: 29px;
 
137
  }
138
 
139
  .wpdt-c .wdt-datetimepicker-modal .datepicker table thead tr th:hover .glyphicon {
6
  -webkit-transition: 0s;
7
  transition: 0s;
8
  }
9
+ .wpdt-c .wpDataTables.wpDataTablesWrapper {
10
+ position: relative !important;
11
+ }
12
 
13
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget {
14
  padding: 0 !important;
25
  }
26
 
27
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget table {
28
+ border: 0 !important;
29
+ font-size: inherit;
30
+ line-height: inherit;
31
  table-layout: auto;
32
  }
33
 
48
  }
49
 
50
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon {
51
+ font-family: 'wpDataTablesIcons';
52
  font-size: 18px;
53
  }
54
 
55
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-left:before {
56
+ content: "\f30a";
57
  }
58
 
59
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-right:before {
60
+ content: "\f30b";
61
  }
62
 
63
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-time:before {
64
+ content: "\f019";
65
  }
66
 
67
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-trash:before {
68
+ content: "\f273";
69
  }
70
 
71
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-calendar:before {
72
+ content: "\f073";
73
  }
74
 
75
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-up:before {
76
+ content: "\f0dd" !important;
77
+ }
78
+ .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .btn[data-action="incrementMinutes"]:after,
79
+ .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .btn[data-action="incrementHours"]:after {
80
+ display: none !important;
81
  }
82
 
83
+ .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .glyphicon-chevron-down:before{
84
+ content: "\f0e1" !important;
85
+ }
86
+ .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .btn[data-action="decrementMinutes"]:after,
87
+ .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .btn[data-action="decrementHours"]:after {
88
+ display: none !important;
89
  }
90
 
91
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget a[data-action] {
94
  }
95
 
96
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .datepicker-decades .decade {
97
+ line-height: 1.8em !important;
98
+ background: none;
99
+ color: inherit;
100
  }
101
 
102
  .wpdt-c .wdt-datetimepicker-modal.bootstrap-datetimepicker-widget .datepicker-decades span {
103
+ height: auto;
104
  }
105
 
106
  .wpdt-c .wdt-datetimepicker-modal .timepicker-picker .table-condensed > tbody > tr > td {
107
+ padding: 0;
108
  background: transparent;
109
  }
110
 
145
  height: 30px;
146
  border-radius: 50%;
147
  line-height: 29px;
148
+ text-decoration: none !important;
149
  }
150
 
151
  .wpdt-c .wdt-datetimepicker-modal .datepicker table thead tr th:hover .glyphicon {
assets/js/wpdatatables/admin/common.js CHANGED
@@ -264,7 +264,7 @@ jQuery.fn.extend({
264
  $('.wdt-button-minus').attr('disabled', false);
265
  }
266
  } else {
267
- input.val(0);
268
  }
269
  });
270
  $(".input-number").on("keydown", function (e) {
264
  $('.wdt-button-minus').attr('disabled', false);
265
  }
266
  } else {
267
+ input.val(0).change();;
268
  }
269
  });
270
  $(".input-number").on("keydown", function (e) {
assets/js/wpdatatables/admin/constructor/wdt.simpleTable.js CHANGED
@@ -17,14 +17,6 @@
17
  */
18
  if (container.length) {
19
 
20
- var perfEntries = performance.getEntriesByType("navigation");
21
-
22
- // Reload page with simple table editor if is coming from some
23
- // page after back button in browser
24
- if (perfEntries[0].type === "back_forward") {
25
- location.reload();
26
- }
27
-
28
  var wpdtEditor = new Handsontable(container[0], {
29
  startRows: rowNumber,
30
  startCols: colNumber,
17
  */
18
  if (container.length) {
19
 
 
 
 
 
 
 
 
 
20
  var wpdtEditor = new Handsontable(container[0], {
21
  startRows: rowNumber,
22
  startCols: colNumber,
assets/js/wpdatatables/admin/table-settings/table_config_object.js CHANGED
@@ -88,6 +88,7 @@ var wpdatatable_config = {
88
  case 'xml':
89
  case 'json':
90
  case 'serialized':
 
91
  jQuery('.wdt-table-settings #wdt-browse-button').removeClass('hidden');
92
  if( jQuery('.wdt-table-settings .input-path-block').hasClass('hidden') ) {
93
  jQuery('.wdt-table-settings .input-path-block').animateFadeIn();
88
  case 'xml':
89
  case 'json':
90
  case 'serialized':
91
+ jQuery('.placeholders-settings-tab').animateFadeIn();
92
  jQuery('.wdt-table-settings #wdt-browse-button').removeClass('hidden');
93
  if( jQuery('.wdt-table-settings .input-path-block').hasClass('hidden') ) {
94
  jQuery('.wdt-table-settings .input-path-block').animateFadeIn();
assets/js/wpdatatables/wdt.funcs.js CHANGED
@@ -150,14 +150,16 @@ jQuery(document).ready(function ($) {
150
  {
151
  format: wdtDateFormat,
152
  showClear: true,
153
- keepOpen: false,
154
  useCurrent: false
155
  }
156
  )
157
  .off('dp.show')
158
  .on('dp.show', function () {
159
  $(this).parent().find('div.bootstrap-datetimepicker-widget').addClass('wdt-datetimepicker-modal');
160
- wdtAddDatePlaceholders($(this));
 
 
161
  });
162
  });
163
 
@@ -190,7 +192,9 @@ jQuery(document).ready(function ($) {
190
  .off('dp.show')
191
  .on('dp.show', function () {
192
  $(this).parent().find('div.bootstrap-datetimepicker-widget').addClass('wdt-datetimepicker-modal');
193
- wdtAddDatePlaceholders($(this));
 
 
194
  });
195
  });
196
 
150
  {
151
  format: wdtDateFormat,
152
  showClear: true,
153
+ keepOpen: true,
154
  useCurrent: false
155
  }
156
  )
157
  .off('dp.show')
158
  .on('dp.show', function () {
159
  $(this).parent().find('div.bootstrap-datetimepicker-widget').addClass('wdt-datetimepicker-modal');
160
+ if (!_.contains(['MM/Y','MMM Y','Y'], wdtDateFormat)) {
161
+ wdtAddDatePlaceholders($(this));
162
+ }
163
  });
164
  });
165
 
192
  .off('dp.show')
193
  .on('dp.show', function () {
194
  $(this).parent().find('div.bootstrap-datetimepicker-widget').addClass('wdt-datetimepicker-modal');
195
+ if (!_.contains(['MM/Y','MMM Y','Y'], wdtDateFormat)) {
196
+ wdtAddDatePlaceholders($(this));
197
+ }
198
  });
199
  });
200
 
config/config.inc.php CHANGED
@@ -9,7 +9,7 @@ defined('ABSPATH') or die("Cannot access pages directly.");
9
 
10
  // Current version
11
 
12
- define('WDT_CURRENT_VERSION', '2.1.10');
13
 
14
  /**
15
  * Regular Expressions
9
 
10
  // Current version
11
 
12
+ define('WDT_CURRENT_VERSION', '2.1.11');
13
 
14
  /**
15
  * Regular Expressions
controllers/wdt_functions.php CHANGED
@@ -646,11 +646,13 @@ function wdtFuncsShortcodeHandler($atts, $content = null, $shortcode = null) {
646
  return $aggregateFunctionsHtml;
647
 
648
  }
649
- function wdtRenderScriptStyleBlock() {
 
 
650
  $customJs = get_option('wdtCustomJs');
651
  $scriptBlockHtml = '';
652
  $styleBlockHtml = '';
653
- $wpDataTable = new WPDataTable();
654
 
655
  if ($customJs) {
656
  $scriptBlockHtml .= '<script type="text/javascript">' . stripslashes_deep(html_entity_decode($customJs)) . '</script>';
@@ -664,7 +666,7 @@ function wdtRenderScriptStyleBlock() {
664
  include WDT_TEMPLATE_PATH . 'frontend/style_block.inc.php';
665
  $styleBlockHtml = ob_get_contents();
666
  ob_end_clean();
667
- $styleBlockHtml = apply_filters('wpdatatables_filter_style_block', $styleBlockHtml, $wpDataTable->getWpId());
668
  }
669
 
670
  $returnHtml .= $styleBlockHtml;
@@ -791,7 +793,7 @@ function welcome_page_activation_redirect( $plugin ) {
791
  $filePathArr = explode('/', $filePath);
792
  $wdtPluginSlug = $filePathArr[0] . '/wpdatatables.php';
793
 
794
- if( $plugin == plugin_basename( $wdtPluginSlug ) ) {
795
  exit( wp_redirect( admin_url( 'admin.php?page=wpdatatables-welcome-page' ) ) );
796
  }
797
  }
646
  return $aggregateFunctionsHtml;
647
 
648
  }
649
+
650
+
651
+ function wdtRenderScriptStyleBlock($tableID) {
652
  $customJs = get_option('wdtCustomJs');
653
  $scriptBlockHtml = '';
654
  $styleBlockHtml = '';
655
+ $wpDataTable = WDTConfigController::loadTableFromDB($tableID,false);
656
 
657
  if ($customJs) {
658
  $scriptBlockHtml .= '<script type="text/javascript">' . stripslashes_deep(html_entity_decode($customJs)) . '</script>';
666
  include WDT_TEMPLATE_PATH . 'frontend/style_block.inc.php';
667
  $styleBlockHtml = ob_get_contents();
668
  ob_end_clean();
669
+ $styleBlockHtml = apply_filters('wpdatatables_filter_style_block', $styleBlockHtml, $wpDataTable->id);
670
  }
671
 
672
  $returnHtml .= $styleBlockHtml;
793
  $filePathArr = explode('/', $filePath);
794
  $wdtPluginSlug = $filePathArr[0] . '/wpdatatables.php';
795
 
796
+ if( $plugin == plugin_basename( $wdtPluginSlug ) && (isset($_GET['action']) && $_GET['action'] == 'activate')) {
797
  exit( wp_redirect( admin_url( 'admin.php?page=wpdatatables-welcome-page' ) ) );
798
  }
799
  }
readme.txt CHANGED
@@ -6,7 +6,7 @@ Tags: table, table builder, data tables, tables, charts, simple table, tables fr
6
  Requires at least: 4.0
7
  Tested up to: 5.7
8
  Requires PHP: 5.6
9
- Stable tag: 2.1.10
10
  License: GPLv2 or later
11
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
 
@@ -205,6 +205,13 @@ This can be changed from the “Number format” drop-down menu in the wpDataTab
205
 
206
  == Changelog ==
207
 
 
 
 
 
 
 
 
208
  = 2.1.10 =
209
  * Feature: Add new option for creating 3D pie chart
210
  * Feature: Search for tables and charts using ID on browse pages
6
  Requires at least: 4.0
7
  Tested up to: 5.7
8
  Requires PHP: 5.6
9
+ Stable tag: 2.1.11
10
  License: GPLv2 or later
11
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
 
205
 
206
  == Changelog ==
207
 
208
+ = 2.1.11 =
209
+ * BugFix: Fixed issue with not showing simple editor on Safari browser
210
+ * BugFix: Fixed issue with welcome page on bulk plugin activation
211
+ * BugFix: Fixed some PHP Notice messages
212
+ * BugFix: Fixed issue with table borders in simple table
213
+ * Other small bug fixes and stability improvements.
214
+
215
  = 2.1.10 =
216
  * Feature: Add new option for creating 3D pie chart
217
  * Feature: Search for tables and charts using ID on browse pages
source/class.wpdatatable.php CHANGED
@@ -1551,7 +1551,7 @@ class WPDataTable
1551
  }
1552
  $returnData .= "</style>\n";
1553
 
1554
- $returnData .= wdtRenderScriptStyleBlock();
1555
  return $returnData;
1556
  }
1557
 
1551
  }
1552
  $returnData .= "</style>\n";
1553
 
1554
+ $returnData .= wdtRenderScriptStyleBlock($this->getWpId());
1555
  return $returnData;
1556
  }
1557
 
source/class.wpdatatablerows.php CHANGED
@@ -259,7 +259,7 @@ class WPDataTableRows
259
  }
260
 
261
  /**
262
- * @param string $cellMetaData
263
  */
264
  public function setCellMetaData($cellMetaData)
265
  {
@@ -446,7 +446,7 @@ class WPDataTableRows
446
  wp_enqueue_script('wdt-simple-table-responsive-js', WDT_JS_PATH . 'responsive/wdt.simpleTable.responsive.init.js', array('jquery'), WDT_CURRENT_VERSION, true);
447
  }
448
 
449
- $returnData .= wdtRenderScriptStyleBlock();
450
 
451
  return $returnData;
452
  }
259
  }
260
 
261
  /**
262
+ * @param mixed $cellMetaData
263
  */
264
  public function setCellMetaData($cellMetaData)
265
  {
446
  wp_enqueue_script('wdt-simple-table-responsive-js', WDT_JS_PATH . 'responsive/wdt.simpleTable.responsive.init.js', array('jquery'), WDT_CURRENT_VERSION, true);
447
  }
448
 
449
+ $returnData .= wdtRenderScriptStyleBlock($this->getTableID());
450
 
451
  return $returnData;
452
  }
templates/admin/dashboard/dashboard.inc.php CHANGED
@@ -342,14 +342,10 @@ $tableChartsCount = WDTTools::getTablesCount('chart');
342
  <div class="alert alert-info m-b-0" role="alert">
343
  <i class="wpdt-icon-info-circle-full"></i>
344
  <ul>
345
- <li> <?php _e('<strong>Feature:</strong> Add new option for creating 3D pie chart.', 'wpdatatables'); ?></li>
346
- <li> <?php _e('<strong>Feature:</strong> Search for tables and charts using ID on browse pages.', 'wpdatatables'); ?></li>
347
- <li> <?php _e('<strong>Improvement:</strong> Added auto-save functionality after insert media in Simple tables.', 'wpdatatables'); ?></li>
348
- <li> <?php _e('<strong>Improvement:</strong> Added German translation', 'wpdatatables'); ?></li>
349
- <li> <?php _e('<strong>Bugfix:</strong> Fixed issue with Fatal errors if allow_url_fopen is turned off on server.', 'wpdatatables'); ?></li>
350
- <li> <?php _e('<strong>BugFix:</strong> Fixed issue with loading simple table preview after clicking on back button in browser from some pages.', 'wpdatatables'); ?></li>
351
- <li> <?php _e('<strong>BugFix:</strong> Fixed issue with inserting “px” in column width option.', 'wpdatatables'); ?></li>
352
- <li> <?php _e('Compatibility with WordPress 5.7 approved.', 'wpdatatables'); ?></li>
353
  <li> <?php _e('Other small bug fixes and stability improvements.', 'wpdatatables'); ?></li>
354
  </ul>
355
  </div>
342
  <div class="alert alert-info m-b-0" role="alert">
343
  <i class="wpdt-icon-info-circle-full"></i>
344
  <ul>
345
+ <li> <?php _e('<strong>Bugfix:</strong> Fixed issue with not showing simple editor on Safari browser.', 'wpdatatables'); ?></li>
346
+ <li> <?php _e('<strong>BugFix:</strong> Fixed issue with welcome page on bulk plugin activation.', 'wpdatatables'); ?></li>
347
+ <li> <?php _e('<strong>BugFix:</strong> Fixed some PHP Notice messages.', 'wpdatatables'); ?></li>
348
+ <li> <?php _e('<strong>BugFix:</strong> Fixed issue with table borders in simple table.', 'wpdatatables'); ?></li>
 
 
 
 
349
  <li> <?php _e('Other small bug fixes and stability improvements.', 'wpdatatables'); ?></li>
350
  </ul>
351
  </div>
templates/frontend/simple_table_html.inc.php CHANGED
@@ -20,6 +20,7 @@
20
  data-has-header="<?php echo $this->getTableSettingsData()->simpleHeader ?>">
21
 
22
  <?php
 
23
  $isStripe = $this->getTableSettingsData()->stripeTable;
24
  $toggleClass = $isStripe ? 'even' : '';
25
  $header = $this->getTableSettingsData()->simpleHeader;
@@ -44,8 +45,7 @@
44
  <tr class="wpdt-cell-row <?php echo $toggleClass ?>" <?php if (isset($this->getRowsData()[$i]->height)) echo 'style="height:' . $this->getRowsData()[$i]->height . 'px;"'; ?>>
45
  <?php for ($j = 0; $j < $this->getColNumber(); $j++) {
46
  $cellMetaClasses = $this->getCellClassesByIndexes($this->getRowsData(), $i, $j) ? implode(" ", $this->getCellClassesByIndexes($this->getRowsData(), $i, $j)) : "";
47
- $cellMetaClasses .= $this->getCellDataByIndexes($this->getRowsData(), $i, $j) == "" ? " wpdt-empty-cell" : "";
48
- $cellMetaClasses = apply_filters('wpdt_filter_simple_table_cell_meta', $cellMetaClasses, $i, $j, $this->getTableID());
49
 
50
  $hiddenCell = $this->getHiddenCellByIndexes($this->getRowsData(), $i, $j) ? 'hidden' : "";
51
  $colspanValue = 1;
@@ -58,7 +58,12 @@
58
  $colspanAttr = 'colspan="' . $colspanValue . '"';
59
  $rowspanAttr = 'rowspan="' . $rowspanValue . '"';
60
  $hiddenCell = "";
 
61
  }
 
 
 
 
62
  ?>
63
  <<?php echo $tag ?> class="wpdt-cell <?php echo $cellMetaClasses ?>"
64
  <?php echo ' ' . $colspanAttr . ' ' . $hiddenCell . ' ' . $rowspanAttr . ' ' ?>
@@ -105,6 +110,7 @@
105
  ?>
106
  <?php echo $cellData ?>
107
  </<?php echo $tag ?>>
 
108
  <?php } ?>
109
  </tr>
110
  <?php } ?>
20
  data-has-header="<?php echo $this->getTableSettingsData()->simpleHeader ?>">
21
 
22
  <?php
23
+ $isResponsive = $this->getTableSettingsData()->simpleResponsive;
24
  $isStripe = $this->getTableSettingsData()->stripeTable;
25
  $toggleClass = $isStripe ? 'even' : '';
26
  $header = $this->getTableSettingsData()->simpleHeader;
45
  <tr class="wpdt-cell-row <?php echo $toggleClass ?>" <?php if (isset($this->getRowsData()[$i]->height)) echo 'style="height:' . $this->getRowsData()[$i]->height . 'px;"'; ?>>
46
  <?php for ($j = 0; $j < $this->getColNumber(); $j++) {
47
  $cellMetaClasses = $this->getCellClassesByIndexes($this->getRowsData(), $i, $j) ? implode(" ", $this->getCellClassesByIndexes($this->getRowsData(), $i, $j)) : "";
48
+ $cellMetaClasses .= $this->getCellDataByIndexes($this->getRowsData(), $i, $j) == "" ? " wpdt-empty-cell " : "";
 
49
 
50
  $hiddenCell = $this->getHiddenCellByIndexes($this->getRowsData(), $i, $j) ? 'hidden' : "";
51
  $colspanValue = 1;
58
  $colspanAttr = 'colspan="' . $colspanValue . '"';
59
  $rowspanAttr = 'rowspan="' . $rowspanValue . '"';
60
  $hiddenCell = "";
61
+ $cellMetaClasses .= " wpdt-merged-cell ";
62
  }
63
+
64
+ $cellMetaClasses = apply_filters('wpdt_filter_simple_table_cell_meta', $cellMetaClasses, $i, $j, $this->getTableID());
65
+
66
+ if (($hiddenCell == 'hidden' && $isResponsive) || $hiddenCell != 'hidden'){
67
  ?>
68
  <<?php echo $tag ?> class="wpdt-cell <?php echo $cellMetaClasses ?>"
69
  <?php echo ' ' . $colspanAttr . ' ' . $hiddenCell . ' ' . $rowspanAttr . ' ' ?>
110
  ?>
111
  <?php echo $cellData ?>
112
  </<?php echo $tag ?>>
113
+ <?php } ?>
114
  <?php } ?>
115
  </tr>
116
  <?php } ?>
templates/frontend/style_block.inc.php CHANGED
@@ -1,5 +1,5 @@
1
  <?php defined('ABSPATH') or die('Access denied.'); ?>
2
-
3
  <style>
4
  <?php if(!empty($wdtFontColorSettings['wdtTableFontColor'])){ ?>
5
  /* table font color */
@@ -23,7 +23,12 @@
23
  <?php } ?>
24
  <?php if(!empty($wdtFontColorSettings['wdtHeaderBorderColor'])){ ?>
25
  /* th border color */
26
- .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable thead th,
 
 
 
 
 
27
  .wpdt-c .wpDataTablesWrapper table.wpDataTable thead th,
28
  .wpdt-c .wpDataTablesWrapper table.wpDataTable thead th.sorting {
29
  border-color: <?php echo $wdtFontColorSettings['wdtHeaderBorderColor'] ?> !important;
@@ -62,10 +67,23 @@
62
  .wpdt-c .wpDataTablesWrapper table.wpDataTable td {
63
  border-color: <?php echo $wdtFontColorSettings['wdtTableInnerBorderColor'] ?> !important;
64
  }
 
 
 
 
 
 
 
 
 
 
 
65
  <?php } ?>
66
  <?php if(!empty($wdtFontColorSettings['wdtTableOuterBorderColor'])){ ?>
67
  /* table outer border color */
68
  .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr:last-child td,
 
 
69
  .wpdt-c .wpDataTablesWrapper table.wpDataTable tr:last-child td {
70
  border-bottom-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
71
  }
@@ -74,9 +92,29 @@
74
  border-left-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
75
  }
76
  .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr td:last-child,
 
77
  .wpdt-c .wpDataTablesWrapper table.wpDataTable tr td:last-child {
78
  border-right-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
79
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
80
  <?php } ?>
81
  <?php if(!empty($wdtFontColorSettings['wdtOddRowColor'])){ ?>
82
  /* odd rows background color */
1
  <?php defined('ABSPATH') or die('Access denied.'); ?>
2
+ <?php /** @var WPDataTable $wpDataTable */ ?>
3
  <style>
4
  <?php if(!empty($wdtFontColorSettings['wdtTableFontColor'])){ ?>
5
  /* table font color */
23
  <?php } ?>
24
  <?php if(!empty($wdtFontColorSettings['wdtHeaderBorderColor'])){ ?>
25
  /* th border color */
26
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable thead tr > th{
27
+ border-bottom-color: <?php echo $wdtFontColorSettings['wdtHeaderBorderColor'] ?> !important;
28
+ border-right-color: <?php echo $wdtFontColorSettings['wdtHeaderBorderColor'] ?> !important;
29
+ border-top-color: <?php echo $wdtFontColorSettings['wdtHeaderBorderColor'] ?> !important;
30
+ border-left-color: <?php echo $wdtFontColorSettings['wdtHeaderBorderColor'] ?> !important;
31
+ }
32
  .wpdt-c .wpDataTablesWrapper table.wpDataTable thead th,
33
  .wpdt-c .wpDataTablesWrapper table.wpDataTable thead th.sorting {
34
  border-color: <?php echo $wdtFontColorSettings['wdtHeaderBorderColor'] ?> !important;
67
  .wpdt-c .wpDataTablesWrapper table.wpDataTable td {
68
  border-color: <?php echo $wdtFontColorSettings['wdtTableInnerBorderColor'] ?> !important;
69
  }
70
+ <?php if ($wpDataTable->simpleHeader) {?>
71
+ <?php if(empty($wdtFontColorSettings['wdtHeaderBorderColor'])){ ?>
72
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable thead tr th {
73
+ border-bottom-color: <?php echo $wdtFontColorSettings['wdtTableInnerBorderColor'] ?> !important;
74
+ border-right-color: <?php echo $wdtFontColorSettings['wdtTableInnerBorderColor'] ?> !important;
75
+ }
76
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable thead tr th:last-child {
77
+ border-right-color: inherit !important;
78
+ }
79
+ <?php } ?>
80
+ <?php } ?>
81
  <?php } ?>
82
  <?php if(!empty($wdtFontColorSettings['wdtTableOuterBorderColor'])){ ?>
83
  /* table outer border color */
84
  .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr:last-child td,
85
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr:last-child td.wpdt-merged-cell:last-child,
86
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr:last-child td.wpdt-merged-cell,
87
  .wpdt-c .wpDataTablesWrapper table.wpDataTable tr:last-child td {
88
  border-bottom-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
89
  }
92
  border-left-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
93
  }
94
  .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr td:last-child,
95
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr td.wpdt-merged-cell:last-child,
96
  .wpdt-c .wpDataTablesWrapper table.wpDataTable tr td:last-child {
97
  border-right-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
98
  }
99
+ <?php if (!$wpDataTable->simpleHeader) {?>
100
+ <?php if(empty($wdtFontColorSettings['wdtHeaderBorderColor'])){ ?>
101
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable tr:first-child td {
102
+ border-top-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
103
+ }
104
+ <?php } ?>
105
+ <?php } else { ?>
106
+ <?php if(empty($wdtFontColorSettings['wdtHeaderBorderColor'])){ ?>
107
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable thead tr th:last-child {
108
+ border-right-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
109
+ }
110
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable thead tr th:first-child {
111
+ border-left-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
112
+ }
113
+ .wpdt-c.wpDataTablesWrapper table.wpdtSimpleTable thead tr th {
114
+ border-top-color: <?php echo $wdtFontColorSettings['wdtTableOuterBorderColor'] ?> !important;
115
+ }
116
+ <?php } ?>
117
+ <?php } ?>
118
  <?php } ?>
119
  <?php if(!empty($wdtFontColorSettings['wdtOddRowColor'])){ ?>
120
  /* odd rows background color */
wpdatatables.php CHANGED
@@ -1,11 +1,9 @@
1
  <?php
2
-
3
-
4
  /*
5
  Plugin Name: wpDataTables - Tables & Table Charts
6
  Plugin URI: https://wpdatatables.com
7
  Description: Create responsive, sortable tables & charts from Excel, CSV or PHP. Add tables & charts to any post in minutes with DataTables.
8
- Version: 2.1.10
9
  Author: TMS-Plugins
10
  Author URI: https://tms-outsource.com
11
  Text Domain: wpdatatables
1
  <?php
 
 
2
  /*
3
  Plugin Name: wpDataTables - Tables & Table Charts
4
  Plugin URI: https://wpdatatables.com
5
  Description: Create responsive, sortable tables & charts from Excel, CSV or PHP. Add tables & charts to any post in minutes with DataTables.
6
+ Version: 2.1.11
7
  Author: TMS-Plugins
8
  Author URI: https://tms-outsource.com
9
  Text Domain: wpdatatables