Skip to content

Commit

Permalink
Installer Step3 updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@condor2
condor2 committed Jan 22, 2025
1 parent 6d5fced commit 5e64b91
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 42 deletions.
1 change: 1 addition & 0 deletions upload/install/controller/install/step_3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ public function index(): void {

$data['text_step_3'] = $this->language->get('text_step_3');
$data['text_db_connection'] = $this->language->get('text_db_connection');
$data['text_db_advanced'] = $this->language->get('text_db_advanced');
$data['text_db_administration'] = $this->language->get('text_db_administration');
$data['text_mysqli'] = $this->language->get('text_mysqli');
$data['text_mpdo'] = $this->language->get('text_mpdo');
Expand Down
1 change: 1 addition & 0 deletions upload/install/language/en-gb/install/step_3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Text
$_['text_step_3'] = 'Enter your database and administration details';
$_['text_db_connection'] = '1. Please enter your database connection details.';
$_['text_db_advanced'] = 'Advanced DB Settings';
$_['text_db_administration'] = '2. Please enter a username and password for the administration.';
$_['text_mysqli'] = 'MySQLi';
$_['text_pdo'] = 'mPDO';
Expand Down
87 changes: 45 additions & 42 deletions upload/install/view/template/install/step_3.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<div class="col-sm-9">
<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data" class="form-horizontal">
<p><?php echo $text_db_connection; ?></p>

<fieldset>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-db-driver"><?php echo $entry_db_driver; ?></label>
Expand Down Expand Up @@ -63,47 +64,6 @@
<input type="password" name="db_password" value="<?php echo $db_password; ?>" id="input-db-password" class="form-control" />
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="panel-group" id="db-advanced">
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" href="#db-advanced-collapse">
<?php echo $entry_db_advanced; ?>
<span class="glyphicon glyphicon-menu-down pull-right"></span>
</a>
</h4>
</div>
<div id="db-advanced-collapse" class="panel-collapse collapse">
<div class="panel-body">
<div class="alert alert-info alert-dismissible">
<?php echo $entry_db_ssl_info; ?>
</div>
<div class="row">
<div class="col-md-12">
<label for="input-db-ssl-key" class="form-label"><?php echo $entry_db_ssl_key; ?></label>
<textarea name="db_ssl_key" id="input-db-ssl-key" class="form-control"><?php echo $db_ssl_key; ?></textarea>
</div>
</div>
<div class="row">
<div class="col-md-12">
<label for="input-db-ssl-cert" class="form-label"><?php echo $entry_db_ssl_cert; ?></label>
<textarea name="db_ssl_cert" id="input-db-ssl-cert" class="form-control"><?php echo $db_ssl_cert; ?></textarea>
</div>
</div>
<div class="row">
<div class="col-md-12">
<label for="input-db-ssl-ca" class="form-label"><?php echo $entry_db_ssl_ca; ?></label>
<textarea name="db_ssl_ca" id="input-db-ssl-ca" class="form-control"><?php echo $db_ssl_ca; ?></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group required">
<label class="col-sm-2 control-label" for="input-db-database"><?php echo $entry_db_database; ?></label>
<div class="col-sm-10">
Expand Down Expand Up @@ -131,7 +91,50 @@
<?php } ?>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="input-db-advanced"><?php echo $entry_db_advanced; ?></label>
<div class="col-sm-2">
<div class="checkbox">
<label>
<input type="hidden" name="advanced" value="0"/>
<input type="checkbox" name="advanced" value="1" data-toggle="collapse" data-target="#collapse-advanced">
</label>
</div>
</div>
</div>
</fieldset>
<div class="row">
<div class="col-sm-12">
<div class="panel-group" id="db-advanced">
<div id="collapse-advanced" class="collapse">
<p><?php echo $text_db_advanced; ?></p>
<div class="alert alert-info">
<?php echo $entry_db_ssl_info; ?>
</div>
<fieldset>
<div class="form-group">
<div class="col-sm-12">
<label class="control-label" for="input-db-ssl-key"><?php echo $entry_db_ssl_key; ?></label>
<textarea class="form-control" name="db_ssl_key" id="input-db-ssl-key"><?php echo $db_ssl_key; ?></textarea>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<label class="control-label" for="input-db-ssl-cert"><?php echo $entry_db_ssl_cert; ?></label>
<textarea class="form-control" name="db_ssl_cert" id="input-db-ssl-cert"><?php echo $db_ssl_cert; ?></textarea>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<label class="control-label" for="input-db-ssl-ca"><?php echo $entry_db_ssl_ca; ?></label>
<textarea class="form-control" name="db_ssl_ca" id="input-db-ssl-ca"><?php echo $db_ssl_ca; ?></textarea>
</div>
</div>
</fieldset>
</div>
</div>
</div>
</div>
<p><?php echo $text_db_administration; ?></p>
<fieldset>
<div class="form-group required">
Expand Down Expand Up @@ -173,4 +176,4 @@
<div class="col-sm-3"><?php echo $column_left; ?></div>
</div>
</div>
<?php echo $footer; ?>
<?php echo $footer; ?>

0 comments on commit 5e64b91

Please sign in to comment.