diff --git a/CHANGES.MD b/CHANGES.MD index 9c173a45..f80e51b2 100644 --- a/CHANGES.MD +++ b/CHANGES.MD @@ -3,6 +3,8 @@ ## Version 8.4.9 * Correction : - Adresse d'une page inactive +* Modification : + - Blog : masquer une image dans l'article tout en conservant la miniature dans l'index ## version 8.4.8 * Correction : diff --git a/core/core.php b/core/core.php index c9e355a0..89566f25 100644 --- a/core/core.php +++ b/core/core.php @@ -137,11 +137,9 @@ class common { 'title' => 'Blog' ], 'galeries' => [ - // menu image 'typeMenu' => 'text', 'iconUrl' => '', 'disable' => false, - // menu image 'content' => "

Cette page contient une instance du module de galeries photos. Cliquez sur la galerie ci-dessous afin de voir les photos qu'elle contient.

", 'hideTitle' => false, 'metaDescription' => '', @@ -155,11 +153,11 @@ class common { 'title' => 'Galeries' ], 'site-de-zwii' => [ - // menu image + 'typeMenu' => 'text', 'iconUrl' => '', 'disable' => false, - // menu image + 'content' => "", 'hideTitle' => false, 'metaDescription' => '', @@ -173,11 +171,11 @@ class common { 'title' => 'Site de Zwii' ], 'contact' => [ - // menu image + 'typeMenu' => 'text', 'iconUrl' => '', 'disable' => false, - // menu image + 'content' => "

Cette page contient un exemple de formulaire conçu à partir du module de génération de formulaires. Il est configuré pour envoyer les données saisies par mail aux administrateurs du site.

", 'hideTitle' => false, 'metaDescription' => '', @@ -205,6 +203,7 @@ class common { ], 'content' => "

Lorem ipsum dolor sit amet, consectetur adipiscing elit. In a placerat metus. Morbi luctus laoreet dolor et euismod. Phasellus eget eros ac eros pretium tincidunt. Sed maximus magna lectus, non vestibulum sapien pretium maximus. Donec convallis leo tortor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras convallis lacus eu risus gravida varius. Etiam mattis massa vitae eros placerat bibendum.

\r\n

Vivamus tempus magna augue, in bibendum quam blandit at. Morbi felis tortor, suscipit ut ipsum ut, volutpat consectetur orci. Nulla tincidunt quis ligula non viverra. Sed pretium dictum blandit. Donec fringilla, nunc at dictum pretium, arcu massa viverra leo, et porta turpis ipsum eget risus. Quisque quis maximus purus, in elementum arcu. Donec nisi orci, aliquam non luctus non, congue volutpat massa. Curabitur sed risus congue, porta arcu vel, tincidunt nisi. Duis tincidunt quam ut velit maximus ornare. Nullam sagittis, ante quis pharetra hendrerit, lorem massa dapibus mi, a hendrerit dolor odio nec augue. Nunc sem nisl, tincidunt vitae nunc et, viverra tristique diam. In eget dignissim lectus. Nullam volutpat lacus id ex dapibus viverra. Pellentesque ultricies lorem ut nunc elementum volutpat. Cras id ultrices justo.

\r\n

Phasellus nec erat leo. Praesent at sem nunc. Vestibulum quis condimentum turpis. Cras semper diam vitae enim fringilla, ut fringilla mauris efficitur. In nec porttitor urna. Nam eros leo, vehicula eget lobortis sed, gravida id mauris. Nulla bibendum nunc tortor, non bibendum justo consectetur vel. Phasellus nec risus diam. In commodo tellus nec nulla fringilla, nec feugiat nunc consectetur. Etiam non eros sodales, sodales lacus vel, finibus leo. Quisque hendrerit tristique congue. Phasellus nec augue vitae libero elementum facilisis. Mauris pretium ornare nisi, non scelerisque velit consectetur sit amet.

", 'picture' => 'galerie/landscape/meadow.jpg', + 'hidePicture' => false, 'publishedOn' => 1420903200, 'state' => true, 'title' => 'Mon premier article', @@ -215,6 +214,7 @@ class common { 'comment' => [], 'content' => "

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lobortis eros pharetra metus rutrum pretium et sagittis mauris. Donec commodo venenatis sem nec suscipit. In tempor sollicitudin scelerisque. Etiam quis nibh eleifend, congue nisl quis, ultricies ipsum. Integer at est a eros vulputate pellentesque eu vitae tellus. Nullam suscipit quam nisl. Vivamus dui odio, luctus ac fringilla ultrices, eleifend vel sapien. Integer sem ex, lobortis eu mattis eu, condimentum non libero. Aliquam non porttitor elit, eu hendrerit neque. Praesent tortor urna, tincidunt sed dictum id, rutrum tempus sapien.

\r\n

Donec accumsan ante ac odio laoreet porttitor. Pellentesque et leo a leo scelerisque mattis id vel elit. Quisque egestas congue enim nec semper. Morbi mollis nibh sapien. Nunc quis fringilla lorem. Donec vel venenatis nunc. Donec lectus velit, tempor sit amet dui sed, consequat commodo enim. Nam porttitor neque semper, dapibus nunc bibendum, lobortis urna. Morbi ullamcorper molestie lectus a elementum. Curabitur eu cursus orci, sed tristique justo. In massa lacus, imperdiet eu elit quis, consectetur maximus magna. Integer suscipit varius ante vitae egestas. Morbi scelerisque fermentum ipsum, euismod faucibus mi tincidunt id. Sed at consectetur velit. Ut fermentum nunc nibh, at commodo felis lacinia nec.

\r\n

Nullam a justo quis lectus facilisis semper eget quis sem. Morbi suscipit erat sem, non fermentum nunc luctus vel. Proin venenatis quam ut arcu luctus efficitur. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nam sollicitudin tristique nunc nec convallis. Maecenas id tortor semper, tempus nisl laoreet, cursus lacus. Aliquam sagittis est in leo congue, a pharetra felis aliquet. Nulla gravida lobortis sapien, quis viverra enim ullamcorper sed. Donec ultrices sem eu volutpat dapibus. Nam euismod, tellus eu congue mollis, massa nisi finibus odio, vitae porta arcu urna ac lorem. Sed faucibus dignissim pretium. Pellentesque eget ante tellus. Pellentesque a elementum odio, sit amet vulputate diam. Lorem ipsum dolor sit amet, consectetur adipiscing elit. In hendrerit consequat dolor, malesuada pellentesque tellus molestie non. Aenean quis purus a lectus pellentesque laoreet.

", 'picture' => 'galerie/landscape/desert.jpg', + 'hidePicture' => false, 'publishedOn' => 1421748000, 'state' => true, 'title' => 'Mon deuxième article', @@ -225,6 +225,7 @@ class common { 'comment' => [], 'content' => "

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ut tempus nibh. Cras eget iaculis justo, ac laoreet lacus. Nunc tellus nulla, auctor id hendrerit eu, pellentesque in sapien. In hac habitasse platea dictumst. Aliquam leo urna, hendrerit id nunc eget, finibus maximus dolor. Sed rutrum sapien consectetur, tincidunt nulla at, blandit quam. Duis ex enim, vehicula vel nisi vitae, lobortis volutpat nisl. Vivamus enim libero, euismod nec risus vel, interdum placerat elit. In cursus sapien condimentum dui imperdiet, sed lobortis ante consectetur. Maecenas hendrerit eget felis non consequat.

\r\n

Nullam nec risus non velit efficitur tempus eget tincidunt mauris. Etiam venenatis leo id justo sagittis, commodo dignissim sapien tristique. Vivamus finibus augue malesuada sapien gravida rutrum. Integer mattis lectus ac pulvinar scelerisque. Integer suscipit feugiat metus, ac molestie odio suscipit eget. Fusce at elit in tellus venenatis finibus id sit amet magna. Integer sodales luctus neque blandit posuere. Cras pellentesque dictum lorem eget vestibulum. Quisque vitae metus non nisi efficitur rhoncus ut vitae ipsum. Donec accumsan massa at est faucibus lacinia. Quisque imperdiet luctus neque eu vestibulum. Phasellus pellentesque felis ligula, id imperdiet elit ultrices eu.

", 'picture' => 'galerie/landscape/iceberg.jpg', + 'hidePicture' => false, 'publishedOn' => 1423154400, 'state' => true, 'title' => 'Mon troisième article', @@ -924,9 +925,7 @@ class common { $this->setData(['core', 'dataVersion', 846]); $this->SaveData(); } - } - } class core extends common { diff --git a/core/module/page/page.php b/core/module/page/page.php index 7a723e9d..f213d66c 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -178,12 +178,10 @@ class page extends common { $this->setData([ 'page', $pageId, - [ - // Menu image + [ 'typeMenu' => $this->getinput('pageTypeMenu'), 'iconUrl' => $this->getinput('pageIconUrl'), - 'disable'=> $this->getinput('pageDisable', helper::FILTER_BOOLEAN), - // Menu image + 'disable'=> $this->getinput('pageDisable', helper::FILTER_BOOLEAN), 'content' => (empty($this->getInput('pageEditContent', null)) ? "

" : $this->getInput('pageEditContent', null)) , 'hideTitle' => $this->getInput('pageEditHideTitle', helper::FILTER_BOOLEAN), 'metaDescription' => $this->getInput('pageEditMetaDescription', helper::FILTER_STRING_LONG), diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php index 9f383fb4..2092d534 100755 --- a/core/module/page/view/edit/edit.php +++ b/core/module/page/view/edit/edit.php @@ -54,9 +54,6 @@ -
@@ -73,12 +70,6 @@ 'value' => $this->getData(['page', $this->getUrl(2), 'iconUrl']) ]); ?>
- - - -
diff --git a/module/blog/blog.php b/module/blog/blog.php index d1fe9eed..ce3a2d65 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -53,6 +53,7 @@ class blog extends common { 'comment' => [], 'content' => $this->getInput('blogAddContent', null), 'picture' => $this->getInput('blogAddPicture', helper::FILTER_STRING_SHORT, true), + 'hidePicture' => $this->getInput('blogAddHidePicture', helper::FILTER_BOOLEAN), 'publishedOn' => $this->getInput('blogAddPublishedOn', helper::FILTER_DATETIME, true), 'state' => $this->getInput('blogAddState', helper::FILTER_BOOLEAN), 'title' => $this->getInput('blogAddTitle', helper::FILTER_STRING_SHORT, true), @@ -235,6 +236,7 @@ class blog extends common { 'comment' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'comment']), 'content' => $this->getInput('blogEditContent', null), 'picture' => $this->getInput('blogEditPicture', helper::FILTER_STRING_SHORT, true), + 'hidePicture' => $this->getInput('blogEditHidePicture', helper::FILTER_BOOLEAN), 'publishedOn' => $this->getInput('blogEditPublishedOn', helper::FILTER_DATETIME, true), 'state' => $this->getInput('blogEditState', helper::FILTER_BOOLEAN), 'title' => $this->getInput('blogEditTitle', helper::FILTER_STRING_SHORT, true), diff --git a/module/blog/view/add/add.php b/module/blog/view/add/add.php index 0b5bf452..358bb260 100755 --- a/module/blog/view/add/add.php +++ b/module/blog/view/add/add.php @@ -40,6 +40,13 @@ 'type' => 1 ]); ?> +
+
+
+ $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'hidePicture']) + ]); ?> +
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 9e281403..80008a55 100755 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -1,10 +1,12 @@ -
- +getData(['module', $this->getUrl(0), $this->getUrl(1), 'hidePicture']) == false) { + echo '
'; +} +?> getData(['module', $this->getUrl(0), $this->getUrl(1), 'content']); ?> -

getData(['user', $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'userId']), 'firstname']); ?> diff --git a/module/blog/view/edit/edit.php b/module/blog/view/edit/edit.php index e56710a0..d740c778 100755 --- a/module/blog/view/edit/edit.php +++ b/module/blog/view/edit/edit.php @@ -42,6 +42,13 @@ 'value' => $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'picture']) ]); ?> +

+
+
+ $this->getData(['module', $this->getUrl(0), $this->getUrl(2), 'hidePicture']) + ]); ?> +