From 199f3a740cec7e3a3e28f212c28d84420e304144 Mon Sep 17 00:00:00 2001 From: Deltacms Date: Tue, 13 Jun 2023 08:46:14 +0200 Subject: [PATCH] menu burger suite --- CHANGES.md | 5 ++- core/core.js.php | 14 +++----- core/core.php | 1 + core/layout/mediaqueries.css | 8 ++--- core/module/install/install.php | 4 ++- core/module/install/lang/en/lex_install.php | 4 +++ core/module/install/lang/es/lex_install.php | 4 +++ core/module/install/lang/fr/lex_install.php | 4 +++ .../databaselight_en/base/content/home.html | 1 + .../databaselight_en/base/locale.json | 2 +- .../ressource/databaselight_en/base/page.json | 4 +-- core/module/install/ressource/defaultdata.php | 32 ++++++++++++------ .../ressource/themes/theme_default.zip | Bin 41536 -> 41864 bytes .../themes/theme_sansbanniere_fluide.zip | Bin 41742 -> 41937 bytes .../themes/theme_sombre_islande_fluide.zip | Bin 96427 -> 96610 bytes core/vendor/tinymce/init.js | 4 +++ module/statislite/lang/en/lex_statislite.php | 2 +- module/statislite/lang/es/lex_statislite.php | 2 +- module/statislite/lang/fr/lex_statislite.php | 2 +- .../download_counter/download_counter.php | 4 ++- module/statislite/view/index/index.php | 27 +++++++++++---- 21 files changed, 82 insertions(+), 42 deletions(-) create mode 100644 core/module/install/ressource/databaselight_en/base/content/home.html diff --git a/CHANGES.md b/CHANGES.md index 02953e6..c3c62fc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,16 +6,15 @@ - 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, - Nouveaux gabarits pour l'éditeur Tinymce : accordéon à 3 et 4 paragraphes, - - Statislite 4.8 : comptage des liens cliqués (ils doivent posséder la class="download-link" ). + - 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 : - - Thème / header : erreur qui permettait l'affichage de la banière sur toutes les pages même si 'Bannière visible uniquement sur la page d'accueil' était cochée - Statislite / configuration : erreur qui effaçait l'information 'configuration validée', - Slider 4.8 / Configuration : les liens sur les images étaient modifiés au changement de l'ordre des pages. ## Version 4.4.09 de Deltacms - Corrections : - Statislite / configuration : erreur qui effaçait l'information 'configuration validée', - - Thème / bannière : bannière sur page d'accueil seulement, correction. + - Thème / header : bannière sur page d'accueil seulement, correction. ## Version 4.4.08 de Deltacms - Correction : diff --git a/core/core.js.php b/core/core.js.php index 1385e83..ddfa79d 100644 --- a/core/core.js.php +++ b/core/core.js.php @@ -580,13 +580,13 @@ $(document).ready(function(){ } }).trigger("resize"); - /* Compteur de téléchargements + /* Compteur de liens cliqués * Fonctionne avec download_counter.php - * Les liens comptabilisés doivent avoir la class="download-link" + * Les liens comptabilisés doivent avoir la class="clicked_link_count" * Envoi au fichier download_counter.php la donnée url */ getData(['config', 'statislite', 'enable']) && is_file('site/data/statislite/module/download_counter/download_counter.php' ) ) { ?> - $('.download-link').on('click', function(event) { + $('.clicked_link_count').on('click', function(event) { // Récupérer le chemin vers le fichier var filePath = $(this).attr('href'); // Envoyer une requête AJAX pour enregistrer le téléchargement @@ -643,11 +643,5 @@ $(document).ready(function(){ $("#site.container").css("padding-top","0"); } - - /* - * Lien vers une page ou une sous-page désactivée en petit écran - */ - if($(window).width() < 800) { - $("a.disabled-link").css('text-decoration', 'line-through'); - } + }); diff --git a/core/core.php b/core/core.php index 7430c56..88e7a89 100644 --- a/core/core.php +++ b/core/core.php @@ -1822,6 +1822,7 @@ class common { $disableChild = 0; foreach($childrenPageIds as $childKey) { $totalChild += 1; + if( $this->getData(['page', $childKey, 'disable']) === true ) $disableChild +=1; } if($childrenPageIds && $disableChild !== $totalChild && $this->getdata(['page',$parentPageId,'hideMenuChildren']) === false) { $itemsLeft .= template::ico('down', 'left'); diff --git a/core/layout/mediaqueries.css b/core/layout/mediaqueries.css index cd125c5..1ec26a5 100644 --- a/core/layout/mediaqueries.css +++ b/core/layout/mediaqueries.css @@ -175,6 +175,9 @@ body > nav { margin: 0 auto !important ; } + nav a.disabled-link { + text-decoration:line-through; + } nav{ padding: 0; } @@ -198,11 +201,6 @@ text-align: left; margin-left: 10px; } - /* Espacement icône down des pages avec sous-pages*/ - nav ul li .spacexpx{ - padding-left:25px; - } - nav #menuLeft { display: block; float: none; diff --git a/core/module/install/install.php b/core/module/install/install.php index 5a3060c..7d6d30f 100644 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -168,11 +168,13 @@ class install extends common { $this->copyDir('core/module/install/ressource/themes', self::FILE_DIR . 'source/theme'); unlink(self::FILE_DIR . 'source/theme/themes.json'); - // Modification du texte 'Pied de page personnalisé' situé dans theme.json ( $this->setData pose problème) + // Modification des textes 'Pied de page personnalisé', 'Bannière vide' et du lien vers la page d'accueil situé dans theme.json ( $this->setData pose problème) if( $langAdmin !== 'fr'){ $theme = file_get_contents( self::DATA_DIR.'theme.json'); $theme = json_decode( $theme, true); $theme['theme']['footer']['text'] = $text['core_install']['index'][7]; + $theme['theme']['header']['featureContent'] = $text['core_install']['index'][8]; + $theme['theme']['menu']['burgerIconLink1'] = $text['core_install']['index'][9]; $json = json_encode($theme); file_put_contents(self::DATA_DIR.'theme.json',$json); } diff --git a/core/module/install/lang/en/lex_install.php b/core/module/install/lang/en/lex_install.php index 34ae9b4..8cc93d8 100644 --- a/core/module/install/lang/en/lex_install.php +++ b/core/module/install/lang/en/lex_install.php @@ -21,4 +21,8 @@ $text['core_install']['index'][5] = 'Installation completed'; $text['core_install']['index'][6] = 'home.html'; // Texte par défaut à gauche du footer $text['core_install']['index'][7] = 'Custom footer'; +// Texte pour la bannière customisable +$text['core_install']['index'][8] = 'Banner empty'; +// Texte pour le lien vers la page d'accueil +$text['core_install']['index'][9] = 'home'; ?> \ No newline at end of file diff --git a/core/module/install/lang/es/lex_install.php b/core/module/install/lang/es/lex_install.php index bfa7b66..60ebdc3 100644 --- a/core/module/install/lang/es/lex_install.php +++ b/core/module/install/lang/es/lex_install.php @@ -21,4 +21,8 @@ $text['core_install']['index'][5] = 'Instalación completa'; $text['core_install']['index'][6] = 'home.html'; // Texte par défaut à gauche du footer $text['core_install']['index'][7] = 'Pie de página personalizado'; +// Texte pour la bannière customisable +$text['core_install']['index'][8] = 'Banner vacío'; +// Texte pour le lien vers la page d'accueil +$text['core_install']['index'][9] = 'inicio'; ?> \ No newline at end of file diff --git a/core/module/install/lang/fr/lex_install.php b/core/module/install/lang/fr/lex_install.php index f4753f0..eb14c91 100644 --- a/core/module/install/lang/fr/lex_install.php +++ b/core/module/install/lang/fr/lex_install.php @@ -21,4 +21,8 @@ $text['core_install']['index'][5] = 'Installation terminée'; $text['core_install']['index'][6] = 'accueil.html'; // Texte par défaut à gauche du footer $text['core_install']['index'][7] = 'Pied de page personnalisé'; +// Texte pour la bannière customisable +$text['core_install']['index'][8] = 'Bannière vide'; +// Texte pour le lien vers la page d'accueil +$text['core_install']['index'][9] = 'accueil'; ?> \ No newline at end of file diff --git a/core/module/install/ressource/databaselight_en/base/content/home.html b/core/module/install/ressource/databaselight_en/base/content/home.html new file mode 100644 index 0000000..cfa5104 --- /dev/null +++ b/core/module/install/ressource/databaselight_en/base/content/home.html @@ -0,0 +1 @@ +

Content of your new page.

\ No newline at end of file diff --git a/core/module/install/ressource/databaselight_en/base/locale.json b/core/module/install/ressource/databaselight_en/base/locale.json index cd1f974..16b32ff 100644 --- a/core/module/install/ressource/databaselight_en/base/locale.json +++ b/core/module/install/ressource/databaselight_en/base/locale.json @@ -1,6 +1,6 @@ { "locale": { - "homePageId": "accueil", + "homePageId": "home", "page302": "none", "page403": "none", "page404": "none", diff --git a/core/module/install/ressource/databaselight_en/base/page.json b/core/module/install/ressource/databaselight_en/base/page.json index b5a93e7..4e6d99d 100644 --- a/core/module/install/ressource/databaselight_en/base/page.json +++ b/core/module/install/ressource/databaselight_en/base/page.json @@ -1,10 +1,10 @@ { "page": { - "accueil": { + "home": { "typeMenu": "text", "iconUrl": "", "disable": false, - "content": "accueil.html", + "content": "home.html", "hideTitle": true, "homePageId": true, "breadCrumb": false, diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 98504c6..22d35e3 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -348,8 +348,8 @@ class init extends common { 'swiperTransition' => '1000' ], 'menu' => [ - 'backgroundColor' => 'rgba(32, 59, 82, 0.85)', - 'backgroundColorSub' => 'rgba(32, 59, 82, 1)', + 'backgroundColor' => 'rgba(103, 127, 163, 0.85)', + 'backgroundColorSub' => 'rgba(83, 107, 143, 1)', 'font' => 'roboto', 'fontSize' => '1.1em', 'fontWeight' => 'normal', @@ -363,19 +363,31 @@ class init extends common { 'fixed' => true, 'activeColorAuto' => true, 'activeColor' => 'rgba(255, 255, 255, 1)', - 'activeTextColor' => 'rgba(255, 255, 255, 1)', + 'activeTextColor' => 'rgba(224, 248, 87, 1)', 'radius' => '0px', 'memberBar' => true, - 'burgerLogo' => '', - 'burgerContent' => 'title', 'width' => 'container', - 'burgerFontSize' => '1.5em', - 'burgerTextColor' => '#DDD', 'minWidthTab' => 'auto', 'minWidthParentOrAll' => false, - 'widthLogo' => '30px', - 'heightLogo' => 'auto' - ], + 'burgerTitle' => false, + 'burgerIcon1' => 'icones/home_orange.png', + 'burgerIcon2' => '', + 'burgerContent' => 'oneIcon', + 'burgerTextColor' => 'rgba(221, 221, 221, 1)', + 'burgerFontSize' => '1.5em', + 'burgerFixed' => true, + 'burgerIconColor' => 'rgba(199, 246, 9, 1)', + 'burgerIconBgColor' => 'rgba(103, 127, 163, 0)', + 'burgerBannerColor' => 'rgba(103, 127, 163, 0)', + 'burgerTextMenuColor' => 'rgba(255, 255, 255, 1)', + 'burgerActiveTextColor' => 'rgba(224, 248, 87, 1)', + 'burgerBackgroundColor' => 'rgba(103, 127, 163, 0.85)', + 'burgerActiveColorAuto' => true, + 'burgerActiveColor' => '', + 'burgerBackgroundColorSub' => 'rgba(83, 107, 143, 1)', + 'burgerIconLink1' => 'accueil', + 'burgerIconLink2' => '' + ], 'site' => [ 'backgroundColor' => 'rgba(255, 255, 255, 1)', 'radius' => '0px', diff --git a/core/module/install/ressource/themes/theme_default.zip b/core/module/install/ressource/themes/theme_default.zip index 814f18aaa613bcd63b98629ce854a2c6d1d02612..7867e1373e47f90cf5a1c9f15c57560faa235478 100644 GIT binary patch delta 4138 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 delta 3777 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 aN~r|R-w;l$Oo$r6hSMp#MNeDuZ{lCTI1B>- diff --git a/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip b/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip index 7a52d1f4e2b5363e24a25957a6d6aea34461caee..babcd25e51e4a915eea3c6032ceafb8fa0db35ac 100644 GIT binary patch delta 3154 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 delta 3013 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 H0RR91S_6{L diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js index 3bffec2..3725b22 100644 --- a/core/vendor/tinymce/init.js +++ b/core/vendor/tinymce/init.js @@ -213,6 +213,10 @@ tinymce.init({ image_caption: true, // Pages internes link_list: baseUrl + "core/vendor/tinymce/links.php", + link_class_list: [ + {title: 'None', value: ''}, + {title: 'clicked_link_count', value: 'clicked_link_count'} + ], // Contenu du menu contextuel contextmenu: "selectall searchreplace | hr | media image link anchor nonbreaking | insertable cell row column deletetable", // Fichiers CSS à intégrer à l'éditeur diff --git a/module/statislite/lang/en/lex_statislite.php b/module/statislite/lang/en/lex_statislite.php index 9551c8f..3507840 100644 --- a/module/statislite/lang/en/lex_statislite.php +++ b/module/statislite/lang/en/lex_statislite.php @@ -105,7 +105,7 @@ $text['statislite_view']['index'][27] = ' - Total number of pages viewed: '; $text['statislite_view']['index'][28] = ' - Number of visits: '; $text['statislite_view']['index'][29] = 'en_GB'; $text['statislite_view']['index'][30] = 'Europe/London'; -$text['statislite_view']['index'][31] = 'Links clicked'; +$text['statislite_view']['index'][31] = 'Links clicked since '; $text['statislite']['config'][0] = 'Your choice...'; $text['statislite']['config'][1] = 'Changes saved'; $text['statislite']['config'][2] = 'No save file'; diff --git a/module/statislite/lang/es/lex_statislite.php b/module/statislite/lang/es/lex_statislite.php index 6499f10..6b47af8 100644 --- a/module/statislite/lang/es/lex_statislite.php +++ b/module/statislite/lang/es/lex_statislite.php @@ -105,7 +105,7 @@ $text['statislite_view']['index'][27] = ' - Número total de páginas vistas: '; $text['statislite_view']['index'][28] = ' - Número de visitas: '; $text['statislite_view']['index'][29] = 'es_ES'; $text['statislite_view']['index'][30] = 'Europe/Madrid'; -$text['statislite_view']['index'][31] = 'Enlaces seleccionados'; +$text['statislite_view']['index'][31] = 'Enlaces seleccionados desde '; $text['statislite']['config'][0] = 'Tu elección...'; $text['statislite']['config'][1] = 'Cambios guardados'; $text['statislite']['config'][2] = 'No hay archivo de respaldo'; diff --git a/module/statislite/lang/fr/lex_statislite.php b/module/statislite/lang/fr/lex_statislite.php index 0cb92bf..636101c 100644 --- a/module/statislite/lang/fr/lex_statislite.php +++ b/module/statislite/lang/fr/lex_statislite.php @@ -105,7 +105,7 @@ $text['statislite_view']['index'][27] = ' - Nombre total de pages vues : '; $text['statislite_view']['index'][28] = ' - Nombre de visites : '; $text['statislite_view']['index'][29] = 'fr_FR'; $text['statislite_view']['index'][30] = 'Europe/Paris'; -$text['statislite_view']['index'][31] = 'Liens cliqués'; +$text['statislite_view']['index'][31] = 'Liens cliqués depuis le '; $text['statislite']['config'][0] = 'Votre choix...'; $text['statislite']['config'][1] = 'Modifications enregistrées'; $text['statislite']['config'][2] = 'Pas de fichier de sauvegarde'; diff --git a/module/statislite/ressource/download_counter/download_counter.php b/module/statislite/ressource/download_counter/download_counter.php index 88016b4..22982db 100644 --- a/module/statislite/ressource/download_counter/download_counter.php +++ b/module/statislite/ressource/download_counter/download_counter.php @@ -4,7 +4,9 @@ if (isset($_POST['url'])) { $url = $_POST['url']; $urlfile = 'counter.json'; - if( !is_file( $urlfile )) file_put_contents($urlfile,'{"'.$url.'":0}'); + if( !is_file( $urlfile ) || filesize($urlfile)<5 ){ + file_put_contents($urlfile,'{"date_creation_fichier":"'.date('Y/m/d H:i:s').'"}'); + } $json = file_get_contents($urlfile); $tab = json_decode($json, true); //Lire le tableau si la clef === $url incrémentation de la valeur associée, sortir diff --git a/module/statislite/view/index/index.php b/module/statislite/view/index/index.php index 935723a..d95efdb 100644 --- a/module/statislite/view/index/index.php +++ b/module/statislite/view/index/index.php @@ -152,19 +152,34 @@ if( function_exists('datefmt_create') && function_exists('datefmt_format') && ex * Affichage des téléchargements * */ -if( file_exists( $module::$downloadLink.'counter.json' ) && file_get_contents($module::$downloadLink.'counter.json') !== '{}'){ ?> -
-
- $value){ ?> + if( function_exists('datefmt_create') && function_exists('datefmt_format') && extension_loaded('intl') ){ + // Affichage au format de la langue d'administration + $fmt = datefmt_create( + $text['statislite_view']['index'][29], + IntlDateFormatter::LONG, + IntlDateFormatter::SHORT, + $text['statislite_view']['index'][30], + IntlDateFormatter::GREGORIAN + ); + $datedeb = datefmt_format($fmt, strtotime($download["date_creation_fichier"])); + + } else{ + $datedeb = $download["date_creation_fichier"]; + } ?> +
+
+ $value){ + if( $key !== "date_creation_fichier" ){ ?>
'.$key.' => '.$value.''; ?>
- +