From 51ec7582b29c29e370f1bcd77cdcf63a6a2a2426 Mon Sep 17 00:00:00 2001
From: mtmeyrick <matt_meyrick@btinternet.com>
Date: Wed, 22 Oct 2014 00:29:39 +0100
Subject: [PATCH] Styling added to update for J! Issue and Github

---
 .../PatchTester/View/Pulls/tmpl/default.php   | 19 +++++++++++++------
 .../View/Pulls/tmpl/default_items.php         | 18 +++++++++---------
 .../language/en-GB/en-GB.com_patchtester.ini  |  3 ++-
 3 files changed, 24 insertions(+), 16 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 0519dfd..d4cdd8c 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
@@ -11,6 +11,8 @@
 \JHtml::_('behavior.tooltip');
 \JHtml::_('behavior.modal');
 
+$this->document->addStyleSheet($this->baseurl.'/components/com_patchtester/assets/octicons/octicons.csss')
+
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
 $sortFields = $this->getSortFields();
@@ -80,21 +82,26 @@ else :
 				<th width="5%" class="nowrap center">
 					<?php echo \JText::_('COM_PATCHTESTER_PULL_ID'); ?>
 				</th>
-				<th class="nowrap center">
+				<th class="nowrap">
 					<?php echo \JText::_('JGLOBAL_TITLE'); ?>
 				</th>
-				<th class="nowrap center">I</th>
-				<th width="20%" class="nowrap center">
+				<th width="8%" class="nowrap center">
+					<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
+				</th>
+				<th width="8%" class="nowrap center">
+					<?php echo \JText::_('COM_PATCHTESTER_JISSUES'); ?>
+				</th>				
+				<th width="10%" class="nowrap center">
 					<?php echo \JText::_('JSTATUS'); ?>
 				</th>
-				<th width="20%" class="nowrap center">
+				<th width="15%" class="nowrap center">
 					<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
 				</th>
 			</tr>
 			</thead>
 			<tfoot>
 				<tr>
-					<td colspan="6">
+					<td colspan="7">
 					</td>
 				</tr>
 			</tfoot>
@@ -102,7 +109,7 @@ else :
 			<?php if (count($this->items)) :
 				echo $this->loadTemplate('items');
 			else : ?>
-				<td align="center" colspan="6"><?php echo \JText::_('COM_PATCHTESTER_NO_ITEMS'); ?></td>
+				<td align="center" colspan="7"><?php echo \JText::_('COM_PATCHTESTER_NO_ITEMS'); ?></td>
 			<?php endif; ?>
 			</tbody>
 		</table>
diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
index 2f8c411..5484c3d 100644
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
@@ -20,18 +20,18 @@ foreach ($this->items as $i => $item) :
 		<?php echo $item->pull_id; ?>
 	</td>
 	<td>
-		<a class="icon icon16-github hasTip" title="<?php echo \JText::_('COM_PATCHTESTER_OPEN_IN_GITHUB'); ?>" href="<?php echo $item->pull_url; ?>" target="_blank">
-			<?php echo $this->escape($item->title); ?>
+		<span class="hasTip" title="" data-original-title="<strong>Info</strong><br/><?php echo $item->description; ?>"><?php echo $this->escape($item->title); ?></span>
+	</td>
+	<td class="center">
+		<a class="btn btn-small btn-info" htref="<?php echo $item->html_url; ?>" target="_blank">
+			<span class="octicon octicon-mark-github"></span> <?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
 		</a>
 	</td>
 	<td class="center">
-		<?php if ($item->description) :
-			echo '<a onclick="SqueezeBox.fromElement(this, {handler:\'iframe\', size: {x: 900, y: 600}, url:\'http://issues.joomla.org/tracker/joomla-cms/'.$item->pull_id.'\'})"><i class="icon-info" style="color:#000;cursor:pointer;"></i>';
-		else :
-			echo '&nbsp;';
-		endif;
-		?>
-	</td>
+		<a class="btn btn-small btn-warning" htref="http://issues.joomla.org/tracker/joomla-cms/<?php echo $item->number; ?>" target="_blank">
+			<i class="icon-joomla"></i> <?php echo \JText::_('COM_PATCHTESTER_JISSUE'); ?>
+		</a>
+	</td>	
 	<td class="center">
 		<?php if ($item->applied) : ?>
 			<span class="label label-success">
diff --git a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
index a30b216..e58814e 100644
--- a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
+++ b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
@@ -34,7 +34,8 @@ COM_PATCHTESTER_PULL_ID="Pull ID"
 COM_PATCHTESTER_NO_CREDENTIALS="No user credentials are saved, this will allow only 60 requests to the GitHub API per hour.  Saving user credentials will allow 5,000 requests per hour."
 COM_PATCHTESTER_NO_ITEMS="No data has been retrieved from GitHub, please click the 'Fetch Data' button in the toolbar to retrieve the open pull requests."
 COM_PATCHTESTER_NOT_APPLIED="Not Applied"
-COM_PATCHTESTER_OPEN_IN_GITHUB="Open in GitHub"
+COM_PATCHTESTER_GITHUB="GitHub"
+COM_PATCHTESTER_JISSUE="J! Issue"
 COM_PATCHTESTER_REPO_IS_GONE="The patch could not be applied because the repository is missing"
 COM_PATCHTESTER_REQUIREMENT_HTTPS="HTTPS wrappers must be enabled"
 COM_PATCHTESTER_REQUIREMENT_OPENSSL="The OpenSSL extension must be installed and enabled in your php.ini"