From 1b6e90856b4ce31ce4c6ac57b158225f477d89ec Mon Sep 17 00:00:00 2001 From: Antoine M Date: Wed, 19 Jul 2023 11:40:26 +0200 Subject: [PATCH] =?UTF-8?q?refining=20accessibility=20=E2=80=94=20starting?= =?UTF-8?q?=20on=20conseils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 404.php | 13 +- comments.php | 74 ------ css/app.css | 224 +++++++++++------- css/editor-style.css | 35 ++- footer.php | 4 +- functions.php | 1 + header.php | 2 +- includes/admin.php | 34 ++- includes/init.php | 23 +- includes/post_types.php | 18 +- includes/shortcuts/shortcuts.php | 102 ++++---- includes/taxonomy.php | 66 +++--- includes/templates.php | 13 + includes/utilities.php | 2 + includes/widget.php | 22 +- js/app.js | 114 ++++++--- resources/css/app.css | 2 +- resources/css/base/generalites.css | 1 - resources/css/layout/menu-homegrade.css | 31 +-- resources/css/layout/menu-renovateur.css | 8 +- .../graphic-assets/icone-external-link.svg | 2 +- resources/js/header.js | 182 ++++++++++---- searchform.php | 4 +- single.php | 19 +- .../aides-financieres/aides-financieres.php | 6 +- .../demarches-administratives.php | 4 +- .../home/latest-news/latest-news.php | 2 +- .../questions-frequentes.php | 4 +- .../home/show-thematiques/block.json | 3 +- .../show-thematiques/show-thematiques.css | 12 +- .../home/show-thematiques/show-thematiques.js | 81 +++++-- .../show-thematiques/show-thematiques.php | 22 +- template-blocks/home/show-thematiques/test.js | 1 - .../card-frequent-question.php | 8 +- .../card-news.css | 5 +- template-components/card-news.php | 14 +- template-components/card-thematique.php | 3 +- template-components/content-single.php | 26 +- template-components/content.php | 18 +- .../header/menu-renovateur.php | 34 +-- .../header/menu-renovateur_old.php | 59 ----- template-components/header/search-module.php | 1 - 42 files changed, 737 insertions(+), 562 deletions(-) delete mode 100644 comments.php create mode 100644 includes/templates.php delete mode 100644 template-blocks/home/show-thematiques/test.js rename resources/css/components/card-post.css => template-components/card-news.css (80%) delete mode 100644 template-components/header/menu-renovateur_old.php diff --git a/404.php b/404.php index 91a9ff1..dc1e221 100644 --- a/404.php +++ b/404.php @@ -1,24 +1,27 @@ class="no-js"> + - + +
404
-

- - +

+ +
- + + \ No newline at end of file diff --git a/comments.php b/comments.php deleted file mode 100644 index fef6856..0000000 --- a/comments.php +++ /dev/null @@ -1,74 +0,0 @@ - - -
- - -

- -

- -
    - 'ol', - 'short_ping' => true, - 'avatar_size' => 56, - ) - ); - ?> -
- - - - 1 && get_option( 'page_comments' ) ) : ?> - - - - - - -

- - - 'bg-primary text-white cursor-pointer rounded font-bold py-2 px-4', - 'comment_field' => '', - ) - ); - ?> - -
diff --git a/css/app.css b/css/app.css index 08d9180..31b7d6a 100644 --- a/css/app.css +++ b/css/app.css @@ -597,6 +597,18 @@ video { } } +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border-width: 0; +} + .m-8 { margin: 2rem; } @@ -606,16 +618,16 @@ video { margin-bottom: 0.75rem; } -.my-8 { - margin-top: 2rem; - margin-bottom: 2rem; -} - .mx-auto { margin-left: auto; margin-right: auto; } +.my-8 { + margin-top: 2rem; + margin-bottom: 2rem; +} + .mb-8 { margin-bottom: 2rem; } @@ -668,10 +680,6 @@ video { flex-grow: 1; } -.cursor-pointer { - cursor: pointer; -} - .flex-col { flex-direction: column; } @@ -780,11 +788,6 @@ video { padding-bottom: 0.5rem; } -.px-3 { - padding-left: 0.75rem; - padding-right: 0.75rem; -} - .py-12 { padding-top: 3rem; padding-bottom: 3rem; @@ -818,10 +821,6 @@ video { font-weight: 300; } -.font-bold { - font-weight: 700; -} - .font-extrabold { font-weight: 800; } @@ -1359,55 +1358,6 @@ button:focus { hue-rotate(263deg) brightness(99%) contrast(96%); } -.card-post { - position: relative; - border-radius: 1.5rem; - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); - --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1); - --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color); - box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); -} - -.card-post__thumbnail { - height: 190px; - border-top-left-radius: 1.5rem; - border-top-right-radius: 1.5rem; - -o-object-fit: cover; - object-fit: cover; -} - -.card-post__inner { - height: 100%; - padding: 2rem; -} - -.card-post__tag { - margin-bottom: 1rem; - width: -webkit-fit-content; - width: -moz-fit-content; - width: fit-content; - border-radius: 0.75rem; - --tw-bg-opacity: 1; - background-color: rgb(255 237 236 / var(--tw-bg-opacity)); - padding-left: 1rem; - padding-right: 1rem; - padding-top: 0.25rem; - padding-bottom: 0.25rem; - --tw-text-opacity: 1; - color: rgb(223 30 30 / var(--tw-text-opacity)); -} - -.card-post__title { - margin-bottom: 1rem; - font-size: 1.5rem; - line-height: 2rem; - font-weight: 700; - --tw-text-opacity: 1; - color: rgb(223 30 30 / var(--tw-text-opacity)); - line-height: 1.1; -} - .card-large-content-container { display: flex; flex-direction: column; @@ -1654,6 +1604,60 @@ button:focus { text-underline-offset: 4px; } +.card-news { + position: relative; + border-radius: 1.5rem; + --tw-bg-opacity: 1; + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); + --tw-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + +.card-news__thumbnail { + height: 190px; + border-top-left-radius: 1.5rem; + border-top-right-radius: 1.5rem; + -o-object-fit: cover; + object-fit: cover; +} + +.card-news__inner { + height: 100%; + padding: 2rem; +} + +.card-news__heading { + display: flex; + flex-direction: column-reverse; +} + +.card-news__tag { + margin-bottom: 1rem; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; + border-radius: 0.75rem; + --tw-bg-opacity: 1; + background-color: rgb(255 237 236 / var(--tw-bg-opacity)); + padding-left: 1rem; + padding-right: 1rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + --tw-text-opacity: 1; + color: rgb(223 30 30 / var(--tw-text-opacity)); +} + +.card-news__title { + margin-bottom: 1rem; + font-size: 1.5rem; + line-height: 2rem; + font-weight: 700; + --tw-text-opacity: 1; + color: rgb(223 30 30 / var(--tw-text-opacity)); + line-height: 1.1; +} + .card-frequent-question { position: relative; border-radius: 1.5rem; @@ -2070,6 +2074,13 @@ article > *:not(.entry-content), } } +.menu-renovateur .website_logo a:focus img { + outline: red solid 1px; + outline-width: 1px; + outline-offset: 8px; + outline-radius: 50px; +} + /* &__main-elements { @apply w-full bg-red-200 flex justify-between items-center; } */ @@ -2286,20 +2297,20 @@ article > *:not(.entry-content), transition: all 0.3s ease-in-out; } -.menu-renovateur__mobile-menu-toggle[aria-expanded] .toggle-icon { +.menu-renovateur__mobile-menu-toggle[aria-expanded='true'] .toggle-icon { position: relative; } -.menu-renovateur__mobile-menu-toggle[aria-expanded] .toggle-icon__bar--top { +.menu-renovateur__mobile-menu-toggle[aria-expanded='true'] .toggle-icon__bar--top { top: 50%; transform: translateY(-50%) rotate(45deg); } -.menu-renovateur__mobile-menu-toggle[aria-expanded] .toggle-icon__bar--middle { +.menu-renovateur__mobile-menu-toggle[aria-expanded='true'] .toggle-icon__bar--middle { opacity: 0; } -.menu-renovateur__mobile-menu-toggle[aria-expanded] .toggle-icon__bar--bottom { +.menu-renovateur__mobile-menu-toggle[aria-expanded='true'] .toggle-icon__bar--bottom { top: 50%; transform: translateY(-50%) rotate(-45deg); } @@ -2474,8 +2485,11 @@ article > *:not(.entry-content), .menu-homegrade .sub-menu { position: static; + bottom: 0px; margin-left: auto; margin-right: auto; + --tw-translate-y: 100%; + transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)); --tw-bg-opacity: 1; background-color: rgb(47 1 84 / var(--tw-bg-opacity)); padding: 1.5rem; @@ -2569,21 +2583,25 @@ article > *:not(.entry-content), } .menu-homegrade__navlist li.menu-item:hover, + .menu-homegrade__navlist li.menu-item button:focus, .menu-homegrade__navlist li.menu-item a:focus { cursor: pointer; background-color: rgba(255, 255, 255, 0.1); } -.menu-homegrade__navlist li.menu-item a:focus { +.menu-homegrade__navlist li.menu-item button:focus, + .menu-homegrade__navlist li.menu-item a:focus { + border-radius: 0.375rem; text-decoration: none; + outline: 1px solid rgba(255, 255, 255, 0.8); + outline-offset: 8px; } /* IF SUBMENU CHILD */ -.menu-homegrade__navlist li.menu-item .menu-item__submenu-toggle:hover, +.menu-homegrade__navlist li.menu-item .menu-item__submenu-toggle:hover, .menu-homegrade__navlist li.menu-item .menu-item__submenu-toggle:focus { - --tw-text-opacity: 1; - color: rgb(223 30 30 / var(--tw-text-opacity)); + /* @apply text-secondary; */ } .menu-homegrade__navlist li.menu-item .menu-item__submenu-toggle { @@ -2592,27 +2610,23 @@ article > *:not(.entry-content), } .menu-homegrade__navlist li.menu-item .menu-item__submenu-toggle:after { - right: 0px; - content: '▼'; - position: absolute; + content: ''; display: inline-block; - line-height: 0.5; - height: 10px; - top: calc(50% - 4px); - width: 10px; - margin-left: 20px; - transform-origin: center; - background-repeat: no-repeat; - background-size: contain; transition: all 0.3s ease-out; + border-bottom: 2px solid white; + border-right: 2px solid white; + height: 10px; + width: 10px; + margin-left: 10px; } .menu-homegrade__navlist li.menu-item .menu-item__submenu-toggle[aria-expanded='false']:after { - transform: rotate(0deg); + transform: translateY(-20%) rotate(45deg); } .menu-homegrade__navlist li.menu-item .menu-item__submenu-toggle[aria-expanded='true']:after { - transform: rotate(180deg); + /* transform: rotate(225deg); */ + transform: translateY(40%) rotate(225deg); } .menu-homegrade__burger-menu-toggle { @@ -3048,10 +3062,18 @@ article > *:not(.entry-content), .swiper-wrapper { width: 100%; + flex-direction: column; + row-gap: 5rem; padding-top: 6rem; padding-bottom: 4rem; } +@media (min-width: 960px) { + .swiper-wrapper { + flex-direction: row; + } +} + .swiper-slide .card-thematique { height: 100%; } @@ -3061,7 +3083,19 @@ article > *:not(.entry-content), position: absolute; top: 50%; z-index: 50; + display: none; opacity: 0.8; +} + +@media (min-width: 960px) { + .thematique-button-next, +.thematique-button-prev { + display: block; + } +} + +.thematique-button-next, +.thematique-button-prev { width: 60px; height: 60px; } @@ -3071,8 +3105,8 @@ article > *:not(.entry-content), .thematique-button-prev:hover, .thematique-button-prev:focus { opacity: 1; - filter: invert(13%) sepia(71%) saturate(4425%) - hue-rotate(338deg) brightness(109%) contrast(117%); + filter: invert(13%) sepia(71%) saturate(4425%) hue-rotate(338deg) brightness(109%) + contrast(117%); } .thematique-button-next:focus, .thematique-button-prev:focus { @@ -3088,6 +3122,16 @@ article > *:not(.entry-content), left: 0px; } +.swiper-pagination { + display: none; +} + +@media (min-width: 960px) { + .swiper-pagination { + display: block; + } +} + .swiper-pagination-bullet { margin-left: 0.5rem; margin-right: 0.5rem; diff --git a/css/editor-style.css b/css/editor-style.css index 1452ff0..7d017bd 100644 --- a/css/editor-style.css +++ b/css/editor-style.css @@ -44,6 +44,18 @@ } } +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border-width: 0 +} + .m-8 { margin: 2rem } @@ -53,16 +65,16 @@ margin-bottom: 0.75rem } -.my-8 { - margin-top: 2rem; - margin-bottom: 2rem -} - .mx-auto { margin-left: auto; margin-right: auto } +.my-8 { + margin-top: 2rem; + margin-bottom: 2rem +} + .mb-8 { margin-bottom: 2rem } @@ -115,10 +127,6 @@ flex-grow: 1 } -.cursor-pointer { - cursor: pointer -} - .flex-col { flex-direction: column } @@ -227,11 +235,6 @@ padding-bottom: 0.5rem } -.px-3 { - padding-left: 0.75rem; - padding-right: 0.75rem -} - .py-12 { padding-top: 3rem; padding-bottom: 3rem @@ -265,10 +268,6 @@ font-weight: 300 } -.font-bold { - font-weight: 700 -} - .font-extrabold { font-weight: 800 } diff --git a/footer.php b/footer.php index a1dbfcb..7f4026e 100644 --- a/footer.php +++ b/footer.php @@ -68,10 +68,10 @@ ?> Plan du site
- " href=""> + " href=""> - " href=""> + " href=""> diff --git a/functions.php b/functions.php index 67cf002..c4ec850 100644 --- a/functions.php +++ b/functions.php @@ -10,6 +10,7 @@ require_once(__DIR__ . '/includes/logos.php'); require_once(__DIR__ . '/includes/taxonomy.php'); require_once(__DIR__ . '/includes/utilities.php'); require_once(__DIR__ . '/includes/navwalker.php'); +require_once(__DIR__ . '/includes/templates.php'); // require_once(__DIR__ . '/includes/widget.php'); // require_once( __DIR__ . '/includes/logos.php'); \ No newline at end of file diff --git a/header.php b/header.php index 8073204..36a3f64 100644 --- a/header.php +++ b/header.php @@ -18,7 +18,7 @@
- +
  • diff --git a/includes/admin.php b/includes/admin.php index 7933a2c..5907dcd 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -12,8 +12,8 @@ function register_theme_settings_option_page() // Register options page. $option_page = acf_add_options_page(array( - 'page_title' => __('Paramètres du site'), - 'menu_title' => __('Paramètres du site'), + 'page_title' => __('Paramètres du site', 'homegrade-theme__texte-backoffice'), + 'menu_title' => __('Paramètres du site', 'homegrade-theme__texte-backoffice'), 'menu_slug' => 'theme-general-settings', 'capability' => 'activate_plugins', 'redirect' => false, @@ -105,3 +105,33 @@ function change_login_logo_url($url) return site_url(); } add_filter('login_headerurl', 'change_login_logo_url'); + + +/* ---------------------------------------------------------------------- + GESTION DE LA COLONNE THEMATIQUE DANS LA LISTE DES POSTS CONSEILS + ------------------------------------------------------------------------*/ + +// AJOUT D'UNE COLONNE CUSTOM +function add_acf_posts_columns($columns) +{ + global $current_screen; + $new_admin_col_arrays = array_slice($columns, 0, 2, true) + array('thematiques_taxo' => 'Thématique') + array_slice($columns, 2, count($columns) - 2, true); + return array_merge($new_admin_col_arrays); +} +add_filter('manage_conseils_posts_columns', 'add_acf_posts_columns'); + +// CUSTOMISATION DE LA COLONNE POUR AFFICHER : THEMATIQUE PARENT > THEMATIQUE +function handle_posts_custom_columns($column, $post_id) +{ + $tax = get_the_terms($post_id, ('thematiques')); + $edit_link = esc_url(get_edit_term_link($tax[0]->term_id, 'thematiques', 'conseils')); + + echo ''; + if (isset($tax[0]->parent) && $tax[0]->parent != 0) { + $tax_parent = get_term($tax[0]->parent, 'thematiques'); + echo $tax_parent->name . " — "; + } + echo $tax[0]->name; + echo ''; +} +add_action('manage_conseils_posts_custom_column', 'handle_posts_custom_columns', 10, 2); diff --git a/includes/init.php b/includes/init.php index 5ed7bc8..7301345 100644 --- a/includes/init.php +++ b/includes/init.php @@ -3,6 +3,7 @@ /** * Theme setup. */ + function tailpress_setup() { @@ -10,9 +11,9 @@ function tailpress_setup() register_nav_menus( array( - 'homegrade' => __('Menu Homegrade', 'homegrade-deligraph-theme'), - 'renovateur' => __('Menu Rénovateur', 'homegrade-deligraph-theme'), - 'footer' => __('Footer', 'homegrade-deligraph-theme'), + 'homegrade' => __('Menu Homegrade', 'homegrade-theme__texte-backoffice'), + 'renovateur' => __('Menu Rénovateur', 'homegrade-theme__texte-backoffice'), + 'footer' => __('Footer', 'homegrade-theme__texte-backoffice'), ) ); @@ -58,13 +59,27 @@ function tailpress_enqueue_scripts() wp_enqueue_style('tailpress', tailpress_asset('css/app.css'), array(), $theme->get('Version')); wp_enqueue_script('tailpress', tailpress_asset('js/app.js'), array('gsap'), $theme->get('Version')); // wp_register_script('showthematiquejs', get_template_directory_uri() . '/template-blocks/home/show-thematiques/show-thematiques.js', array('swiperjs', 'swipercss'), $theme->get('Version')); - wp_enqueue_script('showthematiquejs', get_template_directory_uri() . '/template-blocks/home/show-thematiques/show-thematiques.js', array('swiperjs'), $theme->get('Version')); + + + // SHOW THEMATIQUE + wp_register_script('showthematiquejs', get_template_directory_uri() . '/template-blocks/home/show-thematiques/show-thematiques.js', array('swiperjs'), $theme->get('Version')); + + $translation_array = array( + 'previousSlide' => __('Carte précédente', 'homegrade-theme__texte-fonctionnel'), + 'nextSlide' => __('Carte suivante', 'homegrade-theme__texte-fonctionnel'), + 'slideLabel' => __('Carte Thématique', 'homegrade-theme__texte-fonctionnel'), + ); + wp_localize_script('showthematiquejs', 'textTranslations', $translation_array); + + wp_enqueue_script('showthematiquejs'); // wp_enqueue_script('swiperjs', get_template_directory_uri() . '/assets/swiper/swiper-bundle.min.js', array('tailpress'), $theme->get('Version'), true); // wp_register_style('swipercss', get_template_directory_uri() . '/assets/swiper/swiper-bundle.min.css', array(), $theme->get('Version')); } add_action('wp_enqueue_scripts', 'tailpress_enqueue_scripts'); + + /* ----------------------------------------------------------- Enqueue Theme assets 🡒 Back -----------------------------------------------------------*/ diff --git a/includes/post_types.php b/includes/post_types.php index 141d578..9157087 100644 --- a/includes/post_types.php +++ b/includes/post_types.php @@ -34,7 +34,7 @@ function change_menu_icon() foreach ($menu as $key => $val) { - if (__('News', 'plugin-name') == $val[0]) { + if (__('News', 'homegrade-theme__texte-backoffice') == $val[0]) { $menu[$key][6] = 'dashicons-welcome-widgets-menus'; } } @@ -49,8 +49,8 @@ function create_posttype() 'fiche-questions', array( 'labels' => array( - 'name' => __('Questions'), - 'singular_name' => __('Question') + 'name' => __('Questions', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Question', 'homegrade-theme__texte-backoffice') ), 'public' => true, 'has_archive' => true, @@ -67,15 +67,17 @@ function create_posttype() 'conseils', array( 'labels' => array( - 'name' => __('Conseils'), - 'singular_name' => __('Conseil') + 'name' => __('Conseils', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Conseil', 'homegrade-theme__texte-backoffice') ), + 'hierarchical' => true, 'public' => true, 'has_archive' => true, 'show_in_rest' => true, 'menu_icon' => 'dashicons-pressthis', 'menu_position' => 4, - 'supports' => array('title', 'custom-fields'), + // 'supports' => array('title', 'editor', 'thumbnail', 'page-attributes'), + // 'supports' => array('title', 'custom-fields', 'editor'), ) ); @@ -84,8 +86,8 @@ function create_posttype() 'vocabulaire', array( 'labels' => array( - 'name' => __('Vocabulaire'), - 'singular_name' => __('Vocabulaire') + 'name' => __('Vocabulaire', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Vocabulaire', 'homegrade-theme__texte-backoffice') ), 'public' => true, 'has_archive' => true, diff --git a/includes/shortcuts/shortcuts.php b/includes/shortcuts/shortcuts.php index 54cf12a..803524c 100644 --- a/includes/shortcuts/shortcuts.php +++ b/includes/shortcuts/shortcuts.php @@ -10,12 +10,12 @@ define('WP_DEBUG_DISPLAY', false); // ##### Syntax -

    +

    -

    +

    @@ -120,8 +120,8 @@ echo site_url('/admission/', 'https'); function cc_mime_types($mimes) { -$mimes['svg'] = 'image/svg+xml'; -return $mimes; + $mimes['svg'] = 'image/svg+xml'; + return $mimes; } add_filter('upload_mimes', 'cc_mime_types'); @@ -132,20 +132,20 @@ INIT WIDGET ------------------------------*/ -function tailwind_widgets_init() -{ -register_sidebar( -array( -'name' => esc_html__('Discover_next', 'tailwind'), -'id' => 'discover_next', -'description' => esc_html__('Add widgets here.', 'tailwind'), -'before_widget' => '
    ', - 'after_widget' => '
    ', -'before_title' => '

    ', - 'after_title' => '

    ', -) -); -} +// function tailwind_widgets_init() +// { +// register_sidebar( +// array( +// 'name' => esc_html__('Discover_next', 'tailwind'), +// 'id' => 'discover_next', +// 'description' => esc_html__('Add widgets here.', 'tailwind'), +// 'before_widget' => '
    ', +// 'after_widget' => '
    ', +// 'before_title' => '

    ', +// 'after_title' => '

    ', +// ) +// ); +// } /** ------------------------------ @@ -156,42 +156,42 @@ POSTS // Change Defaults Posts to "News" in menu bar function cp_change_post_object() { -$get_post_type = get_post_type_object('post'); + $get_post_type = get_post_type_object('post'); -$labels = $get_post_type->labels; -$labels->name = 'News'; -$labels->singular_name = 'News'; -$labels->add_new = 'Add News'; -$labels->add_new_item = 'Add News'; -$labels->edit_item = 'Edit News'; -$labels->new_item = 'News'; -$labels->view_item = 'View News'; -$labels->search_items = 'Search News'; -$labels->not_found = 'No News found'; -$labels->not_found_in_trash = 'No News found in Trash'; -$labels->all_items = 'All News'; -$labels->menu_name = 'News'; -$labels->name_admin_bar = 'News'; + $labels = $get_post_type->labels; + $labels->name = 'News'; + $labels->singular_name = 'News'; + $labels->add_new = 'Add News'; + $labels->add_new_item = 'Add News'; + $labels->edit_item = 'Edit News'; + $labels->new_item = 'News'; + $labels->view_item = 'View News'; + $labels->search_items = 'Search News'; + $labels->not_found = 'No News found'; + $labels->not_found_in_trash = 'No News found in Trash'; + $labels->all_items = 'All News'; + $labels->menu_name = 'News'; + $labels->name_admin_bar = 'News'; } add_action('init', 'cp_change_post_object'); // Change Defaults Posts Icon in menu bar -function change_menu_icon() -{ +// function change_menu_icon() +// { -// Access global variables. -global $menu; +// // Access global variables. +// global $menu; -foreach ($menu as $key => $val) { +// foreach ($menu as $key => $val) { -if (__('News', 'plugin-name') == $val[0]) { -$menu[$key][6] = 'dashicons-welcome-widgets-menus'; -} -} -} -add_action('admin_menu', 'change_menu_icon'); +// if (__('News', 'plugin-name') == $val[0]) { +// $menu[$key][6] = 'dashicons-welcome-widgets-menus'; +// } +// } +// } +// add_action('admin_menu', 'change_menu_icon'); /** ------------------------------ @@ -199,11 +199,11 @@ HIDE EDITOR ON SPECIFIC PAGE ------------------------------*/ function remove_editor_init() { -if (isset($_GET['post'])) { -$id = $_GET['post']; -if ($id == 7) { -remove_post_type_support('page', 'editor'); + if (isset($_GET['post'])) { + $id = $_GET['post']; + if ($id == 7) { + remove_post_type_support('page', 'editor'); + } + } } -} -} -add_action('init', 'remove_editor_init'); \ No newline at end of file +add_action('init', 'remove_editor_init'); diff --git a/includes/taxonomy.php b/includes/taxonomy.php index c973be4..411d361 100644 --- a/includes/taxonomy.php +++ b/includes/taxonomy.php @@ -40,59 +40,53 @@ function undo_create_term($term_id, $tt_id, $taxonomy) function add_custom_taxonomies() { // ————— Thématiques ————— - register_taxonomy('thematiques', ['fiche-questions', 'fiche-conseils'], array( + register_taxonomy('thematiques', ['fiche-questions', 'conseils'], array( // 'hierarchical' => true, 'labels' => array( - 'name' => _x('Thématiquesssse', 'taxonomy general name'), - 'singular_name' => _x('Thématique', 'taxonomy singular name'), - 'search_items' => __('Chercher une Thématique'), - 'all_items' => __('Toutes les Thématiques'), - 'parent_item' => __('Thématique Parent'), - 'parent_item_colon' => __('Thématique Parent:'), - 'edit_item' => __('Editer la Thématique'), - 'update_item' => __('Mettre à jour la Thématique'), - 'add_new_item' => __('Ajouter une Thématique'), - 'new_item_name' => __('Nom de la nouvelle Thématique'), - 'menu_name' => __('Thématiques'), + 'name' => __('Thématiques', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Thématique', 'homegrade-theme__texte-backoffice'), + 'search_items' => __('Chercher une Thématique', 'homegrade-theme__texte-backoffice'), + 'all_items' => __('Toutes les Thématiques', 'homegrade-theme__texte-backoffice'), + 'parent_item' => __('Thématique Parent', 'homegrade-theme__texte-backoffice'), + 'parent_item_colon' => __('Thématique Parent:', 'homegrade-theme__texte-backoffice'), + 'edit_item' => __('Editer la Thématique', 'homegrade-theme__texte-backoffice'), + 'update_item' => __('Mettre à jour la Thématique', 'homegrade-theme__texte-backoffice'), + 'add_new_item' => __('Ajouter une Thématique', 'homegrade-theme__texte-backoffice'), + 'new_item_name' => __('Nom de la nouvelle Thématique', 'homegrade-theme__texte-backoffice'), + 'menu_name' => __('Thématiques', 'homegrade-theme__texte-backoffice'), ), 'public' => true, - // 'show_ui' => true, - 'show_admin_column' => true, + 'show_in_rest' => false, // Needed for tax to appear in Gutenberg editor + 'show_ui' => true, + 'show_admin_column' => false, 'hierarchical' => true, // This will allow URL's like "/locations/boston/cambridge/" - 'rewrite' => array( - 'slug' => 'thematiques', // This controls the base slug that will display before each term - 'hierarchical' => true, // This will allow URL's like "/locations/boston/cambridge/" - // 'with_front' => false, // Don't display the category base before "/locations/" - ), + 'show_in_quick_edit' => false, + 'meta_box_cb' => false, )); // ————— ————— - register_taxonomy('mots-cles', ['fiche-questions', 'fiche-conseils'], array( + register_taxonomy('mots-cles', ['fiche-questions', 'conseils'], array( // This array of options controls the labels displayed in the WordPress Admin UI 'labels' => array( - 'name' => _x('Mots-Clés', 'taxonomy general name'), - 'singular_name' => _x('Mots-Clés', 'taxonomy singular name'), - 'search_items' => __('Chercher un Mots-Clé'), - 'all_items' => __('Tous les Mots-Clés'), - 'parent_item' => __('Mots-Clé Parent'), - 'parent_item_colon' => __('Mots-Clé Parent:'), - 'edit_item' => __('Editer le Mots-Clé'), - 'update_item' => __('Mettre à jour le Mots-Clé'), - 'add_new_item' => __('Ajouter un Mots-Clé'), - 'new_item_name' => __('Nom du nouveau Mots-Clés'), - 'menu_name' => __('Mots-Clés'), + 'name' => __('Mots-Clés', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Mots-Clés', 'homegrade-theme__texte-backoffice'), + 'search_items' => __('Chercher un Mots-Clé', 'homegrade-theme__texte-backoffice'), + 'all_items' => __('Tous les Mots-Clés', 'homegrade-theme__texte-backoffice'), + 'parent_item' => __('Mots-Clé Parent', 'homegrade-theme__texte-backoffice'), + 'parent_item_colon' => __('Mots-Clé Parent:', 'homegrade-theme__texte-backoffice'), + 'edit_item' => __('Editer le Mots-Clé', 'homegrade-theme__texte-backoffice'), + 'update_item' => __('Mettre à jour le Mots-Clé', 'homegrade-theme__texte-backoffice'), + 'add_new_item' => __('Ajouter un Mots-Clé', 'homegrade-theme__texte-backoffice'), + 'new_item_name' => __('Nom du nouveau Mots-Clés', 'homegrade-theme__texte-backoffice'), + 'menu_name' => __('Mots-Clés', 'homegrade-theme__texte-backoffice'), ), 'hierarchical' => false, 'public' => false, - 'rewrite' => array( - 'slug' => 'thematiques', // This controls the base slug that will display before each term - // 'with_front' => false, // Don't display the category base before "/locations/" - // 'hierarchical' => true // This will allow URL's like "/locations/boston/cambridge/" - ), + )); } add_action('init', 'add_custom_taxonomies', 0); diff --git a/includes/templates.php b/includes/templates.php new file mode 100644 index 0000000..263209b --- /dev/null +++ b/includes/templates.php @@ -0,0 +1,13 @@ +template_lock = 'insert'; + $post_type_object->template = array( + array('core/paragraph', array('content' => 'Some text')), + array('core/paragraph', array('content' => 'Some text')), + array('core/paragraph', array('content' => 'Some text')), + array('core/paragraph', array('content' => 'et un autre')), + ); +} +add_action('init', 'theme_register_template'); diff --git a/includes/utilities.php b/includes/utilities.php index 9e706b6..f492bac 100644 --- a/includes/utilities.php +++ b/includes/utilities.php @@ -28,6 +28,8 @@ function getThematiqueFamilySlug($thematique_slug) } } + + // Get automatic post used in BLOCK QUESTIONS FREQUENTES function get_automatic_post($post_type) { diff --git a/includes/widget.php b/includes/widget.php index 986ff3f..93e59ff 100644 --- a/includes/widget.php +++ b/includes/widget.php @@ -1,13 +1,13 @@ 'Experts', - 'id' => 'widget_nos_experts', - 'description' => 'Add widgets here.', - // 'before_widget' => '
    ', - // 'after_widget' => '
    ', - // 'before_title' => '

    ', - // 'after_title' => '

    ', - ), -); +// register_sidebar( +// array( +// 'name' => 'Experts', +// 'id' => 'widget_nos_experts', +// 'description' => 'Add widgets here.', +// // 'before_widget' => '
    ', +// // 'after_widget' => '
    ', +// // 'before_title' => '

    ', +// // 'after_title' => '

    ', +// ), +// ); diff --git a/js/app.js b/js/app.js index d959c3c..8405dcf 100644 --- a/js/app.js +++ b/js/app.js @@ -34,8 +34,6 @@ } } function closeCurrentSubmenu(buttonClose) { - console.log("close submenu"); - console.log(buttonClose.parentElement); const currentOpenedSubmenu = buttonClose.parentElement; currentOpenedSubmenu.classList.remove("sub-menu--open"); currentOpenedSubmenu.classList.add("sub-menu--closed"); @@ -94,42 +92,104 @@ }); const renovateurNavListContainer = header.querySelector(".menu-renovateur__navlist-container"); const HomegradeNavListContainer = header.querySelector(".menu-homegrade"); + function isMobileNavOpened() { + console.log("is mobile nav opened"); + console.log(renovateurNavListContainer.hasAttribute("opened") && mobileMenuToggle.getAttribute("aria-expanded") === "true"); + return renovateurNavListContainer.hasAttribute("opened") && mobileMenuToggle.getAttribute("aria-expanded") === "true"; + } function openMenu(menuContainer) { - menuContainer.removeAttribute("closed", ""); - menuContainer.setAttribute("opened", ""); - menuContainer.removeAttribute("aria-hidden", ""); - menuContainer.setAttribute("opening", ""); - menuContainer.addEventListener("animationend", () => { - menuContainer.removeAttribute("opening", ""); - }, { once: true }); + console.log("open menu"); + mobileMenuToggle.setAttribute("aria-expanded", "true"); + const textContent = mobileMenuToggle.querySelector("span.text-content"); + textContent.textContent = mobileMenuToggle.getAttribute("data-text-open"); + function openRenovateur() { + renovateurNavListContainer.removeAttribute("closed", ""); + renovateurNavListContainer.setAttribute("opened", ""); + renovateurNavListContainer.removeAttribute("aria-hidden", ""); + renovateurNavListContainer.setAttribute("opening", ""); + renovateurNavListContainer.addEventListener("animationend", () => { + renovateurNavListContainer.removeAttribute("opening", ""); + }, { once: true }); + console.log("#######"); + } + function openHomegrade() { + HomegradeNavListContainer.removeAttribute("closed", ""); + HomegradeNavListContainer.setAttribute("opened", ""); + HomegradeNavListContainer.removeAttribute("aria-hidden", ""); + HomegradeNavListContainer.setAttribute("opening", ""); + HomegradeNavListContainer.addEventListener("animationend", () => { + HomegradeNavListContainer.removeAttribute("opening", ""); + }, { once: true }); + } + openRenovateur(); + openHomegrade(); } function closeMenu(menuContainer) { - menuContainer.removeAttribute("opened"); - menuContainer.setAttribute("aria-hidden", ""); - menuContainer.setAttribute("closing", ""); - menuContainer.addEventListener("animationend", () => { - menuContainer.setAttribute("closed", ""); - menuContainer.removeAttribute("closing", ""); + mobileMenuToggle.setAttribute("aria-expanded", "false"); + let textContent = mobileMenuToggle.querySelector("span.text-content"); + textContent.textContent = mobileMenuToggle.getAttribute("data-text-close"); + renovateurNavListContainer.removeAttribute("opened"); + renovateurNavListContainer.setAttribute("aria-hidden", ""); + renovateurNavListContainer.setAttribute("closing", ""); + renovateurNavListContainer.addEventListener("animationend", () => { + renovateurNavListContainer.setAttribute("closed", ""); + renovateurNavListContainer.removeAttribute("closing", ""); + }, { once: true }); + HomegradeNavListContainer.removeAttribute("opened"); + HomegradeNavListContainer.setAttribute("aria-hidden", ""); + HomegradeNavListContainer.setAttribute("closing", ""); + HomegradeNavListContainer.addEventListener("animationend", () => { + HomegradeNavListContainer.setAttribute("closed", ""); + HomegradeNavListContainer.removeAttribute("closing", ""); }, { once: true }); } mobileMenuToggle.addEventListener("click", function(e) { - const isNavOpened = renovateurNavListContainer.hasAttribute("opened"); - const textContent = mobileMenuToggle.querySelector("span.text-content"); - const dataTextOpen = mobileMenuToggle.getAttribute("data-text-open"); - const dataTextClose = mobileMenuToggle.getAttribute("data-text-close"); - textContent.textContent = isNavOpened ? dataTextOpen : dataTextClose; - mobileMenuToggle.toggleAttribute("aria-expanded"); - if (isNavOpened) { - closeMenu(renovateurNavListContainer); - closeMenu(HomegradeNavListContainer); + if (isMobileNavOpened() === false) { + openMenu(); + return; } - if (!isNavOpened) { - openMenu(renovateurNavListContainer); - openMenu(HomegradeNavListContainer); + if (isMobileNavOpened() === true) { + closeMenu(); + } + }); + function getFirstLink(menuLinks) { + return menuLinks[0].querySelector("button") ? menuLinks[0].querySelector("button") : menuLinks[0].querySelector("a"); + } + function getLastLink(menuLinks) { + return menuLinks[menuLinks.length - 1].querySelector("button") ? menuLinks[menuLinks.length - 1].querySelector("button") : menuLinks[menuLinks.length - 1].querySelector("a"); + } + const renovateurLinks = header.querySelectorAll(".menu-renovateur__navlist .menu-item"); + const renovateurFirstLink = getFirstLink(renovateurLinks); + const renovateurLastLink = getLastLink(renovateurLinks); + const homegradeLinks = header.querySelectorAll(".menu-homegrade__navlist .menu-item"); + const homegradeFirstLink = getFirstLink(homegradeLinks); + const homegradeLastLink = getLastLink(homegradeLinks); + mobileMenuToggle.addEventListener("focusout", (e) => { + if (isMobileNavOpened()) { + renovateurFirstLink.focus(); + } + }); + renovateurFirstLink.addEventListener("focusout", (e) => { + if (e.relatedTarget.id == "website-logo-link" && isMobileNavOpened()) { + mobileMenuToggle.focus(); + } + }); + renovateurLastLink.addEventListener("focusout", (e) => { + if (isMobileNavOpened()) { + homegradeFirstLink.focus(); + } + }); + homegradeLastLink.addEventListener("focusout", (e) => { + if (isMobileNavOpened()) { + mobileMenuToggle.focus(); } }); document.addEventListener("keydown", (e) => { if (e.key === "Escape") { + if (isMobileNavOpened()) { + closeMenu(renovateurNavListContainer); + closeMenu(HomegradeNavListContainer); + } if (isSearchOpen() === true) { closeSearch(); } diff --git a/resources/css/app.css b/resources/css/app.css index ff1f82c..7d3f894 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -14,11 +14,11 @@ /* ########### COMPONENTS ############ */ @import './components/cta.css'; @import './components/card.css'; -@import './components/card-post.css'; @import './components/card-large-content.css'; @import './components/section-titling.css'; @import './components/search-module.css'; +@import '../../template-components/card-news.css'; @import '../../template-components/card-frequent_question.css'; @import '../../template-components/card-thematique.css'; diff --git a/resources/css/base/generalites.css b/resources/css/base/generalites.css index a32730c..77a107a 100644 --- a/resources/css/base/generalites.css +++ b/resources/css/base/generalites.css @@ -1,7 +1,6 @@ body { @apply bg-white antialiased; } - a:focus, button:focus { outline: red solid 1px; diff --git a/resources/css/layout/menu-homegrade.css b/resources/css/layout/menu-homegrade.css index 44ba736..2210a77 100644 --- a/resources/css/layout/menu-homegrade.css +++ b/resources/css/layout/menu-homegrade.css @@ -22,6 +22,8 @@ mx-auto lg:mx-0 static + bottom-0 + translate-y-full lg:absolute; z-index: 999; display: none; @@ -74,42 +76,43 @@ rounded-xl; &:hover, + button:focus, a:focus { @apply cursor-pointer; background-color: rgba(255, 255, 255, 0.1); } + button:focus, a:focus { + @apply rounded-md; text-decoration: none; + outline: 1px solid rgba(255, 255, 255, 0.8); + outline-offset: 8px; } /* IF SUBMENU CHILD */ .menu-item__submenu-toggle { &:hover, &:focus { - @apply text-secondary; + /* @apply text-secondary; */ } @apply relative pr-4; &:after { - @apply absolute right-0; - content: '▼'; - position: absolute; + content: ''; display: inline-block; - line-height: 0.5; - height: 10px; - top: calc(50% - 4px); - width: 10px; - margin-left: 20px; - transform-origin: center; - background-repeat: no-repeat; - background-size: contain; transition: all 0.3s ease-out; + border-bottom: 2px solid white; + border-right: 2px solid white; + height: 10px; + width: 10px; + margin-left: 10px; } } .menu-item__submenu-toggle[aria-expanded='false']:after { - transform: rotate(0deg); + transform: translateY(-20%) rotate(45deg); } .menu-item__submenu-toggle[aria-expanded='true']:after { - transform: rotate(180deg); + /* transform: rotate(225deg); */ + transform: translateY(40%) rotate(225deg); } } } diff --git a/resources/css/layout/menu-renovateur.css b/resources/css/layout/menu-renovateur.css index 15b3187..5d2c826 100644 --- a/resources/css/layout/menu-renovateur.css +++ b/resources/css/layout/menu-renovateur.css @@ -14,6 +14,12 @@ mr-12 w-[190px] xl:w-[222px]; + + a:focus img { + outline: red solid 1px; + @apply outline-1 outline-offset-8; + outline-radius: 50px; + } } /* &__main-elements { @apply w-full bg-red-200 flex justify-between items-center; @@ -154,7 +160,7 @@ content: url('../resources/images/menu.svg'); } */ } - &__mobile-menu-toggle[aria-expanded] { + &__mobile-menu-toggle[aria-expanded='true'] { .toggle-icon { @apply relative; &__bar--top { diff --git a/resources/img/graphic-assets/icone-external-link.svg b/resources/img/graphic-assets/icone-external-link.svg index e05fc3a..d1f58ee 100644 --- a/resources/img/graphic-assets/icone-external-link.svg +++ b/resources/img/graphic-assets/icone-external-link.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/js/header.js b/resources/js/header.js index be3ddd1..e9ef530 100644 --- a/resources/js/header.js +++ b/resources/js/header.js @@ -49,8 +49,8 @@ export default function menuInit() { } function closeCurrentSubmenu(buttonClose) { - console.log('close submenu'); - console.log(buttonClose.parentElement); + // console.log('close submenu'); + // console.log(buttonClose.parentElement); const currentOpenedSubmenu = buttonClose.parentElement; currentOpenedSubmenu.classList.remove('sub-menu--open'); @@ -152,76 +152,172 @@ export default function menuInit() { -----------------------------------------------------------*/ const renovateurNavListContainer = header.querySelector('.menu-renovateur__navlist-container'); const HomegradeNavListContainer = header.querySelector('.menu-homegrade'); + function isMobileNavOpened() { + console.log('is mobile nav opened'); + console.log( + renovateurNavListContainer.hasAttribute('opened') && + mobileMenuToggle.getAttribute('aria-expanded') === 'true' + ); + return ( + renovateurNavListContainer.hasAttribute('opened') && + mobileMenuToggle.getAttribute('aria-expanded') === 'true' + ); + } function openMenu(menuContainer) { - // header.removeAttribute('closed', ''); - // header.setAttribute('opened', ''); - // header.removeAttribute('aria-hidden', ''); - // header.setAttribute('opening', ''); + console.log('open menu'); + // Change Toggle expanded + mobileMenuToggle.setAttribute('aria-expanded', 'true'); - // RENOVATEUR - menuContainer.removeAttribute('closed', ''); - menuContainer.setAttribute('opened', ''); - menuContainer.removeAttribute('aria-hidden', ''); - menuContainer.setAttribute('opening', ''); + // Change Text button + const textContent = mobileMenuToggle.querySelector('span.text-content'); + textContent.textContent = mobileMenuToggle.getAttribute('data-text-open'); - menuContainer.addEventListener( + function openRenovateur() { + renovateurNavListContainer.removeAttribute('closed', ''); + renovateurNavListContainer.setAttribute('opened', ''); + renovateurNavListContainer.removeAttribute('aria-hidden', ''); + renovateurNavListContainer.setAttribute('opening', ''); + + renovateurNavListContainer.addEventListener( + 'animationend', + () => { + renovateurNavListContainer.removeAttribute('opening', ''); + }, + { once: true } + ); + + console.log('#######'); + } + + function openHomegrade() { + HomegradeNavListContainer.removeAttribute('closed', ''); + HomegradeNavListContainer.setAttribute('opened', ''); + HomegradeNavListContainer.removeAttribute('aria-hidden', ''); + HomegradeNavListContainer.setAttribute('opening', ''); + + HomegradeNavListContainer.addEventListener( + 'animationend', + () => { + HomegradeNavListContainer.removeAttribute('opening', ''); + }, + { once: true } + ); + } + + openRenovateur(); + openHomegrade(); + } + function closeMenu(menuContainer) { + // Change Toggle expanded + mobileMenuToggle.setAttribute('aria-expanded', 'false'); + + // Button Text Content + let textContent = mobileMenuToggle.querySelector('span.text-content'); + textContent.textContent = mobileMenuToggle.getAttribute('data-text-close'); + // console.log(test.textContent); + + // CLOSING #RENOVATEUR + renovateurNavListContainer.removeAttribute('opened'); + renovateurNavListContainer.setAttribute('aria-hidden', ''); + renovateurNavListContainer.setAttribute('closing', ''); + + renovateurNavListContainer.addEventListener( 'animationend', () => { - menuContainer.removeAttribute('opening', ''); + renovateurNavListContainer.setAttribute('closed', ''); + renovateurNavListContainer.removeAttribute('closing', ''); }, { once: true } ); - } - function closeMenu(menuContainer) { - // header.removeAttribute('opened'); - // header.setAttribute('aria-hidden', ''); - // header.setAttribute('closing', ''); - menuContainer.removeAttribute('opened'); - menuContainer.setAttribute('aria-hidden', ''); - menuContainer.setAttribute('closing', ''); + // CLOSING #HOMEGRADE + HomegradeNavListContainer.removeAttribute('opened'); + HomegradeNavListContainer.setAttribute('aria-hidden', ''); + HomegradeNavListContainer.setAttribute('closing', ''); - menuContainer.addEventListener( + HomegradeNavListContainer.addEventListener( 'animationend', () => { - menuContainer.setAttribute('closed', ''); - menuContainer.removeAttribute('closing', ''); + HomegradeNavListContainer.setAttribute('closed', ''); + HomegradeNavListContainer.removeAttribute('closing', ''); }, { once: true } ); } mobileMenuToggle.addEventListener('click', function (e) { - const isNavOpened = renovateurNavListContainer.hasAttribute('opened'); - // Button Text Content - const textContent = mobileMenuToggle.querySelector('span.text-content'); - const dataTextOpen = mobileMenuToggle.getAttribute('data-text-open'); - const dataTextClose = mobileMenuToggle.getAttribute('data-text-close'); - // Change Text button - textContent.textContent = isNavOpened ? dataTextOpen : dataTextClose; - - // Toggle Aria-expanded - mobileMenuToggle.toggleAttribute('aria-expanded'); - - // Handle Visibility - if (isNavOpened) { - closeMenu(renovateurNavListContainer); - closeMenu(HomegradeNavListContainer); + if (isMobileNavOpened() === false) { + openMenu(); + return; } - if (!isNavOpened) { - openMenu(renovateurNavListContainer); - openMenu(HomegradeNavListContainer); + if (isMobileNavOpened() === true) { + closeMenu(); + } + }); + + /* ----------------------------------------------------------- + HANDLE FOCUS CHANGE + -----------------------------------------------------------*/ + function getFirstLink(menuLinks) { + return menuLinks[0].querySelector('button') + ? menuLinks[0].querySelector('button') + : menuLinks[0].querySelector('a'); + } + function getLastLink(menuLinks) { + return menuLinks[menuLinks.length - 1].querySelector('button') + ? menuLinks[menuLinks.length - 1].querySelector('button') + : menuLinks[menuLinks.length - 1].querySelector('a'); + } + + // Menu Renovateur elements + const renovateurLinks = header.querySelectorAll('.menu-renovateur__navlist .menu-item'); + const renovateurFirstLink = getFirstLink(renovateurLinks); + const renovateurLastLink = getLastLink(renovateurLinks); + + // Menu homegrade elements + const homegradeLinks = header.querySelectorAll('.menu-homegrade__navlist .menu-item'); + const homegradeFirstLink = getFirstLink(homegradeLinks); + const homegradeLastLink = getLastLink(homegradeLinks); + + // Leaving the mobile menu Toggle --> Focus on Menu Homegrade + mobileMenuToggle.addEventListener('focusout', (e) => { + if (isMobileNavOpened()) { + renovateurFirstLink.focus(); + } + }); + + // Si shift tab pour retour --> Focuser correctement sur le mobile menu toggle + renovateurFirstLink.addEventListener('focusout', (e) => { + if (e.relatedTarget.id == 'website-logo-link' && isMobileNavOpened()) { + mobileMenuToggle.focus(); + } + }); + + // Leaving the Menu Rénovateur --> Focus on Menu Homegrade + renovateurLastLink.addEventListener('focusout', (e) => { + if (isMobileNavOpened()) { + homegradeFirstLink.focus(); + } + }); + + // Leaving the Menu Homegrade --> Focus on the toggle + homegradeLastLink.addEventListener('focusout', (e) => { + if (isMobileNavOpened()) { + mobileMenuToggle.focus(); } }); /* ----------------------------------------------------------- HANDLE ESCAPE KEY -----------------------------------------------------------*/ - document.addEventListener('keydown', (e) => { if (e.key === 'Escape') { + if (isMobileNavOpened()) { + closeMenu(renovateurNavListContainer); + closeMenu(HomegradeNavListContainer); + } if (isSearchOpen() === true) { closeSearch(); } diff --git a/searchform.php b/searchform.php index d531c24..c6e8379 100644 --- a/searchform.php +++ b/searchform.php @@ -1,9 +1,9 @@
    - +
    - + diff --git a/single.php b/single.php index 9521db4..18c7c1b 100644 --- a/single.php +++ b/single.php @@ -1,28 +1,27 @@ -
    - - +
    + + the_content() + ?> - -
    +
    -

    Aides financières

    -

    +

    +

    @@ -16,7 +16,7 @@ $renolution_datas = get_field('renolution_datas');
    -

    +

    diff --git a/template-blocks/home/demarches-administratives/demarches-administratives.php b/template-blocks/home/demarches-administratives/demarches-administratives.php index 61bc2e0..f334440 100755 --- a/template-blocks/home/demarches-administratives/demarches-administratives.php +++ b/template-blocks/home/demarches-administratives/demarches-administratives.php @@ -15,7 +15,7 @@ $demarches_administratives_links = get_field('demarches_administratives_links');

    -

    +

    @@ -34,7 +34,7 @@ $demarches_administratives_links = get_field('demarches_administratives_links'); // echo ''; ?> -

    post_title ?>

    +

    post_title ?>

    post_excerpt ?>

    diff --git a/template-blocks/home/latest-news/latest-news.php b/template-blocks/home/latest-news/latest-news.php index 32fc132..8d54af2 100644 --- a/template-blocks/home/latest-news/latest-news.php +++ b/template-blocks/home/latest-news/latest-news.php @@ -5,7 +5,7 @@ $block_titling_datas = get_field('block_titling_datas');

    -

    +

    diff --git a/template-blocks/home/questions-frequentes/questions-frequentes.php b/template-blocks/home/questions-frequentes/questions-frequentes.php index 4bdf6b2..589a054 100644 --- a/template-blocks/home/questions-frequentes/questions-frequentes.php +++ b/template-blocks/home/questions-frequentes/questions-frequentes.php @@ -7,8 +7,8 @@ $block_titling = get_field('block_titling_description_datas');
    -

    Les questions les plus fréquentes

    -

    Simplifions votre recherche !

    +

    +

    { const cardThematiques = document.querySelectorAll('.swiper-slide .card-thematique'); - mySwiper = new Swiper('.swiper-container', { - grabCursor: false, - slidesPerView: 3, - spaceBetween: 30, - loop: true, - // centeredSlides: true, - keyboard: { - enabled: true, - }, - navigation: { - nextEl: '.thematique-button-next', - prevEl: '.thematique-button-prev', - }, - pagination: { - el: '.swiper-pagination', - clickable: true, - renderBullet: function (index, className) { - const ariaLabel = cardThematiques[index].getAttribute('data-taxonomy'); + function swiperCheckBreakpoints() { + const hasSwiper = thematiquesSwiper.__swiper__ === true; - return ``; + if (window.innerWidth < 960 && hasSwiper) { + thematiquesSwiper.destroy(true, true); + } + if (window.innerWidth >= 960 && !hasSwiper) { + initiateSwiper(); + } + } + + function initiateSwiper() { + thematiquesSwiper = new Swiper('.swiper-container', { + grabCursor: false, + slidesPerView: 3, + spaceBetween: 30, + a11y: { + enabled: true, + prevSlideMessage: textTranslations.previousSlide, + nextSlideMessage: textTranslations.nextSlide, + slideRole: '', + slideLabelMessage: textTranslations.slideLabel, }, - }, - a11y: false, - }); + // loop: true, + // centeredSlides: true, + keyboard: { + enabled: true, + }, + navigation: { + nextEl: '.thematique-button-next', + prevEl: '.thematique-button-prev', + }, + pagination: { + el: '.swiper-pagination', + clickable: true, + renderBullet: function (index, className) { + const ariaLabel = cardThematiques[index].getAttribute('data-taxonomy'); + + // return ``; + return `
    `; + }, + }, + breakpoints: { + // when window width is >= 320px + + // when window width is >= 480px + 320: { + slidesPerView: 2, + }, + // when window width is >= 640px + 1100: { + slidesPerView: 3, + }, + }, + // a11y: false, + }); + } + initiateSwiper(); + swiperCheckBreakpoints(); + + window.addEventListener('resize', swiperCheckBreakpoints); }); diff --git a/template-blocks/home/show-thematiques/show-thematiques.php b/template-blocks/home/show-thematiques/show-thematiques.php index a1bd7a2..3b05e2d 100755 --- a/template-blocks/home/show-thematiques/show-thematiques.php +++ b/template-blocks/home/show-thematiques/show-thematiques.php @@ -12,26 +12,23 @@ $terms = get_terms(array( ?> -

    -

    +

    - +
    -
    +
    @@ -41,11 +38,8 @@ $terms = get_terms(array(
    Slide 3
    --> -
    - + -
    +
    + +
    diff --git a/template-blocks/home/show-thematiques/test.js b/template-blocks/home/show-thematiques/test.js deleted file mode 100644 index d3f5a12..0000000 --- a/template-blocks/home/show-thematiques/test.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/template-components/card-frequent-question.php b/template-components/card-frequent-question.php index 2e510cd..4323867 100644 --- a/template-components/card-frequent-question.php +++ b/template-components/card-frequent-question.php @@ -11,15 +11,15 @@ $thematique_icon = get_field('taxonomy_pictures', $args['thematique'])['icon'];
    -

    name ?>

    +

    name ?>

      - -
    • name ?>
      • - + +
    • name ?>
      • +
    diff --git a/resources/css/components/card-post.css b/template-components/card-news.css similarity index 80% rename from resources/css/components/card-post.css rename to template-components/card-news.css index ed0f422..f247697 100644 --- a/resources/css/components/card-post.css +++ b/template-components/card-news.css @@ -1,4 +1,4 @@ -.card-post { +.card-news { @apply bg-white shadow-lg rounded-3xl relative; &__thumbnail { @@ -9,6 +9,9 @@ &__inner { @apply p-8 h-full; } + &__heading { + @apply flex flex-col-reverse; + } &__tag { @apply bg-secondary-light diff --git a/template-components/card-news.php b/template-components/card-news.php index 1902f8f..093d5e5 100644 --- a/template-components/card-news.php +++ b/template-components/card-news.php @@ -8,15 +8,19 @@ $post_tags = $args['post_tags']; -
    +
    -
    -

    name ?>

    -

    +
    +
    +

    +

    name ?>

    +
    + - + + diff --git a/template-components/card-thematique.php b/template-components/card-thematique.php index a3a2efa..8e41594 100644 --- a/template-components/card-thematique.php +++ b/template-components/card-thematique.php @@ -9,11 +9,12 @@ $color = getThematiqueFamilySlug($thematique->slug); ?>
    -

    name ?>

    +

    name ?>

    description ?>

    En savoir plus + sur slug ?>
    diff --git a/template-components/content-single.php b/template-components/content-single.php index c499c76..45dba7c 100644 --- a/template-components/content-single.php +++ b/template-components/content-single.php @@ -1,25 +1,25 @@
    >
    - ', esc_url( get_permalink() ) ), '' ); ?> - + ', esc_url(get_permalink())), ''); ?> +
    '
    ' . __( 'Pages:', 'tailpress' ) . '', - 'after' => '
    ', - 'link_before' => '', - 'link_after' => '', - 'pagelink' => '' . __( 'Page', 'tailpress' ) . ' %', - 'separator' => ', ', - ) - ); + wp_link_pages( + array( + 'before' => '
    ' . __('Pages:', 'homegrade-theme__texte-backoffice') . '', + 'after' => '
    ', + 'link_before' => '', + 'link_after' => '', + 'pagelink' => '' . __('Page', 'homegrade-theme__texte-backoffice') . ' %', + 'separator' => ', ', + ) + ); ?>
    -
    + \ No newline at end of file diff --git a/template-components/content.php b/template-components/content.php index 8843eee..7684384 100644 --- a/template-components/content.php +++ b/template-components/content.php @@ -1,11 +1,11 @@ -
    > +
    >
    - ', esc_url( get_permalink() ) ), '' ); ?> - + ', esc_url(get_permalink())), ''); ?> +
    - +
    @@ -18,18 +18,18 @@ /* translators: %s: Name of current post */ the_content( sprintf( - __( 'Continue reading %s', 'tailpress' ), - the_title( '"', '"', false ) + __('Continuer à lire', 'homegrade-theme__texte-backoffice'), + the_title('"', '"', false) ) ); wp_link_pages( array( - 'before' => '
    ' . __( 'Pages:', 'tailpress' ) . '', + 'before' => '
    ' . __('Pages:', 'homegrade-theme__texte-backoffice') . '', 'after' => '
    ', 'link_before' => '', 'link_after' => '', - 'pagelink' => '' . __( 'Page', 'tailpress' ) . ' %', + 'pagelink' => '' . __('Page', 'homegrade-theme__texte-backoffice') . ' %', 'separator' => ', ', ) ); @@ -38,4 +38,4 @@ -
    +
    \ No newline at end of file diff --git a/template-components/header/menu-renovateur.php b/template-components/header/menu-renovateur.php index 25ce600..3bfbebd 100644 --- a/template-components/header/menu-renovateur.php +++ b/template-components/header/menu-renovateur.php @@ -16,8 +16,8 @@ $logoSRC = wp_get_attachment_image_src($logoID, 'full'); -
    - - -
      @@ -163,7 +148,22 @@ $logoSRC = wp_get_attachment_image_src($logoID, 'full');
    +
    + + +
    diff --git a/template-components/header/menu-renovateur_old.php b/template-components/header/menu-renovateur_old.php deleted file mode 100644 index dec4cc6..0000000 --- a/template-components/header/menu-renovateur_old.php +++ /dev/null @@ -1,59 +0,0 @@ -term_id, array('order' => 'DESC')); -// echo '
    ';
-// print_r($menuitems);
-// echo '
    '; -?> - - - - - - - -
    - - - 'false', - 'theme_location' => 'renovateur', - 'li_class' => 'menu-navlink', - 'fallback_cb' => false, - 'show_parent' => true, - 'menu_class' => "menu-renovateur__navlist", - ) - ); - ?> - - - - - - - -
    \ No newline at end of file diff --git a/template-components/header/search-module.php b/template-components/header/search-module.php index 2af6742..b42dbf4 100644 --- a/template-components/header/search-module.php +++ b/template-components/header/search-module.php @@ -1,7 +1,6 @@ -