From 5848941062462602b791ae6d6b7211f331086038 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Fri, 20 Aug 2021 07:03:08 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20des=20modules?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/addon/addon.php              |  2 +-
 core/module/addon/view/index/index.php   | 10 ++------
 core/module/addon/view/store/store.php   |  2 +-
 core/module/addon/view/upload/upload.php | 31 ++++++++++++++++++------
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php
index 2793cc41..ff8c05a7 100644
--- a/core/module/addon/addon.php
+++ b/core/module/addon/addon.php
@@ -395,7 +395,7 @@ class addon extends common {
 
 		// Valeurs en sortie
 		$this->addOutput([
-			'title' => 'Modules installés',
+			'title' => 'Gestion des modules',
 			'view' => 'index'
 		]);
 	}
diff --git a/core/module/addon/view/index/index.php b/core/module/addon/view/index/index.php
index 5b868422..55854804 100644
--- a/core/module/addon/view/index/index.php
+++ b/core/module/addon/view/index/index.php
@@ -14,16 +14,10 @@
 			'value' => 'Aide'
 		]); ?>
 	</div>
-	<div class="col3 offset2">
+	<div class="col2 offset6">
 		<?php echo template::button('configStoreUpload', [
 			'href' => helper::baseUrl() . 'addon/upload',
-			'value' => 'Téléverser un module'
-		]); ?>
-	</div>
-	<div class="col3">
-		<?php echo template::button('configModulesStore', [
-			'href' => helper::baseUrl() . 'addon/store',
-			'value' => 'Catalogue en ligne'
+			'value' => 'Installer un module'
 		]); ?>
 	</div>
 </div>
diff --git a/core/module/addon/view/store/store.php b/core/module/addon/view/store/store.php
index 803f5712..5ed010b6 100644
--- a/core/module/addon/view/store/store.php
+++ b/core/module/addon/view/store/store.php
@@ -2,7 +2,7 @@
 	<div class="col2">
 		<?php echo template::button('configStoreBack', [
 			'class' => 'buttonGrey',
-			'href' => helper::baseUrl() . 'addon',
+			'href' => helper::baseUrl() . 'addon/upload',
 			'ico' => 'left',
 			'value' => 'Retour'
 		]); ?>
diff --git a/core/module/addon/view/upload/upload.php b/core/module/addon/view/upload/upload.php
index 5fcd7cdc..288d77f4 100644
--- a/core/module/addon/view/upload/upload.php
+++ b/core/module/addon/view/upload/upload.php
@@ -15,21 +15,30 @@
           'value' => 'Aide'
         ]); ?>
       </div>
-      <div class="col2 offset6">
-          <?php echo template::submit('configModulesSubmit',[
-              'value' => 'Valider',
-              'ico' => 'check'
-          ]); ?>
-      </div>
   </div>
   <!-- Aide à propos de la gestion des modules, view upload -->
   <div class="helpDisplayContent">
     <?php echo file_get_contents( 'core/module/addon/view/upload/upload.help.html') ;?>
+  </div>
+  <div class="row">
+    <div class="col12">
+      <div class="block">
+        <h4>Télécharger un module du catalogue en ligne </h4>
+          <div class="row">
+            <div class="col4 offset4">
+                <?php echo template::button('configModulesStore', [
+                    'href' => helper::baseUrl() . 'addon/store',
+                    'value' => 'Catalogue en ligne'
+                  ]); ?>
+            </div>
+          </div>
+        </div>
+    </div>
   </div>
 	<div class="row">
 		<div class="col12">
 			<div class="block">
-			<h4>Installer ou mettre à jour un module </h4>
+			<h4>Installer ou mettre à jour un module téléchargé </h4>
 				<div class="row">
 					<div class="col6 offset3">
 						<?php echo template::file('configModulesInstallation', [
@@ -39,12 +48,18 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col6">
+					<div class="col4 offset3">
 						<?php echo template::checkbox('configModulesCheck', true, 'Mise à jour forcée', [
 								'checked' => false,
 								'help' => 'Permet de forcer une mise à jour même si la version du module est inférieure ou égale à celle du module installé.',
 							]); ?>
 					</div>
+          <div class="col2">
+            <?php echo template::submit('configModulesSubmit',[
+                'value' => 'Valider',
+                'ico' => 'check'
+            ]); ?>
+      </div>
 				</div>
 			</div>
 		</div>