From e030dd9d5e81a9fa8e829fe633c0396ccc90ac1e Mon Sep 17 00:00:00 2001
From: Michael Babker <mbabker@flbab.com>
Date: Fri, 12 Jul 2013 21:51:14 -0500
Subject: [PATCH] Standardize the layout a bit

---
 .../views/pulls/tmpl/default.php              | 104 +++++++++---------
 .../views/pulls/tmpl/default_items.php        |  20 ++--
 2 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/administrator/components/com_patchtester/views/pulls/tmpl/default.php b/administrator/components/com_patchtester/views/pulls/tmpl/default.php
index 8426950..f3e33c1 100644
--- a/administrator/components/com_patchtester/views/pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/views/pulls/tmpl/default.php
@@ -23,59 +23,63 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 </script>
 
 <form action="<?php echo JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+		<div id="filter-bar" class="btn-toolbar">
+			<div class="btn-group pull-left hidden-phone">
+				<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+				<button type="button" class="btn" onclick="document.id('filter_search').value='';document.id('filter_searchid').value='';this.form.submit();">
+					<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>
+				</button>
+			</div>
+			<div class="btn-group pull-right hidden-phone">
+				<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+				<?php echo $this->pagination->getLimitBox(); ?>
+			</div>
+		</div>
+		<div class="clearfix"> </div>
 
-	<div>
-		<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
-		<button type="button" class="btn"
-			onclick="document.id('filter_search').value='';document.id('filter_searchid').value='';this.form.submit();">
-			<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>
-		</button>
-	 </div>
-
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-		<tr>
-			<th width="8%">
-				<?php echo JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'number', $listDirn, $listOrder); ?>
-				<br />
-				<input type="text" name="filter_searchid" id="filter_searchid" class="span10" value="<?php echo $this->escape($this->state->get('filter.searchid')); ?>" />
-			</th>
-			<th class="title">
-				<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
-				<br />
-				<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" />
-			</th>
-			<th>I</th>
-			<th class="title">
-				<?php echo JText::_('COM_PATCHTESTER_JOOMLACODE_ISSUE'); ?>
-			</th>
-			<th width="20%">
-				<?php echo JText::_('JSTATUS'); ?>
-			</th>
-			<th width="20%">
-				<?php echo JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
-			</th>
-		</tr>
-		</thead>
-		<tfoot>
+		<table class="table table-striped">
+			<thead>
 			<tr>
-				<td colspan="6">
-				</td>
+				<th width="5%" class="nowrap center">
+					<?php echo JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'number', $listDirn, $listOrder); ?>
+					<br />
+					<input type="text" name="filter_searchid" id="filter_searchid" class="span10" value="<?php echo $this->escape($this->state->get('filter.searchid')); ?>" />
+				</th>
+				<th class="nowrap center">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+					<br />
+					<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" />
+				</th>
+				<th class="nowrap center">I</th>
+				<th class="nowrap center">
+					<?php echo JText::_('COM_PATCHTESTER_JOOMLACODE_ISSUE'); ?>
+				</th>
+				<th width="20%" class="nowrap center">
+					<?php echo JText::_('JSTATUS'); ?>
+				</th>
+				<th width="20%" class="nowrap center">
+					<?php echo JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
+				</th>
 			</tr>
-		</tfoot>
-		<tbody>
-		<?php echo $this->loadTemplate('items'); ?>
-		</tbody>
-	</table>
-	<div class="well">
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="6">
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php echo $this->loadTemplate('items'); ?>
+			</tbody>
+		</table>
+		<?php echo $this->pagination->getListFooter(); ?>
 
-	<?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=""/>
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>"/>
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
+		<?php echo JHtml::_('form.token'); ?>
 	</div>
-
-	<input type="hidden" name="task" value=""/>
-	<input type="hidden" name="boxchecked" value="0"/>
-	<input type="hidden" name="pull_id" id="pull_id" value=""/>
-	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>"/>
-	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
-	<?php echo JHtml::_('form.token'); ?>
 </form>
diff --git a/administrator/components/com_patchtester/views/pulls/tmpl/default_items.php b/administrator/components/com_patchtester/views/pulls/tmpl/default_items.php
index b3ce9c6..343c1ca 100644
--- a/administrator/components/com_patchtester/views/pulls/tmpl/default_items.php
+++ b/administrator/components/com_patchtester/views/pulls/tmpl/default_items.php
@@ -51,19 +51,21 @@ foreach ($this->items as $i => $item) :
 		endif; ?>
 	</td>
 	<td class="center">
-		<?php if ($patch && $patch->applied) :
-			echo '<div class="patchApplied" style="background-color: #adff2f;">';
-			echo JText::_('COM_PATCHTESTER_APPLIED');
-			echo '</div>';
-		else :
-			echo JText::_('COM_PATCHTESTER_NOT_APPLIED');
-		endif; ?>
+		<?php if ($patch && $patch->applied) : ?>
+			<span class="label label-success">
+			<?php echo JText::_('COM_PATCHTESTER_APPLIED'); ?>
+			</span>
+		<?php else : ?>
+			<span class="label">
+			<?php echo JText::_('COM_PATCHTESTER_NOT_APPLIED'); ?>
+			</span>
+		<?php endif; ?>
 	</td>
 	<td class="center">
 		<?php if ($patch && $patch->applied) :
-			echo '<a href="javascript:submitpatch(\'pull.revert\', ' . (int) $patch->id . ');">' . JText::_('COM_PATCHTESTER_REVERT_PATCH') . '</a>';
+			echo '<a class="btn btn-small btn-primary" href="javascript:submitpatch(\'pull.revert\', ' . (int) $patch->id . ');">' . JText::_('COM_PATCHTESTER_REVERT_PATCH') . '</a>';
 		else :
-			echo '<a href="javascript:submitpatch(\'pull.apply\', ' . (int) $item->number . ');">' . JText::_('COM_PATCHTESTER_APPLY_PATCH') . '</a>';
+			echo '<a class="btn btn-small btn-primary" href="javascript:submitpatch(\'pull.apply\', ' . (int) $item->number . ');">' . JText::_('COM_PATCHTESTER_APPLY_PATCH') . '</a>';
 		endif; ?>
 	</td>
 </tr>