33
0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2024-12-23 11:29:00 +00:00

Styling added to update for J! Issue and Github

This commit is contained in:
mtmeyrick 2014-10-22 00:29:39 +01:00
parent 23c0ce5146
commit 51ec7582b2
3 changed files with 24 additions and 16 deletions

View File

@ -11,6 +11,8 @@
\JHtml::_('behavior.tooltip'); \JHtml::_('behavior.tooltip');
\JHtml::_('behavior.modal'); \JHtml::_('behavior.modal');
$this->document->addStyleSheet($this->baseurl.'/components/com_patchtester/assets/octicons/octicons.csss')
$listOrder = $this->escape($this->state->get('list.ordering')); $listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction')); $listDirn = $this->escape($this->state->get('list.direction'));
$sortFields = $this->getSortFields(); $sortFields = $this->getSortFields();
@ -80,21 +82,26 @@ else :
<th width="5%" class="nowrap center"> <th width="5%" class="nowrap center">
<?php echo \JText::_('COM_PATCHTESTER_PULL_ID'); ?> <?php echo \JText::_('COM_PATCHTESTER_PULL_ID'); ?>
</th> </th>
<th class="nowrap center"> <th class="nowrap">
<?php echo \JText::_('JGLOBAL_TITLE'); ?> <?php echo \JText::_('JGLOBAL_TITLE'); ?>
</th> </th>
<th class="nowrap center">I</th> <th width="8%" class="nowrap center">
<th width="20%" 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'); ?> <?php echo \JText::_('JSTATUS'); ?>
</th> </th>
<th width="20%" class="nowrap center"> <th width="15%" class="nowrap center">
<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?> <?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
</th> </th>
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="6"> <td colspan="7">
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
@ -102,7 +109,7 @@ else :
<?php if (count($this->items)) : <?php if (count($this->items)) :
echo $this->loadTemplate('items'); echo $this->loadTemplate('items');
else : ?> 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; ?> <?php endif; ?>
</tbody> </tbody>
</table> </table>

View File

@ -20,17 +20,17 @@ foreach ($this->items as $i => $item) :
<?php echo $item->pull_id; ?> <?php echo $item->pull_id; ?>
</td> </td>
<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"> <span class="hasTip" title="" data-original-title="<strong>Info</strong><br/><?php echo $item->description; ?>"><?php echo $this->escape($item->title); ?></span>
<?php echo $this->escape($item->title); ?> </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> </a>
</td> </td>
<td class="center"> <td class="center">
<?php if ($item->description) : <a class="btn btn-small btn-warning" htref="http://issues.joomla.org/tracker/joomla-cms/<?php echo $item->number; ?>" target="_blank">
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>'; <i class="icon-joomla"></i> <?php echo \JText::_('COM_PATCHTESTER_JISSUE'); ?>
else : </a>
echo '&nbsp;';
endif;
?>
</td> </td>
<td class="center"> <td class="center">
<?php if ($item->applied) : ?> <?php if ($item->applied) : ?>

View File

@ -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_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_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_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_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_HTTPS="HTTPS wrappers must be enabled"
COM_PATCHTESTER_REQUIREMENT_OPENSSL="The OpenSSL extension must be installed and enabled in your php.ini" COM_PATCHTESTER_REQUIREMENT_OPENSSL="The OpenSSL extension must be installed and enabled in your php.ini"