From 3b661fa9e2fd98d0970ab86253af22ed3392eaf1 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 30 Dec 2024 20:52:41 +0100 Subject: [PATCH] =?UTF-8?q?1.16.00=20-=20Nouvelle=20option=20de=20masquage?= =?UTF-8?q?=20des=20pages=20dans=20le=20menu=20lorsque=20les=20pages=20son?= =?UTF-8?q?t=20list=C3=A9es=20dans=20une=20barre=20lat=C3=A9rale=20et=20qu?= =?UTF-8?q?e=20le=20menu=20ne=20doit=20afficher=20que=20les=20commandes=20?= =?UTF-8?q?extra=20-=20Remplace=20les=20variables=20$module=20par=20le=20n?= =?UTF-8?q?om=20de=20la=20classe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/class/layout.class.php | 2 +- core/core.js.php | 13 ++++---- core/core.php | 2 +- core/module/config/view/connect/connect.php | 8 ++--- core/module/config/view/locale/locale.php | 12 +++---- core/module/config/view/network/network.php | 6 ++-- core/module/config/view/setup/setup.php | 8 ++--- core/module/config/view/social/social.php | 10 +++--- core/module/course/view/add/add.php | 10 +++--- core/module/course/view/category/category.php | 4 +-- core/module/course/view/edit/edit.php | 10 +++--- core/module/course/view/export/export.php | 2 +- core/module/course/view/index/index.php | 4 +-- core/module/course/view/manage/manage.php | 8 ++--- core/module/course/view/suscribe/suscribe.php | 20 ++++++------ .../course/view/userReport/userReport.js.php | 6 ++-- .../course/view/userReport/userReport.php | 10 +++--- core/module/course/view/users/users.php | 10 +++--- core/module/course/view/usersAdd/usersAdd.php | 10 +++--- .../course/view/usersDelete/usersDelete.php | 10 +++--- core/module/install/view/index/index.php | 2 +- .../install/view/postinstall/postinstall.php | 2 +- core/module/install/view/update/update.php | 2 +- core/module/language/view/add/add.php | 2 +- core/module/language/view/copy/copy.php | 4 +-- core/module/language/view/edit/edit.php | 4 +-- core/module/language/view/index/index.php | 8 ++--- core/module/page/view/edit/edit.php | 30 ++++++++--------- core/module/plugin/view/index/index.php | 8 ++--- core/module/plugin/view/item/item.php | 14 ++++---- core/module/plugin/view/store/store.php | 4 +-- core/module/sitemap/view/index/index.php | 2 +- core/module/theme/theme.php | 3 +- core/module/theme/view/admin/admin.php | 12 +++---- core/module/theme/view/body/body.php | 8 ++--- core/module/theme/view/font/font.php | 4 +-- core/module/theme/view/footer/footer.php | 28 ++++++++-------- core/module/theme/view/header/header.php | 26 +++++++-------- core/module/theme/view/menu/menu.php | 32 +++++++++++-------- core/module/theme/view/site/site.php | 20 ++++++------ core/module/user/view/add/add.php | 14 ++++---- core/module/user/view/edit/edit.php | 14 ++++---- core/module/user/view/import/import.php | 6 ++-- core/module/user/view/index/index.php | 8 ++--- core/module/user/view/login/login.php | 4 +-- core/module/user/view/profil/profil.php | 2 +- core/module/user/view/profilAdd/profilAdd.php | 6 ++-- .../user/view/profilEdit/profilEdit.php | 6 ++-- core/module/user/view/tag/tag.php | 10 +++--- .../user/view/usersDelete/usersDelete.php | 10 +++--- 50 files changed, 234 insertions(+), 226 deletions(-) diff --git a/core/class/layout.class.php b/core/class/layout.class.php index d20bcc7..c2260af 100644 --- a/core/class/layout.class.php +++ b/core/class/layout.class.php @@ -496,7 +496,7 @@ class layout extends common public function showMenu() { // Met en forme les items du menu - $itemsLeft = $this->formatMenu(false); + $itemsLeft = $this->formatMenu(); // Menu extra $itemsRight = $this->formatMenu(true); diff --git a/core/core.js.php b/core/core.js.php index 26ce5c7..78a063d 100644 --- a/core/core.js.php +++ b/core/core.js.php @@ -221,7 +221,6 @@ core.start = function () { var e = new Date(); e.setFullYear(e.getFullYear() + 1); var expires = "expires=" + e.toUTCString() + ";"; - // Stocke le cookie d'acceptation document.cookie = "ZWII_COOKIE_CONSENT=true; samesite=lax; " + domain + path + expires; }); @@ -254,8 +253,6 @@ core.start = function () { } }); - - /** * Choix de page dans la barre de membre */ @@ -372,9 +369,13 @@ core.start = function () { } } }).trigger("resize"); - - - + /** + * Masque les pages du menu si demandé dans la configuration du thème du menu + */ + var hidePages = "getData(['theme', 'menu', 'hidePages'])?>"; + if (hidePages == 1) { + $("#menuLeft").css("visibility", "hidden"); + } }; diff --git a/core/core.php b/core/core.php index 9f2da92..ae07065 100644 --- a/core/core.php +++ b/core/core.php @@ -51,7 +51,7 @@ class common const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '1.15.04'; + const ZWII_VERSION = '1.16.0'; // URL autoupdate const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/'; diff --git a/core/module/config/view/connect/connect.php b/core/module/config/view/connect/connect.php index ee48bb7..fc3bc8e 100644 --- a/core/module/config/view/connect/connect.php +++ b/core/module/config/view/connect/connect.php @@ -26,13 +26,13 @@
- 'Limitation des tentatives', 'selected' => $this->getData(['config', 'connect', 'attempt']) ]); ?>
- 'Blocage après échecs', 'selected' => $this->getData(['config', 'connect', 'timeout']) ]); ?> @@ -73,7 +73,7 @@ ]); ?>
- 'Type de captcha', 'selected' => $this->getData(['config', 'connect', 'captchaType']) ]); ?> @@ -96,7 +96,7 @@ ]); ?>
- 'Anonymat des adresses IP', 'selected' => $this->getData(['config', 'connect', 'anonymousIp']), 'help' => 'La règlementation française impose un anonymat de niveau 2' diff --git a/core/module/config/view/locale/locale.php b/core/module/config/view/locale/locale.php index 69ddcac..c04f28e 100644 --- a/core/module/config/view/locale/locale.php +++ b/core/module/config/view/locale/locale.php @@ -44,21 +44,21 @@
- 'Page d\'accueil de la plate-forme', 'selected' => $this->homePageId(), 'help' => 'Ce n\'est pas la page d\'accueil d\'un espace.' ]); ?>
- 'Page par défaut'], helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [ + 'Page par défaut'], helper::arrayColumn(config::$orphansList, 'title', 'SORT_ASC')), [ 'label' => 'Accès interdit, erreur 403', 'selected' => $this->getData(['config', 'page403']), 'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.' ]); ?>
- 'Page par défaut'], helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [ + 'Page par défaut'], helper::arrayColumn(config::$orphansList, 'title', 'SORT_ASC')), [ 'label' => 'Page inexistante, erreur 404', 'selected' => $this->getData(['config', 'page404']), 'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.' @@ -67,14 +67,14 @@
- 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [ + 'Aucune'], helper::arrayColumn(config::$pagesList, 'title', 'SORT_ASC')), [ 'label' => 'Mentions légales', 'selected' => $this->getData(['config', 'legalPageId']), 'help' => 'Les mentions légales sont obligatoires en France. Une option du pied de page ajoute un lien discret vers cette page.' ]); ?>
- 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [ + 'Aucune'], helper::arrayColumn(config::$pagesList, 'title', 'SORT_ASC')), [ 'label' => 'Recherche dans le site', 'selected' => $this->getData(['config', 'searchPageId']), 'help' => 'Sélectionnez une page contenant le module \'Recherche\'. Une option du pied de page ajoute un lien discret vers cette page.' @@ -82,7 +82,7 @@
'Page par défaut'], helper::arrayColumn($module::$orphansList, 'title', 'SORT_ASC')), [ + echo template::select('configLocalePage302', array_merge(['none' => 'Page par défaut'], helper::arrayColumn(config::$orphansList, 'title', 'SORT_ASC')), [ 'label' => 'Site en maintenance', 'selected' => $this->getData(['config', 'page302']), 'help' => 'Cette page ne doit pas apparaître dans l\'arborescence du menu. Créez une page orpheline.' diff --git a/core/module/config/view/network/network.php b/core/module/config/view/network/network.php index a419595..aa4077d 100644 --- a/core/module/config/view/network/network.php +++ b/core/module/config/view/network/network.php @@ -7,7 +7,7 @@
- 'Type de proxy', 'selected' => $this->getData(['config', 'proxyType']) ]); ?> @@ -69,7 +69,7 @@ ]); ?>
- 'Authentification', 'selected' => $this->getData(['config', 'smtp', 'auth']) ]); ?> @@ -91,7 +91,7 @@ ]); ?>
- 'Sécurité', 'selected' => $this->getData(['config', 'smtp', 'secure']) ]); ?> diff --git a/core/module/config/view/setup/setup.php b/core/module/config/view/setup/setup.php index d254279..12fbcad 100644 --- a/core/module/config/view/setup/setup.php +++ b/core/module/config/view/setup/setup.php @@ -26,7 +26,7 @@ ]); ?>
- 'Fuseau horaire', 'selected' => $this->getData(['config', 'timezone']), 'help' => 'Le fuseau horaire est utile au bon référencement' @@ -44,7 +44,7 @@ helper::checkRewrite(), 'help' => 'Supprime le point d\'interrogation dans les URL, l\'option est indisponible avec les autres serveurs Web', - 'disabled' => helper::checkServerSoftware() === false and $module->isModRewriteEnabled() + 'disabled' => helper::checkServerSoftware() === false and config->isModRewriteEnabled() ]); ?>
@@ -74,7 +74,7 @@
- 'Fréquence de recherche', 'selected' => $this->getData(['config', 'autoUpdateDelay']), ]); ?> @@ -87,7 +87,7 @@ 'download-cloud', 'href' => helper::baseUrl() . 'install/update', - 'value' => $module::$updateButtonText, + 'value' => config::$updateButtonText, 'class' => 'buttonRed', ]); ?>
diff --git a/core/module/config/view/social/social.php b/core/module/config/view/social/social.php index cf64beb..e4043ca 100644 --- a/core/module/config/view/social/social.php +++ b/core/module/config/view/social/social.php @@ -24,18 +24,18 @@
- +

- %s', helper::translate('Format'), $module::$imageOpenGraph['type']); ?> + %s', helper::translate('Format'), config::$imageOpenGraph['type']); ?>

- %s x %s pixels', helper::translate('Dimensions minimales'), $module::$imageOpenGraph['wide'], $module::$imageOpenGraph['height']); ?> + %s x %s pixels', helper::translate('Dimensions minimales'), config::$imageOpenGraph['wide'], config::$imageOpenGraph['height']); ?>

- %s:1', helper::translate('Ratio'), round($module::$imageOpenGraph['ratio'], 2)); ?> + %s:1', helper::translate('Ratio'), round(config::$imageOpenGraph['ratio'], 2)); ?>

- %s', helper::translate('Poids'), $module::$imageOpenGraph['size']); ?> + %s', helper::translate('Poids'), config::$imageOpenGraph['size']); ?>

diff --git a/core/module/course/view/add/add.php b/core/module/course/view/add/add.php index dade2aa..776ee58 100644 --- a/core/module/course/view/add/add.php +++ b/core/module/course/view/add/add.php @@ -31,19 +31,19 @@ ]); ?>
- 'Auteur' ]); ?>
- 'Copier le thème depuis', ]); ?>
- 'Catégorie', ]); ?>
@@ -57,7 +57,7 @@
- 'Accès' ]); ?>
@@ -76,7 +76,7 @@
- 'Participation' ]); ?>
diff --git a/core/module/course/view/category/category.php b/core/module/course/view/category/category.php index a8a99e4..2484a76 100644 --- a/core/module/course/view/category/category.php +++ b/core/module/course/view/category/category.php @@ -15,8 +15,8 @@
- - + + \ No newline at end of file diff --git a/core/module/course/view/edit/edit.php b/core/module/course/view/edit/edit.php index 96b1b17..59f7d59 100644 --- a/core/module/course/view/edit/edit.php +++ b/core/module/course/view/edit/edit.php @@ -25,7 +25,7 @@ ]); ?>
- 'Auteur', 'selected' => $this->getdata(['course', $this->getUrl(2), 'author']) ]); ?> @@ -33,13 +33,13 @@
- 'Page d\'accueil', 'selected' => $this->getdata(['course', $this->getUrl(2), 'homePageId']), ]); ?>
- 'Catégorie', 'selected' => $this->getdata(['course', $this->getUrl(2), 'category']) ]); ?> @@ -55,7 +55,7 @@
- 'Disponibilité', 'selected' => $this->getdata(['course', $this->getUrl(2), 'access']) ]); ?> @@ -77,7 +77,7 @@
- 'Participation', 'selected' => $this->getdata(['course', $this->getUrl(2), 'enrolment']) ]); ?> diff --git a/core/module/course/view/export/export.php b/core/module/course/view/export/export.php index 174ba9c..1543219 100644 --- a/core/module/course/view/export/export.php +++ b/core/module/course/view/export/export.php @@ -31,7 +31,7 @@

- $value) { + $value) { echo $value; } ?> diff --git a/core/module/course/view/index/index.php b/core/module/course/view/index/index.php index a374468..de1c107 100644 --- a/core/module/course/view/index/index.php +++ b/core/module/course/view/index/index.php @@ -36,8 +36,8 @@
- - 'dataTables']); ?> + + 'dataTables']); ?> \ No newline at end of file diff --git a/core/module/course/view/manage/manage.php b/core/module/course/view/manage/manage.php index 97beec4..7c380a2 100644 --- a/core/module/course/view/manage/manage.php +++ b/core/module/course/view/manage/manage.php @@ -98,14 +98,14 @@
'Page d\'accueil', - 'value' => $module::$pagesList[$this->getdata(['course', $this->getUrl(2), 'homePageId'])]['shortTitle'], + 'value' => course::$pagesList[$this->getdata(['course', $this->getUrl(2), 'homePageId'])]['shortTitle'], 'readonly' => true, ]); ?>
'Catégorie', - 'value' => $module::$courseCategories[$this->getdata(['course', $this->getUrl(2), 'category'])], + 'value' => course::$courseCategories[$this->getdata(['course', $this->getUrl(2), 'category'])], 'readonly' => true, ]); ?>
@@ -123,7 +123,7 @@
'Disponibilité', - 'value' => $module::$courseAccess[$this->getdata(['course', $this->getUrl(2), 'access'])], + 'value' => course::$courseAccess[$this->getdata(['course', $this->getUrl(2), 'access'])], 'readonly' => true, ]); ?>
@@ -148,7 +148,7 @@
'Participation', - 'value' => $module::$courseEnrolment[$this->getdata(['course', $this->getUrl(2), 'enrolment'])], + 'value' => course::$courseEnrolment[$this->getdata(['course', $this->getUrl(2), 'enrolment'])], 'readonly' => true, ]); ?>
diff --git a/core/module/course/view/suscribe/suscribe.php b/core/module/course/view/suscribe/suscribe.php index a821150..f8518ae 100644 --- a/core/module/course/view/suscribe/suscribe.php +++ b/core/module/course/view/suscribe/suscribe.php @@ -4,14 +4,14 @@ Auteur : " . $this->signature($this->getData(['course', $this->getUrl(2), 'author'])) . ""; ?> Description : " . $this->getData(['course', $this->getUrl(2), 'description']) . "

"; ?> - Disponibilité : " . $module::$courseAccess[$this->getData(['course', $this->getUrl(2), 'access'])]; ?> - getData(['course', $this->getUrl(2), 'access']) === $module::COURSE_ACCESS_DATE): ?> + Disponibilité : " . course::$courseAccess[$this->getData(['course', $this->getUrl(2), 'access'])]; ?> + getData(['course', $this->getUrl(2), 'access']) === course::COURSE_ACCESS_DATE): ?> getData(['course', $this->getUrl(2), 'openingDate']), self::$i18nUI) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $this->getData(['course', $this->getUrl(2), 'openingDate']), self::$i18nUI); ?> getData(['course', $this->getUrl(2), 'closingDate']), self::$i18nUI) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $this->getData(['course', $this->getUrl(2), 'closingDate']), self::$i18nUI); ?> '; ?> - Inscription : " . $module::$courseEnrolment[$this->getData(['course', $this->getUrl(2), 'enrolment'])] . '.'; ?> + Inscription : " . course::$courseEnrolment[$this->getData(['course', $this->getUrl(2), 'enrolment'])] . '.'; ?> getData(['course', $this->getUrl(2), 'limitEnrolment']) === true && $this->getData(['course', $this->getUrl(2), 'limitEnrolmentDate']) <= time()):?> @@ -22,12 +22,12 @@
- -
@@ -40,7 +40,7 @@ 'value' => template::ico('left') ]); ?>
- +
helper::baseUrl(true) . 'user/login', @@ -51,8 +51,8 @@
$module::$swapMessage['submitLabel'], - 'disabled' => !($module->courseIsAvailable($this->getUrl(2)) + 'value' => course::$swapMessage['submitLabel'], + 'disabled' => !(course->courseIsAvailable($this->getUrl(2)) && !($this->getData(['course', $this->getUrl(2), 'limitEnrolment']) === true && $this->getData(['course', $this->getUrl(2), 'limitEnrolmentDate']) <= time()) ), diff --git a/core/module/course/view/userReport/userReport.js.php b/core/module/course/view/userReport/userReport.js.php index bebd5c1..3556dc5 100644 --- a/core/module/course/view/userReport/userReport.js.php +++ b/core/module/course/view/userReport/userReport.js.php @@ -13,9 +13,9 @@ $(document).ready((function () { - var dataX = ; - var dataY = ; - var dataText = ; + var dataX = ; + var dataY = ; + var dataText = ; var data = [{ x: dataX, diff --git a/core/module/course/view/userReport/userReport.php b/core/module/course/view/userReport/userReport.php index 0d0d390..417a1f7 100644 --- a/core/module/course/view/userReport/userReport.php +++ b/core/module/course/view/userReport/userReport.php @@ -20,7 +20,7 @@
- +
getData(['course', $this->getUrl(2), 'access']) === self::COURSE_ACCESS_DATE): ?> @@ -34,19 +34,19 @@

Commencé le : - +

Terminé le : - +

Temps passé : - +

- +
diff --git a/core/module/course/view/users/users.php b/core/module/course/view/users/users.php index 981a09c..726dd62 100644 --- a/core/module/course/view/users/users.php +++ b/core/module/course/view/users/users.php @@ -33,27 +33,27 @@
- 'Groupes / Profils', 'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all', ]); ?>
- 'Prénom commence par', 'selected' => isset($_POST['courseFilterFirstName']) ? $_POST['courseFilterFirstName'] : 'all', ]); ?>
- 'Nom commence par', 'selected' => isset($_POST['courseFilterLastName']) ? $_POST['courseFilterLastName'] : 'all', ]); ?>
- - 'dataTables']); ?> + + 'dataTables']); ?> \ No newline at end of file diff --git a/core/module/course/view/usersAdd/usersAdd.php b/core/module/course/view/usersAdd/usersAdd.php index 9ceaac3..7a6761f 100644 --- a/core/module/course/view/usersAdd/usersAdd.php +++ b/core/module/course/view/usersAdd/usersAdd.php @@ -16,19 +16,19 @@
- 'Groupes / Profils', 'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all', ]); ?>
- 'Prénom commence par', 'selected' => isset($_POST['courseFilterFirstName']) ? $_POST['courseFilterFirstName'] : 'all', ]); ?>
- 'Nom commence par', 'selected' => isset($_POST['courseFilterLastName']) ? $_POST['courseFilterLastName'] : 'all', ]); ?> @@ -46,8 +46,8 @@ ]); ?>
- - 'dataTables']); ?> + + 'dataTables']); ?> diff --git a/core/module/course/view/usersDelete/usersDelete.php b/core/module/course/view/usersDelete/usersDelete.php index 71c2fad..3309305 100644 --- a/core/module/course/view/usersDelete/usersDelete.php +++ b/core/module/course/view/usersDelete/usersDelete.php @@ -17,19 +17,19 @@
- 'Groupes / Profils', 'selected' => isset($_POST['courseFilterGroup']) ? $_POST['courseFilterGroup'] : 'all', ]); ?>
- 'Prénom commence par', 'selected' => isset($_POST['courseFilterFirstName']) ? $_POST['courseFilterFirstName'] : 'all', ]); ?>
- 'Nom commence par', 'selected' => isset($_POST['courseFilterLastName']) ? $_POST['courseFilterLastName'] : 'all', ]); ?> @@ -47,8 +47,8 @@ ]); ?>
- - 'dataTables']); ?> + + 'dataTables']); ?> diff --git a/core/module/install/view/index/index.php b/core/module/install/view/index/index.php index a81dbf3..51fafaf 100644 --- a/core/module/install/view/index/index.php +++ b/core/module/install/view/index/index.php @@ -4,7 +4,7 @@
- 'Langues installées', 'selected' => isset(self::$i18nUI) ? self::$i18nUI : 'fr_FR', ]); ?> diff --git a/core/module/install/view/postinstall/postinstall.php b/core/module/install/view/postinstall/postinstall.php index e984b10..b5b95b7 100644 --- a/core/module/install/view/postinstall/postinstall.php +++ b/core/module/install/view/postinstall/postinstall.php @@ -65,7 +65,7 @@
- 'Type de proxy' ]); ?>
diff --git a/core/module/install/view/update/update.php b/core/module/install/view/update/update.php index 9e951e5..ddc82e9 100644 --- a/core/module/install/view/update/update.php +++ b/core/module/install/view/update/update.php @@ -5,7 +5,7 @@   - +

diff --git a/core/module/language/view/add/add.php b/core/module/language/view/add/add.php index 4027b20..abb0eb9 100644 --- a/core/module/language/view/add/add.php +++ b/core/module/language/view/add/add.php @@ -18,7 +18,7 @@

- 'Langues disponibles' ]); ?>
diff --git a/core/module/language/view/copy/copy.php b/core/module/language/view/copy/copy.php index ee4daf0..20e42dc 100644 --- a/core/module/language/view/copy/copy.php +++ b/core/module/language/view/copy/copy.php @@ -20,12 +20,12 @@
- 'Source' ]); ?>
- 'Cible' ]); ?>
diff --git a/core/module/language/view/edit/edit.php b/core/module/language/view/edit/edit.php index ed934ff..5e18a11 100644 --- a/core/module/language/view/edit/edit.php +++ b/core/module/language/view/edit/edit.php @@ -39,7 +39,7 @@
- $value) : ?> + $value) : ?>
@@ -52,7 +52,7 @@
- +
diff --git a/core/module/language/view/index/index.php b/core/module/language/view/index/index.php index 1060a5c..3773225 100644 --- a/core/module/language/view/index/index.php +++ b/core/module/language/view/index/index.php @@ -23,8 +23,8 @@

- - + +
@@ -35,8 +35,8 @@

- - + +
diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php index 2f76a2a..b38bf05 100644 --- a/core/module/page/view/edit/edit.php +++ b/core/module/page/view/edit/edit.php @@ -128,14 +128,14 @@ 'value' => $this->getData(['page', $this->getUrl(2), 'parentPageId']) ]); ?> - 'Page parent', 'selected' => $this->getData(['page', $this->getUrl(2), 'parentPageId']) ]); ?>
- 'Emplacement', 'selected' => $this->getData(['page', $this->getUrl(2), 'extraPosition']), 'help' => 'Le menu accessoire est aligné à droite de la barre de menu, c\'est un emplacement réservé aux drapeaux et au bouton de connexion.' @@ -168,7 +168,7 @@
- 'Apparence', 'selected' => $this->getData(['page', $this->getUrl(2), 'typeMenu']) ]); ?> @@ -212,14 +212,14 @@
- 'En cas de changement de module, les données du module précédent seront supprimées.', 'label' => 'Module', 'selected' => $this->getData(['page', $this->getUrl(2), 'moduleId']) ]); ?> $this->getData(['page', $this->getUrl(2), 'moduleId'])]); ?> array_key_exists($this->getData(['page', $this->getUrl(2), 'moduleId']), $module::$moduleIds) ? $module::$moduleIds[$this->getData(['page', $this->getUrl(2), 'moduleId'])] : ucfirst($this->getData(['page', $this->getUrl(2), 'moduleId'])) + 'value' => array_key_exists($this->getData(['page', $this->getUrl(2), 'moduleId']), page::$moduleIds) ? page::$moduleIds[$this->getData(['page', $this->getUrl(2), 'moduleId'])] : ucfirst($this->getData(['page', $this->getUrl(2), 'moduleId'])) ]); ?>
@@ -232,7 +232,7 @@
- 'En position libre ajoutez le module en plaçant [MODULE] à l\'endroit voulu dans votre page.', 'label' => 'Position du module', 'selected' => $this->getData(['page', $this->getUrl(2), 'modulePosition']) @@ -282,7 +282,7 @@
- 'Gabarits de page - Barre latérale', 'help' => 'Pour définir la page comme barre latérale, choisissez l\'option dans la liste.', 'selected' => $this->getData(['page', $this->getUrl(2), 'block']) @@ -297,7 +297,7 @@ 'value' => $this->getData(['page', $this->getUrl(2), 'barLeft']) ]); ?> - 'Barre latérale gauche :', 'selected' => $this->getData(['page', $this->getUrl(2), 'barLeft']) ]); ?> @@ -307,12 +307,12 @@ 'value' => $this->getData(['page', $this->getUrl(2), 'barRight']) ]); ?> - 'Barre latérale droite :', 'selected' => $this->getData(['page', $this->getUrl(2), 'barRight']) ]); ?> - 'Contenu du menu vertical', 'selected' => $this->getData(['page', $this->getUrl(2), 'displayMenu']), 'help' => 'Par défaut le menu est affiché APRES le contenu de la page. Pour le positionner à un emplacement précis, insérez [MENU] dans le contenu de la page.' @@ -321,19 +321,19 @@
- 'Bouton de navigation gauche', 'selected' => $this->getData(['page', $this->getUrl(2), 'navLeft']), ]); ?>
- 'Modèle', 'selected' => $this->getData(['page', $this->getUrl(2), 'navTemplate']), ]); ?>
- 'Bouton de navigation droit', 'selected' => $this->getData(['page', $this->getUrl(2), 'navRight']), ]); ?> @@ -364,7 +364,7 @@
- 'Profil minimal pour accéder à la page', 'selected' => $this->getData(['page', $this->getUrl(2), 'profil']), 'help' => 'Les profils de niveau supérieur accèdent à la page.', @@ -372,7 +372,7 @@
- 'Profil minimal pour accéder à la page', 'selected' => $this->getData(['page', $this->getUrl(2), 'profil']), 'help' => 'Les profils de niveau supérieur accèdent à la page.', diff --git a/core/module/plugin/view/index/index.php b/core/module/plugin/view/index/index.php index 6ce377a..df22c45 100644 --- a/core/module/plugin/view/index/index.php +++ b/core/module/plugin/view/index/index.php @@ -30,28 +30,28 @@ ]); ?>
- +

- +
- +

- +
diff --git a/core/module/plugin/view/item/item.php b/core/module/plugin/view/item/item.php index efb6cb7..fec44be 100644 --- a/core/module/plugin/view/item/item.php +++ b/core/module/plugin/view/item/item.php @@ -2,33 +2,33 @@
- +
'; + echo '' . plugin::$storeItem['picture'] . ''; ?>
- +
-   +  
- +
@@ -37,7 +37,7 @@   - +
diff --git a/core/module/plugin/view/store/store.php b/core/module/plugin/view/store/store.php index e7ae184..eb03c20 100644 --- a/core/module/plugin/view/store/store.php +++ b/core/module/plugin/view/store/store.php @@ -7,8 +7,8 @@ ]); ?>
- - + + \ No newline at end of file diff --git a/core/module/sitemap/view/index/index.php b/core/module/sitemap/view/index/index.php index f0ef04c..31e48a7 100644 --- a/core/module/sitemap/view/index/index.php +++ b/core/module/sitemap/view/index/index.php @@ -1,4 +1,4 @@ "; -echo $module::$siteMap; +echo sitemap::$siteMap; echo "
"; diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 917ea52..784f217 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -597,8 +597,9 @@ class theme extends common 'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN), 'memberBar' => $this->getInput('themeMenuMemberBar', helper::FILTER_BOOLEAN), 'selectSpace' => $this->getInput('themeMenuSelectSpace', helper::FILTER_BOOLEAN), + 'hidePages' => $this->getInput('themeMenuHidePages', helper::FILTER_BOOLEAN), 'burgerLogo' => $this->getInput('themeMenuBurgerLogo'), - 'burgerContent' => $this->getInput('themeMenuBurgerContent') + 'burgerContent' => $this->getInput('themeMenuBurgerContent'), ] ]); // Valeurs en sortie diff --git a/core/module/theme/view/admin/admin.php b/core/module/theme/view/admin/admin.php index dc4e251..1de6e46 100644 --- a/core/module/theme/view/admin/admin.php +++ b/core/module/theme/view/admin/admin.php @@ -36,7 +36,7 @@
- 'Largeur', 'selected' => $this->getData(['admin', 'width']) ]); ?> @@ -136,23 +136,23 @@
- 'Police du texte', 'selected' => $this->getData(['admin', 'fontText']), - 'font' => $module::$fonts['family'] + 'font' => theme::$fonts['family'] ]); ?>
- 'Taille', 'selected' => $this->getData(['admin', 'fontSize']) ]); ?>
- 'Police des titres', 'selected' => $this->getData(['admin', 'fontTitle']), - 'font' => $module::$fonts['family'] + 'font' => theme::$fonts['family'] ]); ?>
diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php index 4067b49..f9b21ba 100644 --- a/core/module/theme/view/body/body.php +++ b/core/module/theme/view/body/body.php @@ -68,13 +68,13 @@
- 'Répétition', 'selected' => $this->getData(['theme', 'body', 'imageRepeat']) ]); ?>
- 'Position', 'selected' => $this->getData(['theme', 'body', 'imagePosition']) ]); ?> @@ -82,13 +82,13 @@
- 'Défilement', 'selected' => $this->getData(['theme', 'body', 'imageAttachment']) ]); ?>
- 'Taille', 'selected' => $this->getData(['theme', 'body', 'imageSize']) ]); ?> diff --git a/core/module/theme/view/font/font.php b/core/module/theme/view/font/font.php index 2b69d8c..d574875 100644 --- a/core/module/theme/view/font/font.php +++ b/core/module/theme/view/font/font.php @@ -23,8 +23,8 @@ ]); ?>
- - 'dataTables']); ?> + + 'dataTables']); ?> \ No newline at end of file diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php index c2f6265..5340cf2 100644 --- a/core/module/theme/view/footer/footer.php +++ b/core/module/theme/view/footer/footer.php @@ -27,13 +27,13 @@
- 'Position', 'selected' => $this->getData(['theme', 'footer', 'position']) ]); ?>
- 'Marges verticales', 'selected' => $this->getData(['theme', 'footer', 'height']) ]); ?> @@ -137,7 +137,7 @@ ]); ?>
- 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [ + 'Aucune'], helper::arrayColumn(theme::$pagesList, 'title', 'SORT_ASC')), [ 'label' => helper::translate('Mentions légales') , 'selected' => $this->getData(['config', 'legalPageId']) ]); ?> @@ -151,7 +151,7 @@ ]); ?>
- 'Aucune'], helper::arrayColumn($module::$pagesList, 'title', 'SORT_ASC')), [ + 'Aucune'], helper::arrayColumn(theme::$pagesList, 'title', 'SORT_ASC')), [ 'label' => helper::translate('Rechercher dans le site'), 'selected' => $this->getData(['config', 'searchPageId']) ]); ?> @@ -177,27 +177,27 @@
- 'Fonte', 'selected' => $this->getData(['theme', 'footer', 'font']), - 'font' => $module::$fonts['family'] + 'font' => theme::$fonts['family'] ]); ?>
- 'Taille', 'help' => 'Proportionnelle à la taille définie dans le site.', 'selected' => $this->getData(['theme', 'footer', 'fontSize']) ]); ?>
- 'Style', 'selected' => $this->getData(['theme', 'footer', 'fontWeight']) ]); ?>
- 'Casse', 'selected' => $this->getData(['theme', 'footer', 'textTransform']) ]); ?> @@ -214,8 +214,8 @@
- getData(['theme', 'footer', 'template'])) ? $module::$footerblocks[3] : $module::$footerblocks[$this->getData(['theme', 'footer', 'template'])]; ?> - getData(['theme', 'footer', 'template'])) ? theme::$footerblocks[3] : theme::$footerblocks[$this->getData(['theme', 'footer', 'template'])]; ?> + 'Répartition', 'selected' => is_null($this->getData(['theme', 'footer', 'template'])) ? 4 : $this->getData(['theme', 'footer', 'template']) ]); ?> @@ -239,7 +239,7 @@
- 'Alignement', 'selected' => $this->getData(['theme', 'footer', 'textAlign']) ]); ?> @@ -263,7 +263,7 @@
- 'Alignement', 'selected' => $this->getData(['theme', 'footer', 'socialsAlign']) ]); ?> @@ -287,7 +287,7 @@
- 'Alignement', 'selected' => $this->getData(['theme', 'footer', 'copyrightAlign']) ]); ?> diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php index afc5d21..894498c 100644 --- a/core/module/theme/view/header/header.php +++ b/core/module/theme/view/header/header.php @@ -18,20 +18,20 @@
- 'Position', 'selected' => $this->getData(['theme', 'header', 'position']) ]); ?>
- 'Contenu', 'selected' => $this->getData(['theme', 'header', 'feature']) ]); ?>
- 'Hauteur maximale', 'selected' => $this->getData(['theme', 'header', 'height']), ]); ?> @@ -39,7 +39,7 @@
- 'Largeur', 'selected' => $this->getData(['theme', 'header', 'wide']) ]); ?> @@ -102,33 +102,33 @@
- 'Fonte', 'selected' => $this->getData(['theme', 'header', 'font']), - 'font' => $module::$fonts['family'] + 'font' => theme::$fonts['family'] ]); ?>
- 'Taille', 'help' => 'Proportionnelle à la taille définie dans le site.', 'selected' => $this->getData(['theme', 'header', 'fontSize']) ]); ?>
- 'Style', 'selected' => $this->getData(['theme', 'header', 'fontWeight']) ]); ?>
- 'Casse', 'selected' => $this->getData(['theme', 'header', 'textTransform']) ]); ?>
- 'Alignement', 'selected' => $this->getData(['theme', 'header', 'textAlign']) ]); ?> @@ -169,19 +169,19 @@
- 'Répétition', 'selected' => $this->getData(['theme', 'header', 'imageRepeat']) ]); ?>
- 'Adaptation', 'selected' => $this->getData(['theme', 'header', 'imageContainer']), ]); ?>
- 'Position', 'selected' => $this->getData(['theme', 'header', 'imagePosition']) ]); ?> diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index 1516532..641725c 100644 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -21,12 +21,12 @@
getData(['theme', 'header', 'position']) == "site") { - echo template::select('themeMenuPosition', $module::$menuPositionsSite, [ + echo template::select('themeMenuPosition', theme::$menuPositionsSite, [ 'label' => 'Position', 'selected' => $this->getData(['theme', 'menu', 'position']) ]); } else { - echo template::select('themeMenuPosition', $module::$menuPositionsBody, [ + echo template::select('themeMenuPosition', theme::$menuPositionsBody, [ 'label' => 'Position', 'selected' => $this->getData(['theme', 'menu', 'position']) ]); @@ -34,7 +34,7 @@ ?>
- 'Largeur', 'selected' => $this->getData(['theme', 'menu', 'wide']) ]); ?> @@ -42,20 +42,20 @@
- 'Bords arrondis', 'selected' => $this->getData(['theme', 'menu', 'radius']), 'help' => 'Autour de la page sélectionnée' ]); ?>
- 'Hauteur', 'selected' => $this->getData(['theme', 'menu', 'height']) ]); ?>
- 'Alignement', 'selected' => $this->getData(['theme', 'menu', 'textAlign']) ]); ?> @@ -81,6 +81,12 @@
+
+ $this->getData(['theme', 'menu', 'hidePages']), + 'help' => 'Cette option est à utiliser lorsque les pages sont listées dans une barre latérale.' + ]); ?> +
$this->getData(['theme', 'menu', 'loginLink']) @@ -99,13 +105,13 @@
- 'Menu burger dans écran réduit', 'selected' => $this->getData(['theme', 'menu', 'burgerContent']), ]); ?>
+ echo 'displayNone'; ?>"> getData(['theme', 'menu', 'burgerLogo'])) ? $this->getData(['theme', 'menu', 'burgerLogo']) : ""; ?> 'Sélectionner une image de dimensions adaptées', @@ -188,27 +194,27 @@
- 'Fonte', 'selected' => $this->getData(['theme', 'menu', 'font']), - 'font' => $module::$fonts['family'] + 'font' => theme::$fonts['family'] ]); ?>
- 'Taille', 'help' => 'Proportionnelle à la taille définie dans le site.', 'selected' => $this->getData(['theme', 'menu', 'fontSize']) ]); ?>
- 'Style', 'selected' => $this->getData(['theme', 'menu', 'fontWeight']) ]); ?>
- 'Casse', 'selected' => $this->getData(['theme', 'menu', 'textTransform']) ]); ?> diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php index 746167e..6d48ee3 100644 --- a/core/module/theme/view/site/site.php +++ b/core/module/theme/view/site/site.php @@ -27,19 +27,19 @@
- 'Largeur', 'selected' => $this->getData(['theme', 'site', 'width']) ]); ?>
- 'Arrondi des angles', 'selected' => $this->getData(['theme', 'site', 'radius']) ]); ?>
- 'Ombre', 'selected' => $this->getData(['theme', 'site', 'shadow']) ]); ?> @@ -138,14 +138,14 @@
'Fonte', 'selected' => $this->getData(['theme', 'text', 'font']), - 'font' => $module::$fonts['family'] + 'font' => theme::$fonts['family'] ]); ?>
- 'Taille', 'help' => 'Les tailles des polices de la bannière, de menu et de pied de page sont proportionnelles à cette taille.', 'selected' => $this->getData(['theme', 'text', 'fontSize']) @@ -161,20 +161,20 @@
- 'Fonte', 'selected' => $this->getData(['theme', 'title', 'font']), - 'font' => $module::$fonts['family'] + 'font' => theme::$fonts['family'] ]); ?>
- 'Style', 'selected' => $this->getData(['theme', 'title', 'fontWeight']) ]); ?>
- 'Casse', 'selected' => $this->getData(['theme', 'title', 'textTransform']) ]); ?> diff --git a/core/module/user/view/add/add.php b/core/module/user/view/add/add.php index 2734292..4baf88a 100644 --- a/core/module/user/view/add/add.php +++ b/core/module/user/view/add/add.php @@ -40,7 +40,7 @@ ]); ?>
- 'Signature', 'selected' => 1 ]); ?> @@ -54,7 +54,7 @@ ]); ?>
- 'Langues' ]); ?>
@@ -112,13 +112,13 @@
- 'Profil', ]); ?>
- 'Profil', ]); ?>
@@ -128,20 +128,20 @@
implode("\n", $module::$userProfilsComments[self::GROUP_MEMBER]) + "value" => implode("\n", user::$userProfilsComments[self::GROUP_MEMBER]) ]); ?>
implode("\n", $module::$userProfilsComments[self::GROUP_EDITOR]) + "value" => implode("\n", user::$userProfilsComments[self::GROUP_EDITOR]) ]); ?>
implode("\n", $module::$userProfilsComments[self::GROUP_ADMIN]) + "value" => implode("\n", user::$userProfilsComments[self::GROUP_ADMIN]) ]); ?>
diff --git a/core/module/user/view/edit/edit.php b/core/module/user/view/edit/edit.php index 73317bf..2fafb5f 100644 --- a/core/module/user/view/edit/edit.php +++ b/core/module/user/view/edit/edit.php @@ -52,7 +52,7 @@ ]); ?>
- 'Signature', 'selected' => $this->getData(['user', $this->getUrl(2), 'signature']) ]); ?> @@ -67,7 +67,7 @@ ]); ?>
- 'Langue', 'selected' => $this->getData(['user', $this->getUrl(2), 'language']) ]); ?> @@ -140,14 +140,14 @@
- 'Profil', 'selected' => $this->getData(['user', $this->getUrl(2), 'profil']), 'disabled' => $this->getUser('group') !== self::GROUP_ADMIN, ]); ?>
- 'Profil', 'selected' => $this->getData(['user', $this->getUrl(2), 'profil']), 'disabled' => $this->getUser('group') !== self::GROUP_ADMIN, @@ -159,7 +159,7 @@
'Commentaire', - 'value' => implode("\n", $module::$userProfilsComments[self::GROUP_MEMBER]), + 'value' => implode("\n", user::$userProfilsComments[self::GROUP_MEMBER]), 'disabled' => true, ]); @@ -168,7 +168,7 @@
'Commentaire', - 'value' => implode("\n", $module::$userProfilsComments[self::GROUP_EDITOR]), + 'value' => implode("\n", user::$userProfilsComments[self::GROUP_EDITOR]), 'disabled' => true, ]); @@ -177,7 +177,7 @@
'Commentaire', - 'value' => implode("\n", $module::$userProfilsComments[self::GROUP_ADMIN]), + 'value' => implode("\n", user::$userProfilsComments[self::GROUP_ADMIN]), 'disabled' => true, ]); ?> diff --git a/core/module/user/view/import/import.php b/core/module/user/view/import/import.php index 062861d..26efad4 100644 --- a/core/module/user/view/import/import.php +++ b/core/module/user/view/import/import.php @@ -42,7 +42,7 @@ ]); ?>
- 'Séparateur' ]); ?>
@@ -58,10 +58,10 @@
- +
- + Compte créé | Compte créé et notifié | Erreur dans le fichier ou le compte existe. diff --git a/core/module/user/view/index/index.php b/core/module/user/view/index/index.php index cc09241..859a1b3 100644 --- a/core/module/user/view/index/index.php +++ b/core/module/user/view/index/index.php @@ -49,23 +49,23 @@
- 'Groupes / Profils', 'selected' => isset($_POST['userFilterGroup']) ? $_POST['userFilterGroup'] : 'all', ]); ?>
- 'Prénom commence par', 'selected' => isset($_POST['userFilterFirstName']) ? $_POST['userFilterFirstName'] : 'all', ]); ?>
- 'Nom commence par', 'selected' => isset($_POST['userFilterLastName']) ? $_POST['userFilterLastName'] : 'all', ]); ?>
- 'dataTables']); ?> \ No newline at end of file + 'dataTables']); ?> \ No newline at end of file diff --git a/core/module/user/view/login/login.php b/core/module/user/view/login/login.php index f247330..0dd914e 100644 --- a/core/module/user/view/login/login.php +++ b/core/module/user/view/login/login.php @@ -3,7 +3,7 @@
'Identifiant', - 'value' => $module::$userId + 'value' => user::$userId ]); ?>
@@ -31,7 +31,7 @@
$module::$userLongtime + 'checked' => user::$userLongtime ]); ?>
diff --git a/core/module/user/view/profil/profil.php b/core/module/user/view/profil/profil.php index fc84e6c..229aa22 100644 --- a/core/module/user/view/profil/profil.php +++ b/core/module/user/view/profil/profil.php @@ -15,4 +15,4 @@ ]); ?>
- \ No newline at end of file + \ No newline at end of file diff --git a/core/module/user/view/profilAdd/profilAdd.php b/core/module/user/view/profilAdd/profilAdd.php index ccc6bbd..e061dd9 100644 --- a/core/module/user/view/profilAdd/profilAdd.php +++ b/core/module/user/view/profilAdd/profilAdd.php @@ -27,7 +27,7 @@ ]); ?>
- 'Groupe associé', 'selected' => $this->getUrl(2) ]); ?> @@ -69,13 +69,13 @@
- 'Dossier depuis un espace', 'class' => 'filemanager', ]); ?>
- 'Dossier depuis l\'accueil', 'class' => 'filemanager', ]); ?> diff --git a/core/module/user/view/profilEdit/profilEdit.php b/core/module/user/view/profilEdit/profilEdit.php index cf687f9..3a71b91 100644 --- a/core/module/user/view/profilEdit/profilEdit.php +++ b/core/module/user/view/profilEdit/profilEdit.php @@ -29,7 +29,7 @@ ]); ?>
- 'Hiérarchie', 'help' => 'Rang 9 > rang 1. Le profil de rang 1 n\'est pas modifiable.', 'selected' => $this->getUrl(3), @@ -93,7 +93,7 @@ ]); ?>
- 'Dossier depuis un espace', 'class' => 'filemanager', /* @@ -104,7 +104,7 @@ ]); ?>
- 'Dossier depuis l\'accueil', 'class' => 'filemanager', // 'none' interdit l'accès au gestionnaire de fichier au niveau de l'accueil diff --git a/core/module/user/view/tag/tag.php b/core/module/user/view/tag/tag.php index 4ded2c3..6d47b62 100644 --- a/core/module/user/view/tag/tag.php +++ b/core/module/user/view/tag/tag.php @@ -27,19 +27,19 @@
- 'Groupes / Profils', 'selected' => isset($_POST['usersFilterGroup']) ? $_POST['usersFilterGroup'] : 'all', ]); ?>
- 'Prénom commence par', 'selected' => isset($_POST['usersFilterFirstName']) ? $_POST['usersFilterFirstName'] : 'all', ]); ?>
- 'Nom commence par', 'selected' => isset($_POST['usersFilterLastName']) ? $_POST['usersFilterLastName'] : 'all', ]); ?> @@ -57,8 +57,8 @@ ]); ?>
- - 'dataTables']); ?> + + 'dataTables']); ?> diff --git a/core/module/user/view/usersDelete/usersDelete.php b/core/module/user/view/usersDelete/usersDelete.php index dde0952..aa06408 100644 --- a/core/module/user/view/usersDelete/usersDelete.php +++ b/core/module/user/view/usersDelete/usersDelete.php @@ -17,19 +17,19 @@
- 'Groupes / Profils', 'selected' => isset($_POST['usersFilterGroup']) ? $_POST['usersFilterGroup'] : 'all', ]); ?>
- 'Prénom commence par', 'selected' => isset($_POST['usersFilterFirstName']) ? $_POST['usersFilterFirstName'] : 'all', ]); ?>
- 'Nom commence par', 'selected' => isset($_POST['usersFilterLastName']) ? $_POST['usersFilterLastName'] : 'all', ]); ?> @@ -47,8 +47,8 @@ ]); ?>
- - 'dataTables']); ?> + + 'dataTables']); ?>