ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch '10400' into data_engine

This commit is contained in:
fredtempez 2020-10-29 22:07:34 +01:00
parent 71e12a5ada cd39cfe53c
commit 4f6f4139bb
3 changed files with 329 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

443
core/layout/common.css
View File

File diff suppressed because it is too large Load Diff

2
index.php
View File

@ -25,7 +25,7 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) {
*Localisation
*/
date_default_timezone_set('Europe/Paris');
setlocale (LC_ALL, 'fr_FR.utf8','fra');
setlocale(LC_ALL, 'fr','fr_FR','fr_FR.utf8','fr-FR','fra');
/**
* Initialisation de Zwii

2
module/blog/blog.php
View File

@ -348,7 +348,6 @@ class blog extends common {
'<a href="' . helper::baseurl() . $this->getUrl(0) . '/' . $articleIds[$i] . '" target="_blank" >' .
$this->getData(['module', $this->getUrl(0), $articleIds[$i], 'title']) .
'</a>',
// date('d/m/Y H:i', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])),
strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn']))
.' à '.
strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])),
@ -358,7 +357,6 @@ class blog extends common {
'class' => ($toApprove || $approved ) > 0 ? 'buttonBlue' : 'buttonGrey' ,
'href' => ($toApprove || $approved ) > 0 ? helper::baseUrl() . $this->getUrl(0) . '/comment/' . $articleIds[$i] : '',
'value' => $toApprove > 0 ? $toApprove . '/' . $approved : $approved
//'value' => count($this->getData(['module', $this->getUrl(0), $articleIds[$i],'comment']))
]),
template::button('blogConfigEdit' . $articleIds[$i], [
'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $articleIds[$i] . '/' . $_SESSION['csrf'],