Skip to content

Commit 5e64b91

Browse files
condor2condor2
committed
Installer Step3 updated
1 parent 6d5fced commit 5e64b91

File tree

3 files changed

+47
-42
lines changed

3 files changed

+47
-42
lines changed

‎upload/install/controller/install/step_3.php

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public function index(): void {
136136

137137
$data['text_step_3'] = $this->language->get('text_step_3');
138138
$data['text_db_connection'] = $this->language->get('text_db_connection');
139+
$data['text_db_advanced'] = $this->language->get('text_db_advanced');
139140
$data['text_db_administration'] = $this->language->get('text_db_administration');
140141
$data['text_mysqli'] = $this->language->get('text_mysqli');
141142
$data['text_mpdo'] = $this->language->get('text_mpdo');

‎upload/install/language/en-gb/install/step_3.php

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Text
66
$_['text_step_3'] = 'Enter your database and administration details';
77
$_['text_db_connection'] = '1. Please enter your database connection details.';
8+
$_['text_db_advanced'] = 'Advanced DB Settings';
89
$_['text_db_administration'] = '2. Please enter a username and password for the administration.';
910
$_['text_mysqli'] = 'MySQLi';
1011
$_['text_pdo'] = 'mPDO';

‎upload/install/view/template/install/step_3.tpl

+45-42
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<div class="col-sm-9">
2222
<form action="<?php echo $action; ?>" method="post" enctype="multipart/form-data" class="form-horizontal">
2323
<p><?php echo $text_db_connection; ?></p>
24+
2425
<fieldset>
2526
<div class="form-group">
2627
<label class="col-sm-2 control-label" for="input-db-driver"><?php echo $entry_db_driver; ?></label>
@@ -63,47 +64,6 @@
6364
<input type="password" name="db_password" value="<?php echo $db_password; ?>" id="input-db-password" class="form-control" />
6465
</div>
6566
</div>
66-
<div class="row">
67-
<div class="col-md-12">
68-
<div class="panel-group" id="db-advanced">
69-
<div class="panel panel-default">
70-
<div class="panel-heading">
71-
<h4 class="panel-title">
72-
<a data-toggle="collapse" href="#db-advanced-collapse">
73-
<?php echo $entry_db_advanced; ?>
74-
<span class="glyphicon glyphicon-menu-down pull-right"></span>
75-
</a>
76-
</h4>
77-
</div>
78-
<div id="db-advanced-collapse" class="panel-collapse collapse">
79-
<div class="panel-body">
80-
<div class="alert alert-info alert-dismissible">
81-
<?php echo $entry_db_ssl_info; ?>
82-
</div>
83-
<div class="row">
84-
<div class="col-md-12">
85-
<label for="input-db-ssl-key" class="form-label"><?php echo $entry_db_ssl_key; ?></label>
86-
<textarea name="db_ssl_key" id="input-db-ssl-key" class="form-control"><?php echo $db_ssl_key; ?></textarea>
87-
</div>
88-
</div>
89-
<div class="row">
90-
<div class="col-md-12">
91-
<label for="input-db-ssl-cert" class="form-label"><?php echo $entry_db_ssl_cert; ?></label>
92-
<textarea name="db_ssl_cert" id="input-db-ssl-cert" class="form-control"><?php echo $db_ssl_cert; ?></textarea>
93-
</div>
94-
</div>
95-
<div class="row">
96-
<div class="col-md-12">
97-
<label for="input-db-ssl-ca" class="form-label"><?php echo $entry_db_ssl_ca; ?></label>
98-
<textarea name="db_ssl_ca" id="input-db-ssl-ca" class="form-control"><?php echo $db_ssl_ca; ?></textarea>
99-
</div>
100-
</div>
101-
</div>
102-
</div>
103-
</div>
104-
</div>
105-
</div>
106-
</div>
10767
<div class="form-group required">
10868
<label class="col-sm-2 control-label" for="input-db-database"><?php echo $entry_db_database; ?></label>
10969
<div class="col-sm-10">
@@ -131,7 +91,50 @@
13191
<?php } ?>
13292
</div>
13393
</div>
94+
<div class="form-group">
95+
<label class="col-sm-2 control-label" for="input-db-advanced"><?php echo $entry_db_advanced; ?></label>
96+
<div class="col-sm-2">
97+
<div class="checkbox">
98+
<label>
99+
<input type="hidden" name="advanced" value="0"/>
100+
<input type="checkbox" name="advanced" value="1" data-toggle="collapse" data-target="#collapse-advanced">
101+
</label>
102+
</div>
103+
</div>
104+
</div>
134105
</fieldset>
106+
<div class="row">
107+
<div class="col-sm-12">
108+
<div class="panel-group" id="db-advanced">
109+
<div id="collapse-advanced" class="collapse">
110+
<p><?php echo $text_db_advanced; ?></p>
111+
<div class="alert alert-info">
112+
<?php echo $entry_db_ssl_info; ?>
113+
</div>
114+
<fieldset>
115+
<div class="form-group">
116+
<div class="col-sm-12">
117+
<label class="control-label" for="input-db-ssl-key"><?php echo $entry_db_ssl_key; ?></label>
118+
<textarea class="form-control" name="db_ssl_key" id="input-db-ssl-key"><?php echo $db_ssl_key; ?></textarea>
119+
</div>
120+
</div>
121+
<div class="form-group">
122+
<div class="col-sm-12">
123+
<label class="control-label" for="input-db-ssl-cert"><?php echo $entry_db_ssl_cert; ?></label>
124+
<textarea class="form-control" name="db_ssl_cert" id="input-db-ssl-cert"><?php echo $db_ssl_cert; ?></textarea>
125+
</div>
126+
</div>
127+
<div class="form-group">
128+
<div class="col-sm-12">
129+
<label class="control-label" for="input-db-ssl-ca"><?php echo $entry_db_ssl_ca; ?></label>
130+
<textarea class="form-control" name="db_ssl_ca" id="input-db-ssl-ca"><?php echo $db_ssl_ca; ?></textarea>
131+
</div>
132+
</div>
133+
</fieldset>
134+
</div>
135+
</div>
136+
</div>
137+
</div>
135138
<p><?php echo $text_db_administration; ?></p>
136139
<fieldset>
137140
<div class="form-group required">
@@ -173,4 +176,4 @@
173176
<div class="col-sm-3"><?php echo $column_left; ?></div>
174177
</div>
175178
</div>
176-
<?php echo $footer; ?>
179+
<?php echo $footer; ?>

0 commit comments

Comments
 (0)