joomla/Component-Builder
39
25
Fork 12
Code Issues 78 Pull Requests 2 Projects 4 Wiki Activity

Release of v5.1.1-alpha2

Browse Source 
Adds the ModalSelect fieldtype to Joomla Component Builder - J5. Adds the Data Import Function to the Demo Component. Adds new country related tables and fields to the Demo Component. Resolves the Database Updating issue in the compiler. #1212,#1209. Adds the Component Commands Plugin to the CLI for Import of spreadsheet data-sets.
This commit is contained in:
Robot
2025-03-28 13:15:25 +00:00
parent 06185f8c3a
commit 8342c5bb9f
536 changed files with 16369 additions and 2067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
admin/tmpl/custom_codes/default_body.php
View File

@ -31,7 +31,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="order nowrap center hidden-phone">
<?php if ($canDo->get('custom_code.edit.state')): ?>
<?php if (!$this->isModal && $canDo->get('custom_code.edit.state')): ?>
<?php
$iconClass = '';
if (!$this->saveOrder)
@ -51,7 +51,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
<?php endif; ?>
</td>
<td class="nowrap center">
<?php if ($canDo->get('custom_code.edit')): ?>
<?php if (!$this->isModal && $canDo->get('custom_code.edit')): ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo Html::_('grid.id', $i, $item->id); ?>
@ -67,13 +67,29 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
</td>
<td class="nowrap">
<div class="name">
<?php if ($canDo->get('custom_code.edit')): ?>
<?php if (!$this->isModal && $canDo->get('custom_code.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 Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'custom_codes.', $canCheckin); ?>
<?php endif; ?>
<?php else: ?>
<?php echo $this->escape($item->system_name); ?>
<?php if (!$this->isModal): ?>
<?php echo $this->escape($item->system_name); ?>
<?php else: ?>
<?php
$link = "{$edit}&id={$item->id}";
$dataId = $item->{$this->getModalTitleKey()} ?? 0;
$itemHtml = '<a href="' . $this->escape($link, false) . '">' . $this->escape($item->system_name, false) . '</a>';
$attribs = 'data-content-select data-content-type="com_componentbuilder.custom_code"'
. ' data-id="' . $dataId . '"'
. ' data-title="' . $this->escape($item->system_name, false) . '"'
. ' data-uri="' . $this->escape($link, false) . '"'
. ' data-html="' . $this->escape($itemHtml, false) . '"';
?>
<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
<?php echo $this->escape($item->system_name); ?>
</a>
<?php endif; ?>
<?php endif; ?>
</div>
</td>
@ -98,7 +114,7 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
</div>
</td>
<td class="center">
<?php if ($canDo->get('custom_code.edit.state')) : ?>
<?php if (!$this->isModal && $canDo->get('custom_code.edit.state')) : ?>
<?php if ($item->checked_out) : ?>
<?php if ($canCheckin) : ?>
<?php echo Html::_('jgrid.published', $item->published, $i, 'custom_codes.', true, 'cb'); ?>

6
admin/tmpl/custom_codes/default_head.php
View File

@ -17,7 +17,7 @@ defined('_JEXEC') or die;
?>
<tr>
<?php if ($this->canEdit&& $this->canState): ?>
<?php if (!$this->isModal && $this->canEdit && $this->canState): ?>
<th width="1%" class="nowrap center hidden-phone">
<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
</th>
@ -33,7 +33,7 @@ defined('_JEXEC') or die;
</th>
<?php endif; ?>
<th class="nowrap" >
<?php echo Text::_('COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL'); ?>
<?php echo Text::_('COM_COMPONENTBUILDER_CUSTOM_CODES_CODE'); ?>
</th>
<th class="nowrap hidden-phone" >
<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL', 'a.path', $this->listDirn, $this->listOrder); ?>
@ -45,7 +45,7 @@ defined('_JEXEC') or die;
<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL', 'a.type', $this->listDirn, $this->listOrder); ?>
</th>
<th class="nowrap hidden-phone" >
<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL', 'a.comment_type', $this->listDirn, $this->listOrder); ?>
<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODES_COMMENT_TYPE', 'a.comment_type', $this->listDirn, $this->listOrder); ?>
</th>
<th class="nowrap hidden-phone" >
<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_CUSTOM_CODE_JOOMLA_VERSION_LABEL', 'a.joomla_version', $this->listDirn, $this->listOrder); ?>

92
admin/tmpl/custom_codes/modal.php Normal file
View File

@ -0,0 +1,92 @@
<?php
/**
* @package Joomla.Component.Builder
*
* @created 30th April, 2015
* @author Llewellyn van der Merwe <https://dev.vdm.io>
* @git Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
* @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Session\Session;
use Joomla\CMS\HTML\HTMLHelper as Html;
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\CMS\Router\Route;
use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
// No direct access to this file
defined('_JEXEC') or die;
/** @var \VDM\Component\Componentbuilder\Administrator\View\Custom_codes\HtmlView $this */
$app = Factory::getApplication();
if ($app->isClient('site')) {
Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
}
// dynamic selection of title key (link in modal)
$this->modalTitleKey = $app->input->get('titleKey', 'id', 'word');
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->getDocument()->getWebAssetManager();
$wa->useScript('core')
->useScript('multiselect')
->useScript('modal-content-select');
?>
<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=custom_codes&layout=modal&tmpl=component&titleKey=' . $this->getModalTitleKey()); ?>" method="post" name="adminForm" id="adminForm">
<div id="j-main-container">
<?php
// Add the trash helper layout
echo LayoutHelper::render('trashhelper', $this);
// Add the searchtools
echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
?>
<?php if (empty($this->items)): ?>
<div class="alert alert-no-items">
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table table-striped" id="custom_codeList">
<thead><?php echo $this->loadTemplate('head');?></thead>
<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
<tbody><?php echo $this->loadTemplate('body');?></tbody>
</table>
<input type="hidden" name="boxchecked" value="0" />
</div>
<?php endif; ?>
<input type="hidden" name="task" value="" />
<?php echo Html::_('form.token'); ?>
</form>
<script type="text/javascript">
// custom_codes footer script
// get page body
var outerBodyDiv = document.querySelector('body');
// start loading spinner
var loadingDiv = document.createElement('div');
loadingDiv.id = 'loading';
// Set CSS properties individually
loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
loadingDiv.style.position = 'fixed';
loadingDiv.style.opacity = '0.80';
loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
loadingDiv.style.filter = "alpha(opacity=80)";
loadingDiv.style.display = 'none';
// add to page body
outerBodyDiv.appendChild(loadingDiv);
// when the expand button is clicked
jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
loadingDiv.style.display = 'block';
});
</script>