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

Merge branch '10307'

Browse Source
This commit is contained in:
Fred Tempez 2020-11-18 18:30:13 +01:00
parent 5962ef846e
commit 3b2c78e178
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## Version 10.3.07
- Petites corrections
- Bouton format dans TinyMCE
## version 10.3.06 ## version 10.3.06
- Correction : - Correction :
- Edition de page avec module, le changement de mise en page désactive le bouton d'option du module. - Edition de page avec module, le changement de mise en page désactive le bouton d'option du module.

2
README.md
View File

@ -1,6 +1,6 @@
![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS) ![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS)
# ZwiiCMS 10.3.06 # ZwiiCMS 10.3.07
Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.

4
core/core.php
View File

@ -40,7 +40,7 @@ class common {
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.3.06'; const ZWII_VERSION = '10.3.07';
const ZWII_UPDATE_CHANNEL = "v10"; const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = []; public static $actions = [];
@ -1896,7 +1896,7 @@ class core extends common {
'title' => $title, 'title' => $title,
// Meta description = 160 premiers caractères de l'article // Meta description = 160 premiers caractères de l'article
'metaDescription' => $this->getData(['page',$this->getUrl(0),'moduleId']) === 'blog' && !empty($this->getUrl(1)) 'metaDescription' => $this->getData(['page',$this->getUrl(0),'moduleId']) === 'blog' && !empty($this->getUrl(1))
? strip_tags(substr($this->getData(['module',$this->getUrl(0),$this->getUrl(1),'content']) ,0,159)) ? strip_tags(substr($this->getData(['module',$this->getUrl(0),'posts',$this->getUrl(1),'content']) ,0,159))
: $this->getData(['page', $this->getUrl(0), 'metaDescription']), : $this->getData(['page', $this->getUrl(0), 'metaDescription']),
'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']), 'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']), 'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),

4
core/module/sitemap/view/index/index.php
View File

@ -27,7 +27,7 @@
<?php <?php
foreach($this->getData(['module',$childId]) as $articleId => $article): ?> foreach($this->getData(['module',$childId]) as $articleId => $article): ?>
<?php if($this->getData(['module',$childId,$articleId,'state']) === true) {?> <?php if($this->getData(['module',$childId,'posts',$articleId,'state']) === true) {?>
<li> <li>
<a href="<?php echo helper::baseUrl() . $childId . '/' . $articleId;?>"><?php echo $article['title']; ?></a> <a href="<?php echo helper::baseUrl() . $childId . '/' . $articleId;?>"><?php echo $article['title']; ?></a>
</li> </li>
@ -42,7 +42,7 @@
<?php if ($this->getData(['page', $parentId, 'moduleId']) === 'blog' && <?php if ($this->getData(['page', $parentId, 'moduleId']) === 'blog' &&
!empty($this->getData(['module',$parentId])) ) { ?> !empty($this->getData(['module',$parentId])) ) { ?>
<?php foreach($this->getData(['module',$parentId]) as $articleId => $article): ?> <?php foreach($this->getData(['module',$parentId]) as $articleId => $article): ?>
<?php if($this->getData(['module',$parentId,$articleId,'state']) === true ): ?> <?php if($this->getData(['module',$parentId,'posts',$articleId,'state']) === true ): ?>
<li> <li>
<a href="<?php echo helper::baseUrl() . $parentId. '/' . $articleId;?>"><?php echo $article['title']; ?></a> <a href="<?php echo helper::baseUrl() . $parentId. '/' . $articleId;?>"><?php echo $article['title']; ?></a>
</li> </li>

2
core/vendor/tinymce/init.js vendored
View File

@ -20,7 +20,7 @@ tinymce.init({
// Plugins // Plugins
plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor emoticons nonbreaking", plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor emoticons nonbreaking",
// Contenu de la barre d'outils // Contenu de la barre d'outils
toolbar: "restoredraft | undo redo | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist emoticons | table template | image media link | code fullscreen", toolbar: "restoredraft | undo redo | formatselect bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist emoticons | table template | image media link | code fullscreen",
// Emoticons // Emoticons
emoticons_append: { emoticons_append: {
custom_mind_explode: { custom_mind_explode: {