Skip to content

[4.0] [WIP] Joomla Installation: multiple corrections when installing languages and more #32601

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

Closed
infograf768 wants to merge 3 commits into from
Closed

[4.0] [WIP] Joomla Installation: multiple corrections when installing languages and more #32601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2df0227
[4.0] Joomla Installation: multiple corrections when installing
infograf768 Mar 7, 2021
8f16daf
missing closing div
infograf768 Mar 7, 2021
7d8f8c7
scss cs
infograf768 Mar 7, 2021
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
15 changes: 8 additions & 7 deletions installation/language/en-GB/joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,20 @@ INSTL_ADMIN_USERNAME_DESC="Set the username for your Super User account."
INSTL_LOGIN_DATA="Login Data"
INSTL_SETUP_SITE_NAME="Setup Site Name"
INSTL_SITE="Main Configuration"
INSTL_SITE_DEVMODE_LABEL="We detected development mode"
INSTL_SITE_DEVMODE_LABEL="We detected development mode.<br>The \"%s\" folder should be deleted if you are not testing locally."
INSTL_SITE_NAME_DESC="Enter the name of your Joomla site."

; Complete view
INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
INSTL_COMPLETE_CONGRAT="Congratulations!"
INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
INSTL_COMPLETE_ADMIN_BTN="Complete & Open Admin"
INSTL_COMPLETE_CONGRAT="Congratulations!"
INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
INSTL_COMPLETE_FINAL="Installation is Complete"
INSTL_COMPLETE_FINAL_DESC="Your Joomla installation is now complete and ready to use."
INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.<br>You will not be able to proceed beyond this point until the \"%s\" folder has been removed. This is a security feature of Joomla!"
INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
INSTL_REMOVE_INST_FOLDER="Are you sure you want to delete? Confirming will permanently delete the \"%s\" folder."

; Languages view
Expand Down
16 changes: 8 additions & 8 deletions installation/language/en-US/joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ BUILD_NOXML_LANGUAGE="English US"
BUILD_NOXML_TEXT="Your host needs to use PHP with support for the XML library to run this version of Joomla!"
BUILD_NOXML_URL_TEXT="Help me resolve this"


; Main Config
INSTL_SELECT_INSTALL_LANG="Select Installation Language"
INSTL_SELECT_LANGUAGE_TITLE="Select Language"
Expand Down Expand Up @@ -109,19 +108,20 @@ INSTL_ADMIN_USERNAME_DESC="Set the username for your Super User account."
INSTL_LOGIN_DATA="Login Data"
INSTL_SETUP_SITE_NAME="Setup Site Name"
INSTL_SITE="Main Configuration"
INSTL_SITE_DEVMODE_LABEL="We detected development mode"
INSTL_SITE_DEVMODE_LABEL="We detected development mode.<br>The \"%s\" folder should be deleted if you are not testing locally."
INSTL_SITE_NAME_DESC="Enter the name of your Joomla site."

; Complete view
INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
INSTL_COMPLETE_CONGRAT="Congratulations!"
INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
INSTL_COMPLETE_ADMIN_BTN="Complete & Open Admin"
INSTL_COMPLETE_CONGRAT="Congratulations!"
INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
INSTL_COMPLETE_FINAL="Installation is Complete"
INSTL_COMPLETE_FINAL_DESC="Your Joomla installation is now complete and ready to use."
INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.<br>You will not be able to proceed beyond this point until the \"%s\" folder has been removed. This is a security feature of Joomla!"
INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
INSTL_REMOVE_INST_FOLDER="Are you sure you want to delete? Confirming will permanently delete the \"%s\" folder."

; Languages view
Expand Down
3 changes: 2 additions & 1 deletion installation/template/js/remove.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ if (document.getElementById('removeInstallationFolder')) {
customInstallation.parentNode.removeChild(customInstallation);
const removeInstallationTab = document.getElementById('removeInstallationTab');
removeInstallationTab.parentNode.removeChild(removeInstallationTab);
document.getElementById('langInstall').classList.remove('active');
},
onError: function (xhr) {
Joomla.renderMessages({ error: [xhr] }, '#system-message-container');
Joomla.renderMessages({ error: [xhr] }, '#system-message-container');
}
}
);
Expand Down
8 changes: 8 additions & 0 deletions installation/template/scss/template.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,11 @@ caption {
.table > :not(:last-child) > :last-child > * {
border-bottom-color: $table-border-color;
}

.install-lang.active {
display: block;
}

.install-lang {
display: none;
}
35 changes: 20 additions & 15 deletions installation/tmpl/remove/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,26 @@
<legend class="j-install-step-header">
<span class="icon-trophy" aria-hidden="true"></span> <?php echo Text::_('INSTL_COMPLETE_CONGRAT'); ?>
</legend>
<div class="j-install-step-form" id="customInstallation">
<div class="j-install-step-header">
<h2><?php echo Text::_('INSTL_COMPLETE_TITLE'); ?></h2>
</div>
<div class="j-install-step-form" id="customInstallation">
<div class="mb-3 mt-4">
<button class="btn btn-primary w-100" id="installAddFeatures">
<?php echo Text::_('INSTL_COMPLETE_ADD_EXTRA_LANGUAGE'); ?> <span class="icon-chevron-right" aria-hidden="true"></span>
</button>
</div>
</div>

<div id="langInstall" class="install-lang active">
<?php if (count($this->installed_languages->administrator) > 1) : ?>
<div id="defaultLanguage"
class="j-install-step-form flex-column mt-5 border rounded"
>
<div id="defaultLanguage"
class="j-install-step-form flex-column mt-5 border rounded"
>
<?php else : ?>
<div id="defaultLanguage"
class="j-install-step-form flex-column mt-5 border rounded d-none"
>
<div id="defaultLanguage"
class="j-install-step-form flex-column mt-5 border rounded d-none"
>
<?php endif; ?>
<p><?php echo Text::_('INSTL_DEFAULTLANGUAGE_DESC'); ?></p>
<table class="table table-sm">
Expand Down Expand Up @@ -123,6 +126,7 @@ class="j-install-step-form flex-column mt-5 border rounded d-none"
</button>
<?php echo HTMLHelper::_('form.token'); ?>
</div>
</div>
</fieldset>

<div id="installRecommended" class="j-install-step active">
Expand Down Expand Up @@ -174,12 +178,14 @@ class="j-install-step-form flex-column mt-5 border rounded d-none"
</table>

<?php endif; ?>
<?php if ($this->development) : ?>
<div class="alert flex-column mb-1" id="removeInstallationTab">
<span class="mb-1 font-weight-bold"><?php echo Text::_('INSTL_SITE_DEVMODE_LABEL'); ?></span>
<button class="btn btn-danger mb-1" id="removeInstallationFolder"><?php echo Text::sprintf('INSTL_COMPLETE_REMOVE_FOLDER', 'installation'); ?></button>
</div>
<?php endif; ?>
<div class="alert flex-column mb-1" id="removeInstallationTab">
<?php if ($this->development) : ?>
<span class="mb-1 font-weight-bold"><?php echo Text::sprintf('INSTL_SITE_DEVMODE_LABEL', 'installation'); ?></span>
Copy link
Copy Markdown
Contributor

@brianteeman brianteeman Mar 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this was present before BUT the class font-weight-bold should be avoided in this case. It is being used as a visual indication of importance but as it is just css it has no semantic meaning. Instead it should be either an appropriate heading or the semantic "strong"

Copy link
Copy Markdown
Member Author

@infograf768 infograf768 Mar 7, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so, what precisely do you suggest? Modifying both strings to add <strong> in the values?
In any case this is epiphenomenic in this PR and I will wait for real full tests

Copy link
Copy Markdown
Contributor

@brianteeman brianteeman Mar 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<span class="mb-1 font-weight-bold"><?php echo Text::sprintf('INSTL_SITE_DEVMODE_LABEL', 'installation'); ?></span>
<span class="mb-1"><strong><?php echo Text::sprintf('INSTL_SITE_DEVMODE_LABEL', 'installation'); ?></strong></span>

Why would you want to change a language string to add html markup

<?php else : ?>
<span class="mb-1 font-weight-bold"><?php echo Text::sprintf('INSTL_COMPLETE_REMOVE_INSTALLATION', 'installation'); ?></span>
<?php endif; ?>
<button class="btn btn-danger mb-1" id="removeInstallationFolder"><?php echo Text::sprintf('INSTL_COMPLETE_REMOVE_FOLDER', 'installation'); ?></button>
</div>
<?php echo HTMLHelper::_('form.token'); ?>

<div class="form-group j-install-last-step d-grid gap-2">
Expand Down Expand Up @@ -270,6 +276,7 @@ class="btn btn-primary"
</div>
</form>
</div>
</div>
</fieldset>

<fieldset id="installFinal" class="j-install-step">
Expand All @@ -280,6 +287,4 @@ class="btn btn-primary"
<p><?php echo Text::_('INSTL_COMPLETE_FINAL_DESC'); ?></p>
</div>
</fieldset>


</div>