1 files changed, 29 insertions, 6 deletions
diff --git a/modules/field_ui/field_ui-display-overview-table.tpl.php b/modules/field_ui/field_ui-display-overview-table.tpl.php
index c9c39593e..0fe4e0a1f 100644
--- a/modules/field_ui/field_ui-display-overview-table.tpl.php
+++ b/modules/field_ui/field_ui-display-overview-table.tpl.php
@@ -16,35 +16,51 @@
  */
 ?>
 <?php if ($rows): ?>
+<div id="field-display-overview-wrapper">
   <table id="field-display-overview" class="field-display-overview sticky-enabled">
     <thead>
       <tr>
         <th><?php print t('Field'); ?></th>
         <th><?php print t('Weight'); ?></th>
         <th><?php print t('Label'); ?></th>
-        <th><?php print t('Format'); ?></th>
+        <th colspan="3"><?php print t('Format'); ?></th>
       </tr>
     </thead>
     <tbody>
       <tr class="region-message region-visible-message <?php print empty($rows['visible']) ? 'region-empty' : 'region-populated'; ?>">
-        <td colspan="4"><em><?php print t('No field is displayed'); ?></em></td>
+        <td colspan="5"><em><?php print t('No field is displayed'); ?></em></td>
       </tr>
       <?php
       $count = 0;
       foreach ($rows['visible'] as $row): ?>
-        <tr class="<?php print $count % 2 == 0 ? 'odd' : 'even'; ?> <?php print $row->class ?>">
+        <tr id="<?php print $row->id; ?>" class="<?php print $count % 2 == 0 ? 'odd' : 'even'; ?> <?php print $row->class ?>">
           <td><span class="<?php print $row->label_class; ?>"><?php print $row->human_name; ?></span></td>
           <td><?php print $row->weight . $row->hidden_name; ?></td>
           <td><?php if (isset($row->label)) print $row->label; ?></td>
-          <td><?php print $row->type; ?></td>
+          <?php if (isset($row->settings_edit_form)) : ?>
+            <td colspan="3">
+              <?php print $row->type; ?>
+              <?php print $row->settings_edit_form; ?>
+            </td>
+          <?php else :?>
+            <td>
+              <?php print $row->type; ?>
+            </td>
+            <td class="field-formatter-summary-cell">
+              <?php print $row->settings_summary; ?>
+            </td>
+            <td>
+              <?php print $row->settings_edit; ?>
+            </td>
+          <?php endif; ?>
         </tr>
         <?php $count++;
       endforeach; ?>
       <tr class="region-title region-title-hidden">
-        <td colspan="4"><?php print t('Hidden'); ?></td>
+        <td colspan="5"><?php print t('Hidden'); ?></td>
       </tr>
       <tr class="region-message region-hidden-message <?php print empty($rows['hidden']) ? 'region-empty' : 'region-populated'; ?>">
-        <td colspan="4"><em><?php print t('No field is hidden'); ?></em></td>
+        <td colspan="5"><em><?php print t('No field is hidden'); ?></em></td>
       </tr>
       <?php foreach ($rows['hidden'] as $row): ?>
         <tr class="<?php print $count % 2 == 0 ? 'odd' : 'even'; ?> <?php print $row->class ?>">
@@ -52,9 +68,16 @@
           <td><?php print $row->weight . $row->hidden_name; ?></td>
           <td><?php if (isset($row->label)) print $row->label; ?></td>
           <td><?php print $row->type; ?></td>
+          <td class="field-formatter-summary-cell">
+            <?php print $row->settings_summary; ?>
+          </td>
+          <td>
+            <?php print $row->settings_edit; ?>
+          </td>
         </tr>
         <?php $count++;
       endforeach; ?>
     </tbody>
   </table>
+</div>
 <?php endif; ?>