From 17b2521ef17134663d5447e3fdaaf671e3cfb8ca Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Sun, 29 Jul 2018 09:08:23 -0500
Subject: [PATCH] Remove empty table footers, move J4 pagination out of table

---
 .../PatchTester/View/Pulls/tmpl/default.php   | 62 +++++++++----------
 .../html/com_patchtester/pulls/default.php    |  8 +--
 .../html/com_patchtester/pulls/default.php    | 62 +++++++++----------
 3 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
index 25dad00..284f5fd 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
@@ -83,43 +83,37 @@ $colSpan       = $this->trackerAlias !== false ? 8 : 7;
 		<?php else : ?>
 			<table class="table table-striped">
 				<thead>
-				<tr>
-					<th width="5%" class="nowrap center">
-						<?php echo \JText::_('COM_PATCHTESTER_PULL_ID'); ?>
-					</th>
-					<th class="nowrap">
-						<?php echo \JText::_('JGLOBAL_TITLE'); ?>
-					</th>
-					<th width="8%" class="nowrap center">
-						<?php echo \JText::_('COM_PATCHTESTER_BRANCH'); ?>
-					</th>
-					<th width="8%" class="nowrap center">
-						<?php echo \JText::_('COM_PATCHTESTER_READY_TO_COMMIT'); ?>
-					</th>
-					<th width="8%" class="nowrap center">
-						<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
-					</th>
-					<?php if ($this->trackerAlias !== false) : ?>
-					<th width="8%" class="nowrap center">
-						<?php echo \JText::_('COM_PATCHTESTER_JISSUES'); ?>
-					</th>
-					<?php endif; ?>
-					<th width="10%" class="nowrap center">
-						<?php echo \JText::_('JSTATUS'); ?>
-					</th>
-					<th width="15%" class="nowrap center">
-						<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
-					</th>
-				</tr>
-				</thead>
-				<tfoot>
 					<tr>
-						<td colspan="<?php echo $colSpan; ?>">
-						</td>
+						<th width="5%" class="nowrap center">
+							<?php echo \JText::_('COM_PATCHTESTER_PULL_ID'); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo \JText::_('JGLOBAL_TITLE'); ?>
+						</th>
+						<th width="8%" class="nowrap center">
+							<?php echo \JText::_('COM_PATCHTESTER_BRANCH'); ?>
+						</th>
+						<th width="8%" class="nowrap center">
+							<?php echo \JText::_('COM_PATCHTESTER_READY_TO_COMMIT'); ?>
+						</th>
+						<th width="8%" class="nowrap center">
+							<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
+						</th>
+						<?php if ($this->trackerAlias !== false) : ?>
+						<th width="8%" class="nowrap center">
+							<?php echo \JText::_('COM_PATCHTESTER_JISSUES'); ?>
+						</th>
+						<?php endif; ?>
+						<th width="10%" class="nowrap center">
+							<?php echo \JText::_('JSTATUS'); ?>
+						</th>
+						<th width="15%" class="nowrap center">
+							<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
+						</th>
 					</tr>
-				</tfoot>
+				</thead>
 				<tbody>
-				<?php echo $this->loadTemplate('items'); ?>
+					<?php echo $this->loadTemplate('items'); ?>
 				</tbody>
 			</table>
 		<?php endif; ?>
diff --git a/administrator/templates/atum/html/com_patchtester/pulls/default.php b/administrator/templates/atum/html/com_patchtester/pulls/default.php
index ec54252..36095e4 100644
--- a/administrator/templates/atum/html/com_patchtester/pulls/default.php
+++ b/administrator/templates/atum/html/com_patchtester/pulls/default.php
@@ -141,16 +141,14 @@ $colSpan       = $this->trackerAlias !== false ? 8 : 7;
 									</th>
 								</tr>
 							</thead>
-							<tfoot>
-								<tr>
-									<td colspan="<?php echo $colSpan; ?>"><?php echo $this->pagination->getListFooter(); ?></td>
-								</tr>
-							</tfoot>
 							<tbody>
 								<?php echo $this->loadTemplate('items'); ?>
 							</tbody>
 						</table>
 					<?php endif; ?>
+
+					<?php echo $this->pagination->getListFooter(); ?>
+
 					<input type="hidden" name="task" value="" />
 					<input type="hidden" name="boxchecked" value="0" />
 					<input type="hidden" name="pull_id" id="pull_id" value="" />
diff --git a/administrator/templates/hathor/html/com_patchtester/pulls/default.php b/administrator/templates/hathor/html/com_patchtester/pulls/default.php
index 7e448ad..fd98c80 100644
--- a/administrator/templates/hathor/html/com_patchtester/pulls/default.php
+++ b/administrator/templates/hathor/html/com_patchtester/pulls/default.php
@@ -74,43 +74,37 @@ echo \JHtml::_(
 
 		<table class="adminlist">
 			<thead>
-			<tr>
-				<th width="5%" class="nowrap center">
-					<?php echo \JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'a.pull_id', $listDirn, $listOrder); ?>
-				</th>
-				<th class="nowrap">
-					<?php echo \JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
-				</th>
-				<th width="8%" class="nowrap center">
-					<?php echo \JText::_('COM_PATCHTESTER_BRANCH'); ?>
-				</th>
-				<th width="8%" class="nowrap center">
-					<?php echo \JText::_('COM_PATCHTESTER_READY_TO_COMMIT'); ?>
-				</th>
-				<th width="8%" class="nowrap center">
-					<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
-				</th>
-				<?php if ($this->trackerAlias !== false) : ?>
-				<th width="8%" class="nowrap center">
-					<?php echo \JText::_('COM_PATCHTESTER_JISSUES'); ?>
-				</th>
-				<?php endif; ?>
-				<th width="10%" class="nowrap center">
-					<?php echo \JHtml::_('grid.sort', 'JSTATUS', 'applied', $listDirn, $listOrder); ?>
-				</th>
-				<th width="15%" class="nowrap center">
-					<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
-				</th>
-			</tr>
-			</thead>
-			<tfoot>
 				<tr>
-					<td colspan="<?php echo $colSpan; ?>">
-					</td>
+					<th width="5%" class="nowrap center">
+						<?php echo \JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'a.pull_id', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo \JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="8%" class="nowrap center">
+						<?php echo \JText::_('COM_PATCHTESTER_BRANCH'); ?>
+					</th>
+					<th width="8%" class="nowrap center">
+						<?php echo \JText::_('COM_PATCHTESTER_READY_TO_COMMIT'); ?>
+					</th>
+					<th width="8%" class="nowrap center">
+						<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
+					</th>
+					<?php if ($this->trackerAlias !== false) : ?>
+					<th width="8%" class="nowrap center">
+						<?php echo \JText::_('COM_PATCHTESTER_JISSUES'); ?>
+					</th>
+					<?php endif; ?>
+					<th width="10%" class="nowrap center">
+						<?php echo \JHtml::_('grid.sort', 'JSTATUS', 'applied', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap center">
+						<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
+					</th>
 				</tr>
-			</tfoot>
+			</thead>
 			<tbody>
-			<?php echo $this->loadTemplate('items'); ?>
+				<?php echo $this->loadTemplate('items'); ?>
 			</tbody>
 		</table>
 		<?php echo $this->pagination->getListFooter(); ?>