From 91a1448e74fd1717f8959dc5806597b957f39433 Mon Sep 17 00:00:00 2001 From: Deltacms Date: Fri, 16 Jun 2023 08:24:17 +0200 Subject: [PATCH] =?UTF-8?q?am=C3=A9liorations=20menus=20en=20grand=20et=20?= =?UTF-8?q?petit=20=C3=A9cran?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 +- core/core.js.php | 17 +++++++++++++++-- core/core.php | 8 ++++++++ core/layout/mediaqueries.css | 14 ++++++++++---- .../themes/theme_banniere_animee_85vw.zip | Bin 220566 -> 220796 bytes 5 files changed, 34 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c3c62fc..16b7a1b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,7 @@ - Modifications : - Une troisième langue d'administration est disponible : espagnol / castillan, - Thème / Menu : le menu en petit écran (burger) dispose maintenant de ses propres paramètres, - - Edition de page / emplacement dans le menu : une page désactivée est signalée par le curseur 'not-allowed' en grand écran et par son nom barré en petit écran, + - Edition de page / emplacement dans le menu : une page désactivée est signalée par le curseur 'not-allowed' en grand écran et par une icône en petit écran, son lien est inactif, - Nouveaux gabarits pour l'éditeur Tinymce : accordéon à 3 et 4 paragraphes, - Statislite 4.8 : comptage des liens cliqués pour lesquels la class 'clicked_link_count' a été ajoutée par l'éditeur de liens de Tinymce. - Corrections : diff --git a/core/core.js.php b/core/core.js.php index 93013d4..9f8e66d 100644 --- a/core/core.js.php +++ b/core/core.js.php @@ -607,8 +607,10 @@ $(document).ready(function(){ $("nav #menu ul li span").click(function() { // id de la page parent var parentId = $(this).parents().attr("id"); + console.log(parentId); var select = "ul#_"+parentId+".navSub"; - var select2 = "nav #menu ul li #" + parentId + " span"; + var select2 = 'nav #menu ul li #' + parentId + ' span.iconSubExistSmallScreen'; + console.log(select2); if( $(select).css("z-index") === "-1" ) { $(select).css("z-index","1"); $(select).css("opacity","1"); @@ -632,6 +634,17 @@ $(document).ready(function(){ getData(['theme','menu', 'burgerFixed'])=== true && $this->getData(['theme','header', 'position'])=== 'site' && $this->getData(['theme','header', 'tinyHidden'])=== false && ( $this->getData(['theme','header', 'homePageOnly'])=== false || $this->getUrl(0) === $this->getData(['locale','homePageId']) ) ){ ?> $("#site.container").css("padding-top","0"); - } + } + /* Signalisation qu'une page désactivée en petit écran + * pour la page ou la sous-page cliquée + */ + if($(window).width() < 800) { + $("nav #menu a.disabled-link").click(function() { + var parentIdSubPage = $(this).parents("ul").attr("id"); + var parentIdPage = $(this).parents().parents().attr("id"); + $("nav #menu ul li ul li #"+parentIdSubPage+" .linkDisabledSmallScreen").css("display","inline"); + $("nav #menu ul li #"+parentIdPage+" .linkDisabledSmallScreen").css("display","inline"); + }); + } }); diff --git a/core/core.php b/core/core.php index 0863f23..b7034df 100644 --- a/core/core.php +++ b/core/core.php @@ -1795,11 +1795,13 @@ class common { } // Mise en page de l'item $itemsLeft .= '
  • '; + $pageDesactived = false; if ( ( $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') !== $this->getInput('DELTA_USER_PASSWORD')) OR ( $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') === $this->getInput('DELTA_USER_PASSWORD')AND $this->getUser('group') < self::GROUP_EDITOR )) { $pageUrl = ($this->getData(['locale', 'homePageId']) === $this->getUrl(0)) ? helper::baseUrl(false) : helper::baseUrl() . $this->getUrl(0); $itemsLeft .= '
  • '; + $pageDesactived = false; if ( ( $this->getData(['page',$childKey,'disable']) === true AND $this->getUser('password') !== $this->getInput('DELTA_USER_PASSWORD') ) OR ( @@ -1855,6 +1860,7 @@ class common { ){ $pageUrl = ($this->getData(['locale', 'homePageId']) === $this->getUrl(0)) ? helper::baseUrl(false) : helper::baseUrl() . $this->getUrl(0); $itemsLeft .= ''; + $pageDesactived = true; } else { $pageUrl = ($this->getData(['locale', 'homePageId']) === $childKey) ? helper::baseUrl(false) : helper::baseUrl() . $childKey; $itemsLeft .= ''; @@ -1890,6 +1896,8 @@ class common { } break; } + $fileIcon = './site/file/source/icones/disabledPage.gif'; + if( file_exists($fileIcon) && $pageDesactived) $itemsLeft .=''; $itemsLeft .= '
  • '; } $itemsLeft .= ''; diff --git a/core/layout/mediaqueries.css b/core/layout/mediaqueries.css index 05ac2b5..4ec4a58 100644 --- a/core/layout/mediaqueries.css +++ b/core/layout/mediaqueries.css @@ -42,11 +42,13 @@ nav .iconSubExistLargeScreen{ display:inline; margin-left :5px; - font-weight: bolder; } nav .iconSubExistSmallScreen{ display:none; } + nav .linkDisabledSmallScreen{ + display:none; + } /* Corps */ section { padding: 20px; @@ -183,9 +185,6 @@ body > nav { margin: 0 auto !important ; } - nav a.disabled-link { - text-decoration:line-through; - } nav{ padding: 0; } @@ -195,6 +194,10 @@ nav .iconSubExistSmallScreen{ display:inline; } + nav .linkDisabledSmallScreen{ + display:none; + margin-left:20px; + } /*bandeau flex*/ nav #toggle { display: flex; @@ -236,6 +239,9 @@ overflow-x: hidden; overflow-y: auto; } + nav #menu a{ + padding:10px 10px; + } nav li { display: block; } diff --git a/core/module/install/ressource/themes/theme_banniere_animee_85vw.zip b/core/module/install/ressource/themes/theme_banniere_animee_85vw.zip index 4e39f035a7d70efe1697203d337e0390d992678a..2e0e421e15e86ea8d8b4afc0c26573d04da95b5c 100644 GIT binary patch delta 3436 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 Ko;l>tkpBT8rDNa# delta 3146 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