Edition de page ok
This commit is contained in:
parent
5844a57d8c
commit
a3fdb3bc1e
|
@ -1077,16 +1077,12 @@ class common
|
||||||
case 'image/jpeg':
|
case 'image/jpeg':
|
||||||
case 'image/jpg':
|
case 'image/jpg':
|
||||||
return (imagejpeg($virtual_image, $dest));
|
return (imagejpeg($virtual_image, $dest));
|
||||||
break;
|
|
||||||
case 'image/png':
|
case 'image/png':
|
||||||
return (imagepng($virtual_image, $dest));
|
return (imagepng($virtual_image, $dest));
|
||||||
break;
|
|
||||||
case 'image/gif':
|
case 'image/gif':
|
||||||
return (imagegif($virtual_image, $dest));
|
return (imagegif($virtual_image, $dest));
|
||||||
break;
|
|
||||||
case 'webp':
|
case 'webp':
|
||||||
$source_image = imagecreatefromwebp($src);
|
$source_image = imagecreatefromwebp($src);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return (false);
|
return (false);
|
||||||
|
@ -2319,7 +2315,7 @@ class common
|
||||||
{
|
{
|
||||||
// Import des styles liés à la page
|
// Import des styles liés à la page
|
||||||
if ($this->output['inlineStyle']) {
|
if ($this->output['inlineStyle']) {
|
||||||
foreach($this->output['inlineStyle'] as $style) {
|
foreach ($this->output['inlineStyle'] as $style) {
|
||||||
echo '<style type="text/css">' . helper::minifyCss($style) . '</style>';
|
echo '<style type="text/css">' . helper::minifyCss($style) . '</style>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2988,22 +2984,15 @@ class core extends common
|
||||||
'</a> › ' .
|
'</a> › ' .
|
||||||
$this->getData(['page', $this->getUrl(0), 'title']);
|
$this->getData(['page', $this->getUrl(0), 'title']);
|
||||||
}
|
}
|
||||||
// Importe la page simple sans module ou avec un module inexistant
|
|
||||||
|
|
||||||
// Importe le CSS de la page principale
|
|
||||||
$pageContent = $this->getPage($this->getUrl(0), self::$i18nContent);
|
|
||||||
$inlineStyle[] = $this->getData(['page', $this->getUrl(0), 'css']) === null ? '' : $this->getData(['page', $this->getUrl(0), 'css']);
|
|
||||||
// $css = strpos($css, '<style>') == null ? '<style>' . $css . '</style>' : $css;
|
|
||||||
|
|
||||||
// Importe le CSS des barres
|
// Importe le CSS des barres
|
||||||
$contentRight = $this->getData(['page', $this->getUrl(0), 'barRight']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barRight']), self::$i18nContent) : '';
|
$contentRight = $this->getData(['page', $this->getUrl(0), 'barRight']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barRight']), self::$i18nContent) : '';
|
||||||
$inlineStyle[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'css']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'css']);
|
$inlineStyle[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'css']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'css']);
|
||||||
//$cssRight = strpos($cssRight, '<style>') == null ? '<style>' . $cssRight . '</style>' : $cssRight;
|
|
||||||
|
|
||||||
$contentLeft = $this->getData(['page', $this->getUrl(0), 'barLeft']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barLeft']), self::$i18nContent) : '';
|
$contentLeft = $this->getData(['page', $this->getUrl(0), 'barLeft']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barLeft']), self::$i18nContent) : '';
|
||||||
$inlineStyle[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'css']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'css']);
|
$inlineStyle[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'css']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'css']);
|
||||||
//$cssLeft = strpos($cssRight, '<style>') == null ? '<style>' . $cssLeft . '</style>' : $cssLeft;
|
|
||||||
|
|
||||||
|
// Importe la page simple sans module ou avec un module inexistant
|
||||||
if (
|
if (
|
||||||
$this->getData(['page', $this->getUrl(0)]) !== null
|
$this->getData(['page', $this->getUrl(0)]) !== null
|
||||||
and ($this->getData(['page', $this->getUrl(0), 'moduleId']) === ''
|
and ($this->getData(['page', $this->getUrl(0), 'moduleId']) === ''
|
||||||
|
@ -3012,6 +3001,10 @@ class core extends common
|
||||||
and $access
|
and $access
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
// Importe le CSS de la page principale
|
||||||
|
$pageContent = $this->getPage($this->getUrl(0), self::$i18nContent);
|
||||||
|
$inlineStyle[] = $this->getData(['page', $this->getUrl(0), 'css']) === null ? '' : $this->getData(['page', $this->getUrl(0), 'css']);
|
||||||
|
|
||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'title' => $title,
|
'title' => $title,
|
||||||
'content' => $pageContent,
|
'content' => $pageContent,
|
||||||
|
@ -3038,6 +3031,10 @@ class core extends common
|
||||||
? strip_tags(substr($this->getData(['module', $this->getUrl(0), 'posts', $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']);
|
||||||
|
|
||||||
|
// Importe le CSS de la page principale
|
||||||
|
$pageContent = $this->getPage($this->getUrl(0), self::$i18nContent);
|
||||||
|
$inlineStyle[] = $this->getData(['page', $this->getUrl(0), 'css']) === null ? '' : $this->getData(['page', $this->getUrl(0), 'css']);
|
||||||
|
|
||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'title' => $title,
|
'title' => $title,
|
||||||
// Meta description = 160 premiers caractères de l'article
|
// Meta description = 160 premiers caractères de l'article
|
||||||
|
|
Loading…
Reference in New Issue