ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Merge branch 'master' into dev10

Browse Source
This commit is contained in:
Fred Tempez 2020-02-05 17:58:03 +01:00
commit 966c2e5172
3 changed files with 58 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -946,7 +946,7 @@ class common {
if($this->getData(['core', 'dataVersion']) < 9100) { if($this->getData(['core', 'dataVersion']) < 9100) {
$this->setData(['theme','footer','displayVersion', true ]); $this->setData(['theme','footer','displayVersion', true ]);
$this->setData(['theme','footer','displaySiteMap', true ]); $this->setData(['theme','footer','displaySiteMap', true ]);
$this->setData(['theme','footer','displayCopyright', true ]); $this->setData(['theme','footer','displayCopyright', false ]);
$this->setData(['core', 'dataVersion', 9100]); $this->setData(['core', 'dataVersion', 9100]);
//$this->SaveData(); //$this->SaveData();
} }

110
core/module/config/view/index/index.php
View File

@ -124,65 +124,68 @@
'checked' => $this->getData(['config', 'autoUpdate']), 'checked' => $this->getData(['config', 'autoUpdate']),
'help' => 'Vérification quotidienne des mises à jour.' 'help' => 'Vérification quotidienne des mises à jour.'
]); ?> ]); ?>
</div>
<div class="col4">
<?php echo template::text('configSocialTwitterId', [
'help' => 'Saisissez votre ID : https://twitter.com/[ID].',
'label' => 'Twitter',
'value' => $this->getData(['config', 'social', 'twitterId'])
]); ?>
</div>
</div> </div>
<div class="row"> </div>
<div class="col4"> </div>
<?php echo template::text('configSocialYoutubeId', [ </div>
'help' => 'ID de la chaîne : https://www.youtube.com/channel/[ID].', <div class="col6">
'label' => 'Chaîne Youtube', <div class="block">
'value' => $this->getData(['config', 'social', 'youtubeId']) <h4>Réseaux sociaux</h4>
]); ?> <div class="row">
</div> <div class="col4">
<div class="col4"> <?php echo template::text('configSocialFacebookId', [
<?php echo template::text('configSocialYoutubeUserId', [ 'help' => 'Saisissez votre ID : https://www.facebook.com/[ID].',
'help' => 'Saisissez votre ID Utilisateur : https://www.youtube.com/user/[ID].', 'label' => 'Facebook',
'label' => 'Youtube', 'value' => $this->getData(['config', 'social', 'facebookId'])
'value' => $this->getData(['config', 'social', 'youtubeUserId']) ]); ?>
]); ?>
</div>
<div class="col4">
<?php echo template::text('configSocialPinterestId', [
'help' => 'Saisissez votre ID : https://pinterest.com/[ID].',
'label' => 'Pinterest',
'value' => $this->getData(['config', 'social', 'pinterestId'])
]); ?>
</div>
</div> </div>
<div class="row"> <div class="col4">
<div class="col4 offset2"> <?php echo template::text('configSocialInstagramId', [
<?php echo template::text('configSocialGithubId', [ 'help' => 'Saisissez votre ID : https://www.instagram.com/[ID].',
'help' => 'Saisissez votre ID Github : https://github.com/[ID].', 'label' => 'Instagram',
'label' => 'Github', 'value' => $this->getData(['config', 'social', 'instagramId'])
'value' => $this->getData(['config', 'social', 'githubId']) ]); ?>
]); ?> </div>
</div> <div class="col4">
<div class="col4"> <?php echo template::text('configSocialTwitterId', [
<?php echo template::text('configSocialLinkedinId', [ 'help' => 'Saisissez votre ID : https://twitter.com/[ID].',
'help' => 'Saisissez votre ID Linkedin : https://fr.linkedin.com/in/[ID].', 'label' => 'Twitter',
'label' => 'Linkedin', 'value' => $this->getData(['config', 'social', 'twitterId'])
'value' => $this->getData(['config', 'social', 'linkedinId']) ]); ?>
]); ?>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col6"> <div class="col4">
<?php echo template::text('configSocialYoutubeId', [
'help' => 'ID de la chaîne : https://www.youtube.com/channel/[ID].',
'label' => 'Chaîne Youtube',
'value' => $this->getData(['config', 'social', 'youtubeId'])
]); ?>
</div>
<div class="col4">
<?php echo template::text('configSocialYoutubeUserId', [
'help' => 'Saisissez votre ID Utilisateur : https://www.youtube.com/user/[ID].',
'label' => 'Youtube',
'value' => $this->getData(['config', 'social', 'youtubeUserId'])
]); ?>
</div>
<div class="col4">
<?php echo template::text('configSocialPinterestId', [ <?php echo template::text('configSocialPinterestId', [
'help' => 'Saisissez votre ID : https://pinterest.com/[ID].', 'help' => 'Saisissez votre ID : https://pinterest.com/[ID].',
'label' => 'Pinterest', 'label' => 'Pinterest',
'value' => $this->getData(['config', 'social', 'pinterestId']) 'value' => $this->getData(['config', 'social', 'pinterestId'])
]); ?> ]); ?>
</div> </div>
<div class="col6"> </div>
<div class="row">
<div class="col4 offset2">
<?php echo template::text('configSocialGithubId', [
'help' => 'Saisissez votre ID Github : https://github.com/[ID].',
'label' => 'Github',
'value' => $this->getData(['config', 'social', 'githubId'])
]); ?>
</div>
<div class="col4">
<?php echo template::text('configSocialLinkedinId', [ <?php echo template::text('configSocialLinkedinId', [
'help' => 'Saisissez votre ID Linkedin : https://fr.linkedin.com/in/[ID].', 'help' => 'Saisissez votre ID Linkedin : https://fr.linkedin.com/in/[ID].',
'label' => 'Linkedin', 'label' => 'Linkedin',
@ -190,19 +193,8 @@
]); ?> ]); ?>
</div> </div>
</div> </div>
<div class="row">
<div class="col6 offset3">
<?php echo template::text('configSocialGithubId', [
'help' => 'Saisissez votre ID Github : https://github.com/[ID].',
'label' => 'Github',
'value' => $this->getData(['config', 'social', 'githubId'])
]); ?>
</div>
</div>
</div> </div>
</div> </div>
<!--</div>
<div class="row">-->
<div class="col6"> <div class="col6">
<div class="block"> <div class="block">
<h4>Référencement</h4> <h4>Référencement</h4>

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

@ -19,7 +19,7 @@ class init extends common {
], ],
'timezone' => 'Europe/Paris', 'timezone' => 'Europe/Paris',
'itemsperPage' => 10, 'itemsperPage' => 10,
'legalPageId' => '', 'legalPageId' => 'mentions-legales',
'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.', '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' => 'Votre site en quelques clics !' 'title' => 'Votre site en quelques clics !'
], ],
@ -84,17 +84,16 @@ class init extends common {
'textColor' => 'rgba(33, 34, 35, 1)', 'textColor' => 'rgba(33, 34, 35, 1)',
'copyrightPosition' => 'right', 'copyrightPosition' => 'right',
'copyrightAlign' => 'right', 'copyrightAlign' => 'right',
'text' => 'Pied de page personnalisé', 'text' => '<p>Pied de page personnalisé</p>',
'textPosition' => 'left', 'textPosition' => 'left',
'textAlign' => 'left', 'textAlign' => 'left',
'textTransform' => 'none', 'textTransform' => 'none',
'socialsPosition' => 'center', 'socialsPosition' => 'center',
'socialsAlign' => 'center', 'socialsAlign' => 'center',
'displayVersion' => true, 'displayVersion' => true,
'displayVersion' => true,
'displaySiteMap' => true, 'displaySiteMap' => true,
'displayCopyright' => true, 'displayCopyright' => false,
'displayLegal' => false, 'displayLegal' => true,
'displaySearch' => false, 'displaySearch' => false,
'template' => '3' 'template' => '3'
], ],
@ -125,7 +124,7 @@ class init extends common {
'fontSize' => '1em', 'fontSize' => '1em',
'fontWeight' => 'normal', 'fontWeight' => 'normal',
'height' => '15px 10px', 'height' => '15px 10px',
'loginLink' => true, 'loginLink' => false,
'burgerTitle' => true, 'burgerTitle' => true,
'margin' => false, 'margin' => false,
'position' => 'site-second', 'position' => 'site-second',