Skip to content

Commit

Permalink
Split form
Browse files Browse the repository at this point in the history
  • Loading branch information
@ciar4n
ciar4n committed Jun 1, 2017
1 parent 14aa21c commit 97c32b4
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 61 deletions.
14 changes: 11 additions & 3 deletions installation/template/css/template.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3269,8 +3269,10 @@ tbody.collapse.show {

@media (min-width: 576px) {
.card-columns {
column-count: 3;
column-gap: 1.25rem; }
-moz-column-count: 3;
column-count: 3;
-moz-column-gap: 1.25rem;
column-gap: 1.25rem; }
.card-columns .card {
display: inline-block;
width: 100%;
Expand Down Expand Up @@ -8717,6 +8719,7 @@ form {
position: relative;
z-index: 1060;
padding-top: 100px;
padding-bottom: 80px;
margin-bottom: 100px;
background-color: #fff;
box-shadow: 0 0 80px rgba(0, 0, 0, 0.1), inset 0 7px 0 #e8e6e6; }
Expand Down Expand Up @@ -8868,4 +8871,9 @@ form {
line-height: 1; }

.hidden {
display: none; }
display: none; }

.install-step {
display: none; }
.install-step.active {
display: block; }
2 changes: 1 addition & 1 deletion installation/template/css/template.css.map
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions installation/template/scss/template.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ form {
position: relative;
z-index: 1060;
padding-top: 100px;
padding-bottom: 80px;
margin-bottom: 100px;
background-color: #fff;
box-shadow: 0 0 80px rgba(0,0,0,.1), inset 0 7px 0 #e8e6e6;
Expand Down Expand Up @@ -247,3 +248,10 @@ form {
.hidden {
display: none;
}

.install-step {
display: none;
&.active {
display: block;
}
}
126 changes: 69 additions & 57 deletions installation/view/site/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,71 +27,86 @@
<form action="index.php" method="post" id="adminForm" class="form-validate">
<div class="row">
<div class="col-md-11 col-lg-12 container">
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('site_name'); ?>
<?php echo $this->form->getInput('site_name'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_SITE_NAME_DESC'); ?></p>
<div id="installStep1" class="install-step active">
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('site_name'); ?>
<?php echo $this->form->getInput('site_name'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_SITE_NAME_DESC'); ?></p>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('admin_user'); ?>
<?php echo $this->form->getInput('admin_user'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_USER_DESC'); ?></p>
<div class="col-md-8 offset-md-2 justify-content-end d-flex">
<button class="btn btn-success" ?><?php echo JText::_('Next'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></button>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('admin_email'); ?>
<?php echo $this->form->getInput('admin_email'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_EMAIL_DESC'); ?></p>
<div id="installStep2" class="install-step">
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('admin_user'); ?>
<?php echo $this->form->getInput('admin_user'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_USER_DESC'); ?></p>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('admin_password'); ?>
<div class="input-group">
<?php echo $this->form->getInput('admin_password'); ?>
<span class="input-group-addon fa fa-eye"></span>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('admin_email'); ?>
<?php echo $this->form->getInput('admin_email'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_EMAIL_DESC'); ?></p>
</div>

<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_PASSWORD_DESC'); ?></p>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_type'); ?>
<?php echo $this->form->getInput('db_type'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_TYPE_DESC'); ?></p>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('admin_password'); ?>
<div class="input-group">
<?php echo $this->form->getInput('admin_password'); ?>
<span class="input-group-addon fa fa-eye"></span>
</div>

<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_PASSWORD_DESC'); ?></p>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_host'); ?>
<?php echo $this->form->getInput('db_host'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_HOST_DESC'); ?></p>
<div class="col-md-8 offset-md-2 justify-content-end d-flex">
<button class="btn btn-success" ?><?php echo JText::_('Next'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></button>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_user'); ?>
<?php echo $this->form->getInput('db_user'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_USER_DESC'); ?></p>
<div id="installStep3" class="install-step">
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_type'); ?>
<?php echo $this->form->getInput('db_type'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_TYPE_DESC'); ?></p>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_pass'); ?>
<?php echo $this->form->getInput('db_pass'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_PASSWORD_DESC'); ?></p>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_host'); ?>
<?php echo $this->form->getInput('db_host'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_HOST_DESC'); ?></p>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_name'); ?>
<?php echo $this->form->getInput('db_name'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_NAME_DESC'); ?></p>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_user'); ?>
<?php echo $this->form->getInput('db_user'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_USER_DESC'); ?></p>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_pass'); ?>
<?php echo $this->form->getInput('db_pass'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_PASSWORD_DESC'); ?></p>
</div>
</div>
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<?php echo $this->form->getLabel('db_name'); ?>
<?php echo $this->form->getInput('db_name'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_NAME_DESC'); ?></p>
</div>
</div>
<div class="col-md-8 offset-md-2 justify-content-end d-flex">
<button class="btn btn-success" onclick="Joomla.checkInputs()" ?><?php echo JText::_('Install'); ?> <span class="fa fa-chevron-right" aria-hidden="true"></span></button>
</div>
</div>
</div>
Expand All @@ -106,9 +121,6 @@
</div>
</div>
</div>
<div class="btn-toolbar justify-content-end">
<a class="btn btn-success" href="#" onclick="Joomla.checkInputs()"> <?php echo JText::_('Install'); ?></a>
</div>

<input type="hidden" name="admin_password2" id="jform_admin_password2">
<input type="hidden" name="task" value="site">
Expand Down

0 comments on commit 97c32b4

Please sign in to comment.