diff --git a/core/core.php b/core/core.php index db18c31c..bc8e5f4d 100644 --- a/core/core.php +++ b/core/core.php @@ -45,7 +45,7 @@ class common { // Numéro de version const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; - const ZWII_VERSION = '11.3.04'; + const ZWII_VERSION = '11.4.00'; const ZWII_UPDATE_CHANNEL = "v11"; public static $actions = []; diff --git a/core/module/theme/view/fontEdit/fontEdit.js.php b/core/module/theme/view/fontEdit/fontEdit.js.php index dda81719..d702e658 100644 --- a/core/module/theme/view/fontEdit/fontEdit.js.php +++ b/core/module/theme/view/fontEdit/fontEdit.js.php @@ -10,3 +10,35 @@ */ +/** + * Option par défaut du sélecteur de mode + */ + $(document).ready(function(){ + $('input[name=fontEditFontImported]').prop('checked', true); + $('input[name=fontEditFontUrl]').prop('checked', false); + $('#containerfontEditFile').hide(); +}); + + +/** + * Mode téléchargement en ligne de la fonte ou installation locale + */ +$("input[name=fontEditFontImported]").on("click", function() { + if( $('input[name=fontEditFontImported]').is(':checked') ){ + $('input[name=fontEditFontFile]').prop('checked', false); + } else { + $('input[name=fontEditFontFile]').prop('checked', true); + } + $('#containerfontEditFile').hide(); + $('#containerfontEditUrl').show(); +}); + +$("input[name=fontEditFontFile]").on("click", function() { + if( $('input[name=fontEditFontFile]').is(':checked') ){ + $('input[name=fontEditFontImported]').prop('checked', false); + } else { + $('input[name=fontEditFontImported]').prop('checked', true); + } + $('#containerfontEditFile').show(); + $('#containerfontEditUrl').hide(); +}); diff --git a/core/module/theme/view/fontEdit/fontEdit.php b/core/module/theme/view/fontEdit/fontEdit.php index d6a1d2a9..33fec58c 100644 --- a/core/module/theme/view/fontEdit/fontEdit.php +++ b/core/module/theme/view/fontEdit/fontEdit.php @@ -30,19 +30,14 @@