joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Release of v3.2.0-beta10

Browse Source 
Fix the search area layout. Fix the search area code line selection. Fix the input edit button for custom fields. Add the new layout to list fields (GUI UPDATE).
This commit is contained in:
Robot
2024-03-26 22:30:10 +02:00
parent 02a5e42bb5
commit ec714566f6
46 changed files with 255 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Factory.php
View File

@ -31,6 +31,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Service\Library;
use VDM\Joomla\Componentbuilder\Compiler\Service\Customview;
use VDM\Joomla\Componentbuilder\Compiler\Service\Templatelayout;
use VDM\Joomla\Componentbuilder\Compiler\Service\Extension;
use VDM\Joomla\Componentbuilder\Service\CoreRules;
use VDM\Joomla\Componentbuilder\Compiler\Service\Field;
use VDM\Joomla\Componentbuilder\Compiler\Service\Joomlamodule;
use VDM\Joomla\Componentbuilder\Compiler\Service\Joomlaplugin;
@ -162,6 +163,7 @@ abstract class Factory implements FactoryInterface
->registerServiceProvider(new Customview())
->registerServiceProvider(new Templatelayout())
->registerServiceProvider(new Extension())
->registerServiceProvider(new CoreRules())
->registerServiceProvider(new Field())
->registerServiceProvider(new Joomlamodule())
->registerServiceProvider(new Joomlaplugin())

2
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFive/InputButton.php
View File

@ -261,7 +261,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " build edit button";
$addButton[] = Indent::_(4)
. "\$button[] = '<a id=\"'.\$button_code_name.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.Text:"
. "\$button[] = '<a id=\"'.\$button_code_name.'Edit\" class=\"btn btn-small btn-outline-success button-select hasTooltip\" title=\"'.Text:"
. ":sprintf('" . $this->config->lang_prefix
. "_EDIT_S', \$button_label).'\" style=\"display: none; border-radius: 0px 4px 4px 0px;\" href=\"#\" >";
$addButton[] = Indent::_(5)

2
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaFour/InputButton.php
View File

@ -261,7 +261,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)
. " build edit button";
$addButton[] = Indent::_(4)
. "\$button[] = '<a id=\"'.\$button_code_name.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.Text:"
. "\$button[] = '<a id=\"'.\$button_code_name.'Edit\" class=\"btn btn-small btn-outline-success button-select hasTooltip\" title=\"'.Text:"
. ":sprintf('" . $this->config->lang_prefix
. "_EDIT_S', \$button_label).'\" style=\"display: none; border-radius: 0px 4px 4px 0px;\" href=\"#\" >";
$addButton[] = Indent::_(5)

2
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Field/JoomlaThree/InputButton.php
View File

@ -263,7 +263,7 @@ final class InputButton implements InputButtonInterface
$addButton[] = Indent::_(4)
. "\$button[] = '<a id=\"'.\$button_code_name.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.Text:"
. ":sprintf('" . $this->config->lang_prefix
. "_EDIT_S', \$button_label).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
. "_EDIT_S', \$button_label).'\" style=\"display: none; padding: 3px 4px 4px 7px;\" href=\"#\" >";
$addButton[] = Indent::_(5)
. "<span class=\"icon-edit\"></span></a>';";
$addButton[] = Indent::_(4) . "//" . Line::_(__Line__, __Class__)

73
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Compiler/Service/Field.php
View File

@ -25,9 +25,6 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\UniqueName;
use VDM\Joomla\Componentbuilder\Compiler\Field\Rule;
use VDM\Joomla\Componentbuilder\Compiler\Field\Customcode;
use VDM\Joomla\Componentbuilder\Compiler\Field\DatabaseName;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\CoreRule as J3CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\CoreRule as J4CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\CoreRule as J5CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\CoreField as J3CoreField;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\CoreField as J4CoreField;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\CoreField as J5CoreField;
@ -35,7 +32,6 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\InputButton as J3Inpu
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\InputButton as J4InputButton;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\InputButton as J5InputButton;
use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreFieldInterface as CoreField;
use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface as CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\InputButtonInterface as InputButton;
@ -102,15 +98,6 @@ class Field implements ServiceProviderInterface
$container->alias(DatabaseName::class, 'Field.Database.Name')
->share('Field.Database.Name', [$this, 'getDatabaseName'], true);
$container->alias(J3CoreRule::class, 'J3.Field.Core.Rule')
->share('J3.Field.Core.Rule', [$this, 'getJ3CoreRule'], true);
$container->alias(J4CoreRule::class, 'J4.Field.Core.Rule')
->share('J4.Field.Core.Rule', [$this, 'getJ4CoreRule'], true);
$container->alias(J5CoreRule::class, 'J5.Field.Core.Rule')
->share('J5.Field.Core.Rule', [$this, 'getJ5CoreRule'], true);
$container->alias(J3CoreField::class, 'J3.Field.Core.Field')
->share('J3.Field.Core.Field', [$this, 'getJ3CoreField'], true);
@ -132,9 +119,6 @@ class Field implements ServiceProviderInterface
$container->alias(CoreField::class, 'Field.Core.Field')
->share('Field.Core.Field', [$this, 'getCoreField'], true);
$container->alias(CoreRule::class, 'Field.Core.Rule')
->share('Field.Core.Rule', [$this, 'getCoreRule'], true);
$container->alias(InputButton::class, 'Field.Input.Button')
->share('Field.Input.Button', [$this, 'getInputButton'], true);
}
@ -308,45 +292,6 @@ class Field implements ServiceProviderInterface
);
}
/**
* Get The CoreRule Class.
*
* @param Container $container The DI container.
*
* @return J3CoreRule
* @since 3.2.0
*/
public function getJ3CoreRule(Container $container): J3CoreRule
{
return new J3CoreRule();
}
/**
* Get The CoreRule Class.
*
* @param Container $container The DI container.
*
* @return J4CoreRule
* @since 3.2.0
*/
public function getJ4CoreRule(Container $container): J4CoreRule
{
return new J4CoreRule();
}
/**
* Get The CoreRule Class.
*
* @param Container $container The DI container.
*
* @return J5CoreRule
* @since 3.2.0
*/
public function getJ5CoreRule(Container $container): J5CoreRule
{
return new J5CoreRule();
}
/**
* Get The CoreField Class.
*
@ -455,24 +400,6 @@ class Field implements ServiceProviderInterface
return $container->get('J' . $this->currentVersion . '.Field.Core.Field');
}
/**
* Get The CoreRuleInterface Class.
*
* @param Container $container The DI container.
*
* @return CoreRule
* @since 3.2.0
*/
public function getCoreRule(Container $container): CoreRule
{
if (empty($this->currentVersion))
{
$this->currentVersion = Version::MAJOR_VERSION;
}
return $container->get('J' . $this->currentVersion . '.Field.Core.Rule');
}
/**
* Get The InputButton Class.
*

119
libraries/jcb_powers/VDM.Joomla/src/Componentbuilder/Service/CoreRules.php Normal file
View File

@ -0,0 +1,119 @@
<?php
/**
* @package Joomla.Component.Builder
*
* @created 4th September, 2022
* @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
*/
namespace VDM\Joomla\Componentbuilder\Service;
use Joomla\DI\Container;
use Joomla\DI\ServiceProviderInterface;
use Joomla\CMS\Version;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree\CoreRule as J3CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour\CoreRule as J4CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive\CoreRule as J5CoreRule;
use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface as CoreRule;
/**
* Joomla Core Rules
*
* @since 3.2.0
*/
class CoreRules implements ServiceProviderInterface
{
/**
* Current Joomla Version We are IN
*
* @var int
* @since 3.2.0
**/
protected $currentVersion;
/**
* Registers the service provider with a DI container.
*
* @param Container $container The DI container.
*
* @return void
* @since 3.2.0
*/
public function register(Container $container)
{
$container->alias(J3CoreRule::class, 'J3.Field.Core.Rule')
->share('J3.Field.Core.Rule', [$this, 'getJ3CoreRule'], true);
$container->alias(J4CoreRule::class, 'J4.Field.Core.Rule')
->share('J4.Field.Core.Rule', [$this, 'getJ4CoreRule'], true);
$container->alias(J5CoreRule::class, 'J5.Field.Core.Rule')
->share('J5.Field.Core.Rule', [$this, 'getJ5CoreRule'], true);
$container->alias(CoreRule::class, 'Field.Core.Rule')
->share('Field.Core.Rule', [$this, 'getCoreRule'], true);
}
/**
* Get The CoreRule Class.
*
* @param Container $container The DI container.
*
* @return J3CoreRule
* @since 3.2.0
*/
public function getJ3CoreRule(Container $container): J3CoreRule
{
return new J3CoreRule();
}
/**
* Get The CoreRule Class.
*
* @param Container $container The DI container.
*
* @return J4CoreRule
* @since 3.2.0
*/
public function getJ4CoreRule(Container $container): J4CoreRule
{
return new J4CoreRule();
}
/**
* Get The CoreRule Class.
*
* @param Container $container The DI container.
*
* @return J5CoreRule
* @since 3.2.0
*/
public function getJ5CoreRule(Container $container): J5CoreRule
{
return new J5CoreRule();
}
/**
* Get The CoreRuleInterface Class.
*
* @param Container $container The DI container.
*
* @return CoreRule
* @since 3.2.0
*/
public function getCoreRule(Container $container): CoreRule
{
if (empty($this->currentVersion))
{
$this->currentVersion = Version::MAJOR_VERSION;
}
return $container->get('J' . $this->currentVersion . '.Field.Core.Rule');
}
}