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

@@ -11,6 +11,10 @@
// 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;
use VDM\Joomla\Utilities\StringHelper;
$edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=custom_admin_view.edit";
@@ -19,7 +23,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
<?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('custom_admin_view',$item,'custom_admin_views');
?>
<tr class="row<?php echo $i % 2; ?>">
@@ -29,7 +33,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
$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; ?>">
@@ -47,12 +51,12 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
<?php if ($canDo->get('core.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;
@@ -63,7 +67,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
<?php if ($canDo->get('core.edit')): ?>
<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
<?php if ($item->checked_out): ?>
<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'custom_admin_views.', $canCheckin); ?>
<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'custom_admin_views.', $canCheckin); ?>
<?php endif; ?>
<?php else: ?>
<?php echo $this->escape($item->system_name); ?>
@@ -71,12 +75,12 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
</div>
</td>
<td class="hidden-phone">
<div><?php echo JText::_('COM_COMPONENTBUILDER_NAME'); ?>: <b>
<div><?php echo Text::_('COM_COMPONENTBUILDER_NAME'); ?>: <b>
<?php echo $this->escape($item->name); ?></b><br />
<?php echo JText::_('COM_COMPONENTBUILDER_CODE'); ?>: <b>
<?php echo Text::_('COM_COMPONENTBUILDER_CODE'); ?>: <b>
<?php echo $this->escape($item->codename); ?></b><br />
<?php if (StringHelper::check($item->context)): ?>
<?php echo JText::_('COM_COMPONENTBUILDER_CONTEXT'); ?>: <b>
<?php echo Text::_('COM_COMPONENTBUILDER_CONTEXT'); ?>: <b>
<?php echo $this->escape($item->context); ?></b>
<?php endif; ?>
</div>
@@ -85,10 +89,10 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
<div><em>
<?php echo $this->escape($item->description); ?></em>
<ul style="list-style: none">
<li><?php echo JText::_("COM_COMPONENTBUILDER_CUSTOM_BUTTON"); ?>: <b>
<?php echo JText::_($item->add_custom_button); ?></b></li>
<li><?php echo JText::_("COM_COMPONENTBUILDER_AJAX"); ?>: <b>
<?php echo JText::_($item->add_php_ajax); ?></b></li>
<li><?php echo Text::_("COM_COMPONENTBUILDER_CUSTOM_BUTTON"); ?>: <b>
<?php echo Text::_($item->add_custom_button); ?></b></li>
<li><?php echo Text::_("COM_COMPONENTBUILDER_AJAX"); ?>: <b>
<?php echo Text::_($item->add_php_ajax); ?></b></li>
</ul>
</div>
</td>
@@ -105,15 +109,15 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
<?php if ($canDo->get('core.edit.state')) : ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'custom_admin_views.', true, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'custom_admin_views.', true, 'cb'); ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'custom_admin_views.', false, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'custom_admin_views.', false, 'cb'); ?>
<?php endif; ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'custom_admin_views.', true, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'custom_admin_views.', true, 'cb'); ?>
<?php endif; ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'custom_admin_views.', false, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'custom_admin_views.', false, 'cb'); ?>
<?php endif; ?>
</td>
<td class="nowrap center hidden-phone">