diff --git a/core/core.php b/core/core.php index dff94b13..636db5f2 100644 --- a/core/core.php +++ b/core/core.php @@ -2117,7 +2117,7 @@ class layout extends common { */ public function showCopyright() { $items = '
'; - $items .= 'Motorisé par Zwii'; + $items .= 'Motorisé par Zwii'; $items .= ' | Plan du site'; if( ( @@ -2146,7 +2146,7 @@ class layout extends common { */ public function showFooterText() { if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') { - echo '
' . nl2br($footerText) . '
'; + echo '
' . nl2br($footerText) . '
'; } } diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index eeb59a6c..c7696df5 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -74,7 +74,7 @@ class theme extends common { 'right' => 'Bloc Droite' ]; public static $fontWeights = [ - 'normal' => 'Normal', + 'normal' => 'Standard', 'bold' => 'Gras' ]; public static $footerHeights = [ @@ -189,8 +189,10 @@ class theme extends common { 'cover' => 'Largeur adaptée au fond' ]; public static $textTransforms = [ - 'none' => 'Normaux', - 'uppercase' => 'Majuscules' + 'none' => 'Standard', + 'lowercase' => 'Minuscules', + 'uppercase' => 'Majuscules', + 'capitalize' => 'Majuscule à chaque mot' ]; public static $widths = [ '750px' => 'Petite (750 pixels)', diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php index 93dfefec..8f13fe2b 100755 --- a/core/module/theme/view/footer/footer.js.php +++ b/core/module/theme/view/footer/footer.js.php @@ -47,7 +47,7 @@ $("input, select").on("change", function() { .attr("type", "text/css") .attr("id", "themePreview") .text(css) - .appendTo("head"); + .appendTo("footer"); // Position du pied de page switch($("#themeFooterPosition").val()) { case 'hide': @@ -95,7 +95,6 @@ $("#themeFooterForm").on("change",function() { $("#footerSocials").show().appendTo("#footersiteCenter"); break; case 'right': - console.log("right"); $("#footerSocials").show().appendTo("#footerbodyRight"); $("#footerSocials").show().appendTo("#footersiteRight"); break; diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php index a2779360..c4726904 100755 --- a/core/module/theme/view/footer/footer.php +++ b/core/module/theme/view/footer/footer.php @@ -64,16 +64,10 @@

Mise en forme du texte

-
- 'Caractères', - 'selected' => $this->getData(['theme', 'footer', 'textTransform']) - ]); ?> -
-
- 'Style', - 'selected' => $this->getData(['theme', 'footer', 'fontWeight']) +
+ 'Police', + 'selected' => $this->getData(['theme', 'footer', 'font']) ]); ?>
@@ -84,12 +78,17 @@ ]); ?>
- 'Police', - 'selected' => $this->getData(['theme', 'footer', 'font']) + 'Style', + 'selected' => $this->getData(['theme', 'footer', 'fontWeight']) ]); ?> -
- +
+
+ 'Casse', + 'selected' => $this->getData(['theme', 'footer', 'textTransform']) + ]); ?> +
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php index 2b393f9a..3ea3f5db 100755 --- a/core/module/theme/view/header/header.php +++ b/core/module/theme/view/header/header.php @@ -83,16 +83,10 @@

Mise en forme du texte

-
- 'Caractères', - 'selected' => $this->getData(['theme', 'header', 'textTransform']) - ]); ?> -
-
- 'Style', - 'selected' => $this->getData(['theme', 'header', 'fontWeight']) +
+ 'Police', + 'selected' => $this->getData(['theme', 'header', 'font']) ]); ?>
@@ -103,11 +97,17 @@ ]); ?>
- 'Police', - 'selected' => $this->getData(['theme', 'header', 'font']) + 'Style', + 'selected' => $this->getData(['theme', 'header', 'fontWeight']) ]); ?> -
+
+
+ 'Casse', + 'selected' => $this->getData(['theme', 'header', 'textTransform']) + ]); ?> +
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index 6bdea033..2184b297 100755 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -50,32 +50,31 @@

Mise en forme du texte

+
+ 'Police', + 'selected' => $this->getData(['theme', 'menu', 'font']) + ]); ?> +
- 'Caractères', - 'selected' => $this->getData(['theme', 'menu', 'textTransform']) - ]); ?> + 'Taille', + 'help' => 'Proportionnelle à celle définie dans le site', + 'selected' => $this->getData(['theme', 'menu', 'fontSize']) + ]); ?>
'Style', 'selected' => $this->getData(['theme', 'menu', 'fontWeight']) ]); ?> -
+
- 'Police', - 'selected' => $this->getData(['theme', 'menu', 'font']) - ]); ?> -
-
- 'Taille', - 'help' => 'Proportionnelle à celle définie dans le site', - 'selected' => $this->getData(['theme', 'menu', 'fontSize']) - ]); ?> -
-
+ 'Casse', + 'selected' => $this->getData(['theme', 'menu', 'textTransform']) + ]); ?> +
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php index 477694ab..083199c4 100755 --- a/core/module/theme/view/site/site.php +++ b/core/module/theme/view/site/site.php @@ -63,6 +63,53 @@ +
+
+
+

Mise en forme du texte

+
+
+ 'Police', + 'selected' => $this->getData(['theme', 'text', 'font']) + ]); ?> +
+
+ 'Taille', + 'help' => 'Hauteur de référence pour la bannière, le menu et le pied de page', + 'selected' => $this->getData(['theme', 'text', 'fontSize']) + ]); ?> +
+
+
+
+
+
+

Mise en forme des titres

+
+
+ 'Police', + 'selected' => $this->getData(['theme', 'title', 'font']) + ]); ?> +
+
+ 'Style', + 'selected' => $this->getData(['theme', 'title', 'fontWeight']) + ]); ?> +
+
+ 'Casse', + 'selected' => $this->getData(['theme', 'title', 'textTransform']) + ]); ?> +
+
+
+
+
@@ -90,51 +137,4 @@
-
-
-
-

Mise en forme du texte

-
-
- 'Taille du site', - 'help' => 'Correspond au libellé de taille \'Normale\' du menu, de la bannière et du pied de page', - 'selected' => $this->getData(['theme', 'text', 'fontSize']) - ]); ?> -
-
- 'Police', - 'selected' => $this->getData(['theme', 'text', 'font']) - ]); ?> -
-
-
-
-
-
-

Mise en forme des titres

-
-
- 'Caractères', - 'selected' => $this->getData(['theme', 'title', 'textTransform']) - ]); ?> -
-
- 'Style', - 'selected' => $this->getData(['theme', 'title', 'fontWeight']) - ]); ?> -
-
- 'Police', - 'selected' => $this->getData(['theme', 'title', 'font']) - ]); ?> -
-
-
-
-
\ No newline at end of file diff --git a/core/vendor/tinymce/link_list.json b/core/vendor/tinymce/link_list.json index 572c1e6a..d9305ccd 100644 --- a/core/vendor/tinymce/link_list.json +++ b/core/vendor/tinymce/link_list.json @@ -1 +1 @@ -[{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}] \ No newline at end of file +[{"title":"blockLeft","value":"?blockLeft"},{"title":"blockRight","value":"?blockRight"},{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise_en_page"}]},{"title":"Cach\u00e9e","value":"?cachee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Code","value":"?code"},{"title":"Contact","value":"?contact"}] \ No newline at end of file