From d1a8e14e64b2d36762f8406f330958db344be4d6 Mon Sep 17 00:00:00 2001
From: Nikolai Plath <der.el.kuku@gmail.com>
Date: Tue, 12 Jun 2012 13:42:03 -0500
Subject: [PATCH] Move out items template

---
 .../views/pulls/tmpl/default.php              | 189 +++++++-----------
 .../views/pulls/tmpl/default_items.php        |  89 +++++++++
 2 files changed, 162 insertions(+), 116 deletions(-)
 create mode 100644 administrator/components/com_patchtester/views/pulls/tmpl/default_items.php

diff --git a/administrator/components/com_patchtester/views/pulls/tmpl/default.php b/administrator/components/com_patchtester/views/pulls/tmpl/default.php
index 61c7354..8ba82ad 100644
--- a/administrator/components/com_patchtester/views/pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/views/pulls/tmpl/default.php
@@ -1,146 +1,103 @@
 <?php
 /**
- * @package		PatchTester
- * @copyright	Copyright (C) 2011 Ian MacLennan, Inc. All rights reserved.
- * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @package        PatchTester
+ * @copyright      Copyright (C) 2011 Ian MacLennan, Inc. All rights reserved.
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-// no direct access
+// No direct access
 defined('_JEXEC') or die;
 
 JHtml::_('behavior.tooltip');
 JHtml::_('behavior.modal');
 
-$listOrder	= $this->escape($this->state->get('list.ordering'));
-$listDirn	= $this->escape($this->state->get('list.direction'));
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
 
 ?>
 <script type="text/javascript">
-	var submitpatch = function(task, id) {
+	var submitpatch = function (task, id) {
 		document.id('pull_id').set('value', id);
 		return Joomla.submitbutton(task);
 	}
 </script>
 
-<form action="<?php echo JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm"
+      id="adminForm">
 	<table class="adminlist">
 		<thead>
-			<tr>
-				<th colspan="6" style="text-align: left;"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></th>
-			</tr>
-			<tr>
-				<td>
-			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
-			<button type="button" onclick="document.id('filter_search').value='';document.id('filter_searchid').value='';this.form.submit();">
-				<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>
-			</button>
-				</td>
-				<td>
-			<label class="filter-search-lbl" for="filter_searchid"><?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_PULL_ID'); ?></label>
-			<input type="text" name="filter_searchid" id="filter_searchid" size="5"
-			value="<?php echo $this->escape($this->state->get('filter.searchid')); ?>"
-			title="<?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_PULL_ID'); ?>" />
-				</td>
-				<td>
-			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_TITLE'); ?></label>
-			<br />
-			<input type="text" name="filter_search" id="filter_search"
-			value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
-			title="<?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_TITLE'); ?>" />
-				</td>
-				<td>
-				</td>
-				<td>
-				</td>
-				<td>
-				</td>
-			</tr>
-			<tr>
-				<th colspan="6" style="text-align: left;"><?php echo JText::_('COM_PATCHTESTER_SORT'); ?></th>
-			</tr>
-			<tr>
-				<th width="1%">
-					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
-				</th>
-				<th width="5%">
-					<?php echo JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'number', $listDirn, $listOrder); ?>
-				</th>
-				<th class="title">
-					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
-				</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>
+		<tr>
+			<th colspan="7" style="text-align: left;"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></th>
+		</tr>
+		<tr>
+			<td>
+				<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+				<button type="button"
+				        onclick="document.id('filter_search').value='';document.id('filter_searchid').value='';this.form.submit();">
+					<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>
+				</button>
+			</td>
+			<td>
+				<label class="filter-search-lbl"
+				       for="filter_searchid"><?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_PULL_ID'); ?></label>
+				<input type="text" name="filter_searchid" id="filter_searchid" size="5"
+				       value="<?php echo $this->escape($this->state->get('filter.searchid')); ?>"
+				       title="<?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_PULL_ID'); ?>"/>
+			</td>
+			<td>
+				<label class="filter-search-lbl"
+				       for="filter_search"><?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_TITLE'); ?></label>
+				<br/>
+				<input type="text" name="filter_search" id="filter_search"
+				       value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
+				       title="<?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_TITLE'); ?>"/>
+			</td>
+			<td colspan="4">
+			</td>
+		</tr>
+		<tr>
+			<th colspan="7" style="text-align: left;"><?php echo JText::_('COM_PATCHTESTER_SORT'); ?></th>
+		</tr>
+		<tr>
+			<th width="1%">
+				<input type="checkbox" name="checkall-toggle" value=""
+				       title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)"/>
+			</th>
+			<th width="5%">
+				<?php echo JHtml::_('grid.sort', 'COM_PATCHTESTER_PULL_ID', 'number', $listDirn, $listOrder); ?>
+			</th>
+			<th class="title">
+				<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+			</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>
-			<tr>
-				<td colspan="10">
-				</td>
-			</tr>
+		<tr>
+			<td colspan="10">
+			</td>
+		</tr>
 		</tfoot>
 		<tbody>
-		<?php foreach ($this->items as $i => $item) :
-			if (isset($this->patches[$item->number])) {
-				$patch = $this->patches[$item->number];
-			} else {
-				$patch = false;
-			}
-			?>
-			<tr class="row<?php echo $i % 2; ?>">
-				<td class="center">
-					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
-				</td>
-				<td class="center">
-					<?php echo $item->number; ?>
-				</td>
-				<td>
-					<a href="<?php echo $item->html_url; ?>" title="<?php echo htmlspecialchars($item->body); ?>"><?php echo $item->title; ?></a>
-				</td>
-				<td>
-					<?php
-					if ($item->joomlacode_issue > 0) {
-						echo '<a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=';
-						echo  $item->joomlacode_issue . '" class="modal" rel="{handler: \'iframe\', size: {x: 900, y: 500}}">';
-						echo '[#' . $item->joomlacode_issue . ']</a>';
-					}
-					?>
-				</td>
-				<td class="center">
-					<?php
-					if ($patch && $patch->applied) {
-						echo JText::_('COM_PATCHTESTER_APPLIED');
-					} else {
-						echo JText::_('COM_PATCHTESTER_NOT_APPLIED');
-					}
-					?>
-				</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>';
-					} else {
-						echo '<a href="javascript:submitpatch(\'pull.apply\', '.(int)$item->number.');">'.JText::_('COM_PATCHTESTER_APPLY_PATCH').'</a>';
-					}
-					?>
-				</td>
-			</tr>
-			<?php endforeach; ?>
+		<?php echo $this->loadTemplate('items'); ?>
 		</tbody>
 	</table>
 
 	<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; ?>" />
+		<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>
 </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
new file mode 100644
index 0000000..77f3719
--- /dev/null
+++ b/administrator/components/com_patchtester/views/pulls/tmpl/default_items.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package        PatchTester
+ * @copyright      Copyright (C) 2011 Ian MacLennan, Inc. All rights reserved.
+ * @license        GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+foreach ($this->items as $i => $item) :
+	if (isset($this->patches[$item->number])) :
+		$patch = $this->patches[$item->number];
+	else :
+		$patch = false;
+	endif;
+	?>
+<tr class="row<?php echo $i % 2; ?>">
+	<td class="center">
+		<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+	</td>
+	<td class="center">
+		<?php echo $item->number; ?>
+	</td>
+	<td>
+		<a class="icon icon16-github hasTip"
+		   title="<?php echo JText::_('COM_PATCHTESTER_OPEN_IN_GITHUB'); ?>"
+		   href="<?php echo $item->html_url; ?>">
+			<?php echo $item->title; ?>
+		</a>
+	</td>
+	<td>
+		<?php
+		if ($item->body) :
+			echo JHtml::_('tooltip', htmlspecialchars($item->body), 'Info');
+		else :
+			echo '&nbsp;';
+		endif;
+		?>
+	</td>
+	<td>
+		<?php
+		if ($item->joomlacode_issue)
+		{
+			$title = ' title="Open link::'.JText::_('COM_PATCHTESTER_OPEN_IN_JOOMLACODE').'"';
+
+			if(is_int($item->joomlacode_issue))
+			{
+				echo '<a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=';
+				echo  $item->joomlacode_issue . '"'.$title.' class="modal hasTip" rel="{handler: \'iframe\', size: {x: 900, y: 500}}">';
+				echo '[#' . $item->joomlacode_issue . ']</a>';
+			}
+			else
+			{
+				echo '<a href="' . $item->joomlacode_issue . '"'.$title;
+				echo ' class="modal hasTip" rel="{handler: \'iframe\', size: {x: 900, y: 500}}">';
+				echo '[#joomlacode]</a>';
+			}
+		}
+		?>
+	</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');
+		}
+		?>
+	</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>';
+		}
+		else
+		{
+			echo '<a href="javascript:submitpatch(\'pull.apply\', ' . (int) $item->number . ');">' . JText::_('COM_PATCHTESTER_APPLY_PATCH') . '</a>';
+		}
+		?>
+	</td>
+</tr>
+<?php endforeach;