'https://doc.zwiicms.fr/gestion-des-utilisateurs',
'target' => '_blank',
- 'value' => template::ico('help'),
- 'class' => 'buttonHelp',
- 'help' => 'Consulter l\'aide en ligne'
+ 'ico' => 'help',
+ 'value' => 'Aide',
+ 'class' => 'buttonHelp'
]); ?>
+
helper::baseUrl() . 'user/import',
- 'value' => template::ico('upload') ,
- 'help' => 'Importer des utilisateurs en masse'
+ 'ico' => 'plus',
+ 'value' => 'Importation'
]); ?>
-
+
helper::baseUrl() . 'user/add',
- 'value' => template::ico('plus'),
- 'help' => 'Ajouter un utilisateur'
+ 'ico' => 'plus',
+ 'value' => 'Utilisateur'
]); ?>
diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js
index b4d3bad3..6daa4b89 100755
--- a/core/vendor/tinymce/init.js
+++ b/core/vendor/tinymce/init.js
@@ -114,7 +114,7 @@ tinymce.init({
// Active l'onglet avancé lors de l'ajout d'une image
image_advtab: true,
// Urls absolues
- relative_urls: true,
+ relative_urls: false,
// Url de base
document_base_url: baseUrl,
// Gestionnaire de fichiers
@@ -294,7 +294,7 @@ tinymce.init({
// Active l'onglet avancé lors de l'ajout d'une image
image_advtab: true,
// Urls absolues
- relative_urls: true,
+ relative_urls: false,
// Url de base
document_base_url: baseUrl,
// Contenu du bouton formats
diff --git a/core/vendor/tippy/init.js b/core/vendor/tippy/init.js
index 210a5f14..976da1e6 100755
--- a/core/vendor/tippy/init.js
+++ b/core/vendor/tippy/init.js
@@ -1,49 +1,38 @@
/**
* Initialisation de Tippy
*/
-$(document).ready(function () {
-
- // Tooltip des attributs title
- tippy("[data-tippy-content]", {
- arrow: true,
- placement: "top"
- });
-
- // Pour les images map, pas de flèche, bulle haut suivant le curseur
- tippy('img[title], a[title]:not(.button), area[title]', {
-
- content(reference) {
- const title = reference.getAttribute('title')
- reference.removeAttribute('title')
- return title
- },
-
- placement: "top",
- followCursor: true,
- animation: "fade",
- animateFill: true
- });
-
- // Tooltip des aides
- tippy('a.button[title]', {
- content(reference) {
- const title = reference.getAttribute('title')
- reference.removeAttribute('title')
- return title
- },
- delay: [1000,250],
- placement: "bottom",
- followCursor: false,
- arrow: true,
- animateFill: true,
- arrowType: "round",
- });
-
- // Pour les images map, pas de flèche, bulle haut suivant le curseur
- tippy("#image-map", {
- placement: "top",
- followCursor: true,
- animation: "fade",
- animateFill: true
- });
-});
\ No newline at end of file
+$(document).ready(function() {
+ // Tooltip des aides
+ tippy(".helpButton", {
+ arrow: true,
+ arrowType: "round",
+ placement: "top"
+ });
+ // Tooltip des attributs title
+ tippy("[data-tippy-content]", {
+ arrow: true,
+ placement: "top"
+ });
+ // Pour les images map, pas de flèche, bulle haut suivant le curseur
+
+ tippy('img[title], a[title], area[title]', {
+
+ content(reference) {
+ const title = reference.getAttribute('title')
+ reference.removeAttribute('title')
+ return title
+ },
+
+ placement: "top",
+ followCursor: true,
+ animation: "fade",
+ animateFill: true
+ });
+ // Pour les images map, pas de flèche, bulle haut suivant le curseur
+ tippy("#image-map", {
+ placement: "top",
+ followCursor: true,
+ animation: "fade",
+ animateFill: true
+ });
+});
diff --git a/module/blog/blog.php b/module/blog/blog.php
index b25c4b0f..333a93dc 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -15,7 +15,7 @@
class blog extends common {
- const VERSION = '6.0';
+ const VERSION = '5.1';
const REALNAME = 'Blog';
const DELETE = true;
const UPDATE = '0.0';
@@ -32,7 +32,6 @@ class blog extends common {
'commentDelete' => self::GROUP_MODERATOR,
'commentDeleteAll' => self::GROUP_MODERATOR,
'config' => self::GROUP_MODERATOR,
- 'option' => self::GROUP_MODERATOR,
'delete' => self::GROUP_MODERATOR,
'edit' => self::GROUP_MODERATOR,
'index' => self::GROUP_VISITOR,
@@ -101,9 +100,6 @@ class blog extends common {
self::EDIT_OWNER => 'Propriétaire'
];
- // Nombre d'articles dans la page de config:
- public static $itemsperPage = 8;
-
public static $users = [];
@@ -402,116 +398,103 @@ class blog extends common {
* Configuration
*/
public function config() {
-
- // Ids des articles par ordre de publication
- $articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
- // Gestion des droits d'accès
- $filterData=[];
- foreach ($articleIds as $key => $value) {
- if (
- ( // Propriétaire
- $this->getData(['module', $this->getUrl(0), 'posts', $value,'editConsent']) === self::EDIT_OWNER
- AND ( $this->getData(['module', $this->getUrl(0), 'posts', $value,'userId']) === $this->getUser('id')
- OR $this->getUser('group') === self::GROUP_ADMIN )
- )
-
- OR (
- // Groupe
- $this->getData(['module', $this->getUrl(0), 'posts', $value,'editConsent']) !== self::EDIT_OWNER
- AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), 'posts', $value,'editConsent'])
- )
- OR (
- // Tout le monde
- $this->getData(['module', $this->getUrl(0), 'posts', $value,'editConsent']) === self::EDIT_ALL
- )
- ) {
- $filterData[] = $value;
- }
- }
- $articleIds = $filterData;
- // Pagination
- $pagination = helper::pagination($articleIds, $this->getUrl(),self::$itemsperPage);
- // Liste des pages
- self::$pages = $pagination['pages'];
- // Articles en fonction de la pagination
- for($i = $pagination['first']; $i < $pagination['last']; $i++) {
- // Nombre de commentaires à approuver et approuvés
- $approvals = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'comment' ]),'approval', 'SORT_DESC');
- if ( is_array($approvals) ) {
- $a = array_values($approvals);
- $toApprove = count(array_keys($a,false));
- $approved = count(array_keys($a,true));
- } else {
- $toApprove = 0;
- $approved = count($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i],'comment']));
- }
- // Met en forme le tableau
- $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
- ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
- : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
- $heure = mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
- ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
- : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
- self::$articles[] = [
- '
' .
- $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'title']) .
- '',
- $date .' à '. $heure,
- self::$states[$this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'state'])],
- // Bouton pour afficher les commentaires de l'article
- template::button('blogConfigComment' . $articleIds[$i], [
- 'class' => ($toApprove || $approved ) > 0 ? '' : 'buttonGrey' ,
- 'href' => ($toApprove || $approved ) > 0 ? helper::baseUrl() . $this->getUrl(0) . '/comment/' . $articleIds[$i] : '',
- 'value' => $toApprove > 0 ? $toApprove . '/' . $approved : $approved,
- 'help' => ($toApprove || $approved ) > 0 ? 'Editer / Approuver les commentaires' : ''
- ]),
- template::button('blogConfigEdit' . $articleIds[$i], [
- 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
- 'value' => template::ico('pencil'),
- 'help' => 'Editer l\'article'
- ]),
- template::button('blogConfigDelete' . $articleIds[$i], [
- 'class' => 'blogConfigDelete buttonRed',
- 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
- 'value' => template::ico('cancel'),
- 'help' => 'Effacer l\'article'
- ])
- ];
- }
- // Valeurs en sortie
- $this->addOutput([
- 'title' => 'Configuration du module',
- 'view' => 'config'
- ]);
- }
-
- public function option() {
// Mise à jour des données de module
$this->update();
// Soumission du formulaire
if($this->isPost()) {
$this->setData(['module', $this->getUrl(0), 'config',[
- 'feeds' => $this->getInput('blogOptionShowFeeds',helper::FILTER_BOOLEAN),
- 'feedsLabel' => $this->getInput('blogOptionFeedslabel',helper::FILTER_STRING_SHORT),
- 'itemsperPage' => $this->getInput('blogOptionItemsperPage', helper::FILTER_INT,true),
+ 'feeds' => $this->getInput('blogConfigShowFeeds',helper::FILTER_BOOLEAN),
+ 'feedsLabel' => $this->getInput('blogConfigFeedslabel',helper::FILTER_STRING_SHORT),
+ 'itemsperPage' => $this->getInput('blogConfigItemsperPage', helper::FILTER_INT,true),
'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
]]);
// Valeurs en sortie
$this->addOutput([
- 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/option',
+ 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
'notification' => 'Modifications enregistrées',
'state' => true
]);
} else {
+ // Ids des articles par ordre de publication
+ $articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
+ // Gestion des droits d'accès
+ $filterData=[];
+ foreach ($articleIds as $key => $value) {
+ if (
+ ( // Propriétaire
+ $this->getData(['module', $this->getUrl(0), 'posts', $value,'editConsent']) === self::EDIT_OWNER
+ AND ( $this->getData(['module', $this->getUrl(0), 'posts', $value,'userId']) === $this->getUser('id')
+ OR $this->getUser('group') === self::GROUP_ADMIN )
+ )
+
+ OR (
+ // Groupe
+ $this->getData(['module', $this->getUrl(0), 'posts', $value,'editConsent']) !== self::EDIT_OWNER
+ AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), 'posts', $value,'editConsent'])
+ )
+ OR (
+ // Tout le monde
+ $this->getData(['module', $this->getUrl(0), 'posts', $value,'editConsent']) === self::EDIT_ALL
+ )
+ ) {
+ $filterData[] = $value;
+ }
+ }
+ $articleIds = $filterData;
+ // Pagination
+ $pagination = helper::pagination($articleIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0),'config', 'itemsperPage']));
+ // Liste des pages
+ self::$pages = $pagination['pages'];
+ // Articles en fonction de la pagination
+ for($i = $pagination['first']; $i < $pagination['last']; $i++) {
+ // Nombre de commentaires à approuver et approuvés
+ $approvals = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'comment' ]),'approval', 'SORT_DESC');
+ if ( is_array($approvals) ) {
+ $a = array_values($approvals);
+ $toApprove = count(array_keys($a,false));
+ $approved = count(array_keys($a,true));
+ } else {
+ $toApprove = 0;
+ $approved = count($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i],'comment']));
+ }
+ // Met en forme le tableau
+ $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+ ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+ : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+ $heure = mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+ ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+ : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+ self::$articles[] = [
+ '
' .
+ $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'title']) .
+ '',
+ $date .' à '. $heure,
+ self::$states[$this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'state'])],
+ // Bouton pour afficher les commentaires de l'article
+ template::button('blogConfigComment' . $articleIds[$i], [
+ 'class' => ($toApprove || $approved ) > 0 ? '' : 'buttonGrey' ,
+ 'href' => ($toApprove || $approved ) > 0 ? helper::baseUrl() . $this->getUrl(0) . '/comment/' . $articleIds[$i] : '',
+ 'value' => $toApprove > 0 ? $toApprove . '/' . $approved : $approved
+ ]),
+ template::button('blogConfigEdit' . $articleIds[$i], [
+ 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
+ 'value' => template::ico('pencil')
+ ]),
+ template::button('blogConfigDelete' . $articleIds[$i], [
+ 'class' => 'blogConfigDelete buttonRed',
+ 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $articleIds[$i] . '/' . $_SESSION['csrf'],
+ 'value' => template::ico('cancel')
+ ])
+ ];
+ }
// Valeurs en sortie
$this->addOutput([
- 'title' => 'Options de configuration',
- 'view' => 'option'
+ 'title' => 'Configuration du module',
+ 'view' => 'config'
]);
}
}
-
/**
* Suppression
*/
diff --git a/module/blog/changes.md b/module/blog/changes.md
deleted file mode 100644
index 6a7d7be0..00000000
--- a/module/blog/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# version 6
- - mise à la norme avec le module news : le formulaire est sorti de l'écran principal
\ No newline at end of file
diff --git a/module/blog/view/add/add.php b/module/blog/view/add/add.php
index 22e51de4..7f50b45e 100644
--- a/module/blog/view/add/add.php
+++ b/module/blog/view/add/add.php
@@ -1,16 +1,17 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
+
true,
- 'value' => 'Brouillon'
+ 'value' => 'Enregistrer en brouillon'
]); ?>
true
diff --git a/module/blog/view/config/config.php b/module/blog/view/config/config.php
index df44db80..736151c9 100644
--- a/module/blog/view/config/config.php
+++ b/module/blog/view/config/config.php
@@ -1,27 +1,51 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0), 'posts',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
- helper::baseUrl() . $this->getUrl(0) . '/option',
- 'value' => template::ico('sliders'),
- 'help' => 'Options de configuration'
- ]); ?>
-
-
-
+
helper::baseUrl() . $this->getUrl(0) . '/add',
- 'value' => template::ico('plus'),
- 'help' => 'Rédiger un article'
+ 'ico' => 'plus',
+ 'value' => 'Article'
]); ?>
+
+
+
+
+
+
+
+
Paramètres du module
+
+
+ $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
+ ]); ?>
+
+
+ 'Texte de l\'étiquette',
+ 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
+ ]); ?>
+
+
+
+
+ 'Articles par page',
+ 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
+ ]); ?>
+
+
+
+
diff --git a/module/blog/view/edit/edit.php b/module/blog/view/edit/edit.php
index b60da969..404467b8 100644
--- a/module/blog/view/edit/edit.php
+++ b/module/blog/view/edit/edit.php
@@ -1,16 +1,17 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
+
true,
- 'value' => 'Brouillon'
+ 'value' => 'Enregistrer en brouillon'
]); ?>
true
diff --git a/module/blog/view/option/option.php b/module/blog/view/option/option.php
deleted file mode 100644
index 721eb6a7..00000000
--- a/module/blog/view/option/option.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
- 'buttonGrey',
- 'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
- ]); ?>
-
-
-
-
-
-
-
-
-
Paramètres du module
-
-
- $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
- ]); ?>
-
-
- 'Texte de l\'étiquette',
- 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
- ]); ?>
-
-
-
-
- 'Articles par page',
- 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
- ]); ?>
-
-
-
-
-
-
-
Version n°
-
-
-
diff --git a/module/form/changes.md b/module/form/changes.md
deleted file mode 100644
index c8442301..00000000
--- a/module/form/changes.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Version 3
- - Déplacement des options de formulaires
- - Gabarit du formulaire sur la page
\ No newline at end of file
diff --git a/module/form/form.php b/module/form/form.php
index 496272ba..627ad4da 100644
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -16,7 +16,7 @@
class form extends common {
- const VERSION = '3.0';
+ const VERSION = '2.11';
const REALNAME = 'Formulaire';
const DELETE = true;
const UPDATE = '0.0';
@@ -24,7 +24,6 @@ class form extends common {
public static $actions = [
'config' => self::GROUP_MODERATOR,
- 'option' => self::GROUP_MODERATOR,
'data' => self::GROUP_MODERATOR,
'delete' => self::GROUP_MODERATOR,
'deleteall' => self::GROUP_MODERATOR,
@@ -39,9 +38,6 @@ class form extends common {
public static $pagination;
- // Nombre d'articles dans la page de config:
- public static $itemperPage = 20;
-
// Objets
const TYPE_MAIL = 'mail';
@@ -79,35 +75,38 @@ class form extends common {
'100' => '100%'
];
- public static $optionOffset = [
- 0 => 'Aucune',
- 1 => 'Une colonne',
- 2 => 'Deux colonnes'
- ];
-
- public static $optionWidth = [
- 6 => 'Six colonnes',
- 7 => 'Sept colonnes',
- 8 => 'Huit colonnes',
- 9 => 'Neuf colonnes',
- 10 => 'Dix colonnes',
- 11 => 'Onze colonnes',
- 12 => 'Douze colonnes',
- ];
-
- public static $optionAlign = [
- '' => 'A gauche',
- 'textAlignCenter' => 'Au centre',
- 'textAlignRight' => 'A droite'
- ];
-
-
/**
* Configuration
*/
public function config() {
+ // Liste des utilisateurs
+ $userIdsFirstnames = helper::arrayCollumn($this->getData(['user']), 'firstname');
+ ksort($userIdsFirstnames);
+ self::$listUsers [] = '';
+ foreach($userIdsFirstnames as $userId => $userFirstname) {
+ self::$listUsers [] = $userId;
+ }
// Soumission du formulaire
if($this->isPost()) {
+ // Configuration
+ $this->setData([
+ 'module',
+ $this->getUrl(0),
+ 'config',
+ [
+ 'button' => $this->getInput('formConfigButton'),
+ 'captcha' => $this->getInput('formConfigCaptcha', helper::FILTER_BOOLEAN),
+ 'group' => $this->getInput('formConfigGroup', helper::FILTER_INT),
+ 'user' => self::$listUsers [$this->getInput('formConfigUser', helper::FILTER_INT)],
+ 'mail' => $this->getInput('formConfigMail') ,
+ 'pageId' => $this->getInput('formConfigPageIdToggle', helper::FILTER_BOOLEAN) === true ? $this->getInput('formConfigPageId', helper::FILTER_ID) : '',
+ 'subject' => $this->getInput('formConfigSubject'),
+ 'replyto' => $this->getInput('formConfigMailReplyTo', helper::FILTER_BOOLEAN),
+ 'signature' => $this->getInput('formConfigSignature'),
+ 'logoUrl' => $this->getInput('formConfigLogo'),
+ 'logoWidth' => $this->getInput('formConfigLogoWidth')
+ ]
+ ]);
// Génération des données vides
if ($this->getData(['module', $this->getUrl(0), 'data']) === null) {
$this->setData(['module', $this->getUrl(0), 'data', []]);
@@ -149,75 +148,6 @@ class form extends common {
]);
}
-
- public function option() {
- // Liste des utilisateurs
- $userIdsFirstnames = helper::arrayCollumn($this->getData(['user']), 'firstname');
- ksort($userIdsFirstnames);
- self::$listUsers [] = '';
- foreach ($userIdsFirstnames as $userId => $userFirstname) {
- self::$listUsers [] = $userId;
- }
- // Soumission du formulaire
- if ($this->isPost()) {
- // Débordement
- $width = $this->getInput('formOptionWidth');
- if ($this->getInput('formOptionWidth',helper::FILTER_INT) + $this->getInput('formOptionOffset',helper::FILTER_INT) > 12 ) {
- $width = (string) $this->getInput('formOptionWidth',helper::FILTER_INT) - $this->getInput('formOptionOffset',helper::FILTER_INT);
- }
-
- // Configuration
- $this->setData([
- 'module',
- $this->getUrl(0),
- 'config',
- [
- 'button' => $this->getInput('formOptionButton'),
- 'captcha' => $this->getInput('formOptionCaptcha', helper::FILTER_BOOLEAN),
- 'group' => $this->getInput('formOptionGroup', helper::FILTER_INT),
- 'user' => self::$listUsers [$this->getInput('formOptionUser', helper::FILTER_INT)],
- 'mail' => $this->getInput('formOptionMail') ,
- 'pageId' => $this->getInput('formOptionPageIdToggle', helper::FILTER_BOOLEAN) === true ? $this->getInput('formOptionPageId', helper::FILTER_ID) : '',
- 'subject' => $this->getInput('formOptionSubject'),
- 'replyto' => $this->getInput('formOptionMailReplyTo', helper::FILTER_BOOLEAN),
- 'signature' => $this->getInput('formOptionSignature'),
- 'logoUrl' => $this->getInput('formOptionLogo'),
- 'logoWidth' => $this->getInput('formOptionLogoWidth'),
- 'offset' =>$this->getInput('formOptionOffset'),
- 'width' =>$width,
- 'align' =>$this->getInput('formOptionAlign'),
- ]
- ]);
- // Génération des données vides
- if ($this->getData(['module', $this->getUrl(0), 'data']) === null) {
- $this->setData(['module', $this->getUrl(0), 'data', []]);
- }
- // Valeurs en sortie
- $this->addOutput([
- 'notification' => 'Modifications enregistrées' ,
- 'redirect' => helper::baseUrl() . $this->getUrl(),
- 'state' => true
- ]);
- } else {
- // Liste des pages
- foreach($this->getHierarchy(null, false) as $parentPageId => $childrenPageIds) {
- self::$pages[$parentPageId] = $this->getData(['page', $parentPageId, 'title']);
- foreach($childrenPageIds as $childKey) {
- self::$pages[$childKey] = ' ' . $this->getData(['page', $childKey, 'title']);
- }
- }
- // Valeurs en sortie
- $this->addOutput([
- 'title' => 'Options de configuration',
- 'vendor' => [
- 'html-sortable',
- 'flatpickr'
- ],
- 'view' => 'option'
- ]);
- }
- }
-
/**
* Données enregistrées
*/
@@ -225,7 +155,7 @@ class form extends common {
$data = $this->getData(['module', $this->getUrl(0), 'data']);
if($data) {
// Pagination
- $pagination = helper::pagination($data, $this->getUrl(), self::$itemsperPages);
+ $pagination = helper::pagination($data, $this->getUrl(),self::ITEMSPAGE);
// Liste des pages
self::$pages = $pagination['pages'];
// Inverse l'ordre du tableau
diff --git a/module/form/view/config/config.js.php b/module/form/view/config/config.js.php
index 2d64a2aa..1522ee3d 100644
--- a/module/form/view/config/config.js.php
+++ b/module/form/view/config/config.js.php
@@ -54,15 +54,6 @@ function add(inputUid, input) {
position();
}
-/**
- * Afficher/cacher les options supplémentaires
- */
- $(document).on("click", ".formConfigMoreToggle", function() {
-
- $(this).parents(".formConfigInput").find(".formConfigMore").slideToggle();
- $(this).parents(".formConfigInput").find(".formConfigMoreLabel").slideToggle();
-});
-
/**
* Calcul des positions
*/
@@ -85,6 +76,14 @@ if(inputs) {
});
}
+/**
+ * Afficher/cacher les options supplémentaires
+ */
+$(document).on("click", ".formConfigMoreToggle", function() {
+
+ $(this).parents(".formConfigInput").find(".formConfigMore").slideToggle();
+ $(this).parents(".formConfigInput").find(".formConfigMoreLabel").slideToggle();
+});
/**
* Crée un nouveau champ à partir des champs cachés
@@ -97,12 +96,6 @@ $("#formConfigAdd").on("click", function() {
/**
* Actions sur les champs
*/
-
-// Validation auto après ajout d'un champ
-$("a#formConfigAdd.button").click(function () {
- $("#formConfigForm").submit();
-});
-
// Tri entre les champs
sortable("#formConfigInputs", {
forcePlaceholderSize: true,
@@ -150,3 +143,73 @@ $("#formConfigInputs")
});
// Simule un changement de type au chargement de la page
$(".formConfigType").trigger("change");
+
+/**
+ * Affiche/cache les options de la case à cocher du mail
+ */
+$("#formConfigMailOptionsToggle").on("change", function() {
+ if($(this).is(":checked")) {
+ $("#formConfigMailOptions").slideDown();
+ }
+ else {
+ $("#formConfigMailOptions").slideUp(function() {
+ $("#formConfigGroup").val("");
+ $("#formConfigSubject").val("");
+ $("#formConfigMail").val("");
+ $("#formConfigUser").val("");
+ });
+ }
+}).trigger("change");
+
+/**
+ * Affiche/cache les options de la case à cocher de la redirection
+ */
+$("#formConfigPageIdToggle").on("change", function() {
+ if($(this).is(":checked")) {
+ $("#formConfigPageIdWrapper").slideDown();
+ }
+ else {
+ $("#formConfigPageIdWrapper").slideUp(function() {
+ $("#formConfigPageId").val("");
+ });
+ }
+}).trigger("change");
+
+/**
+* Paramètres par défaut au chargement
+*/
+$( document ).ready(function() {
+
+ /**
+ * Masquer ou afficher la sélection du logo
+ */
+ if ($("#formConfigSignature").val() !== "text") {
+ $("#formConfigLogoWrapper").addClass("disabled");
+ $("#formConfigLogoWrapper").slideDown();
+ $("#formConfigLogoWidthWrapper").addClass("disabled");
+ $("#formConfigLogoWidthWrapper").slideDown();
+ } else {
+ $("#formConfigLogoWrapper").removeClass("disabled");
+ $("#formConfigLogoWrapper").slideUp();
+ $("#formConfigLogoWidthWrapper").removeClass("disabled");
+ $("#formConfigLogoWidthWrapper").slideUp();
+ }
+});
+
+/**
+ * Masquer ou afficher la sélection du logo
+ */
+var formConfigSignatureDOM = $("#formConfigSignature");
+formConfigSignatureDOM.on("change", function() {
+ if ($(this).val() !== "text") {
+ $("#formConfigLogoWrapper").addClass("disabled");
+ $("#formConfigLogoWrapper").slideDown();
+ $("#formConfigLogoWidthWrapper").addClass("disabled");
+ $("#formConfigLogoWidthWrapper").slideDown();
+ } else {
+ $("#formConfigLogoWrapper").removeClass("disabled");
+ $("#formConfigLogoWrapper").slideUp();
+ $("#formConfigLogoWidthWrapper").removeClass("disabled");
+ $("#formConfigLogoWidthWrapper").slideUp();
+ }
+});
diff --git a/module/form/view/config/config.php b/module/form/view/config/config.php
index 49050a8d..6631a20a 100644
--- a/module/form/view/config/config.php
+++ b/module/form/view/config/config.php
@@ -49,48 +49,140 @@
-
-
- 'buttonGrey',
- 'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
- 'value' => template::ico('left')
- ]); ?>
-
-
- helper::baseUrl() . $this->getUrl(0) . '/data',
- 'value' => template::ico('code'),
- 'help' => 'Voir et exporter les données du formulaire'
- ]); ?>
-
-
- helper::baseUrl() . $this->getUrl(0) . '/option',
- 'value' => template::ico('sliders'),
- 'help' => 'Options de configuration'
- ]); ?>
-
-
-
-
-
-
-
Liste des champs
-
-
-
-
-
- template::ico('plus'),
- 'class' => 'buttonGreen'
+
+ 'buttonGrey',
+ 'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
+
+ helper::baseUrl() . $this->getUrl(0) . '/data',
+ 'value' => 'Gérer les données'
+ ]); ?>
+
+
+
+
+
+
+
+
+
Configuration
+ 'Laissez vide afin de conserver le texte par défaut.',
+ 'label' => 'Texte du bouton de soumission',
+ 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'button'])
+ ]); ?>
+ (bool) $this->getData(['module', $this->getUrl(0), 'config', 'group']) ||
+ !empty($this->getData(['module', $this->getUrl(0), 'config', 'user'])) ||
+ !empty($this->getData(['module', $this->getUrl(0), 'config', 'mail'])),
+ 'help' => 'Sélectionnez au moins un groupe, un utilisateur ou saississez un email. Votre serveur doit autoriser les envois de mail.'
+ ]); ?>
+
+
+
+ 'Sélectionner le type de signature',
+ 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'signature'])
+ ]); ?>
+
+
+ 'Sélectionnez le logo du site',
+ 'label' => 'Logo',
+ 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'logoUrl'])
+ ]); ?>
+
+
+ 'Sélectionner la largeur du logo',
+ 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'logoWidth'])
+ ]); ?>
+
+
+
+
+ (bool) $this->getData(['module', $this->getUrl(0), 'config', 'pageId'])
+ ]); ?>
+
+
+ 'displayNone',
+ 'label' => 'Sélectionner une page du site :',
+ 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'pageId'])
+ ]); ?>
+
+
+ $this->getData(['module', $this->getUrl(0), 'config', 'captcha'])
+ ]); ?>
+
+
+
Liste des champs
+
+
+
+
+
+
+ template::ico('plus')
+ ]); ?>
+
+
+
+
-
-
Version n°
diff --git a/module/form/view/data/data.php b/module/form/view/data/data.php
index 147548a7..d0a22868 100644
--- a/module/form/view/data/data.php
+++ b/module/form/view/data/data.php
@@ -1,24 +1,25 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
+
'formDataDeleteAll buttonRed',
'href' => helper::baseUrl() . $this->getUrl(0) . '/deleteall' . '/' . $_SESSION['csrf'],
- 'value' => template::ico('cancel'),
- 'help' => 'Effacer toutes les données'
+ 'ico' => 'cancel',
+ 'value' => 'Tout effacer'
]); ?>
-
+
helper::baseUrl() . $this->getUrl(0) . '/export2csv' . '/' . $_SESSION['csrf'],
- 'value' => template::ico('download'),
- 'help' => 'Exporter toutes les données'
+ 'ico' => 'download',
+ 'value' => 'Export CSV'
]); ?>
diff --git a/module/form/view/index/index.php b/module/form/view/index/index.php
index c2251225..6eba5cc9 100644
--- a/module/form/view/index/index.php
+++ b/module/form/view/index/index.php
@@ -1,75 +1,67 @@
getData(['module', $this->getUrl(0), 'input'])): ?>
-
-
-
- getData(['module', $this->getUrl(0), 'input']) as $index => $input): ?>
-
- 'formInput_' . $index,
- 'label' => $input['name']
- ]); ?>
-
- $key) {
- $values[$value] = trim($value);
- }
- ?>
- 'formInput_' . $index,
- 'label' => $input['name']
- ]); ?>
-
- 'formInput_' . $index,
- 'label' => $input['name']
- ]); ?>
-
- 'formInput_' . $index,
- 'label' => $input['name']
- ]); ?>
-
- 'formInput_' . $index,
- 'label' => $input['name'],
- 'vendor' => 'flatpickr'
- ]); ?>
-
-
-
-
-
-
- getData(['module', $this->getUrl(0), 'config', 'captcha'])): ?>
-
-
- $this->getData(['config','connect', 'captchaStrong']),
- 'type' => $this->getData(['config','connect', 'captchaType'])
- ]); ?>
-
-
+
+ getData(['module', $this->getUrl(0), 'input']) as $index => $input): ?>
+
+ 'formInput_' . $index,
+ 'label' => $input['name']
+ ]); ?>
+
+ $key) {
+ $values[$value] = trim($value);
+ }
+ ?>
+ 'formInput_' . $index,
+ 'label' => $input['name']
+ ]); ?>
+
+ 'formInput_' . $index,
+ 'label' => $input['name']
+ ]); ?>
+
+ 'formInput_' . $index,
+ 'label' => $input['name']
+ ]); ?>
+
+ 'formInput_' . $index,
+ 'label' => $input['name'],
+ 'vendor' => 'flatpickr'
+ ]); ?>
+
+
+
+
+
+ getData(['module', $this->getUrl(0), 'config', 'captcha'])): ?>
-
- $this->getData(['module', $this->getUrl(0), 'config', 'button']) ? $this->getData(['module', $this->getUrl(0), 'config', 'button']) : 'Envoyer',
- 'ico' => ''
+
+ $this->getData(['config','connect', 'captchaStrong']),
+ 'type' => $this->getData(['config','connect', 'captchaType'])
]); ?>
+
+
+
+ $this->getData(['module', $this->getUrl(0), 'config', 'button']) ? $this->getData(['module', $this->getUrl(0), 'config', 'button']) : 'Envoyer',
+ 'ico' => ''
+ ]); ?>
+
-
-
-
+
\ No newline at end of file
diff --git a/module/form/view/option/option.js.php b/module/form/view/option/option.js.php
deleted file mode 100644
index 2148e0c6..00000000
--- a/module/form/view/option/option.js.php
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-/*
-* Affiche/cache les options de la case à cocher du mail
-*/
-$("#formOptionMailOptionsToggle").on("change", function() {
- if($(this).is(":checked")) {
- $("#formOptionMailOptions").slideDown();
- }
- else {
- $("#formOptionMailOptions").slideUp(function() {
- $("#formOptionGroup").val("");
- $("#formOptionSubject").val("");
- $("#formOptionMail").val("");
- $("#formOptionUser").val("");
- });
- }
-}).trigger("change");
-
-/**
-* Affiche/cache les options de la case à cocher de la redirection
-*/
-$("#formOptionPageIdToggle").on("change", function() {
- if($(this).is(":checked")) {
- $("#formOptionPageIdWrapper").slideDown();
- }
- else {
- $("#formOptionPageIdWrapper").slideUp(function() {
- $("#formOptionPageId").val("");
- });
- }
-}).trigger("change");
-
-/**
-* Paramètres par défaut au chargement
-*/
-$( document ).ready(function() {
-
- /**
- * Masquer ou afficher la sélection du logo
- */
- if ($("#formOptionSignature").val() !== "text") {
- $("#formOptionLogoWrapper").addClass("disabled");
- $("#formOptionLogoWrapper").slideDown();
- $("#formOptionLogoWidthWrapper").addClass("disabled");
- $("#formOptionLogoWidthWrapper").slideDown();
- } else {
- $("#formOptionLogoWrapper").removeClass("disabled");
- $("#formOptionLogoWrapper").slideUp();
- $("#formOptionLogoWidthWrapper").removeClass("disabled");
- $("#formOptionLogoWidthWrapper").slideUp();
- }
-});
-
-/**
-* Masquer ou afficher la sélection du logo
-*/
-var formOptionSignatureDOM = $("#formOptionSignature");
-formOptionSignatureDOM.on("change", function() {
- if ($(this).val() !== "text") {
- $("#formOptionLogoWrapper").addClass("disabled");
- $("#formOptionLogoWrapper").slideDown();
- $("#formOptionLogoWidthWrapper").addClass("disabled");
- $("#formOptionLogoWidthWrapper").slideDown();
- } else {
- $("#formOptionLogoWrapper").removeClass("disabled");
- $("#formOptionLogoWrapper").slideUp();
- $("#formOptionLogoWidthWrapper").removeClass("disabled");
- $("#formOptionLogoWidthWrapper").slideUp();
- }
-});
\ No newline at end of file
diff --git a/module/form/view/option/option.php b/module/form/view/option/option.php
deleted file mode 100644
index fe479465..00000000
--- a/module/form/view/option/option.php
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
- 'buttonGrey',
- 'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
- ]); ?>
-
-
-
-
-
-
-
-
-
Validation du formulaire
-
-
- $this->getData(['module', $this->getUrl(0), 'config', 'captcha'])
- ]); ?>
-
-
- 'Laissez vide afin de conserver le texte par défaut.',
- 'label' => 'Etiquette du bouton de soumission',
- 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'button'])
- ]); ?>
-
-
-
-
- (bool) $this->getData(['module', $this->getUrl(0), 'config', 'pageId'])
- ]); ?>
-
-
- 'displayNone',
- 'label' => 'Page du site :',
- 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'pageId'])
- ]); ?>
-
-
-
-
-
-
-
-
-
Gabarit
-
-
- 'Alignement du formulaire',
- 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'align'])
- ]); ?>
-
-
-
-
- 'Décalage à gauche',
- 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'offset'])
- ]); ?>
-
-
- 'Largeur',
- 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'width'])
- ]); ?>
-
-
-
-
-
-
-
-
-
Courriel
- (bool) $this->getData(['module', $this->getUrl(0), 'config', 'group']) ||
- !empty($this->getData(['module', $this->getUrl(0), 'config', 'user'])) ||
- !empty($this->getData(['module', $this->getUrl(0), 'config', 'mail'])),
- 'help' => 'Sélectionnez au moins un groupe, un utilisateur ou saisissez un email. Votre serveur doit autoriser les envois de mail.'
- ]); ?>
-
-
-
-
-
\ No newline at end of file
diff --git a/module/gallery/changes.md b/module/gallery/changes.md
deleted file mode 100644
index 5eaca775..00000000
--- a/module/gallery/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# version 3.4
- - Changement de nom du bouton Thème devient mise en page
\ No newline at end of file
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index e2d99e61..37a8a0df 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -17,7 +17,7 @@
class gallery extends common {
- const VERSION = '3.4';
+ const VERSION = '3.3';
const REALNAME = 'Galerie';
const DELETE = true;
const UPDATE = '0.0';
@@ -346,14 +346,12 @@ class gallery extends common {
$gallery['config']['directory'],
template::button('galleryConfigEdit' . $galleryId , [
'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $galleryId . '/' . $_SESSION['csrf'],
- 'value' => template::ico('pencil'),
- 'help' => 'Configuration de la galerie '
+ 'value' => template::ico('pencil')
]),
template::button('galleryConfigDelete' . $galleryId, [
'class' => 'galleryConfigDelete buttonRed',
'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $galleryId . '/' . $_SESSION['csrf'],
- 'value' => template::ico('cancel'),
- 'help' => 'Supprimer cette galerie'
+ 'value' => template::ico('cancel')
])
];
// Tableau des id des galleries pour le drag and drop
diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php
index 5f1fc67f..91400a98 100644
--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@@ -1,17 +1,17 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
+
helper::baseUrl() . $this->getUrl(0) . '/theme/' . $_SESSION['csrf'],
- 'value' => template::ico('sliders'),
- 'help' => 'Options de configuration'
+ 'value' => template::ico('brush','right') . 'Thème'
]); ?>
diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php
index 240c85fa..df001bf7 100644
--- a/module/gallery/view/edit/edit.php
+++ b/module/gallery/view/edit/edit.php
@@ -1,13 +1,14 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
diff --git a/module/gallery/view/gallery/gallery.php b/module/gallery/view/gallery/gallery.php
index 235aac0d..9e617583 100644
--- a/module/gallery/view/gallery/gallery.php
+++ b/module/gallery/view/gallery/gallery.php
@@ -1,9 +1,10 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0),
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
diff --git a/module/gallery/view/theme/theme.php b/module/gallery/view/theme/theme.php
index a66c589d..8da3639e 100644
--- a/module/gallery/view/theme/theme.php
+++ b/module/gallery/view/theme/theme.php
@@ -1,14 +1,15 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
diff --git a/module/news/changes.md b/module/news/changes.md
deleted file mode 100644
index ea0c25f1..00000000
--- a/module/news/changes.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Version 4
- - Config : le nombre d'objet est fixe, constante dans news.php
- - Ecran layout réservé à la configuration et au thème
- - Bug avec l'initialisation, fichier css déclaré mais absent
-
- A faire partie CSS à amléiorer au niveau des options
\ No newline at end of file
diff --git a/module/news/news.php b/module/news/news.php
index 0f7a2aac..c2dbdabd 100644
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -15,7 +15,7 @@
class news extends common {
- const VERSION = '4.0';
+ const VERSION = '3.7';
const REALNAME = 'News';
const DELETE = true;
const UPDATE = '0.0';
@@ -23,8 +23,7 @@ class news extends common {
public static $actions = [
'add' => self::GROUP_MODERATOR,
- 'config' => self::GROUP_MODERATOR, // Edition des news
- 'option' => self::GROUP_MODERATOR, // paramétrage des news
+ 'config' => self::GROUP_MODERATOR,
'delete' => self::GROUP_MODERATOR,
'edit' => self::GROUP_MODERATOR,
'index' => self::GROUP_VISITOR,
@@ -89,8 +88,7 @@ class news extends common {
// Signature de l'article
public static $articleSignature = '';
- // Nombre d'articles dans la page de config:
- public static $itemsperPage = 8;
+
/**
* Flux RSS
@@ -191,65 +189,10 @@ class news extends common {
// Mise à jour des données de module
$this->update();
- // Ids des news par ordre de publication
- $newsIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
- // Pagination fixe
- $pagination = helper::pagination($newsIds, $this->getUrl(),self::$itemsperPage );
- // Liste des pages
- self::$pages = $pagination['pages'];
- // News en fonction de la pagination
- for($i = $pagination['first']; $i < $pagination['last']; $i++) {
- // Met en forme le tableau
- $dateOn = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
- ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
- : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
- $dateOn .= ' à ';
- $dateOn .= mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
- ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
- : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
- if ($this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])) {
- $dateOff = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
- ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
- : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
- $dateOff .= ' à ';
- $dateOff .= mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
- ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
- : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
- } else {
- $dateOff = 'Permanent';
- }
- self::$news[] = [
- $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'title']),
- $dateOn,
- $dateOff,
- self::$states[$this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'state'])],
- template::button('newsConfigEdit' . $newsIds[$i], [
- 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsIds[$i]. '/' . $_SESSION['csrf'],
- 'value' => template::ico('pencil'),
- 'help' => 'Editer cette nouvelle'
- ]),
- template::button('newsConfigDelete' . $newsIds[$i], [
- 'class' => 'newsConfigDelete buttonRed',
- 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $newsIds[$i] . '/' . $_SESSION['csrf'],
- 'value' => template::ico('cancel'),
- 'help' => 'Effacer cette nouvelle'
- ])
- ];
- }
- // Valeurs en sortie
- $this->addOutput([
- 'title' => 'Configuration du module',
- 'view' => 'config',
- 'vendor' => [
- 'tinycolorpicker'
- ]
- ]);
- }
-
- public function option() {
// Soumission du formulaire
if($this->isPost()) {
+
// Générer la feuille de CSS
$style = '.newsFrame {';
$style .= 'border:' . $this->getInput('newsThemeBorderStyle',helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor') . ' ' . $this->getInput('newsThemeBorderWidth',helper::FILTER_STRING_SHORT) . ';';
@@ -274,26 +217,69 @@ class news extends common {
]]);
$this->setData(['module', $this->getUrl(0), 'config',[
- 'feeds' => $this->getInput('newsOptionShowFeeds',helper::FILTER_BOOLEAN),
- 'feedsLabel' => $this->getInput('newsOptionFeedslabel',helper::FILTER_STRING_SHORT),
- 'itemsperPage' => $this->getInput('newsOptionItemsperPage', helper::FILTER_INT,true),
- 'itemsperCol' => $this->getInput('newsOptionItemsperCol', helper::FILTER_INT,true),
- 'height' => $this->getInput('newsOptionHeight', helper::FILTER_INT,true),
+ 'feeds' => $this->getInput('newsConfigShowFeeds',helper::FILTER_BOOLEAN),
+ 'feedsLabel' => $this->getInput('newsConfigFeedslabel',helper::FILTER_STRING_SHORT),
+ 'itemsperPage' => $this->getInput('newsConfigItemsperPage', helper::FILTER_INT,true),
+ 'itemsperCol' => $this->getInput('newsConfigItemsperCol', helper::FILTER_INT,true),
+ 'height' => $this->getInput('newsConfigHeight', helper::FILTER_INT,true),
'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
]]);
// Valeurs en sortie
$this->addOutput([
- 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/option',
+ 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
'notification' => 'Modifications enregistrées',
'state' => true
]);
} else {
+ // Ids des news par ordre de publication
+ $newsIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
+ // Pagination
+ $pagination = helper::pagination($newsIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0), 'config', 'itemsperPage']) );
+ // Liste des pages
+ self::$pages = $pagination['pages'];
+ // News en fonction de la pagination
+ for($i = $pagination['first']; $i < $pagination['last']; $i++) {
+ // Met en forme le tableau
+ $dateOn = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
+ ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
+ : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
+ $dateOn .= ' à ';
+ $dateOn .= mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
+ ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
+ : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
+ if ($this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])) {
+ $dateOff = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
+ ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
+ : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
+ $dateOff .= ' à ';
+ $dateOff .= mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
+ ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
+ : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
+ } else {
+ $dateOff = 'Permanent';
+ }
+ self::$news[] = [
+ $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'title']),
+ $dateOn,
+ $dateOff,
+ self::$states[$this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'state'])],
+ template::button('newsConfigEdit' . $newsIds[$i], [
+ 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsIds[$i]. '/' . $_SESSION['csrf'],
+ 'value' => template::ico('pencil')
+ ]),
+ template::button('newsConfigDelete' . $newsIds[$i], [
+ 'class' => 'newsConfigDelete buttonRed',
+ 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $newsIds[$i] . '/' . $_SESSION['csrf'],
+ 'value' => template::ico('cancel')
+ ])
+ ];
+ }
// Valeurs en sortie
$this->addOutput([
- 'title' => 'Options de configuration',
- 'view' => 'option',
+ 'title' => 'Configuration du module',
+ 'view' => 'config',
'vendor' => [
'tinycolorpicker'
]
@@ -449,7 +435,8 @@ class news extends common {
$newsIds[] = $newsId;
}
}
- // Pagination selon le layout
+ // Pagination
+ //$pagination = helper::pagination($newsIds, $this->getUrl(),$this->getData(['config','itemsperPage']));
$pagination = helper::pagination($newsIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0),'config', 'itemsperPage']));
// Nombre de colonnes
self::$nbrCol = $this->getData(['module', $this->getUrl(0),'config', 'itemsperCol']);
diff --git a/module/news/view/add/add.php b/module/news/view/add/add.php
index 59e3b9da..b4427b96 100644
--- a/module/news/view/add/add.php
+++ b/module/news/view/add/add.php
@@ -1,16 +1,17 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
+
true,
- 'value' => 'Brouillon'
+ 'value' => 'Enregistrer en brouillon'
]); ?>
true
diff --git a/module/news/view/config/config.php b/module/news/view/config/config.php
index 5527854a..873c9a66 100644
--- a/module/news/view/config/config.php
+++ b/module/news/view/config/config.php
@@ -1,28 +1,102 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),'posts',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
- helper::baseUrl() . $this->getUrl(0) . '/option',
- 'value' => template::ico('sliders'),
- 'help' => 'Options de configuration'
- ]); ?>
-
-
+
helper::baseUrl() . $this->getUrl(0) . '/add',
- 'value' => template::ico('plus'),
- 'help' => 'Rédiger une news'
+ 'ico' => 'plus',
+ 'value' => 'News'
]); ?>
+
+
+
+
+
+
+
+
Paramètres du module
+
+
+ $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
+ 'help' => 'Flux limité aux articles de la première page.'
+ ]); ?>
+
+
+ 'Etiquette RSS',
+ 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
+ ]); ?>
+
+
+
+
+ 'Nombre de colonnes',
+ 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperCol'])
+ ]); ?>
+
+
+ 'Articles par page',
+ 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
+ ]); ?>
+
+
+ 'Abrégé de l\'article',
+ 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'height'])
+ ]); ?>
+
+
+
+
+
+
+
+
+
Thème du module
+
+
+ 'Bordure',
+ 'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderStyle'])
+ ]); ?>
+
+
+ 'Epaisseur',
+ 'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderWidth'])
+ ]); ?>
+
+
+ 'colorPicker',
+ 'help' => 'Couleur visible en l\'absence d\'une image.
Le curseur horizontal règle le niveau de transparence.',
+ 'label' => 'Couleur de la bordure',
+ 'value' => $this->getData(['module', $this->getUrl(0),'theme', 'borderColor'])
+ ]); ?>
+
+
+ 'colorPicker',
+ 'help' => 'Couleur visible en l\'absence d\'une image.
Le curseur horizontal règle le niveau de transparence.',
+ 'label' => 'Couleur du fond',
+ 'value' => $this->getData(['module', $this->getUrl(0),'theme', 'backgroundColor'])
+ ]); ?>
+
+
+
+
-
diff --git a/module/news/view/edit/edit.php b/module/news/view/edit/edit.php
index 2cc71bc0..927be92d 100644
--- a/module/news/view/edit/edit.php
+++ b/module/news/view/edit/edit.php
@@ -4,13 +4,14 @@
'buttonGrey',
'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
+
true,
- 'value' => 'Brouillon'
+ 'value' => 'Enregistrer en brouillon'
]); ?>
true
diff --git a/module/news/view/option/option.css b/module/news/view/option/option.css
deleted file mode 100644
index 52709ea6..00000000
--- a/module/news/view/option/option.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez
- * @copyright Copyright (C) 2018-2022, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.fr/
- */
-
-
-/** NE PAS EFFACER
-* admin.css
-*/
\ No newline at end of file
diff --git a/module/news/view/option/option.php b/module/news/view/option/option.php
deleted file mode 100644
index 463439ec..00000000
--- a/module/news/view/option/option.php
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
- 'buttonGrey',
- 'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
- 'value' => template::ico('left')
- ]); ?>
-
-
-
-
-
-
-
-
-
Paramètres du module
-
-
- $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
- 'help' => 'Flux limité aux articles de la première page.'
- ]); ?>
-
-
- 'Etiquette RSS',
- 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
- ]); ?>
-
-
-
-
- 'Nombre de colonnes',
- 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperCol'])
- ]); ?>
-
-
- 'Articles par page',
- 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
- ]); ?>
-
-
- 'Abrégé de l\'article',
- 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'height'])
- ]); ?>
-
-
-
-
-
-
-
-
-
Thème du module
-
-
- 'Bordure',
- 'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderStyle'])
- ]); ?>
-
-
- 'Epaisseur',
- 'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderWidth'])
- ]); ?>
-
-
- 'colorPicker',
- 'help' => 'Couleur visible en l\'absence d\'une image.
Le curseur horizontal règle le niveau de transparence.',
- 'label' => 'Couleur de la bordure',
- 'value' => $this->getData(['module', $this->getUrl(0),'theme', 'borderColor'])
- ]); ?>
-
-
- 'colorPicker',
- 'help' => 'Couleur visible en l\'absence d\'une image.
Le curseur horizontal règle le niveau de transparence.',
- 'label' => 'Couleur du fond',
- 'value' => $this->getData(['module', $this->getUrl(0),'theme', 'backgroundColor'])
- ]); ?>
-
-
-
-
-
-
-Version n°
-
-
\ No newline at end of file
diff --git a/module/redirection/view/config/config.php b/module/redirection/view/config/config.php
index b786dbf1..ff421b39 100644
--- a/module/redirection/view/config/config.php
+++ b/module/redirection/view/config/config.php
@@ -1,13 +1,14 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-
diff --git a/module/search/view/config/config.php b/module/search/view/config/config.php
index ac8bcfc5..68b6ab8f 100644
--- a/module/search/view/config/config.php
+++ b/module/search/view/config/config.php
@@ -1,13 +1,14 @@
-
+
'buttonGrey',
'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0),
- 'value' => template::ico('left')
+ 'ico' => 'left',
+ 'value' => 'Retour'
]); ?>
-