joomla/patchtester
33
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2025-01-03 15:17:22 +00:00
Code Issues Releases Activity

Make the errors layout a base layout

Browse Source
This commit is contained in:
Michael Babker 2017-01-21 13:52:15 -06:00
parent 3483d98e58
commit cb5ce7e6ac
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php
View File

@ -88,6 +88,12 @@ class PullsHtmlView extends DefaultHtmlView
$this->trackerAlias = TrackerHelper::getTrackerAlias($this->state->get('github_user'), $this->state->get('github_repo')); $this->trackerAlias = TrackerHelper::getTrackerAlias($this->state->get('github_user'), $this->state->get('github_repo'));
} }
// Change the layout if there are environment errors
if (count($this->envErrors))
{
$this->setLayout('errors');
}
$this->addToolbar(); $this->addToolbar();
// Make text strings available in the JavaScript API // Make text strings available in the JavaScript API

4
administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
View File

@ -14,9 +14,6 @@
\JHtml::_('stylesheet', 'com_patchtester/octicons.css', array('version' => 'auto', 'relative' => true)); \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array('version' => 'auto', 'relative' => true));
\JHtml::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true)); \JHtml::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true));
if (count($this->envErrors)) :
echo $this->loadTemplate('errors');
else :
$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'));
$filterApplied = $this->escape($this->state->get('filter.applied')); $filterApplied = $this->escape($this->state->get('filter.applied'));
@ -126,4 +123,3 @@ $colSpan = $this->trackerAlias !== false ? 7 : 6;
<?php echo \JHtml::_('form.token'); ?> <?php echo \JHtml::_('form.token'); ?>
</div> </div>
</form> </form>
<?php endif;

2
administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_errors.php → administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/errors.php
View File

@ -6,7 +6,7 @@
* @license GNU General Public License version 2 or later * @license GNU General Public License version 2 or later
*/ */
/** @var \PatchTester\View\DefaultHtmlView $this */ /** @var \PatchTester\View\Pulls\PullsHtmlView $this */
?> ?>
<h3><?php echo \JText::_('COM_PATCHTESTER_REQUIREMENTS_HEADING'); ?></h3> <h3><?php echo \JText::_('COM_PATCHTESTER_REQUIREMENTS_HEADING'); ?></h3>
<p><?php echo \JText::_('COM_PATCHTESTER_REQUIREMENTS_NOT_MET'); ?></p> <p><?php echo \JText::_('COM_PATCHTESTER_REQUIREMENTS_NOT_MET'); ?></p>

4
administrator/components/com_patchtester/script.php
View File

@ -31,6 +31,10 @@ class Com_PatchtesterInstallerScript extends JInstallerScript
$this->minimumJoomla = '3.7'; $this->minimumJoomla = '3.7';
$this->minimumPhp = JOOMLA_MINIMUM_PHP; $this->minimumPhp = JOOMLA_MINIMUM_PHP;
$this->deleteFiles = array(
'/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_errors.php',
);
$this->deleteFolders = array( $this->deleteFolders = array(
'/administrator/components/com_patchtester/PatchTester/Table', '/administrator/components/com_patchtester/PatchTester/Table',
'/components/com_patchtester', '/components/com_patchtester',

4
administrator/templates/hathor/html/com_patchtester/pulls/default.php
View File

@ -13,9 +13,6 @@
\JHtml::_('stylesheet', 'com_patchtester/octicons.css', array('version' => 'auto', 'relative' => true)); \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array('version' => 'auto', 'relative' => true));
\JHtml::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true)); \JHtml::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true));
if (count($this->envErrors)) :
echo $this->loadTemplate('errors');
else :
$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'));
$filterApplied = $this->escape($this->state->get('filter.applied')); $filterApplied = $this->escape($this->state->get('filter.applied'));
@ -114,4 +111,3 @@ echo \JHtml::_(
<?php echo \JHtml::_('form.token'); ?> <?php echo \JHtml::_('form.token'); ?>
</div> </div>
</form> </form>
<?php endif;