tag.
* - colgroups: An array of column groups. Each element of the array can be
@@ -1548,53 +1555,75 @@ function template_preprocess_table(&$variables) {
// Build an associative array of responsive classes keyed by column.
$responsive_classes = array();
- // Format the table header:
- $ts = array();
- if (!empty($variables['header'])) {
- $ts = tablesort_init($variables['header']);
-
- foreach ($variables['header'] as $col_key => $cell) {
- if (!is_array($cell)) {
- $cell_content = $cell;
- $cell_attributes = new Attribute();
- $is_header = TRUE;
- }
- else {
- $cell_content = '';
- if (isset($cell['data'])) {
- $cell_content = $cell['data'];
- unset($cell['data']);
+ // Format the table header & footer:
+ $table_parts = array('header' , 'footer');
+ foreach ($table_parts as $table_part) {
+ $ts = array();
+ if (!empty($variables[$table_part])) {
+ $ts = tablesort_init($variables[$table_part]);
+
+ foreach ($variables[$table_part] as $col_key => $cell) {
+ if (!is_array($cell)) {
+ $cell_content = $cell;
+ $cell_attributes = new Attribute();
+ if ($table_part == 'header') {
+ $is_header = TRUE;
+ } else {
+ $is_header = FALSE;
+ }
}
- // Flag the cell as a header or not and remove the flag.
- $is_header = isset($cell['header']) ? $cell['header'] : TRUE;
- unset($cell['header']);
-
- // Track responsive classes for each column as needed. Only the header
- // cells for a column are marked up with the responsive classes by a
- // module developer or themer. The responsive classes on the header cells
- // must be transferred to the content cells.
- if (!empty($cell['class']) && is_array($cell['class'])) {
- if (in_array(RESPONSIVE_PRIORITY_MEDIUM, $cell['class'])) {
- $responsive_classes[$col_key] = RESPONSIVE_PRIORITY_MEDIUM;
+ else {
+ $cell_content = '';
+ if (isset($cell['data'])) {
+ $cell_content = $cell['data'];
+ unset($cell['data']);
}
- elseif (in_array(RESPONSIVE_PRIORITY_LOW, $cell['class'])) {
- $responsive_classes[$col_key] = RESPONSIVE_PRIORITY_LOW;
+ if ($table_part == 'header') {
+ // Default header tag is | .
+ $cell_header_default = TRUE;
+ } else {
+ // Default header tag is | .
+ $cell_header_default = FALSE;
}
- }
+ // Flag the cell as a header or not and remove the flag.
+ $is_header = isset($cell['header']) ? $cell['header'] : $cell_header_default;
+ unset($cell['header']);
+
+ if ($table_part == 'header') {
+ // Track responsive classes for each column as needed. Only the header
+ // cells for a column are marked up with the responsive classes by a
+ // module developer or themer. The responsive classes on the header cells
+ // must be transferred to the content cells.
+ if (!empty($cell['class']) && is_array($cell['class'])) {
+ if (in_array(RESPONSIVE_PRIORITY_MEDIUM, $cell['class'])) {
+ $responsive_classes[$col_key] = RESPONSIVE_PRIORITY_MEDIUM;
+ }
+ elseif (in_array(RESPONSIVE_PRIORITY_LOW, $cell['class'])) {
+ $responsive_classes[$col_key] = RESPONSIVE_PRIORITY_LOW;
+ }
+ }
- if (is_array($cell_content)) {
- $cell_content = drupal_render($cell_content);
- }
+ if (is_array($cell_content)) {
+ $cell_content = drupal_render($cell_content);
+ }
- tablesort_header($cell_content, $cell, $variables['header'], $ts);
+ tablesort_header($cell_content, $cell, $variables['header'], $ts);
- // tablesort_header() removes the 'sort' and 'field' keys.
- $cell_attributes = new Attribute($cell);
+ // tablesort_header() removes the 'sort' and 'field' keys.
+ $cell_attributes = new Attribute($cell);
+ } else {
+ $cell_attributes = new Attribute($cell);
+
+ if (is_array($cell_content)) {
+ $cell_content = drupal_render($cell_content);
+ }
+ }
+ }
+ $variables[$table_part][$col_key] = array();
+ $variables[$table_part][$col_key]['tag'] = $is_header ? 'th' : 'td';
+ $variables[$table_part][$col_key]['attributes'] = $cell_attributes;
+ $variables[$table_part][$col_key]['content'] = $cell_content;
}
- $variables['header'][$col_key] = array();
- $variables['header'][$col_key]['tag'] = $is_header ? 'th' : 'td';
- $variables['header'][$col_key]['attributes'] = $cell_attributes;
- $variables['header'][$col_key]['content'] = $cell_content;
}
}
@@ -2553,7 +2582,7 @@ function drupal_common_theme() {
'template' => 'breadcrumb',
),
'table' => array(
- 'variables' => array('header' => NULL, 'rows' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => FALSE, 'responsive' => TRUE, 'empty' => ''),
+ 'variables' => array('header' => NULL, 'footer' => NULL, 'rows' => NULL, 'attributes' => array(), 'caption' => NULL, 'colgroups' => array(), 'sticky' => FALSE, 'responsive' => TRUE, 'empty' => ''),
'template' => 'table',
),
'tablesort_indicator' => array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
index 6b9c5ef..6457309 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
@@ -31,71 +31,67 @@ public static function getInfo() {
}
/**
- * Tableheader.js provides 'sticky' table headers, and is included by default.
+ * Tests that the table header is printed correctly even if there are no rows,
+ * and that the empty text is displayed correctly.
*/
- function testThemeTableStickyHeaders() {
- $header = array('one', 'two', 'three');
- $rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
- $table = array(
- '#type' => 'table',
- '#header' => $header,
- '#rows' => $rows,
- '#sticky' => TRUE,
+ function testThemeTableWithEmptyMessage() {
+ $header = array(
+ 'Header 1',
+ array(
+ 'data' => 'Header 2',
+ 'colspan' => 2,
+ ),
);
- $this->render($table);
- $js = _drupal_add_js();
- $this->assertTrue(isset($js['core/misc/tableheader.js']), 'tableheader.js found.');
- $this->assertRaw('sticky-enabled');
- drupal_static_reset('_drupal_add_js');
- }
-
- /**
- * If $sticky is FALSE, no tableheader.js should be included.
- */
- function testThemeTableNoStickyHeaders() {
- $header = array('one', 'two', 'three');
- $rows = array(array(1,2,3), array(4,5,6), array(7,8,9));
- $attributes = array();
- $caption = NULL;
- $colgroups = array();
$table = array(
'#type' => 'table',
'#header' => $header,
- '#rows' => $rows,
- '#attributes' => $attributes,
- '#caption' => $caption,
- '#colgroups' => $colgroups,
- '#sticky' => FALSE,
+ '#rows' => array(),
+ '#empty' => 'Empty row.',
);
$this->render($table);
- $js = _drupal_add_js();
- $this->assertFalse(isset($js['core/misc/tableheader.js']), 'tableheader.js not found.');
- $this->assertNoRaw('sticky-enabled');
- drupal_static_reset('_drupal_add_js');
+ $this->removeWhiteSpace();
+ $this->assertRaw('| Header 1 | Header 2 |
|---|
', 'Table header found.');
+ $this->assertRaw('| Empty row. | ', 'Colspan on #empty row found.');
}
/**
- * Tests that the table header is printed correctly even if there are no rows,
- * and that the empty text is displayed correctly.
+ * Tests that the table header and footer is printed correctly..
*/
- function testThemeTableWithEmptyMessage() {
+ function testThemeTableHeaderAndFooter() {
$header = array(
- 'Header 1',
+ array(
+ 'data' => 'Header 1',
+ 'header' => FALSE,
+ ),
array(
'data' => 'Header 2',
'colspan' => 2,
),
+ 'Header 3',
+ );
+ $footer = array(
+ array(
+ 'data' => 'Footer 1',
+ 'header' => TRUE,
+ ),
+ array(
+ 'data' => 'Footer 2',
+ 'colspan' => 2,
+ ),
+ 'Footer 3',
);
$table = array(
'#type' => 'table',
'#header' => $header,
+ '#footer' => $footer,
'#rows' => array(),
'#empty' => 'Empty row.',
);
$this->render($table);
$this->removeWhiteSpace();
- $this->assertRaw('| Header 1 | Header 2 |
|---|
', 'Table header found.');
- $this->assertRaw('| Empty row. | ', 'Colspan on #empty row found.');
+ $this->assertRaw('| Header 1 | Header 2 | Header 3 |
|---|
', 'Table header found.');
+ $this->assertRaw(' |