joomla/Component-Builder
40
26
Fork 12
Code Issues 80 Pull Requests 2 Projects 4 Wiki Activity

Stable release of v3.2.0-beta1

Browse Source 
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:
Robot
2024-03-02 22:10:30 +02:00
parent 3c91a5cdbb
commit d1e1a56671
1786 changed files with 73608 additions and 37437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
admin/views/joomla_modules/tmpl/default_body.php
View File

@@ -11,7 +11,12 @@
// 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\ArrayHelper;
use VDM\Joomla\Utilities\GetHelper;
$edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_module.edit";
@@ -19,7 +24,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
<?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('joomla_module',$item,'joomla_modules');
?>
<tr class="row<?php echo $i % 2; ?>">
@@ -29,7 +34,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
$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 +52,12 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
<?php if ($canDo->get('joomla_module.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 +68,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
<?php if ($canDo->get('joomla_module.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, 'joomla_modules.', $canCheckin); ?>
<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_modules.', $canCheckin); ?>
<?php endif; ?>
<?php else: ?>
<?php echo $this->escape($item->system_name); ?>
@@ -79,19 +84,19 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
array(
'view' => 'joomla_module_updates',
'views' => 'joomla_modules_updates',
'title' => JText::_('COM_COMPONENTBUILDER_THE_MODULE_UPDATES'),
'title' => Text::_('COM_COMPONENTBUILDER_THE_MODULE_UPDATES'),
'icon' => 'database'),
array(
'view' => 'joomla_module_files_folders_urls',
'views' => 'joomla_modules_files_folders_urls',
'title' => JText::_('COM_COMPONENTBUILDER_THE_MODULE_FILES_FOLDERS'),
'title' => Text::_('COM_COMPONENTBUILDER_THE_MODULE_FILES_FOLDERS'),
'icon' => 'briefcase')
);
}
?>
<div class="btn-group" style="margin: 5px 0 0 0;">
<?php foreach ($_buttons[0] as $_button): ?>
<?php if ($canDo->get($_button['view'].'.edit') && ($id = ComponentbuilderHelper::getVar($_button['view'], $item->id, 'joomla_module', 'id')) !== false): ?>
<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_module', 'id')) !== false): ?>
<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
<?php elseif ($canDo->get($_button['view'].'.create')): ?>
<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_module&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
@@ -100,7 +105,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
</div>
</td>
<td class="hidden-phone">
<?php echo JText::_($item->target); ?>
<?php echo Text::_($item->target); ?>
</td>
<td class="hidden-phone">
<?php echo $this->escape($item->description); ?>
@@ -109,15 +114,15 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
<?php if ($canDo->get('joomla_module.edit.state')) : ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
<?php endif; ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
<?php endif; ?>
<?php else: ?>
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
<?php endif; ?>
</td>
<td class="nowrap center hidden-phone">