Adjust markup table header + new configurable tableHeaderClass

croogo · Jul 4, 2019 · 927616d · 927616d
1 parent 158ecc2
commit 927616d
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 71 deletions.
diff --git a/Blocks/src/Template/Admin/Blocks/index.ctp b/Blocks/src/Template/Admin/Blocks/index.ctp
@@ -24,7 +24,7 @@ $tableHeaders = $this->Html->tableHeaders([
     $this->Paginator->sort('status', __d('croogo', 'Status')),
     __d('croogo', 'Actions'),
 ]);
-echo $this->Html->tag('thead', $tableHeaders);
+echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Contacts/src/Template/Admin/Messages/index.ctp b/Contacts/src/Template/Admin/Messages/index.ctp
@@ -55,7 +55,7 @@ $tableHeaders = $this->Html->tableHeaders([
     $this->Paginator->sort('created', __d('croogo', 'Created')),
     __d('croogo', 'Actions'),
 ]);
-echo $this->Html->tag('thead', $tableHeaders);
+echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Core/src/Template/Common/admin_index.ctp b/Core/src/Template/Common/admin_index.ctp
@@ -12,6 +12,7 @@ $i18nDomain = $this->request->param('plugin') ? 'croogo' : $this->request->param
 
 $rowClass = $this->Theme->getCssClass('row');
 $columnFull = $this->Theme->getCssClass('columnFull');
+$tableHeaderClass = isset($tableHeaderClass) ? $tableHeaderClass : $this->Theme->getCssClass('tableHeaderClass');
 $tableClass = isset($tableClass) ? $tableClass : $this->Theme->getCssClass('tableClass');
 $tableContainerClass = $this->Theme->getCssClass('tableContainerClass');
 
@@ -133,7 +134,9 @@ $tableFooters = trim($this->fetch('table-footer'));
                     <div class="<?= $tableContainerClass ?>">
                     <table class="<?= $tableClass ?>">
                         <?php
-                        echo $this->Html->tag('thead', $tableHeaders);
+                        echo $this->Html->tag('thead', $tableHeaders, [
+                            'class' => $tableHeaderClass,
+                        ]);
                         echo $this->Html->tag('tbody', $tableBody);
                         if ($tableFooters):
                             echo $this->Html->tag('tfoot', $tableFooters);

diff --git a/Dashboards/src/Template/Admin/Dashboards/index.ctp b/Dashboards/src/Template/Admin/Dashboards/index.ctp
@@ -19,7 +19,7 @@ $this->append('table-heading');
         $this->Paginator->sort('created'),
         __d('croogo', 'Actions'),
     ));
-    echo $this->Html->tag('thead', $tableHeaders);
+    echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Extensions/src/CroogoTheme.php b/Extensions/src/CroogoTheme.php
@@ -79,6 +79,7 @@ public function getData($theme = null, $path = null)
                     'formInput' => 'input-block-level',
                     'imageClass' => 'img-fluid',
                     'row' => 'row',
+                    'tableHeaderClass' => 'thead-light',
                     'tableClass' => 'table table-striped',
                     'tableContainerClass' => 'table-responsive',
                     'thumbnailClass' => 'img-thumbnail',

diff --git a/Extensions/src/Template/Admin/Locales/index.ctp b/Extensions/src/Template/Admin/Locales/index.ctp
@@ -24,7 +24,7 @@ $this->start('table-heading');
         __d('croogo', 'Default'),
         __d('croogo', 'Actions'),
     ));
-    echo $this->Html->tag('thead', $tableHeaders);
+    echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Extensions/src/Template/Admin/Plugins/index.ctp b/Extensions/src/Template/Admin/Plugins/index.ctp
@@ -9,10 +9,9 @@ $this->Breadcrumbs->add(__d('croogo', 'Extensions'), $this->request->getUri()->g
 
 $this->start('action-buttons');
 echo $this->Croogo->adminAction(__d('croogo', 'Upload'), ['action' => 'add']);
-$this->end() ?>
+$this->end();
 
-<table class="table table-striped">
-    <?php
+$this->append('table-heading');
     $tableHeaders = $this->Html->tableHeaders([
         '',
         __d('croogo', 'Alias'),
@@ -21,12 +20,11 @@ $this->end() ?>
         __d('croogo', 'Active'),
         __d('croogo', 'Actions'),
     ]);
-    ?>
-    <thead>
-        <?= $tableHeaders ?>
-    </thead>
+    echo $tableHeaders;
+$this->end();
+
+$this->append('table-body');
 
-    <?php
     $rows = [];
     foreach ($plugins as $pluginAlias => $pluginData):
         $toggleText = $pluginData['active'] ? __d('croogo', 'Deactivate') : __d('croogo', 'Activate');
@@ -78,5 +76,4 @@ $this->end() ?>
     endforeach;
 
     echo $this->Html->tableCells($rows);
-    ?>
-</table>
+$this->end();
diff --git a/FileManager/src/Template/Admin/Attachments/index.ctp b/FileManager/src/Template/Admin/Attachments/index.ctp
@@ -47,7 +47,7 @@ $this->append('table-heading');
         __d('croogo', 'Actions'),
     ));
 
-    echo $this->Html->tag('thead', $tableHeaders);
+    echo $tableHeaders;
 $this->end();
 
 $this->append('search', $this->element('Croogo/Core.admin/search'));

diff --git a/FileManager/src/Template/Admin/FileManager/browse.ctp b/FileManager/src/Template/Admin/FileManager/browse.ctp
@@ -1,6 +1,7 @@
 <?php
 
 $this->extend('Croogo/Core./Common/admin_index');
+$tableHeaderClass = $this->Theme->getCssClass('tableHeaderClass');
 
 $this->assign('title', __d('croogo', 'File Manager'));
 $this->Breadcrumbs->add(__d('croogo', 'File Manager'), $this->request->getRequestTarget());
@@ -31,7 +32,7 @@ $this->Breadcrumbs->add(__d('croogo', 'File Manager'), $this->request->getReques
             __d('croogo', 'Actions'),
         ]);
         ?>
-        <thead>
+        <thead class="<?= $tableHeaderClass ?>">
             <?= $tableHeaders ?>
         </thead>
         <?php
@@ -104,7 +105,7 @@ $this->Breadcrumbs->add(__d('croogo', 'File Manager'), $this->request->getReques
         echo $this->Html->tableCells($rows, ['class' => 'file-listing'], ['class' => 'file-listing']);
 
         ?>
-        <thead>
+        <thead class="<?= $tableHeaderClass ?>">
             <?= $tableHeaders ?>
         </thead>
     </table>

diff --git a/FileManager/src/Template/Element/admin/asset_list.ctp b/FileManager/src/Template/Element/admin/asset_list.ctp
@@ -5,6 +5,8 @@ use Cake\Utility\Inflector;
 use Cake\ORM\TableRegistry;
 use Cake\view\Form\NullContext;
 
+$tableHeaderClass = $this->Theme->getCssClass('tableHeaderClass');
+
 $this->Html->script([
     'Croogo/FileManager.admin.js',
     'Croogo/FileManager.assets.js',
@@ -252,7 +254,7 @@ $this->set('_assetButtons', true);
 endif;
 ?>
 <table class="<?php echo $this->Theme->getCssClass('tableClass'); ?> asset-list" data-url="<?php echo $assetListUrl; ?>">
-    <thead><?php echo $this->Html->tableHeaders($headers); ?></thead>
+    <thead class="<?= $tableHeaderClass ?>"><?php echo $this->Html->tableHeaders($headers); ?></thead>
     <tbody><?php echo $this->Html->tableCells($rows); ?></tbody>
 </table>
 <?php

diff --git a/Menus/src/Template/Admin/Links/index.ctp b/Menus/src/Template/Admin/Links/index.ctp
@@ -29,7 +29,7 @@ $tableHeaders = $this->Html->tableHeaders([
     __d('croogo', 'Status'),
     __d('croogo', 'Actions'),
 ]);
-echo $this->Html->tag('thead', $tableHeaders);
+echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Menus/src/Template/Admin/Menus/index.ctp b/Menus/src/Template/Admin/Menus/index.ctp
@@ -14,7 +14,7 @@ $tableHeaders = $this->Html->tableHeaders([
     $this->Paginator->sort('status', __d('croogo', 'Status')),
     __d('croogo', 'Actions'),
 ]);
-echo $this->Html->tag('thead', $tableHeaders);
+echo $tableHeaders;
 $this->end();
 
 $this->start('table-body');

diff --git a/Nodes/src/Template/Admin/Nodes/translations.ctp b/Nodes/src/Template/Admin/Nodes/translations.ctp
@@ -1,51 +1,55 @@
-<div class="nodes index">
-    <h2><?= $title_for_layout ?></h2>
+<?php
 
-    <div class="actions">
-        <ul>
-            <li>
-            <?php
-                echo $this->Html->link(__d('croogo', 'Translate in a new language'), array(
-                    'controller' => 'languages',
-                    'action' => 'select',
-                    'nodes',
-                    'translate',
-                    $node['Node']['id'],
-                ));
-            ?>
-            </li>
-        </ul>
-    </div>
+$this->append('action-buttons');
+    echo $this->Html->link(__d('croogo', 'Translate in a new language'), [
+        'controller' => 'languages',
+        'action' => 'select',
+        'nodes',
+        'translate',
+        $node['Node']['id'],
+    ]);
+$this->end();
 
-    <?php if (count($translations) > 0): ?>
-    <table cellpadding="0" cellspacing="0">
-    <?php
-        $tableHeaders = $this->Html->tableHeaders(array(
-            '',
-            __d('croogo', 'Title'),
-            __d('croogo', 'Locale'),
-            __d('croogo', 'Actions'),
-        ));
-        echo $tableHeaders;
+if (count($translations) == 0):
+    echo __d('croogo', 'No translations available.');
+    return;
+endif;
+
+$this->append('table-heading');
+    $tableHeaders = $this->Html->tableHeaders(array(
+        '',
+        __d('croogo', 'Title'),
+        __d('croogo', 'Locale'),
+        __d('croogo', 'Actions'),
+    ));
+    echo $tableHeaders;
+$this->end();
 
-        $rows = array();
-        foreach ($translations as $translation) {
-            $actions = $this->Html->link(__d('croogo', 'Edit'), array('action' => 'translate', $id, 'locale' => $translation[$runtimeModelAlias]['locale']));
-            $actions .= ' ' . $this->Form->postLink(__d('croogo', 'Delete'), array('action' => 'delete_translation', $translation[$runtimeModelAlias]['locale'], $id), null, __d('croogo', 'Are you sure?'));
+$this->append('table-footer');
+    echo $tableHeaders;
+$this->end();
 
-            $rows[] = array(
-                '',
-                $translation[$runtimeModelAlias]['content'],
-                $translation[$runtimeModelAlias]['locale'],
-                $actions,
-            );
-        }
+$this->append('table-body');
+
+    $rows = [];
+    foreach ($translations as $translation):
+        $actions = $this->Html->link(__d('croogo', 'Edit'), [
+            'action' => 'translate',
+            $id,
+            'locale' => $translation[$runtimeModelAlias]['locale'],
+        ]);
+        $actions .= ' ' . $this->Form->postLink(__d('croogo', 'Delete'), [
+            'action' => 'delete_translation',
+            $translation[$runtimeModelAlias]['locale'],
+            $id
+        ], null, __d('croogo', 'Are you sure?'));
+        $rows[] = array(
+            '',
+            $translation[$runtimeModelAlias]['content'],
+            $translation[$runtimeModelAlias]['locale'],
+            $actions,
+        );
+    endforeach;
 
-        echo $this->Html->tableCells($rows);
-        echo $tableHeaders;
-    ?>
-    </table>
-    <?php else: ?>
-        <p><?= __d('croogo', 'No translations available.') ?></p>
-    <?php endif ?>
-</div>
+    echo $this->Html->tableCells($rows);
+$this->end();
diff --git a/Settings/src/Template/Admin/Settings/index.ctp b/Settings/src/Template/Admin/Settings/index.ctp
@@ -20,7 +20,7 @@ $this->start('table-heading');
         $this->Paginator->sort('editable', __d('croogo', 'Editable')),
         __d('croogo', 'Actions'),
     ));
-    echo $this->Html->tag('thead', $tableHeaders);
+    echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Taxonomy/src/Template/Admin/Terms/index.ctp b/Taxonomy/src/Template/Admin/Terms/index.ctp
@@ -25,7 +25,7 @@ $tableHeaders = $this->Html->tableHeaders([
     __d('croogo', 'Slug'),
     __d('croogo', 'Actions'),
 ]);
-echo $this->Html->tag('thead', $tableHeaders);
+echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Taxonomy/src/Template/Admin/Vocabularies/index.ctp b/Taxonomy/src/Template/Admin/Vocabularies/index.ctp
@@ -14,7 +14,7 @@ $tableHeaders = $this->Html->tableHeaders([
     __d('croogo', 'Actions'),
 ]);
 
-echo $this->Html->tag('thead', $tableHeaders);
+echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');

diff --git a/Translate/src/Template/Admin/Translate/index.ctp b/Translate/src/Template/Admin/Translate/index.ctp
@@ -92,7 +92,7 @@ $this->append('table-heading');
         __d('croogo', 'Locale'),
         __d('croogo', 'Actions'),
     ));
-    echo $this->Html->tag('thead', $tableHeaders);
+    echo $tableHeaders;
 $this->end();
 
 $this->append('table-body');