Skip to content

Commit

Permalink
Merge pull request joomla#64 from ciar4n/style-postinstall
Browse files Browse the repository at this point in the history
Post install markup and style
  • Loading branch information
Dimitri Grammatikogianni authored Sep 1, 2017
2 parents 1b1726d + 6981a18 commit 727401a
Show file tree
Hide file tree
Showing 8 changed files with 190 additions and 129 deletions.
11 changes: 10 additions & 1 deletion installation/language/en-GB/en-GB.ini
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ INSTL_SETUP_LOGIN_DATA="Setup Login Data"
INSTL_PRECHECK_TITLE="Pre-Installation Check"
INSTL_PRECHECK_DESC="If any of these items are not supported (marked as <strong class="_QQ_"badge badge-danger"_QQ_">No</strong>) then please take actions to correct them.<br>You can't install Joomla! until your setup meets the requirements below."
INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:"
INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.<br>However, Joomla! will still operate if your settings do not quite match the recommended configuration."
INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla. However, Joomla! will still operate if your settings do not quite match the recommended configuration."
INSTL_PRECHECK_DIRECTIVE="Directive"
INSTL_PRECHECK_RECOMMENDED="Recommended"
INSTL_PRECHECK_ACTUAL="Actual"
Expand Down Expand Up @@ -143,8 +143,16 @@ INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need internet access for Joomla! t
INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder"
; The word 'installation' should not be translated as it is a physical 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 installation folder has been removed. This is a security feature of Joomla!"
INSTL_COMPLETE_CONGRAT="Congratulations!"
INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed."
INSTL_COMPLETE_DESC="<p>Before going on to your site you have the chance to pre-configure some features to your Joomla! installation. <ul><li>Languages for site and administration</li><li>Sample Data</li></ul>If you are not interested just skip this step and finish the installation process."
INSTL_COMPLETE_ADD_FEATURES="Add Features"
INSTL_COMPLETE_FINISH="Finish Installation Process"
INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages"
INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
INSTL_COMPLETE_ADMIN_BTN="Complete & Open Admin"
INSTL_COMPLETE_FINAL="Installation is Complete"
INSTL_COMPLETE_FINAL_DESC="Your Joomla! installation is now complete and ready to use."

;Languages view
INSTL_LANGUAGES="Install Language packages"
Expand Down Expand Up @@ -299,6 +307,7 @@ JOFF="Off"
JON="On"
JPREVIOUS="Previous"
JSITE="Site"
JSKIP="Skip"
JUSERNAME="Username"
JYES="Yes"

Expand Down
10 changes: 9 additions & 1 deletion installation/language/en-US/en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
INSTL_PRECHECK_TITLE="Pre-Installation Check"
INSTL_PRECHECK_DESC="If any of these items are not supported (marked as <strong class="_QQ_"badge badge-danger"_QQ_">No</strong>) then please take actions to correct them.<br>You can't install Joomla! until your setup meets the requirements below."
INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:"
INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.<br>However, Joomla! will still operate if your settings do not quite match the recommended configuration."
INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla. However, Joomla! will still operate if your settings do not quite match the recommended configuration."
INSTL_PRECHECK_DIRECTIVE="Directive"
INSTL_PRECHECK_RECOMMENDED="Recommended"
INSTL_PRECHECK_ACTUAL="Actual"
Expand Down Expand Up @@ -140,8 +140,16 @@ INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need internet access for Joomla! t
INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder"
; The word 'installation' should not be translated as it is a physical 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 installation folder has been removed. This is a security feature of Joomla!"
INSTL_COMPLETE_CONGRAT="Congratulations!"
INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed."
INSTL_COMPLETE_DESC="<p>Before going on to your site you have the chance to add some additional features to your Joomla! installation. <ul><li>Languages for site and administration</li><li>Sample Data</li></ul>If you are not interested just skip this step and finish the installation process."
INSTL_COMPLETE_ADD_PRECONFIG="Preconfigure"
INSTL_COMPLETE_FINISH="Finish Installation Process"
INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages"
INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
INSTL_COMPLETE_ADMIN_BTN="Complete & Open Admin"
INSTL_COMPLETE_FINAL="Installation is Complete"
INSTL_COMPLETE_FINAL_DESC="Your Joomla! installation is now complete and ready to use."

;Languages view
INSTL_LANGUAGES="Install Language packages"
Expand Down
4 changes: 4 additions & 0 deletions installation/model/setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ public function initialise($options)
// Get a database object.
try
{
if (!property_exists($options, 'db_select'))
{
debug_print_backtrace();die;
}
return InstallationHelperDatabase::getDbo(
$options->db_type,
$options->db_host,
Expand Down
2 changes: 2 additions & 0 deletions installation/template/css/template.css
Original file line number Diff line number Diff line change
Expand Up @@ -8777,6 +8777,8 @@ body {

.j-install-step-form {
padding: 30px 30px 10px; }
.j-install-step-form .btn-block + .btn-block {
margin-top: .5rem; }

.languageForm {
padding: 0 0 30px; }
Expand Down
2 changes: 1 addition & 1 deletion installation/template/css/template.css.map

Large diffs are not rendered by default.

42 changes: 22 additions & 20 deletions installation/template/js/remove.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
// Init on dom content loaded event
var url = Joomla.getOptions('system.installation').url ? Joomla.getOptions('system.installation').url.replace(/&amp;/g, '&') : 'index.php';

if (document.getElementById('step1')) {
document.getElementById('step1').addEventListener('click', function(e) {
e.preventDefault();
if (document.getElementById('installStep2')) {
document.getElementById('installStep2').removeAttribute('hidden');
document.getElementById('installStep2').classList.add('active');
document.getElementById('step1').parentNode.removeChild(document.getElementById('step1'));

document.getElementById('installStep2').scrollIntoView();
}
if (document.getElementById('installAddFeatures')) {
document.getElementById('installAddFeatures').addEventListener('click', function(e) {
document.getElementById('installLanguages').classList.add('active');
document.getElementById('installCongrat').classList.remove('active');
document.getElementById('installRecommended').classList.remove('active');
})
}

if (document.getElementById('step2')) {
document.getElementById('step2').addEventListener('click', function(e) {
// e.preventDefault();
if (document.getElementById('installStep3')) {
document.getElementById('installStep3').removeAttribute('hidden');
document.getElementById('installStep3').classList.add('active');
document.getElementById('step2').parentNode.removeChild(document.getElementById('step2'))
if (document.getElementById('skipLanguages')) {
document.getElementById('skipLanguages').addEventListener('click', function(e) {
document.getElementById('installSampleData').classList.add('active');
document.getElementById('installLanguages').classList.remove('active');
})
}

document.getElementById('installStep3').scrollIntoView();
}
});
if (document.getElementById('installSampleData')) {
document.getElementById('installSampleData').addEventListener('click', function(e) {
document.getElementById('installLanguages').classList.add('active');
document.getElementById('installSampleData').classList.remove('active');
})
}

if (document.getElementById('skipSampleData')) {
document.getElementById('skipSampleData').addEventListener('click', function(e) {
document.getElementById('installFinal').classList.add('active');
document.getElementById('installSampleData').classList.remove('active');
})
}
3 changes: 3 additions & 0 deletions installation/template/scss/template.scss
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ body {

.j-install-step-form {
padding: 30px 30px 10px;
.btn-block + .btn-block {
margin-top: .5rem;
}
}


Expand Down
Loading

0 comments on commit 727401a

Please sign in to comment.