Skip to content

Commit

Permalink
1 col
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgrammatiko
dgrammatiko committed May 30, 2017
1 parent 9e85f1c commit a5213d6
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 13 deletions.
1 change: 1 addition & 0 deletions installation/model/forms/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
class="form-control"
label="INSTL_DATABASE_NAME_LABEL"
required="true"
default="joomla_db"
/>
</fieldset>

Expand Down
55 changes: 42 additions & 13 deletions installation/view/site/tmpl/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@

/* @var InstallationViewDefault $this */
?>
<!--
<div class="btn-toolbar justify-content-end">
<div class="btn-group">
<a href="#" class="btn btn-primary" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNEXT'); ?>"><span class="fa fa-arrow-right icon-white"></span> <?php echo JText::_('JNEXT'); ?></a>
</div>
</div>
--->
<form action="index.php" method="post" id="languageForm">
<div class="form-group">
<label for="jform_language"><?php echo JText::_('INSTL_SELECT_LANGUAGE_TITLE'); ?></label>
Expand All @@ -25,117 +27,144 @@
<input type="hidden" name="format" value="json">
<?php echo JHtml::_('form.token'); ?>
</form>


<form action="index.php" method="post" id="adminForm" class="form-validate">
<h3><?php echo JText::_('INSTL_SITE'); ?></h3>
<hr>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<?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 class="form-group">
</div>
<!-- <div class="form-group">
<?php echo $this->form->getLabel('site_metadesc'); ?>
<?php echo $this->form->getInput('site_metadesc'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_SITE_METADESC_TITLE_LABEL'); ?></p>
</div>

<div class="form-group">
<?php echo $this->form->getLabel('site_offline'); ?>
<?php echo $this->form->getInput('site_offline'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_SITE_OFFLINE_TITLE_LABEL'); ?></p>
</div>
-->
<div class="row">
<div class="form-group">
<?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 class="col-md-6">
</div>
<div class="row">
<div class="form-group">
<?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>
<div class="form-group">
<?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 class="row">
<div class="form-group">
<?php echo $this->form->getLabel('admin_password'); ?>
<?php // Disables autocomplete ?> <input type="password" style="display:none">
<?php echo $this->form->getInput('admin_password'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_PASSWORD_DESC'); ?></p>
</div>
</div>
<!--
<div class="form-group">
<?php echo $this->form->getLabel('admin_password2'); ?>
<?php // Disables autocomplete ?> <input type="password" style="display:none">
<?php echo $this->form->getInput('admin_password2'); ?>
</div>
</div>
-->
</div>
<!--
<div class="btn-toolbar justify-content-end">
<div class="btn-group">
<a href="#" class="btn btn-primary" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNEXT'); ?>"><span class="fa fa-arrow-right icon-white"></span> <?php echo JText::_('JNEXT'); ?></a>
</div>
</div>
-->
<input type="hidden" name="task" value="site">
<input type="hidden" name="format" value="json">
<?php echo JHtml::_('form.token'); ?>
</form>
<form action="index.php" method="post" id="adminForm" class="form-validate">
<!--
<div class="btn-toolbar justify-content-end">
<div class="btn-group">
<a class="btn btn-secondary" href="#" onclick="return Install.goToPage('site');" rel="prev" title="<?php echo JText::_('JPREVIOUS'); ?>"><span class="fa fa-arrow-left"></span> <?php echo JText::_('JPREVIOUS'); ?></a>
<a class="btn btn-primary" href="#" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNEXT'); ?>"><span class="fa fa-arrow-right icon-white"></span> <?php echo JText::_('JNEXT'); ?></a>
</div>
</div>
-->
<h3><?php echo JText::_('INSTL_DATABASE'); ?></h3>
<hr>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<?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 class="row">
<div class="form-group">
<?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 class="row">
<div class="form-group">
<?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="row">
<div class="form-group">
<?php echo $this->form->getLabel('db_pass'); ?>
<?php // Disables autocomplete ?> <input type="password" style="display:none">
<?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="row">
<div class="form-group">
<?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-6">
</div>
<!--
<div class="row">
<div class="form-group">
<?php echo $this->form->getLabel('db_prefix'); ?>
<?php echo $this->form->getInput('db_prefix'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_PREFIX_DESC'); ?></p>
</div>
</div>

<div class="row">
<div class="form-group">
<?php echo $this->form->getLabel('db_old'); ?>
<?php echo $this->form->getInput('db_old'); ?>
<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_OLD_PROCESS_DESC'); ?></p>
</div>
</div>
</div>
-->
</div>
<!--
<div class="btn-toolbar justify-content-end">
<div class="btn-group">
<a class="btn btn-secondary" href="#" onclick="return Install.goToPage('site');" rel="prev" title="<?php echo JText::_('JPREVIOUS'); ?>"><span class="fa fa-arrow-left"></span> <?php echo JText::_('JPREVIOUS'); ?></a>
<a class="btn btn-primary" href="#" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNEXT'); ?>"><span class="fa fa-arrow-right icon-white"></span> <?php echo JText::_('JNEXT'); ?></a>
</div>
</div>
-->
<input type="hidden" name="task" value="database">
<input type="hidden" name="format" value="json">
<?php echo JHtml::_('form.token'); ?>
Expand Down

0 comments on commit a5213d6

Please sign in to comment.