From 299f11bfd1d8ebfe979d7034c23f028be66bf18d Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Wed, 21 Sep 2022 13:52:42 +0200
Subject: [PATCH] =?UTF-8?q?Install=20supprimer=20l'accord=C3=A9on=20pour?=
 =?UTF-8?q?=20le=20compte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/install/view/index/index.php | 184 +++++++++++------------
 1 file changed, 87 insertions(+), 97 deletions(-)

diff --git a/core/module/install/view/index/index.php b/core/module/install/view/index/index.php
index f6614ad7..6c1b4010 100644
--- a/core/module/install/view/index/index.php
+++ b/core/module/install/view/index/index.php
@@ -2,110 +2,100 @@
 	<?php echo template::topic('Renseignez les champs ci-dessous pour finaliser l\'installation.'); ?>
 </p>
 <?php echo template::formOpen('installForm'); ?>
-	<div class="installStep1">
-		<div class="row">
-			<div class="col12">
-			</div>
+<h3>
+	<?php echo template::topic('Compte administrateur'); ?>
+</h3>
+<div>
+	<div class="row">
+		<div class="col12">
+			<?php echo template::text('installId', [
+				'autocomplete' => 'off',
+				'label' => 'Identifiant'
+			]); ?>
 		</div>
 	</div>
-	<div class="installStep2">
-		<ul class="accordion" data-speed="150">
-			<li class="accordion-item active">
-				<h3 class="accordion-title">
-					<?php echo template::topic('Compte administrateur'); ?>
-				</h3>
-				<div class="accordion-content">
-					<div class="row">
-						<div class="col12">
-							<?php echo template::text('installId', [
-								'autocomplete' => 'off',
-								'label' => 'Identifiant'
-							]); ?>
-						</div>
+	<div class="row">
+		<div class="col6">
+			<?php echo template::password('installPassword', [
+				'autocomplete' => 'off',
+				'label' => 'Mot de passe'
+			]); ?>
+		</div>
+		<div class="col6">
+			<?php echo template::password('installConfirmPassword', [
+				'autocomplete' => 'off',
+				'label' => 'Confirmation'
+			]); ?>
+		</div>
+	</div>
+	<?php echo template::mail('installMail', [
+		'autocomplete' => 'off',
+		'label' => 'Adresse mail'
+	]); ?>
+	<div class="row">
+		<div class="col6">
+			<?php echo template::text('installFirstname', [
+				'autocomplete' => 'off',
+				'label' => 'Prénom'
+			]); ?>
+		</div>
+		<div class="col6">
+			<?php echo template::text('installLastname', [
+				'autocomplete' => 'off',
+				'label' => 'Nom'
+			]); ?>
+		</div>
+	</div>
+</div>		
+<ul class="accordion" data-speed="150">
+	<li class="accordion-item">
+		<h3 class="accordion-title">
+			<?php echo template::topic('&#9655; Options avancées'); ?>
+		</h3>
+		<div class="accordion-content">
+			<div class="row">
+				<div class="col12">
+					<?php echo template::checkbox('installDefaultData',true , 'Ne pas charger l\'exemple de site (utilisateurs avancés)', [
+						'checked' => false
+					]);
+					?>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col3">
+					<?php echo template::select('installProxyType', $module::$proxyType, [
+						'label' => 'Type de proxy',
+						'selected' => $this->getData(['config', 'proxyType'])
+						]); ?>
 					</div>
-					<div class="row">
-						<div class="col6">
-							<?php echo template::password('installPassword', [
-								'autocomplete' => 'off',
-								'label' => 'Mot de passe'
-							]); ?>
-						</div>
-						<div class="col6">
-							<?php echo template::password('installConfirmPassword', [
-								'autocomplete' => 'off',
-								'label' => 'Confirmation'
-							]); ?>
-						</div>
-					</div>
-					<?php echo template::mail('installMail', [
-						'autocomplete' => 'off',
-						'label' => 'Adresse mail'
+				<div  class="col6">
+					<?php echo template::text('installProxyUrl', [
+						'label' => 'Adresse du proxy',
+						'placeholder' => 'cache.proxy.fr'
 					]); ?>
-					<div class="row">
-						<div class="col6">
-							<?php echo template::text('installFirstname', [
-								'autocomplete' => 'off',
-								'label' => 'Prénom'
-							]); ?>
-						</div>
-						<div class="col6">
-							<?php echo template::text('installLastname', [
-								'autocomplete' => 'off',
-								'label' => 'Nom'
-							]); ?>
-						</div>
-					</div>
 				</div>
-			</li>
-			<li class="accordion-item">
-				<h3 class="accordion-title">
-					<?php echo template::topic('Options avancées'); ?>
-				</h3>
-				<div class="accordion-content">
-					<div class="row">
-						<div class="col12">
-							<?php echo template::checkbox('installDefaultData',true , 'Ne pas charger l\'exemple de site (utilisateurs avancés)', [
-								'checked' => false
-							]);
-							?>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col3">
-							<?php echo template::select('installProxyType', $module::$proxyType, [
-								'label' => 'Type de proxy',
-								'selected' => $this->getData(['config', 'proxyType'])
-								]); ?>
-							</div>
-						<div  class="col6">
-							<?php echo template::text('installProxyUrl', [
-								'label' => 'Adresse du proxy',
-								'placeholder' => 'cache.proxy.fr'
-							]); ?>
-						</div>
-						<div  class="col3">
-							<?php echo template::text('installProxyPort', [
-								'label' => 'Port du proxy',
-								'placeholder' => '6060'
-							]); ?>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col12">
-						<?php echo template::select('installTheme', $module::$themes, [
-								'label' => 'Thème'
-							]); ?>
-						</div>
-					</div>
+				<div  class="col3">
+					<?php echo template::text('installProxyPort', [
+						'label' => 'Port du proxy',
+						'placeholder' => '6060'
+					]); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col12">
+				<?php echo template::select('installTheme', $module::$themes, [
+						'label' => 'Thème'
+					]); ?>
 				</div>
-			</li>
-		</ul>
-		<div class="row">
-			<div class="col3 offset9">
-				<?php echo template::submit('installSubmit', [
-					'value' => 'Installer'
-				]); ?>
 			</div>
 		</div>
+	</li>
+</ul>
+<div class="row">
+	<div class="col3 offset9">
+		<?php echo template::submit('installSubmit', [
+			'value' => 'Installer'
+		]); ?>
 	</div>
+</div>
 <?php echo template::formClose(); ?>
\ No newline at end of file