From b950b54ebcfc285c23135de6daeed130b479e46e Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 2 Dec 2019 13:20:19 +0100 Subject: [PATCH] [9.2.13] Ouverte dans une poup lity --- core/core.php | 14 +++++++++----- core/module/page/page.php | 2 ++ core/module/page/view/edit/edit.js.php | 18 ++++++++++++++++++ core/module/page/view/edit/edit.php | 6 ++++++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/core/core.php b/core/core.php index 4a940c7f..374f3336 100644 --- a/core/core.php +++ b/core/core.php @@ -2167,7 +2167,8 @@ class layout extends common { // Passer les entrées masquées // Propriétés de l'item $active = ($parentPageId === $currentPageId OR in_array($currentPageId, $childrenPageIds)) ? ' class="active"' : ''; - $targetBlank = $this->getData(['page', $parentPageId, 'targetBlank']) ? ' target="_blank"' : ''; + $targetBlank = $this->getData(['page', $parentPageId, 'targetBlank']) ? ' target="_blank"' : ''; + $targetLity = ($this->getData(['page', $parentPageId, 'targetLity']) && $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) ? ' rel="data-lity"' : ''; // Mise en page de l'item $items .= '
  • '; @@ -2176,7 +2177,7 @@ class layout extends common { {$items .= ''; } else { - $items .= ''; + $items .= ''; } switch ($this->getData(['page', $parentPageId, 'typeMenu'])) { @@ -2224,13 +2225,14 @@ class layout extends common { // Propriétés de l'item $active = ($childKey === $currentPageId) ? ' class="active"' : ''; $targetBlank = $this->getData(['page', $childKey, 'targetBlank']) ? ' target="_blank"' : ''; + $targetLity = ($this->getData(['page', $childKey, 'targetLity']) && $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) ? ' rel="data-lity"' : ''; // Mise en page du sous-item $items .= '
  • '; if ( $this->getData(['page',$childKey,'disable']) === true AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) { $items .= ''; } else { - $items .= ''; + $items .= ''; } switch ($this->getData(['page', $childKey, 'typeMenu'])) { @@ -2323,6 +2325,7 @@ class layout extends common { // Propriétés de l'item $active = ($parentPageId === $currentPageId OR in_array($currentPageId, $childrenPageIds)) ? ' class="active"' : ''; $targetBlank = $this->getData(['page', $parentPageId, 'targetBlank']) ? ' target="_blank"' : ''; + $targetLity = ($this->getData(['page', $parentPageId, 'targetLity']) && $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) ? ' rel="data-lity"' : ''; // Mise en page de l'item; // Ne pas afficher le parent d'une sous-page quand l'option est sélectionnée. if ($onlyChildren === false) { @@ -2331,7 +2334,7 @@ class layout extends common { AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) { $items .= ''; } else { - $items .= ''; + $items .= ''; } $items .= $this->getData(['page', $parentPageId, 'title']); $items .= ''; @@ -2346,6 +2349,7 @@ class layout extends common { // Propriétés de l'item $active = ($childKey === $currentPageId) ? ' class="active"' : ''; $targetBlank = $this->getData(['page', $childKey, 'targetBlank']) ? ' target="_blank"' : ''; + $targetLity = ($this->getData(['page', $childKey, 'targetLity']) && $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')) ? ' rel="data-lity"' : ''; // Mise en page du sous-item $itemsChildren .= '
  • '; @@ -2353,7 +2357,7 @@ class layout extends common { AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) { $itemsChildren .= ''; } else { - $itemsChildren .= ''; + $itemsChildren .= ''; } $itemsChildren .= $this->getData(['page', $childKey, 'title']); diff --git a/core/module/page/page.php b/core/module/page/page.php index 254567e3..57298aba 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -81,6 +81,7 @@ class page extends common { 'position' => 0, 'group' => self::GROUP_VISITOR, 'targetBlank' => false, + 'targetLity' => false, 'title' => $pageTitle, 'block' => '12', 'barLeft' => '', @@ -258,6 +259,7 @@ class page extends common { 'position' => $position, 'group' => $this->getinput('pageEditBlock') !== 'bar' ? $this->getInput('pageEditGroup', helper::FILTER_INT) : 0, 'targetBlank' => $this->getInput('pageEditTargetBlank', helper::FILTER_BOOLEAN), + 'targetLity' => $this->getInput('pageEditTargetBlank', helper::FILTER_BOOLEAN) === true ? false : $this->getInput('pageEditTargetLity', helper::FILTER_BOOLEAN), 'title' => htmlspecialchars_decode($this->getInput('pageEditTitle', helper::FILTER_STRING_SHORT, true), ENT_QUOTES), 'block' => $this->getinput('pageEditBlock'), 'barLeft' => $barLeft, diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index 7cafb7d3..a1ab375a 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -203,6 +203,24 @@ $( document ).ready(function() { }); +/** + * Empêche la double sélection Blank et Lity + */ +var pageEditTargetBlankDOM = $("#pageEditTargetBlank"); +pageEditTargetBlankDOM.on("change", function() { + if ($(this).is(':checked') && + $("#pageEditTargetLity").is(':checked') ) { + $("#pageEditTargetLity").prop("checked", false); + } +}); +var pageEditTargetLityDOM = $("#pageEditTargetLity"); +pageEditTargetLityDOM.on("change", function() { + if ($(this).is(':checked') && + $("#pageEditTargetBlank").is(':checked') ) { + $("#pageEditTargetBlank").prop("checked", false); + } +}); + /** * Cache le l'option "ne pas afficher les pages enfants dans le menu horizontal" lorsque la page est désactivée */ diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php index 8ce7f6ed..6b4e8141 100755 --- a/core/module/page/view/edit/edit.php +++ b/core/module/page/view/edit/edit.php @@ -171,6 +171,12 @@ echo template::formOpen('pageEditForm'); ?> 'checked' => $this->getData(['page', $this->getUrl(2), 'targetBlank']) ]); ?> +
    + $this->getData(['page', $this->getUrl(2), 'targetLity']) + ]); ?> +
    +