Stable release of v3.2.0-beta1

Move beta to main repo. Fix #1053 so that the right and left tabs display correctly in Joomla 4&5.
This commit is contained in:
2024-03-02 22:10:30 +02:00
parent 3c91a5cdbb
commit d1e1a56671
1786 changed files with 73608 additions and 37437 deletions

View File

@@ -12,13 +12,17 @@
// No direct access to this file
defined('_JEXEC') or die('Restricted access');
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\HTML\HTMLHelper as Html;
$edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_method.edit";
?>
<?php foreach ($this->items as $i => $item): ?>
<?php
$canCheckin = $this->user->authorise('core.manage', 'com_checkin') || $item->checked_out == $this->user->id || $item->checked_out == 0;
$userChkOut = JFactory::getUser($item->checked_out);
$userChkOut = Factory::getUser($item->checked_out);
$canDo = ComponentbuilderHelper::getActions('class_method',$item,'class_methods');
?>
<tr class="row<?php echo $i % 2; ?>">
@@ -28,7 +32,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
$iconClass = '';
if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
$iconClass = ' inactive tip-top" hasTooltip" title="' . Html::tooltipText('JORDERINGDISABLED');
}
?>
<span class="sortable-handler<?php echo $iconClass; ?>">
@@ -46,12 +50,12 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
<?php if ($canDo->get('class_method.edit')): ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
<?php echo Html::_('grid.id', $i, $item->id); ?>
<?php else: ?>
&#9633;
<?php endif; ?>
<?php else: ?>
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
<?php echo Html::_('grid.id', $i, $item->id); ?>
<?php endif; ?>
<?php else: ?>
&#9633;
@@ -62,7 +66,7 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
<?php if ($canDo->get('class_method.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->name); ?></a>
<?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'class_methods.', $canCheckin); ?>
<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'class_methods.', $canCheckin); ?>
<?php endif; ?>
<?php else: ?>
<?php echo $this->escape($item->name); ?>
@@ -71,16 +75,16 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
</div>
</td>
<td class="hidden-phone">
<?php echo JText::_($item->visibility); ?>
<?php echo Text::_($item->visibility); ?>
</td>
<td class="hidden-phone">
<div><?php if (isset($item->joomla_plugin_group) && $item->joomla_plugin_group > 0): ?>
<?php echo JText::_($item->extension_type); ?> <?php echo JText::_('COM_COMPONENTBUILDER_GROUP'); ?>: <b>
<?php echo Text::_($item->extension_type); ?> <?php echo Text::_('COM_COMPONENTBUILDER_GROUP'); ?>: <b>
<?php echo $this->escape($item->joomla_plugin_group_name); ?></b>
<?php else: ?>
<?php echo JText::_($item->extension_type); ?>
<?php echo Text::_($item->extension_type); ?>
<?php endif; ?>
</div>
</td>
@@ -88,15 +92,15 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
<?php if ($canDo->get('class_method.edit.state')) : ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'class_methods.', true, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'class_methods.', true, 'cb'); ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'class_methods.', false, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'class_methods.', false, 'cb'); ?>
<?php endif; ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'class_methods.', true, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'class_methods.', true, 'cb'); ?>
<?php endif; ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'class_methods.', false, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'class_methods.', false, 'cb'); ?>
<?php endif; ?>
</td>
<td class="nowrap center hidden-phone">