ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

url cdnfonts en https

This commit is contained in:
Fred Tempez 2022-02-17 15:23:18 +01:00
parent c6c9aad4d4
commit 57d15fc646
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -2,8 +2,9 @@
## Version 11.3.01 ## Version 11.3.01
### Correction : ### Corrections :
- Gestionnaire de fichier, chevauchement d'icônes en multi sélection et aides non traduites. - Gestionnaire de fichier, chevauchement d'icônes en multi sélection et aides non traduites.
- Fontes : utilisation d'une adresse d'import de fonte HTTPS
## Version 11.3.00 ## Version 11.3.00

4
core/core.php
View File

@ -2324,7 +2324,7 @@ class core extends common {
*/ */
foreach ($fonts as $fontId) { foreach ($fonts as $fontId) {
if (!array_key_exists($fontId, $localFonts) ) { if (!array_key_exists($fontId, $localFonts) ) {
$css .= '@import url("http://fonts.cdnfonts.com/css/' . $fontId . '");'; $css .= '@import url("https://fonts.cdnfonts.com/css/' . $fontId . '");';
// Supprimer l'élément des fontes chargées en ligne // Supprimer l'élément des fontes chargées en ligne
unset($fonts[$fontId]); unset($fonts[$fontId]);
} }
@ -2550,7 +2550,7 @@ class core extends common {
*/ */
foreach ($fonts as $fontId) { foreach ($fonts as $fontId) {
if (!array_key_exists($fontId, $localFonts) ) { if (!array_key_exists($fontId, $localFonts) ) {
$css .= '@import url("http://fonts.cdnfonts.com/css/' . $fontId . '");'; $css .= '@import url("https://fonts.cdnfonts.com/css/' . $fontId . '");';
// Supprimer l'élément des fontes chargées en ligne // Supprimer l'élément des fontes chargées en ligne
unset($fonts[$fontId]); unset($fonts[$fontId]);
} }

4
core/module/theme/view/admin/admin.js.php
View File

@ -17,8 +17,8 @@ $("input, select").on("change", function() {
var titleFont = $("#adminFontTitle").val(); var titleFont = $("#adminFontTitle").val();
var textFont = $("#adminFontText").val(); var textFont = $("#adminFontText").val();
var css = "@import url('http://fonts.cdnfonts.com/css/" + titleFont + "');"; var css = "@import url('https://fonts.cdnfonts.com/css/" + titleFont + "');";
var css = "@import url('http://fonts.cdnfonts.com/css/" + textFont + "');"; var css = "@import url('https://fonts.cdnfonts.com/css/" + textFont + "');";
var colors = core.colorVariants($("#adminBackgroundColor").val()); var colors = core.colorVariants($("#adminBackgroundColor").val());
var css = "#site{background-color:" + colors.normal + ";}"; var css = "#site{background-color:" + colors.normal + ";}";
css += "body, .row > div {font:" + $("#adminFontTextSize").val() + " '" + textFont + "', sans-serif;}"; css += "body, .row > div {font:" + $("#adminFontTextSize").val() + " '" + textFont + "', sans-serif;}";

2
core/module/theme/view/fonts/fonts copy.php
View File

@ -5,7 +5,7 @@ $doc->loadHTMLFile($filefont, LIBXML_NOERROR);
$elements = $doc->getElementsByTagName('i'); $elements = $doc->getElementsByTagName('i');
var_dump ($elements); var_dump ($elements);
foreach($elements as $element) { foreach($elements as $element) {
if ($element->$textContent === 'http://fonts.cdnfonts.com/css/sketched') { if ($element->$textContent === 'https://fonts.cdnfonts.com/css/sketched') {
var_dump( $element['textContent'] ); var_dump( $element['textContent'] );
} }
} }

2
core/module/theme/view/footer/footer.js.php
View File

@ -19,7 +19,7 @@ $("input, select").on("change", function() {
// Import des polices de caractères // Import des polices de caractères
var footerFont = $("#themeFooterFont :selected").val(); var footerFont = $("#themeFooterFont :selected").val();
var footerFontText = $("#themeFooterFont :selected").text(); var footerFontText = $("#themeFooterFont :selected").text();
var css = "@import url('http://fonts.cdnfonts.com/css/" + footerFont + "');"; var css = "@import url('https://fonts.cdnfonts.com/css/" + footerFont + "');";
// Couleurs du pied de page // Couleurs du pied de page
var colors = core.colorVariants($("#themeFooterBackgroundColor").val()); var colors = core.colorVariants($("#themeFooterBackgroundColor").val());
var textColor = $("#themeFooterTextColor").val(); var textColor = $("#themeFooterTextColor").val();

2
core/module/theme/view/header/header.js.php
View File

@ -82,7 +82,7 @@ $("input, select").on("change", function() {
// Import des polices de caractères // Import des polices de caractères
var headerFont = $("#themeHeaderFont :selected").val(); var headerFont = $("#themeHeaderFont :selected").val();
var headerFontText = $("#themeHeaderFont :selected").text(); var headerFontText = $("#themeHeaderFont :selected").text();
var css = "@import url('http://fonts.cdnfonts.com/css/" + headerFont + "');"; var css = "@import url('https://fonts.cdnfonts.com/css/" + headerFont + "');";
css += "header{text-align:" + $("#themeHeaderTextAlign").val() + ";"; css += "header{text-align:" + $("#themeHeaderTextAlign").val() + ";";
if ($("#themeHeaderImage").val()) { if ($("#themeHeaderImage").val()) {

2
core/module/theme/view/menu/menu.js.php
View File

@ -42,7 +42,7 @@ $("input, select").on("change", function() {
// Import des polices de caractères // Import des polices de caractères
var menuFont = $("#themeMenuFont :selected").val(); var menuFont = $("#themeMenuFont :selected").val();
var menuFontText = $("#themeMenuFont :selected").text(); var menuFontText = $("#themeMenuFont :selected").text();
var css = "@import url('http://fonts.cdnfonts.com/css/" + menuFont + "');"; var css = "@import url('https://fonts.cdnfonts.com/css/" + menuFont + "');";
var colors = core.colorVariants($("#themeMenuBackgroundColor").val()); var colors = core.colorVariants($("#themeMenuBackgroundColor").val());
// Couleurs du menu // Couleurs du menu
css += "nav,nav.navLevel1 a{background-color:" + colors.normal + "}"; css += "nav,nav.navLevel1 a{background-color:" + colors.normal + "}";

4
core/module/theme/view/site/site.js.php
View File

@ -38,8 +38,8 @@ $("input, select").on("change",function() {
var textFont = $("#themeTextFont :selected").val(); var textFont = $("#themeTextFont :selected").val();
var textFontText = $("#themeTextFont :selected").text(); var textFontText = $("#themeTextFont :selected").text();
console.log(textFontText); console.log(textFontText);
var css = "@import url('http://fonts.cdnfonts.com/css/" + titleFont + "');"; var css = "@import url('https://fonts.cdnfonts.com/css/" + titleFont + "');";
var css = "@import url('http://fonts.cdnfonts.com/css/" + textFont + "');"; var css = "@import url('https://fonts.cdnfonts.com/css/" + textFont + "');";
// Couleurs des boutons // Couleurs des boutons
var colors = core.colorVariants($("#themeButtonBackgroundColor").val()); var colors = core.colorVariants($("#themeButtonBackgroundColor").val());
css += ".button.buttonSubmitPreview{background-color:" + colors.normal + ";}"; css += ".button.buttonSubmitPreview{background-color:" + colors.normal + ";}";