From 04d953747aa4ca0fcfba99f9ef117df6e696717c Mon Sep 17 00:00:00 2001 From: fredtempez Date: Fri, 4 Feb 2022 08:45:58 +0100 Subject: [PATCH] petites modifs ergonomie --- core/module/plugin/plugin.php | 6 ++--- core/module/plugin/view/index/index.php | 32 ++++++++++++++++++------- core/module/plugin/view/store/store.php | 9 +------ 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/core/module/plugin/plugin.php b/core/module/plugin/plugin.php index 5156254f..436d3e37 100644 --- a/core/module/plugin/plugin.php +++ b/core/module/plugin/plugin.php @@ -226,7 +226,7 @@ class plugin extends common { $state = $this->install(self::FILE_DIR.'source/'.$zipFilename, $checkValidMaj); } $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(), + 'redirect' => helper::baseUrl() . 'plugin', 'notification' => $state['notification'], 'state' => $state['success'] ]); @@ -310,7 +310,7 @@ class plugin extends common { // Module non installé $ico = template::ico('download'); $class = ''; - $help = 'Installer le module'; + $help = 'Télécharger le module'; // Le module est installé if (array_key_exists($key,$infoModules) === true) { $class = 'buttonGreen'; @@ -494,7 +494,7 @@ class plugin extends common { // Valeurs en sortie $this->addOutput([ - 'title' => 'Gestion des modules installés', + 'title' => 'Gestion des modules', 'view' => 'index' ]); } diff --git a/core/module/plugin/view/index/index.php b/core/module/plugin/view/index/index.php index 16c83659..24ca3fe7 100644 --- a/core/module/plugin/view/index/index.php +++ b/core/module/plugin/view/index/index.php @@ -15,13 +15,6 @@ 'help' => 'Consulter l\'aide en ligne' ]); ?> -
- helper::baseUrl() . 'plugin/store', - 'value' => template::ico('shopping-basket'), - "help" => 'Catalogue de modules en ligne' - ]); ?> -
@@ -41,6 +34,27 @@
+
+
+
+

Installation / mise à jour d'un module

+
+
+ helper::baseUrl() . 'plugin/store', + 'value' => template::ico('shopping-basket') . ' Catalogue en ligne' + ]); ?> +
+
+ helper::baseUrl() . 'plugin/upload', + 'value' => template::ico('upload') . ' Depuis une archive ZIP' + ]); ?> +
+
+
+
+
@@ -69,7 +83,7 @@
-

Données des modules installés

+

Modules configurés

- +
diff --git a/core/module/plugin/view/store/store.php b/core/module/plugin/view/store/store.php index 9aabc4a0..f06bf536 100644 --- a/core/module/plugin/view/store/store.php +++ b/core/module/plugin/view/store/store.php @@ -6,16 +6,9 @@ 'value' => template::ico('left') ]); ?>
-
- helper::baseUrl() . 'plugin/upload', - 'value' => template::ico('plus'), - "help" => 'Importer depuis une archive ZIP' - ]); ?> -
- + \ No newline at end of file