diff --git a/core/class/template.class.php b/core/class/template.class.php index edf63be..c57a4ee 100644 --- a/core/class/template.class.php +++ b/core/class/template.class.php @@ -611,7 +611,7 @@ class template { 'ico' => 'check', 'id' => $nameId, 'name' => $nameId, - 'uniqueSubmission' => false, //true avant 9.1.08 + 'uniqueSubmission' => false, 'value' => 'Enregistrer' ], $attributes); // Retourne le html diff --git a/core/module/theme/lang/en/lex_theme.php b/core/module/theme/lang/en/lex_theme.php index fcc1cc2..a6ab379 100644 --- a/core/module/theme/lang/en/lex_theme.php +++ b/core/module/theme/lang/en/lex_theme.php @@ -199,6 +199,7 @@ $text['core_theme_view']['manage'][11] = 'Download theme'; $text['core_theme_view']['manage'][12] = 'Site theme'; $text['core_theme_view']['manage'][13] = 'Administration theme'; $text['core_theme_view']['manage'][14] = "Are you sure you want to reset the site theme to its original state ?"; +$text['core_theme_view']['manage'][15] = "Your custom.css file will be overwritten, you will be able to find it in the automatic backup that will be created, continue?"; $text['core_theme_view']['menu'][0] = 'Back'; $text['core_theme_view']['menu'][1] = 'Help'; $text['core_theme_view']['menu'][2] = 'Save'; diff --git a/core/module/theme/lang/fr/lex_theme.php b/core/module/theme/lang/fr/lex_theme.php index b57388d..b437f43 100644 --- a/core/module/theme/lang/fr/lex_theme.php +++ b/core/module/theme/lang/fr/lex_theme.php @@ -199,6 +199,7 @@ $text['core_theme_view']['manage'][11] = 'Télécharger le thème'; $text['core_theme_view']['manage'][12] = 'Thème du site'; $text['core_theme_view']['manage'][13] = 'Thème de l\'administration'; $text['core_theme_view']['manage'][14] = "Êtes-vous sûr de vouloir réinitialiser à son état d\'origine le thème du site ?"; +$text['core_theme_view']['manage'][15] = "Votre fichier custom.css va être écrasé, vous pourrez le retrouver dans la sauvegarde automatique qui va être créée, continuez ?"; $text['core_theme_view']['menu'][0] = 'Retour'; $text['core_theme_view']['menu'][1] = 'Aide'; $text['core_theme_view']['menu'][2] = 'Enregistrer'; diff --git a/core/module/theme/view/manage/manage.js.php b/core/module/theme/view/manage/manage.js.php index 0b66d42..764f88d 100644 --- a/core/module/theme/view/manage/manage.js.php +++ b/core/module/theme/view/manage/manage.js.php @@ -22,4 +22,13 @@ $("#configManageReset").on("click", function() { return core.confirm(textConfirm, function() { $(location).attr("href", _this.attr("href")); }); +}); + +/** + * Confirmation de changement de thème + */ +$("#themeImportSubmit").on("click", function() { + return core.confirm(textConfirm2, function() { + $('#themeManageForm').submit(); + }); }); \ No newline at end of file diff --git a/core/module/theme/view/manage/manage.php b/core/module/theme/view/manage/manage.php index aa686d1..04055e2 100644 --- a/core/module/theme/view/manage/manage.php +++ b/core/module/theme/view/manage/manage.php @@ -98,4 +98,5 @@ echo template::formOpen('themeManageForm'); ?>