#553298 follow-up by yched: Rename field_ui-display-overview-table.tpl.php to field_ui-display-overview-form.tpl.php.

2 files changed, 60 insertions, 55 deletions

diff --git a/modules/field_ui/field_ui-display-overview-form.tpl.php b/modules/field_ui/field_ui-display-overview-form.tpl.php
deleted file mode 100644
index d4c2d903f..000000000
--- a/modules/field_ui/field_ui-display-overview-form.tpl.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-// $Id$
-
-/**
- * @file
- * Default theme implementation to configure field display settings.
- *
- * Available variables:
- *
- * - $form: The complete form for the field display settings.
- * - $contexts: An associative array of the available contexts for these fields.
- *   On the node field display settings this defaults to including "teaser" and
- *   "full" as the available contexts.
- * - $rows: The field display settings form broken down into rendered rows for
- *   printing as a table.
- * - $submit: The rendered submit button for this form.
- *
- * @see field_ui_display_overview_form()
- * @see template_preprocess_field_ui_display_overview_form()
- */
-?>
-<?php if ($rows): ?>
-  <table id="field-display-overview" class="sticky-enabled">
-    <thead>
-      <tr>
-        <th>&nbsp;</th>
-        <?php foreach ($contexts as $key => $value): ?>
-          <th colspan="2"><?php print $value; ?>
-        <?php endforeach; ?>
-      </tr>
-      <tr>
-        <th><?php print t('Field'); ?></th>
-        <?php foreach ($contexts as $key => $value): ?>
-          <th><?php print t('Label'); ?></th>
-          <th><?php print t('Format'); ?></th>
-        <?php endforeach; ?>
-      </tr>
-    </thead>
-    <tbody>
-      <?php
-      $count = 0;
-      foreach ($rows as $row): ?>
-        <tr class="<?php print $count % 2 == 0 ? 'odd' : 'even'; ?>">
-          <td><span class="<?php print $row->label_class; ?>"><?php print $row->human_name; ?></span></td>
-          <?php foreach ($contexts as $context => $title): ?>
-            <td><?php print $row->{$context}->label; ?></td>
-            <td><?php print $row->{$context}->type; ?></td>
-          <?php endforeach; ?>
-        </tr>
-        <?php $count++;
-      endforeach; ?>
-    </tbody>
-  </table>
-  <?php print $submit; ?>
-<?php endif; ?>
diff --git a/modules/field_ui/field_ui-display-overview-table.tpl.php b/modules/field_ui/field_ui-display-overview-table.tpl.php
new file mode 100644
index 000000000..a6ad1c155
--- /dev/null
+++ b/modules/field_ui/field_ui-display-overview-table.tpl.php
@@ -0,0 +1,60 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Default theme implementation to configure field display settings.
+ *
+ * Available variables:
+ * - $rows: The field display settings form broken down into rendered rows for
+ *   printing as a table. The array is separated in two entries, 'visible' and
+ *   'hidden'.
+ * - $id: The HTML id for the table.
+ *
+ * @see field_ui_display_overview_form()
+ * @see template_preprocess_field_ui_display_overview_table()
+ */
+?>
+<?php if ($rows): ?>
+  <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>
+      </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>
+      </tr>
+      <?php
+      $count = 0;
+      foreach ($rows['visible'] as $row): ?>
+        <tr 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>
+        </tr>
+        <?php $count++;
+      endforeach; ?>
+      <tr class="region-title region-title-hidden">
+        <td colspan="4"><?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>
+      </tr>
+      <?php foreach ($rows['hidden'] as $row): ?>
+        <tr 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>
+        </tr>
+        <?php $count++;
+      endforeach; ?>
+    </tbody>
+  </table>
+<?php endif; ?>