joomla
/
cms
mirror of https://github.com/joomla/joomla-cms.git
29
0
Fork 0
Code Packages Releases Activity

[4.2] Fix indents in installation (#38367)

This commit is contained in:
Konstantin Kolos 2022-09-06 21:20:40 +03:00 committed by GitHub
parent ecc2cf0dc9
commit 4ef513c872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
installation/tmpl/remove/default.php
View File

@ -23,10 +23,10 @@ HTMLHelper::_('behavior.formvalidator');
<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 id="customInstallation" class="j-install-step-form">
<h2><?php echo Text::_('INSTL_COMPLETE_TITLE'); ?></h2>
<div class="mb-3 mt-4">
<button class="btn btn-primary w-100" id="installAddFeatures">
<div class="mt-4 mb-3">
<button id="installAddFeatures" class="btn btn-primary w-100">
<?php echo Text::_('INSTL_COMPLETE_ADD_EXTRA_LANGUAGE'); ?> <span class="icon-chevron-right" aria-hidden="true"></span>
</button>
</div>
@ -34,11 +34,11 @@ HTMLHelper::_('behavior.formvalidator');
<?php if (count($this->installed_languages->administrator) > 1) : ?>
<div id="defaultLanguage"
class="j-install-step-form flex-column mt-5 border rounded"
class="j-install-step-form flex-column"
>
<?php else : ?>
<div id="defaultLanguage"
class="j-install-step-form flex-column mt-5 border rounded d-none"
class="j-install-step-form flex-column d-none"
>
<?php endif; ?>
<p><?php echo Text::_('INSTL_DEFAULTLANGUAGE_DESC'); ?></p>
@ -125,7 +125,7 @@ HTMLHelper::_('behavior.formvalidator');
<?php endforeach; ?>
</tbody>
</table>
<button id="defaultLanguagesButton" class="btn w-100 mt-4 btn-primary">
<button id="defaultLanguagesButton" class="btn btn-primary mt-2 mb-3 w-100">
<?php echo Text::_('INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE'); ?> <span class="icon-chevron-right" aria-hidden="true"></span>
</button>
<?php echo HTMLHelper::_('form.token'); ?>
@ -184,14 +184,14 @@ HTMLHelper::_('behavior.formvalidator');
<?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 id="removeInstallationTab" class="flex-column">
<p><?php echo Text::_('INSTL_SITE_DEVMODE_LABEL'); ?></p>
<button id="removeInstallationFolder" class="btn btn-danger w-100"><?php echo Text::sprintf('INSTL_COMPLETE_REMOVE_FOLDER', 'installation'); ?></button>
</div>
<?php endif; ?>
<?php echo HTMLHelper::_('form.token'); ?>
<div class="form-group j-install-last-step d-grid gap-2">
<div class="form-group j-install-last-step d-grid gap-2 mt-4 mb-3">
<button type="button" class="complete-installation btn btn-primary w-100"
data-href="<?php echo Uri::root(); ?>" <?php if ($this->development) :
?>data-development<?php
@ -217,7 +217,7 @@ HTMLHelper::_('behavior.formvalidator');
<p><?php echo Text::_('INSTL_LANGUAGES_WARNING_NO_INTERNET'); ?></p>
<p>
<a href="#"
class="btn btn-primary"
class="btn btn-primary w-100"
onclick="return Joomla.goToPage('remove');">
<span class="icon-arrow-left icon-white" aria-hidden="true"></span>
<?php echo Text::_('INSTL_LANGUAGES_WARNING_BACK_BUTTON'); ?>
@ -226,10 +226,10 @@ HTMLHelper::_('behavior.formvalidator');
<p><?php echo Text::_('INSTL_LANGUAGES_WARNING_NO_INTERNET2'); ?></p>
<?php else : ?>
<form action="index.php" method="post" id="languagesForm" class="form-validate">
<p id="wait_installing" class="hidden">
<div id="wait_installing" class="hidden">
<?php echo Text::_('INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT'); ?><br>
<div id="wait_installing_spinner" class="spinner spinner-img hidden"></div>
</p>
<div id="wait_installing_spinner" class="spinner spinner-img hidden"></div>
</div>
<table class="table table-sm">
<caption id="install_languages_desc"><?php echo Text::_('INSTL_LANGUAGES_DESC'); ?></caption>
<thead>
@ -279,7 +279,7 @@ HTMLHelper::_('behavior.formvalidator');
</table>
<?php echo HTMLHelper::_('form.token'); ?>
<?php endif; ?>
<div class="form-group d-grid gap-2">
<div class="form-group d-grid gap-2 mt-4 mb-3">
<button id="installLanguagesButton" class="btn btn-primary w-100">
<?php echo Text::_('INSTL_LANGUAGES_SELECTED'); ?>
</button>
@ -300,5 +300,4 @@ HTMLHelper::_('behavior.formvalidator');
</div>
</fieldset>
</div>

12
installation/tmpl/setup/default.php
View File

@ -43,8 +43,8 @@ HTMLHelper::_('behavior.formvalidator');
<div class="mb-3">
<?php echo $this->form->renderField('site_name'); ?>
</div>
<div class="mb-3 mt-4">
<button class="btn btn-primary w-100" id="step1"><?php echo Text::_('INSTL_SETUP_LOGIN_DATA'); ?> <span class="icon-chevron-right" aria-hidden="true"></span></button>
<div class="mt-4 mb-3">
<button id="step1" class="btn btn-primary w-100"><?php echo Text::_('INSTL_SETUP_LOGIN_DATA'); ?> <span class="icon-chevron-right" aria-hidden="true"></span></button>
</div>
</div>
</fieldset>
@ -65,8 +65,8 @@ HTMLHelper::_('behavior.formvalidator');
<div class="mb-3">
<?php echo $this->form->renderField('admin_email'); ?>
</div>
<div class="mb-3 mt-4">
<button class="btn btn-primary w-100" id="step2"><?php echo Text::_('INSTL_CONNECT_DB'); ?> <span class="icon-chevron-right" aria-hidden="true"></span></button>
<div class="mt-4 mb-3">
<button id="step2" class="btn btn-primary w-100"><?php echo Text::_('INSTL_CONNECT_DB'); ?> <span class="icon-chevron-right" aria-hidden="true"></span></button>
</div>
</div>
</fieldset>
@ -115,8 +115,8 @@ HTMLHelper::_('behavior.formvalidator');
<?php //echo $this->form->getLabel('db_old'); ?>
<?php echo $this->form->getInput('db_old'); ?>
</div>
<div class="mb-3 mt-4">
<button class="btn btn-primary w-100" id="setupButton"><?php echo Text::_('INSTL_INSTALL_JOOMLA'); ?> <span class="icon-chevron-right" aria-hidden="true"></span></button>
<div class="mt-4 mb-3">
<button id="setupButton" class="btn btn-primary w-100"><?php echo Text::_('INSTL_INSTALL_JOOMLA'); ?> <span class="icon-chevron-right" aria-hidden="true"></span></button>
</div>
</div>
</fieldset>