commit 7e164b2cdf15b1e4ef890f7b80bf0346101f6f89
Author: gnuget <gnuget@992990.no-reply.drupal.org>
Date:   Sat May 18 03:04:14 2013 -0500

    1898034 <table> markup instead type table

diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc
index a1899c8..72dc432 100644
--- a/core/modules/block/block.admin.inc
+++ b/core/modules/block/block.admin.inc
@@ -94,7 +94,6 @@ function block_admin_edit(Block $entity) {
  *   - form: A render element representing the form.
  */
 function template_preprocess_block_admin_display_form(&$variables) {
-  $header = array(t('Block'), t('Region'), t('Weight'), t('Operations'));
   // @todo Remove/refactor pending http://drupal.org/node/1920886.
   $children = $variables['form'];
 
@@ -105,11 +104,11 @@ function template_preprocess_block_admin_display_form(&$variables) {
 
   foreach ($variables['block_regions'] as $key => $value) {
     // Initialize an empty array for the region.
-    $block_listing[$key] = array();
+    $variables['block_listing'][$key] = array();
   }
 
   // Initialize disabled blocks array.
-  $block_listing[BLOCK_REGION_NONE] = array();
+  $variables['block_listing'][BLOCK_REGION_NONE] = array();
 
   // Add each block in the form to the appropriate place in the block listing.
   foreach (element_children($variables['form']['blocks']) as $i) {
@@ -122,11 +121,11 @@ function template_preprocess_block_admin_display_form(&$variables) {
     $block['region']['#attributes']['class'] = array('block-region-select', 'block-region-' . $region);
     $block['weight']['#attributes']['class'] = array('block-weight', 'block-weight-' . $region);
 
-    $block_listing[$region][$i] = new stdClass();
-    $block_listing[$region][$i]->row_class = !empty($block['#attributes']['class']) ? implode(' ', $block['#attributes']['class']) : '';
-    $block_listing[$region][$i]->block_modified = !empty($block['#attributes']['class']) && in_array('block-modified', $block['#attributes']['class']);
-    $block_listing[$region][$i]->block_title = $block['info'];
-    $block_listing[$region][$i]->region_select = array(
+    $variables['block_listing'][$region][$i] = new stdClass();
+    $variables['block_listing'][$region][$i]->row_class = !empty($block['#attributes']['class']) ? implode(' ', $block['#attributes']['class']) : '';
+    $variables['block_listing'][$region][$i]->block_modified = !empty($block['#attributes']['class']) && in_array('block-modified', $block['#attributes']['class']);
+    $variables['block_listing'][$region][$i]->block_title = $block['info'];
+    $variables['block_listing'][$region][$i]->region_select = array(
       'region' => array(
         'data' => $block['region'],
         '#weight' => 1,
@@ -136,50 +135,11 @@ function template_preprocess_block_admin_display_form(&$variables) {
         '#weight' => 2,
       ),
     );
-    $block_listing[$region][$i]->weight_select = $block['weight'];
-    $block_listing[$region][$i]->operations = $block['operations'];
-    $block_listing[$region][$i]->printed = FALSE;
+    $variables['block_listing'][$region][$i]->weight_select = $block['weight'];
+    $variables['block_listing'][$region][$i]->operations = $block['operations'];
+    $variables['block_listing'][$region][$i]->printed = FALSE;
   }
 
-  $rows = array();
-  foreach ($block_listing as $region => $block_list) {
-    $rows[] = array(
-      'data' => array(
-        array('data' => t($variables['block_regions'][$region]), 'colspan' => 5),
-      ),
-      'class' => array('region-title region-title-' . $region),
-      'no_striping' => TRUE,
-    );
-    $rows[] = array(
-      'data' => array(
-        array('data' => '<em>'. t('No blocks in this region ') . '</em>', 'colspan' => 5),
-      ),
-      'class' => array('region-message', 'region-' . $region . '-message', empty($block_listing[$region]) ? 'region-empty' : 'region-populated'),
-      'no_striping' => TRUE,
-    );
-    foreach ($block_list as $key => $block) {
-      $rows[] = array(
-        'data' => array(
-          array('data' => $block->block_title, 'class' => 'block'),
-          array('data' => $block->region_select),
-          array('data' => $block->weight_select),
-          array('data' => $block->operations),
-        ),
-        'class' => array('draggable'),
-      );
-    }
-  }
-  $attributes = new Attribute(array('id' => 'blocks', 'class' => array()));
-  drupal_add_tabledrag('blocks', 'order', 'sibling', 'block-weight');
-  $variables['table'] = array(
-    '#theme' => 'table',
-    '#header' => $header,
-    '#rows' => $rows,
-    '#attributes' => $attributes,
-    '#responsive' => FALSE,
-  );
-  // Remove elements from the 'children' render array.
-  // @todo Refactor when http://drupal.org/node/1920886 is resolved.
   unset($children['blocks'], $children['block_regions']);
-  $variables['children'] = drupal_render_children($children);
+  $variables['form_submit'] = drupal_render_children($children);
 }
diff --git a/core/modules/block/templates/block-admin-display-form.html.twig b/core/modules/block/templates/block-admin-display-form.html.twig
index 0a9fbc9..75661ec 100644
--- a/core/modules/block/templates/block-admin-display-form.html.twig
+++ b/core/modules/block/templates/block-admin-display-form.html.twig
@@ -4,14 +4,53 @@
  * Default theme implementation to configure blocks.
  *
  * Available variables:
- * - table: Draggable table containing blocks.
- * - children: Child elements of the form that still need to be printed.
+ * - block_regions: An array of regions. Keyed by name with the title as value.
+ * - block_listing: An array of blocks keyed by region and then delta.
+ * - form_submit: Form submit button.
  *
+ * Each block_listing[region] contains an array of blocks for that region.
+ *
+ * Each data in block_listing[region] contains:
+ * - data->region_title: Region title for the listed block.
+ * - data->block_title: Block title.
+ * - data->region_select: Drop-down menu for assigning a region.
+ * - data->weight_select: Drop-down menu for setting weights.
+ * - data->operations: Block operations.
  * @see template_preprocess()
  * @see template_preprocess_block_admin_display_form()
  *
  * @ingroup themeable
  */
 #}
-{{ table }}
-{{ children }}
+<table id="blocks" class="sticky-enabled">
+  <thead>
+    <tr>
+      <th>{{ 'Block'|t }}</th>
+      <th>{{ 'Region'|t }}</th>
+      <th>{{ 'Weight'|t }}</th>
+      <th>{{ 'Operations'|t }}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% set row = 0 %}
+    {% for region, title in block_regions %}
+      <tr class="region-title region-title-{{ region }}">
+        <td colspan="5">{{ title }}</td>
+      </tr>
+      <tr class="region-message region-{{ region }}-message {{ block_listing[region] is empty ? 'region-empty' : 'region-populated' }}">
+        <td colspan="5"><em>{{ 'No blocks in this region'|t }}</em></td>
+      </tr>
+      {% for delta, data in block_listing[region] %}
+      <tr class="draggable {{ row is divisibleby(2)  ? 'odd' : 'even'}}{{ data.row_class }}">
+        <td class="block">{{ data.block_title }}</td>
+        <td>{{ data.region_select }}</td>
+        <td>{{ data.weight_select }}</td>
+        <td>{{ data.operations }}</td>
+      </tr>
+      {% set row = row + 1 %}
+      {% endfor %}
+    {% endfor %}
+  </tbody>
+</table>
+
+{{ form_submit }}