remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

[9.0.08] theme : order in form field, new option, new help

Browse Source
This commit is contained in:
fredtempez 2019-03-20 20:05:03 +01:00
parent 45914d3f7c
commit 8dcfb23b5a
8 changed files with 101 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core.php
View File

@ -2117,7 +2117,7 @@ class layout extends common {
*/
public function showCopyright() {
$items = '<div id="footerCopyright">';
$items .= '<span>Motorisé&nbsp;par&nbsp;<a href="http://zwiicms.com/" onclick="window.open(this.href);return false" data-tippy-content="Zwii CMS sans base de données, très léger et performant">Zwii</a>';
$items .= '<span id="footerFont">Motorisé&nbsp;par&nbsp;<a href="http://zwiicms.com/" onclick="window.open(this.href);return false" data-tippy-content="Zwii CMS sans base de données, très léger et performant">Zwii</a>';
$items .= '&nbsp;|&nbsp;<a href="' . helper::baseUrl() . 'sitemap" data-tippy-content="Plan du site" >Plan&nbsp;du&nbsp;site</a></span>';
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 '<div id="footerText"><span>' . nl2br($footerText) . '</span></div>';
echo '<div id="footerText"><span id="footerFont">' . nl2br($footerText) . '</span></div>';
}
}

8
core/module/theme/theme.php
View File

@ -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)',

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

@ -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;

27
core/module/theme/view/footer/footer.php
View File

@ -64,16 +64,10 @@
<div class="block">
<h4>Mise en forme du texte</h4>
<div class="row">
<div class="col3">
<?php echo template::select('themeFooterTextTransform', $module::$textTransforms, [
'label' => 'Caractères',
'selected' => $this->getData(['theme', 'footer', 'textTransform'])
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeFooterFontWeight', $module::$fontWeights, [
'label' => 'Style',
'selected' => $this->getData(['theme', 'footer', 'fontWeight'])
<div class="col3">
<?php echo template::select('themeFooterFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'footer', 'font'])
]); ?>
</div>
<div class="col3">
@ -84,12 +78,17 @@
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeFooterFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'footer', 'font'])
<?php echo template::select('themeFooterFontWeight', $module::$fontWeights, [
'label' => 'Style',
'selected' => $this->getData(['theme', 'footer', 'fontWeight'])
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeFooterTextTransform', $module::$textTransforms, [
'label' => 'Casse',
'selected' => $this->getData(['theme', 'footer', 'textTransform'])
]); ?>
</div>
</div>
</div>
</div>

26
core/module/theme/view/header/header.php
View File

@ -83,16 +83,10 @@
<div class="block">
<h4>Mise en forme du texte</h4>
<div class="row">
<div class="col3">
<?php echo template::select('themeHeaderTextTransform', $module::$textTransforms, [
'label' => 'Caractères',
'selected' => $this->getData(['theme', 'header', 'textTransform'])
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeHeaderFontWeight', $module::$fontWeights, [
'label' => 'Style',
'selected' => $this->getData(['theme', 'header', 'fontWeight'])
<div class="col3">
<?php echo template::select('themeHeaderFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'header', 'font'])
]); ?>
</div>
<div class="col3">
@ -103,9 +97,15 @@
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeHeaderFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'header', 'font'])
<?php echo template::select('themeHeaderFontWeight', $module::$fontWeights, [
'label' => 'Style',
'selected' => $this->getData(['theme', 'header', 'fontWeight'])
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeHeaderTextTransform', $module::$textTransforms, [
'label' => 'Casse',
'selected' => $this->getData(['theme', 'header', 'textTransform'])
]); ?>
</div>
</div>

31
core/module/theme/view/menu/menu.php
View File

@ -50,11 +50,18 @@
<div class="block">
<h4>Mise en forme du texte</h4>
<div class="row">
<div class="col3">
<?php echo template::select('themeMenuFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'menu', 'font'])
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
'label' => 'Caractères',
'selected' => $this->getData(['theme', 'menu', 'textTransform'])
]); ?>
<?php echo template::select('themeMenuFontSize', $module::$menuFontSizes, [
'label' => 'Taille',
'help' => 'Proportionnelle à celle définie dans le site',
'selected' => $this->getData(['theme', 'menu', 'fontSize'])
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeMenuFontWeight', $module::$fontWeights, [
@ -63,18 +70,10 @@
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeMenuFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'menu', 'font'])
]); ?>
</div>
<div class="col3">
<?php echo template::select('themeMenuFontSize', $module::$menuFontSizes, [
'label' => 'Taille',
'help' => 'Proportionnelle à celle définie dans le site',
'selected' => $this->getData(['theme', 'menu', 'fontSize'])
]); ?>
</div>
<?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
'label' => 'Casse',
'selected' => $this->getData(['theme', 'menu', 'textTransform'])
]); ?>
</div>
</div>
<div>

94
core/module/theme/view/site/site.php
View File

@ -63,6 +63,53 @@
</div>
</div>
</div>
<div class="row">
<div class="col6">
<div class="block">
<h4>Mise en forme du texte</h4>
<div class="row">
<div class="col6">
<?php echo template::select('themeTextFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'text', 'font'])
]); ?>
</div>
<div class="col6">
<?php echo template::select('themeTextFontSize', $module::$siteFontSizes, [
'label' => 'Taille',
'help' => 'Hauteur de référence pour la bannière, le menu et le pied de page',
'selected' => $this->getData(['theme', 'text', 'fontSize'])
]); ?>
</div>
</div>
</div>
</div>
<div class="col6">
<div class="block">
<h4>Mise en forme des titres</h4>
<div class="row">
<div class="col4">
<?php echo template::select('themeTitleFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'title', 'font'])
]); ?>
</div>
<div class="col4">
<?php echo template::select('themeTitleFontWeight', $module::$fontWeights, [
'label' => 'Style',
'selected' => $this->getData(['theme', 'title', 'fontWeight'])
]); ?>
</div>
<div class="col4">
<?php echo template::select('themeTitleTextTransform', $module::$textTransforms, [
'label' => 'Casse',
'selected' => $this->getData(['theme', 'title', 'textTransform'])
]); ?>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col12">
<div class="block">
@ -90,51 +137,4 @@
</div>
</div>
</div>
<div class="row">
<div class="col6">
<div class="block">
<h4>Mise en forme du texte</h4>
<div class="row">
<div class="col6">
<?php echo template::select('themeTextFontSize', $module::$siteFontSizes, [
'label' => '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'])
]); ?>
</div>
<div class="col6">
<?php echo template::select('themeTextFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'text', 'font'])
]); ?>
</div>
</div>
</div>
</div>
<div class="col6">
<div class="block">
<h4>Mise en forme des titres</h4>
<div class="row">
<div class="col4">
<?php echo template::select('themeTitleTextTransform', $module::$textTransforms, [
'label' => 'Caractères',
'selected' => $this->getData(['theme', 'title', 'textTransform'])
]); ?>
</div>
<div class="col4">
<?php echo template::select('themeTitleFontWeight', $module::$fontWeights, [
'label' => 'Style',
'selected' => $this->getData(['theme', 'title', 'fontWeight'])
]); ?>
</div>
<div class="col4">
<?php echo template::select('themeTitleFont', $module::$fonts, [
'label' => 'Police',
'selected' => $this->getData(['theme', 'title', 'font'])
]); ?>
</div>
</div>
</div>
</div>
</div>
<?php echo template::formClose(); ?>

2
core/vendor/tinymce/link_list.json vendored
View File

@ -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"}]
[{"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"}]