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

Merge branch '12300' into 12400

Browse Source
This commit is contained in:
Fred Tempez 2023-03-06 15:24:11 +01:00
commit b2c25db925
6 changed files with 64 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -3162,12 +3162,6 @@ class core extends common
'style' => file_get_contents($stylePath) 'style' => file_get_contents($stylePath)
]); ]);
} }
if ($output['style']) {
$this->addOutput([
//'style' => $this->output['style'] . file_get_contents($output['style'])
'style' => file_get_contents($output['style'])
]);
}
// JS // JS
$scriptPath = $modulePath . self::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.js.php'; $scriptPath = $modulePath . self::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.js.php';

20
module/blog/view/index/index.php
View File

@ -1,4 +1,14 @@
<?php if ($module::$articles) : ?> <?php if ($module::$articles) : ?>
<?php if ($this->getData(['module', $this->getUrl(0), 'config', 'feeds'])) : ?>
<div id="rssFeed">
<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?>" target="_blank">
<img src='module/blog/ressource/feed-icon-16.gif' />
<?php
echo $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) ? '<p>' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '</p>' : '';
?>
</a>
</div>
<?php endif; ?>
<article> <article>
<?php foreach ($module::$articles as $articleId => $article) : ?> <?php foreach ($module::$articles as $articleId => $article) : ?>
<?php if ($this->getData(['module', $this->getUrl(0), 'config', 'articlesLenght']) === 0) : ?> <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'articlesLenght']) === 0) : ?>
@ -143,16 +153,6 @@
<?php endforeach; ?> <?php endforeach; ?>
</article> </article>
<?php echo $module::$pages; ?> <?php echo $module::$pages; ?>
<?php if ($this->getData(['module', $this->getUrl(0), 'config', 'feeds'])) : ?>
<div id="rssFeed">
<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?>" target="_blank">
<img src='module/blog/ressource/feed-icon-16.gif' />
<?php
echo '<p>' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '</p>';
?>
</a>
</div>
<?php endif; ?>
<?php else : ?> <?php else : ?>
<?php echo template::speech('Aucun article'); ?> <?php echo template::speech('Aucun article'); ?>
<?php endif; ?> <?php endif; ?>

3
module/news/changes.md
View File

@ -1,6 +1,7 @@
# Version 4.4 # Version 4.4
- Intl date Formats - Intl date Formats
- Modification liées à la suppression de flatpickr - Bug un conflit avec le style de la page
- Modifications liées à la suppression de flatpickr
# Version 4.3 # Version 4.3
- Multilinguisme - Multilinguisme
# Version 4.23 # Version 4.23

6
module/news/news.php
View File

@ -266,8 +266,7 @@ class news extends common
// Générer la feuille de CSS // Générer la feuille de CSS
$style = '.newsFrame {'; $style = '.newsFrame {';
$style .= 'border-right:' . $this->getInput('newsThemeBorderStyle', helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor') . ' ' . $this->getInput('newsThemeBorderWidth', helper::FILTER_STRING_SHORT) . ';'; $style .= 'border:' . $this->getInput('newsThemeBorderStyle', helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor') . ' ' . $this->getInput('newsThemeBorderWidth', helper::FILTER_STRING_SHORT) . ';';
$style .= 'border-left:' . $this->getInput('newsThemeBorderStyle', helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor') . ' ' . $this->getInput('newsThemeBorderWidth', helper::FILTER_STRING_SHORT) . ';';
$style .= 'background-color:' . $this->getInput('newsThemeBackgroundColor') . ';'; $style .= 'background-color:' . $this->getInput('newsThemeBackgroundColor') . ';';
$style .= '}'; $style .= '}';
@ -546,9 +545,6 @@ class news extends common
'showBarEditButton' => true, 'showBarEditButton' => true,
'showPageContent' => true, 'showPageContent' => true,
'view' => 'index', 'view' => 'index',
'style' => file_exists($this->getData(['module', $this->getUrl(0), 'theme', 'style']))
? $this->getData(['module', $this->getUrl(0), 'theme', 'style'])
: ''
]); ]);
} }
} }

9
module/news/view/index/index.css
View File

@ -13,14 +13,9 @@
*/ */
/* /*
* Module news * Module news TRUC
*/ */
/*
.newsTitle {
background-color: #ECEFF1;
padding:5px;
}*/
.newsContent { .newsContent {
overflow: hidden; /* les dépassements seront masqués */ overflow: hidden; /* les dépassements seront masqués */
position: relative; position: relative;
@ -51,5 +46,3 @@
display: inline; display: inline;
vertical-align: top; vertical-align: top;
} }

32
module/news/view/index/index.php
View File

@ -1,8 +1,21 @@
<?php if ($module::$news): ?> <?php if ($module::$news): ?>
<link rel="stylesheet" type="text/css" href="<?php echo helper::baseUrl(false) . $this->getData(['module', $this->getUrl(0), 'theme', 'style']);?> "/>
<?php if ($this->getData(['module', $this->getUrl(0), 'config', 'feeds'])): ?>
<div id="rssFeed">
<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?>" target="_blank">
<img src='module/news/ressource/feed-icon-16.gif' />
<?php
echo $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) ? '<p>' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '</p>' : '';
?>
</a>
</div>
<?php endif; ?>
<article> <article>
<div class="row"> <div class="row">
<?php foreach ($module::$news as $newsId => $news): ?> <?php foreach ($module::$news as $newsId => $news): ?>
<div class="newsFrame col<?php echo $module::$nbrCol; ?>"> <div class="col<?php echo $module::$nbrCol; ?>">
<div class="newsFrame">
<h2 class="newsTitle" id="<?php echo $newsId; ?>"> <h2 class="newsTitle" id="<?php echo $newsId; ?>">
<?php echo '<a href="' . helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '">' . $news['title'] . '</a>'; ?> <?php echo '<a href="' . helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '">' . $news['title'] . '</a>'; ?>
</h2> </h2>
@ -20,12 +33,12 @@
($this->getUser('group') === self::GROUP_ADMIN) ($this->getUser('group') === self::GROUP_ADMIN)
) )
): ?> ): ?>
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsId . '/' . $_SESSION['csrf']; ?>"> <a
href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsId . '/' . $_SESSION['csrf']; ?>">
<?php echo template::ico('pencil'); ?> Éditer <?php echo template::ico('pencil'); ?> Éditer
</a> </a>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div>
<div class="newsContent"> <div class="newsContent">
<?php echo $news['content']; ?> <?php echo $news['content']; ?>
<?php if ( <?php if (
@ -35,20 +48,13 @@
<?php echo ' ... <a href="' . helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '"><span class="newsSuite">lire la suite</span></a>'; ?> <?php echo ' ... <a href="' . helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '"><span class="newsSuite">lire la suite</span></a>'; ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div>
</div>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
</article> </article>
<?php echo $module::$pages; ?> <?php echo $module::$pages; ?>
<?php if ($this->getData(['module', $this->getUrl(0), 'config', 'feeds'])) : ?>
<div id="rssFeed">
<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?>" target="_blank">
<img src='module/news/ressource/feed-icon-16.gif' />
<?php
echo '<p>' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '</p>';
?>
</a>
</div>
<?php endif; ?>
<?php else: ?> <?php else: ?>
<?php echo template::speech('Aucune news'); ?> <?php echo template::speech('Aucune news'); ?>
<?php endif; ?> <?php endif; ?>