Skip to content

[4.0] Split up installer plugin JS #30162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roland-d merged 16 commits into from
Aug 4, 2020
Merged

[4.0] Split up installer plugin JS #30162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
54cb386
Split installer plugin JS
SharkyKZ Jul 21, 2020
5f64293
Remove unused function
SharkyKZ Jul 21, 2020
c4c799b
Split installer plugin JS
SharkyKZ Jul 21, 2020
16591a7
Split installer plugin JS
SharkyKZ Jul 21, 2020
3cdabf7
Rename file
SharkyKZ Jul 21, 2020
bd8ab00
Correct string
SharkyKZ Jul 21, 2020
cec2cbd
Replace JText
SharkyKZ Jul 21, 2020
17a1c86
Disable language autoloading, clean up strings
SharkyKZ Jul 22, 2020
a900eaf
Split installer plugin JS
SharkyKZ Jul 22, 2020
dda2425
Remove tabset when no plugins enabled
SharkyKZ Jul 22, 2020
1385656
Use static alert
SharkyKZ Jul 22, 2020
25f1f75
Add core.js dependency
SharkyKZ Jul 22, 2020
e108c06
CS
SharkyKZ Jul 22, 2020
aa3c82f
CS
SharkyKZ Jul 22, 2020
f9ad2c4
Hound
SharkyKZ Jul 22, 2020
080e1ef
Defer
SharkyKZ Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions administrator/components/com_installer/tmpl/install/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
Text::script('NOTICE');
Text::script('MESSAGE');

Text::script('PLG_INSTALLER_PACKAGEINSTALLER_NO_PACKAGE');
Text::script('PLG_INSTALLER_FOLDERINSTALLER_NO_INSTALL_PATH');
Text::script('PLG_INSTALLER_URLINSTALLER_NO_URL');
Text::script('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL');

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
Expand All @@ -31,9 +28,10 @@
->usePreset('com_installer.installer')
->useScript('webcomponent.core-loader');

$app = Factory::getApplication();
?>
$app = Factory::getApplication();
$tabs = $app->triggerEvent('onInstallerAddInstallationTab', []);

?>
<div id="installer-install" class="clearfix">

<form enctype="multipart/form-data" action="<?php echo Route::_('index.php?option=com_installer&view=install'); ?>" method="post" name="adminForm" id="adminForm">
Expand All @@ -44,31 +42,36 @@
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
<?php endif; ?>
<?php $tabs = $app->triggerEvent('onInstallerAddInstallationTab', []); ?>
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => $tabs[0]['name'] ?? '']); ?>
<?php // Show installation tabs ?>
<?php foreach ($tabs as $tab) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', $tab['name'], $tab['label']); ?>
<fieldset class="uploadform option-fieldset options-form">
<?php echo $tab['content']; ?>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endforeach; ?>

<?php if (!$tabs) : ?>
<?php $app->enqueueMessage(Text::_('COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND'), 'warning'); ?>
<div class="alert alert-warning">
<span class="fas fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
<?php echo Text::_('COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND'); ?>
</div>
<?php endif; ?>

<?php if ($this->ftp) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'ftp', Text::_('COM_INSTALLER_MSG_DESCFTPTITLE')); ?>
<?php echo $this->loadTemplate('ftp'); ?>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php if ($tabs || $this->ftp) : ?>
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => $tabs[0]['name'] ?? '']); ?>
<?php // Show installation tabs ?>
<?php foreach ($tabs as $tab) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', $tab['name'], $tab['label']); ?>
<fieldset class="uploadform option-fieldset options-form">
<?php echo $tab['content']; ?>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endforeach; ?>

<?php if ($this->ftp) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'ftp', Text::_('COM_INSTALLER_MSG_DESCFTPTITLE')); ?>
<?php echo $this->loadTemplate('ftp'); ?>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>
<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
<?php endif; ?>

<input type="hidden" name="installtype" value="">
<input type="hidden" name="task" value="install.install">
<?php echo HTMLHelper::_('form.token'); ?>

<?php echo HTMLHelper::_('uitab.endTabSet'); ?>
</div>
</div>
</div>
Expand Down
11 changes: 0 additions & 11 deletions administrator/language/en-GB/com_installer.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ COM_INSTALLER_INSTALL_BUTTON="Install"
COM_INSTALLER_INSTALL_CHECKSUM_WRONG="The checksum verification failed. Please make sure you are using the correct update server!"
COM_INSTALLER_INSTALL_DIRECTORY="Install Folder"
COM_INSTALLER_INSTALL_ERROR="Error installing %s"
COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"
COM_INSTALLER_INSTALL_FROM_URL="Install from URL"
COM_INSTALLER_INSTALL_FROM_WEB="Install from Web"
COM_INSTALLER_INSTALL_LANGUAGE_SUCCESS="Installation of the <strong>%s</strong> language was successful."
COM_INSTALLER_INSTALL_SUCCESS="Installation of the %s was successful."
COM_INSTALLER_INSTALL_URL="Install URL"
Expand Down Expand Up @@ -282,14 +279,6 @@ COM_INSTALLER_VALUE_SUPPORTED_MISSING="Download Key invalid"
COM_INSTALLER_VALUE_SUPPORTED_SELECT="- Select Download Key -"
COM_INSTALLER_VALUE_SUPPORTED_SUPPORTED="Download Key supported"
COM_INSTALLER_VALUE_TYPE_SELECT="- Select Type -"
COM_INSTALLER_WEBINSTALLER_INSTALL_OBSOLETE="The Install from Web plugin needs to be updated."
COM_INSTALLER_WEBINSTALLER_INSTALL_UPDATE_AVAILABLE="There is a new update available for the Install from Web plugin. It is advisable that you update as soon as possible."
COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM="Please confirm the installation by selecting the Install button"
COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_NAME="Extension Name"
COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_URL="Install from"
COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING="Loading ..."
COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR="Can't connect to the Joomla! server. Please try again later."
COM_INSTALLER_WEBINSTALLER_LOAD_APPS="Select to load extensions browser"
COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions"

; Alternate language strings for the rules form field
Expand Down
6 changes: 6 additions & 0 deletions administrator/language/en-GB/plg_installer_webinstaller.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@

PLG_INSTALLER_WEBINSTALLER="Installer - Install from Web"
PLG_INSTALLER_WEBINSTALLER_CANNOT_INSTALL_EXTENSION_IN_PLUGIN="This extension cannot be installed via the install from web system. Please visit the developer's website to purchase/download."
PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM="Please confirm the installation by selecting the Install button"
PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_NAME="Extension Name"
PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_URL="Install from"
PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING="Loading ..."
PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR="Can't connect to the Joomla! server. Please try again later."
; The [SITEURL] placeholder should not be translated as it is used in the JavaScript API to insert the correct URL
PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL="You will be redirected to the following link to complete the registration/purchase: [SITEURL]"
PLG_INSTALLER_WEBINSTALLER_TAB_LABEL="Install from Web"
PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION="This plugin allows you to install directly from the Joomla! Extension Directory."
Loading