Skip to content

Commit

Permalink
Merge branch '5.1-dev' into js-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Quy committed Mar 3, 2024
2 parents d1786a3 + baa889d commit be3894e
Show file tree
Hide file tree
Showing 203 changed files with 423 additions and 12 deletions.
29 changes: 29 additions & 0 deletions administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -2208,6 +2208,31 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
// From 5.1.0-alpha3 to 5.1.0-alpha4
'/administrator/components/com_redirect/tmpl/links/default_batch_footer.php',
'/modules/mod_banners/mod_banners.php',
// From 5.1.0-alpha4 to 5.1.0-beta1
'/administrator/modules/mod_custom/mod_custom.php',
'/administrator/modules/mod_frontend/mod_frontend.php',
'/administrator/modules/mod_latestactions/mod_latestactions.php',
'/administrator/modules/mod_loginsupport/mod_loginsupport.php',
'/administrator/modules/mod_messages/mod_messages.php',
'/administrator/modules/mod_multilangstatus/mod_multilangstatus.php',
'/administrator/modules/mod_sampledata/mod_sampledata.php',
'/administrator/modules/mod_stats_admin/mod_stats_admin.php',
'/administrator/modules/mod_title/mod_title.php',
'/administrator/modules/mod_toolbar/mod_toolbar.php',
'/administrator/modules/mod_user/mod_user.php',
'/administrator/modules/mod_version/mod_version.php',
'/media/plg_system_jooa11y/css/jooa11y.css',
'/media/plg_system_jooa11y/css/jooa11y.min.css',
'/media/plg_system_jooa11y/css/jooa11y.min.css.gz',
'/media/plg_system_jooa11y/scss/jooa11y.scss',
'/media/vendor/joomla-a11y-checker/LICENSE.md',
'/modules/mod_feed/mod_feed.php',
'/modules/mod_languages/mod_languages.php',
'/modules/mod_stats/mod_stats.php',
'/modules/mod_syndicate/mod_syndicate.php',
'/modules/mod_tags_popular/mod_tags_popular.php',
'/modules/mod_tags_similar/mod_tags_similar.php',
'/modules/mod_wrapper/mod_wrapper.php',
];

$folders = [
Expand Down Expand Up @@ -2442,6 +2467,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
'/libraries/vendor/fgrosse/phpasn1/lib',
'/libraries/vendor/fgrosse/phpasn1',
'/libraries/vendor/fgrosse',
// From 5.1.0-alpha4 to 5.1.0-beta1
'/media/vendor/joomla-a11y-checker',
'/media/plg_system_jooa11y/scss',
'/media/plg_system_jooa11y/css',
];

$status['files_checked'] = $files;
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_admin/tmpl/help/langforum.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;

/** @var \Joomla\Component\Admin\Administrator\View\Help\HtmlView $this */

$this->getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR);

$forumId = (int) Text::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;

/** @var \Joomla\CMS\Layout\FileLayout $this */

$data = $displayData;

// Receive overridable options
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
use Joomla\CMS\Router\Route;
use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;

/** @var Joomla\Component\Associations\Administrator\View\Associations\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('com_associations.admin-associations-default')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
use Joomla\CMS\Session\Session;
use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;

/** @var Joomla\Component\Associations\Administrator\View\Associations\HtmlView $this */

$app = Factory::getApplication();

if ($app->isClient('site')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

use Joomla\CMS\Layout\LayoutHelper;

/** @var \Joomla\Component\Banners\Administrator\View\Banners\HtmlView $this */

$displayData = [
'textPrefix' => 'COM_BANNERS',
'formURL' => 'index.php?option=com_banners&view=banners',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

use Joomla\CMS\Layout\LayoutHelper;

/** @var \Joomla\Component\Banners\Administrator\View\Clients\HtmlView $this */

$displayData = [
'textPrefix' => 'COM_BANNERS_CLIENT',
'formURL' => 'index.php?option=com_banners&view=clients',
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_banners/tmpl/tracks/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\CMS\Router\Route;

/** @var \Joomla\Component\Banners\Administrator\View\Tracks\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('table.columns');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;

/** @var \Joomla\CMS\Layout\FileLayout $this */

extract($displayData);

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;

/** @var \Joomla\CMS\Layout\FileLayout $this */

extract($displayData);

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
use Joomla\CMS\Session\Session;
use Joomla\String\Inflector;

/** @var \Joomla\Component\Categories\Administrator\View\Categories\HtmlView $this */

/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('table.columns')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;

/** @var \Joomla\Component\Categories\Administrator\View\Categories\HtmlView $this */

$published = (int) $this->state->get('filter.published');
$extension = $this->escape($this->state->get('filter.extension'));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;

/** @var \Joomla\Component\Categories\Administrator\View\Categories\HtmlView $this */

$extension = $this->state->get('filter.extension');
$component = $this->state->get('filter.component');
$section = $this->state->get('filter.section');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
use Joomla\CMS\Session\Session;
use Joomla\Component\Content\Site\Helper\RouteHelper;

/** @var \Joomla\Component\Categories\Administrator\View\Categories\HtmlView $this */

$app = Factory::getApplication();

if ($app->isClient('site')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
use Joomla\CMS\Router\Route;
use Joomla\CMS\Workflow\WorkflowServiceInterface;

/** @var \Joomla\Component\Categories\Administrator\View\Category\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('keepalive')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
*/

defined('_JEXEC') or die;

/** @var \Joomla\Component\Categories\Administrator\View\Category\HtmlView $this */

?>
<div class="subhead noshadow mb-3">
<?php echo $this->document->getToolbar('toolbar')->render(); ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

use Joomla\Component\Content\Site\Helper\RouteHelper;

/** @var \Joomla\Component\Categories\Administrator\View\Category\HtmlView $this */

$icon = 'icon-check';
$title = $this->item ? $this->item->title : '';
$content = $this->item ? $this->item->alias : '';
Expand Down
2 changes: 2 additions & 0 deletions administrator/components/com_checkin/tmpl/checkin/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\CMS\Router\Route;

/** @var \Joomla\Component\Checkin\Administrator\View\Checkin\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('multiselect');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('keepalive')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_CACHE_SETTINGS');
$this->description = '';
$this->fieldsname = 'cache';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_COOKIE_SETTINGS');
$this->description = '';
$this->fieldsname = 'cookie';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_DATABASE_SETTINGS');
$this->description = '';
$this->fieldsname = 'database';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_DEBUG_SETTINGS');
$this->description = '';
$this->fieldsname = 'debug';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
$this->description = '';
$this->fieldsname = 'filters';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_LOCATION_SETTINGS');
$this->description = '';
$this->fieldsname = 'locale';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_LOGGING_SETTINGS');
$this->description = '';
$this->fieldsname = 'logging';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_LOGGING_CUSTOM_SETTINGS');
$this->description = '';
$this->fieldsname = 'logging_custom';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

HTMLHelper::_('form.csrf');
$this->document->getWebAssetManager()
->useScript('webcomponent.field-send-test-mail');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_METADATA_SETTINGS');
$this->description = '';
$this->fieldsname = 'metadata';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
use Joomla\CMS\Language\Text;

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */
?>
<ul class="nav flex-column">
<?php if ($this->userIsSuperAdmin) : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_PERMISSION_SETTINGS');
$this->description = '';
$this->fieldsname = 'permissions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_PROXY_SETTINGS');
$this->description = '';
$this->fieldsname = 'proxy';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_SEO_SETTINGS');
$this->description = Text::_('COM_CONFIG_SEO_SETTINGS_DESC');
$this->fieldsname = 'seo';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_SERVER_SETTINGS');
$this->description = '';
$this->fieldsname = 'server';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_SESSION_SETTINGS');
$this->description = '';
$this->fieldsname = 'session';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_SITE_SETTINGS');
$this->description = '';
$this->fieldsname = 'site';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Application\HtmlView $this */

$this->name = Text::_('COM_CONFIG_WEBSERVICES_SETTINGS');
$this->description = '';
$this->fieldsname = 'webservices';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\Router\Route;

/** @var \Joomla\Component\Config\Administrator\View\Component\HtmlView $this */

$app = Factory::getApplication();
$template = $app->getTemplate();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
use Joomla\CMS\Language\Text;

defined('_JEXEC') or die;

/** @var \Joomla\Component\Config\Administrator\View\Component\HtmlView $this */
?>
<ul class="nav flex-column">
<?php if ($this->userIsSuperAdmin) : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;

/** @var \Joomla\CMS\Layout\FileLayout $this */

extract($displayData);

/**
Expand Down

0 comments on commit be3894e

Please sign in to comment.