lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

[10.0.008.dev] fix couleur fond menu + banniere pans install

Browse Source
This commit is contained in:
fredtempez 2019-12-14 13:24:13 +01:00
parent 0c1273e69a
commit d98e0c67da
8 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -34,7 +34,7 @@ class common {
const TEMP_DIR = 'site/tmp/';
// Numéro de version
const ZWII_VERSION = '10.0.007.dev';
const ZWII_VERSION = '10.0.008.dev';
public static $actions = [];
public static $coreModuleIds = [

10
core/module/install/install.php
View File

@ -51,15 +51,19 @@ class install extends common {
$userLastname = $this->getInput('installLastname', helper::FILTER_STRING_SHORT, true);
$userMail = $this->getInput('installMail', helper::FILTER_MAIL, true);
$userId = $this->getInput('installId', helper::FILTER_ID, true);
// Copier la bannière par défaut
mkdir(self::FILE_DIR.'source/banner/');
mkdir(self::FILE_DIR.'thumb/banner/');
copy('core/module/install/ressource/file/source/banner960.jpg',self::FILE_DIR.'source/banner/banner960.jpg');
copy('core/module/install/ressource/file/thumb/banner960.jpg',self::FILE_DIR.'thumb/banner/banner960.jpg');
// Configure certaines données par défaut
if ($this->getInput('installDefaultData',helper::FILTER_BOOLEAN) === TRUE) {
$this->initData('page','fr',true);
$this->initData('module','fr',true);
} else {
$this->setData(['module', 'blog', 'mon-premier-article', 'userId', $userId]);
$this->setData(['module', 'blog', 'mon-deuxieme-article', 'userId', $userId]);
$this->setData(['module', 'blog', 'mon-troisieme-article', 'userId', $userId]);
}
$this->setData(['module', 'blog', 'mon-troisieme-article', 'userId', $userId]);
}
$success = $this->setData([
'user',
$userId,

8
core/module/install/ressource/defaultdata.php
View File

@ -15,13 +15,13 @@ class init extends common {
'pinterestId' => '',
'twitterId' => '',
'youtubeId' => '',
'githubId' => ''
'githubId' => 'fredtempez/ZwiiCMS/'
],
'timezone' => 'Europe/Paris',
'itemsperPage' => 10,
'legalPageId' => '',
'metaDescription' => 'Zwii est un CMS sans base de données qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.',
'title' => 'Zwii, votre site en quelques clics !'
'title' => 'Votre site en quelques clics !'
],
'core' => [
'dataVersion' => 10000,
@ -104,14 +104,14 @@ class init extends common {
'fontSize' => '2em',
'fontWeight' => 'normal',
'height' => '150px',
'image' => 'banniere/zwii_banniere-960px.jpg',
'image' => 'banner/banner960.jpg',
'imagePosition' => 'center center',
'imageRepeat' => 'no-repeat',
'margin' => false,
'position' => 'site',
'textAlign' => 'center',
'textColor' => 'rgba(33, 34, 35, 1)',
'textHide' => true,
'textHide' => false,
'textTransform' => 'none',
'linkHomePage' => true,
'imageContainer' => 'auto'

BIN
core/module/install/ressource/file/source/banner960.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 100 KiB

BIN
core/module/install/ressource/file/thumb/banner960.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

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

@ -30,6 +30,7 @@ $("input, select").on("change", function() {
// Informations affichées
$("#themeHeaderImageHeight").html(tmpImg.height + "px");
$("#themeHeaderImageWidth").html(tmpImg.width + "px");
$("#themeHeaderImageRatio").html(tmpImg.width / tmpImg.height);
// Limiter la hauteur à 600 px
if (tmpImg.height > 600) {

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

@ -83,7 +83,7 @@
<div class="row">
<div class="col12 textAlignCenter">
<span id="themeHeaderImage">
Dimensions de l'image : largeur <span id="themeHeaderImageWidth"></span> - hauteur <span id="themeHeaderImageHeight"></span>
Dimensions de l'image : largeur <span id="themeHeaderImageWidth"></span> - hauteur <span id="themeHeaderImageHeight"></span> - ratio <span id="themeHeaderImageRatio"></span>
</span>
</div>
</div>

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

@ -38,7 +38,7 @@
<div class="col6">
<?php
echo template::checkbox('themeMenuActiveColorAuto', true, 'Page sélectionnée, couleur de fond automatique ', [
'checked' => is_null($this->getData(['theme', 'menu', 'activeColor'])) ? true : $this->getData(['theme', 'menu', 'activeColorAuto']),
'checked' => $this->getData(['theme', 'menu', 'activeColorAuto']),
'help' => 'La couleur de fond de la page active peut être définie automatique ou selon une couleur définie, comme par exemple celle de fond des pages.'
]); ?>
</div>