diff --git a/footer.php b/footer.php index ff7bbcb..620fea0 100644 --- a/footer.php +++ b/footer.php @@ -1,168 +1,171 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/functions.php b/functions.php index 12325b1..b9b0b9b 100644 --- a/functions.php +++ b/functions.php @@ -16,3 +16,4 @@ require_once(__DIR__ . '/includes/wysiwyg.php'); require_once(__DIR__ . '/includes/search.php'); require_once(__DIR__ . '/includes/rooting.php'); require_once(__DIR__ . '/includes/forms.php'); +require_once(__DIR__ . '/includes/wpml.php'); diff --git a/header.php b/header.php index 551cc25..d3ac399 100644 --- a/header.php +++ b/header.php @@ -8,17 +8,17 @@ - + current-language=""> - - -
" class="min-h-screen flex flex-col ">
@@ -31,13 +31,11 @@
- - + + @@ -47,5 +45,7 @@ - -
\ No newline at end of file +
+ \ No newline at end of file diff --git a/includes/admin.php b/includes/admin.php index cbeb955..9900c22 100644 --- a/includes/admin.php +++ b/includes/admin.php @@ -7,15 +7,14 @@ function register_theme_settings_option_page() { + $current_blog_id = get_current_blog_id(); - // Check function exists. - if (function_exists('acf_add_options_page')) { + if (function_exists('acf_add_options_page') && $current_blog_id === 1) { // Register options page. $homegrade_option_page = acf_add_options_page(array( 'page_title' => __('Paramètres & Outils', 'homegrade-theme__texte-backoffice'), 'menu_title' => __('Paramètres', 'homegrade-theme__texte-backoffice'), - 'menu_slug' => 'theme-general-settings', 'capability' => 'activate_plugins', 'redirect' => false, diff --git a/includes/forms/export-paper-publication-entries.php b/includes/forms/export-paper-publication-entries.php index c9511bd..31fca26 100644 --- a/includes/forms/export-paper-publication-entries.php +++ b/includes/forms/export-paper-publication-entries.php @@ -7,8 +7,6 @@ function add_menu_item($menu_items) return $menu_items; } - - function homegrade_stats_option_page() { ?> @@ -90,9 +88,6 @@ function generate_order_datas_to_csv() $document_id_nl = $document['id_nl'] ?? null; $document_quantity_nl = $document['quantity_nl'] ?? null; - $dateCreatedRaw = $entry['date_created'] ?? ''; - $dateCreated = $dateCreatedRaw ? date('d / m / Y', strtotime($dateCreatedRaw)) : ''; - if (!$document_quantity_fr && !$document_quantity_nl) { continue; } @@ -108,7 +103,6 @@ function generate_order_datas_to_csv() 'company_type' => $companyType, 'zipCode' => $zipCode, 'userLanguage' => $userLanguage, - 'order_date' => $dateCreated, ]; array_push($output_formatted_entries, $document_formatted_order_nl); } @@ -125,7 +119,6 @@ function generate_order_datas_to_csv() 'company_type' => $companyType, 'zipCode' => $zipCode, 'userLanguage' => $userLanguage, - 'order_date' => $dateCreated, ]; array_push($output_formatted_entries, $document_formatted_order_fr); } @@ -143,7 +136,7 @@ function generate_order_datas_to_csv() } // Ajouter les en-têtes du CSV - fputcsv($file, ['Publication', 'Quantité', 'Langue de la publication', 'Thématique', 'ID de la brochure', 'Type d\'organisme', 'Code Postal', 'Langue de l\'utilisateur', 'Date de la commande']); + fputcsv($file, ['Publication', 'Quantité', 'Langue de la publication', 'Thématique', 'ID de la brochure', 'Type d\'organisme', 'Code Postal', 'Langue de l\'utilisateur']); // Boucler sur chaque entrée formatée et l'écrire dans le CSV foreach ($output_formatted_entries as $entry) { diff --git a/includes/init.php b/includes/init.php index 6e7e18c..0fa33dc 100644 --- a/includes/init.php +++ b/includes/init.php @@ -4,6 +4,7 @@ * Theme setup. */ + function tailpress_setup() { @@ -61,7 +62,7 @@ function homegrade_enqueue_scripts() wp_enqueue_script('gsap', get_template_directory_uri() . '/assets/gsap/gsap.min.js', array(), $theme->get('Version')); wp_enqueue_script('swiperjs', get_template_directory_uri() . '/assets/swiper/swiper-bundle_11.min.js', array(), $theme->get('Version')); wp_enqueue_style('swipercss', get_template_directory_uri() . '/assets/swiper/swiper-bundle.min.css', array(), $theme->get('Version')); - wp_enqueue_style('tailpress', tailpress_asset('css/app.css'), array(), $theme->get('Version')); + wp_enqueue_style('homegrade-main-css', get_template_directory_uri() . '/css/app.css', array(), $theme->get('Version')); // #PASSING TRANSLATIONS wp_register_script('main-app-js', get_template_directory_uri() . '/js/app.js', array('gsap', 'jquery'), $theme->get('Version')); @@ -89,6 +90,15 @@ add_action('wp_enqueue_scripts', 'homegrade_enqueue_scripts'); Enqueue Theme assets 🡒 Back -----------------------------------------------------------*/ add_action('enqueue_block_editor_assets', 'homegrade_enqueue_scripts'); + +function homegrade_enqueue_back_scripts() +{ + wp_enqueue_script('metiers-theme-editor-js', get_stylesheet_directory_uri() . '/js/editor.js', array(), $theme->get('Version')); +} + +add_action('enqueue_block_editor_assets', 'homegrade_enqueue_scripts'); + + // ALSO SEE add_editor_style('css/editor-style.css') line 41 diff --git a/includes/navwalker.php b/includes/navwalker.php index 0354a06..950d7b2 100644 --- a/includes/navwalker.php +++ b/includes/navwalker.php @@ -16,38 +16,85 @@ function wrap_parent_menu_item_buttons($output, $item, $depth, $args) $output = '
' . $item->title . '
'; } - - // #### MENU RENOVATEUR - // if ($args->theme_location === "renovateur") { - // $page_icon = get_field('page_icon', $item->object_id); - - // if (in_array('menu-item-has-children', $item->classes, true)) { - // $output = ''; - // } - - // // #### ICONE DE PAGE FOR TOP LEVEL MENU ITEMS - // if (isset($page_icon['url'])) { - // $icon = ''; - // $link = $output; - // $output = $icon . $link; - // } - - - // // #### TAXONOMY : GET ICON & INFOS ABOUT TAX - - // if ($item->type === "taxonomy") { - // $term = get_term_by('id', $item->object_id, 'thematiques'); - // $cover = get_field('taxonomy_pictures', "thematiques_" . $item->object_id); - - // $output = ''; - // $output .= ''; - // $output .= '
' . $item->title . "
"; - // $output .= '

' . $term->description . "

"; - // $output .= ""; - // } - // } - - return $output; } add_filter('walker_nav_menu_start_el', 'wrap_parent_menu_item_buttons', 10, 4); + + + + +/* ----------------------------------------------------------- + Hide Page presse from homegrade top-menu but not footer + -----------------------------------------------------------*/ + + +function metiers_patrimoine_filter_menu_items($items, $args) +{ + + // ID de l'élément de menu à masquer + $isMenuHomegradeInFooter = $args->menu_class === 'menu-homegrade--footer'; + + foreach ($items as $key => $item) { + $isPagePresse = $item->object_id == "2784" || $item->object_id == "4973"; + + if ($isPagePresse && !$isMenuHomegradeInFooter) { + unset($items[$key]); + } + } + + return $items; +} +add_filter('wp_nav_menu_objects', 'metiers_patrimoine_filter_menu_items', 10, 2); + + + +/* ----------------------------------------------------------- + PASS CUSTOM WPML NAV SWITCHER TO MENU + -----------------------------------------------------------*/ + +add_filter('wp_nav_menu_items', 'add_custom_item_to_menu', 10, 2); +function add_custom_item_to_menu($items, $args) +{ + + $isMenuHomegradeInFooter = $args->menu_class === 'menu-homegrade--footer'; + + // restore_current_blog(); + + + + if ($args->theme_location === 'homegrade' && !$isMenuHomegradeInFooter) { + /* BOUTON METIERS DU PATRIMOINE */ + + switch_to_blog(2); + // $home_url_metiers_patrimoine = get_home_url(); + $home_url_metiers_patrimoine = get_the_permalink(43); + // switch_to_blog(1); + restore_current_blog(); + + $items .= '
  • '; + $items .= ''; + $items .= __('Artisans du patrimoine', 'homegrade'); + $items .= ''; + $items .= '
    • '; + + + /* WPML NAV SWITCHER */ + ob_start(); + // switch_to_blog(1); + restore_current_blog(); + // do_action('wpml_language_switcher', array('flags' => false, 'translated' => false, 'link_current' => true)); + do_action('wpml_add_language_selector'); + + switch_to_blog(1); + $wpmlnav = ob_get_clean(); + + $items .= '
  • '; + $items .= $wpmlnav; + $items .= '
    • '; + } + + + // switch_to_blog(1); + + return $items; +} diff --git a/includes/post_types.php b/includes/post_types.php index 9475594..ebb0ce6 100644 --- a/includes/post_types.php +++ b/includes/post_types.php @@ -1,202 +1,204 @@ -labels; - $labels->name = 'News'; - $labels->singular_name = 'News'; - $labels->add_new = 'Ajouter une Actu'; - $labels->add_new_item = 'Ajouter une Actu'; - $labels->edit_item = 'Editer l\'actualité'; - $labels->new_item = 'News'; - $labels->view_item = 'Voir l\'actualité'; - $labels->search_items = 'Chercher une Actualité'; - $labels->not_found = 'Pas de News trouvée'; - $labels->not_found_in_trash = 'Pas de News trouvée dans la corbeille'; - $labels->all_items = 'Toutes les Actus'; - $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() -{ - - // Access global variables. - global $menu; - - foreach ($menu as $key => $val) { - - if (__('News', 'homegrade-theme__texte-backoffice') == $val[0]) { - $menu[$key][6] = 'dashicons-welcome-widgets-menus'; - } - } -} -add_action('admin_menu', 'change_menu_icon'); - -// #### POST TYPES -function create_posttype() -{ - // **** CONSEILS - register_post_type( - 'conseils', - array( - 'labels' => array( - 'name' => __('Conseils', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Conseil', 'homegrade-theme__texte-backoffice') - ), - 'template' => [ - array('homegrade-content-blocks/chapter-header'), - array('core/paragraph', ['placeholder' => 'Add truc Description…',]), - ], - 'hierarchical' => true, - 'public' => true, - 'has_archive' => false, - 'show_in_rest' => true, - 'menu_icon' => 'dashicons-pressthis', - 'menu_position' => 2, - 'supports' => array('title', 'editor', 'page-attributes', 'thumbnail', 'revisions', 'excerpt'), - - // 'supports' => array('title', 'custom-fields', 'editor'), - ) - ); - - // **** BROCHURES - register_post_type( - 'brochures', - array( - 'labels' => array( - 'name' => __('Brochures', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Brochure', 'homegrade-theme__texte-backoffice') - ), - 'hierarchical' => true, - 'show_in_rest' => true, - 'public' => true, - 'has_archive' => false, - 'menu_icon' => 'dashicons-book', - 'menu_position' => 2, - 'position' => 2, - 'supports' => array('custom-fields', 'page-attributes', 'title'), - ) - ); - - // **** QUESTIONS - register_post_type( - 'questions', - array( - 'labels' => array( - 'name' => __('Questions', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Question', 'homegrade-theme__texte-backoffice') - ), - 'public' => true, - 'has_archive' => false, - 'show_in_rest' => true, - 'menu_icon' => 'dashicons-editor-help', - 'menu_position' => 2.1, - 'supports' => array('title', 'custom-fields', 'editor', 'excerpt', 'revisions'), - - // 'rewrite' => array('slug' => 'questions'), - // 'rewrite' => array('slug' => 'questions/%thematiques%'), - ) - ); - - // **** FICHES-INFOS - register_post_type( - 'fiches-infos', - array( - 'labels' => array( - 'name' => __('Fiches info', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Fiches Info', 'homegrade-theme__texte-backoffice') - ), - 'public' => true, - 'has_archive' => false, - 'show_in_rest' => true, - 'menu_icon' => 'dashicons-info-outline', - 'menu_position' => 2.1, - 'supports' => array('title', 'custom-fields'), - ) - ); - - // **** VOCABULAIRE - register_post_type( - 'vocabulaire', - array( - 'labels' => array( - 'name' => __('Vocabulaire', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Vocabulaire', 'homegrade-theme__texte-backoffice') - ), - 'public' => true, - 'has_archive' => true, - 'show_in_rest' => true, - 'menu_icon' => 'dashicons-testimonial', - 'menu_position' => 5.1, - 'supports' => array('title', 'custom-fields'), - ) - ); - - // **** JOBS - register_post_type( - 'jobs', - array( - 'labels' => array( - 'name' => __('Jobs', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Job', 'homegrade-theme__texte-backoffice') - ), - 'rewrite' => array('slug' => 'job'), - 'public' => true, - 'has_archive' => true, - 'show_in_rest' => true, - 'menu_icon' => 'dashicons-id-alt', - 'menu_position' => 5.1, - 'supports' => array('title', 'editor', 'custom-fields', 'page-attributes'), - - ) - ); - - // **** VIDEOS / WEBINAIRES - register_post_type( - 'videos-webinaires', - array( - 'labels' => array( - 'name' => __('Webinaires', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Webinaire', 'homegrade-theme__texte-backoffice') - ), - 'public' => true, - 'has_archive' => true, - 'show_in_rest' => true, - 'menu_icon' => 'dashicons-video-alt2', - 'menu_position' => 5.1, - 'supports' => array('title', 'custom-fields'), - 'supports' => array('title', 'custom-fields', 'excerpt', 'thumbnail'), - - ) - ); - - // **** VIDEOS / WEBINAIRES - register_post_type( - 'parcours', - array( - 'labels' => array( - 'name' => __('Parcours', 'homegrade-theme__texte-backoffice'), - 'singular_name' => __('Parcours', 'homegrade-theme__texte-backoffice') - ), - 'public' => true, - 'has_archive' => true, - 'hierarchical' => true, - 'show_in_rest' => true, - 'menu_icon' => 'dashicons-forms', - 'supports' => array('title', 'custom-fields'), - 'supports' => array('title', 'editor', 'page-attributes', 'thumbnail', 'revisions', 'excerpt'), - - ) - ); -} - -add_action('init', 'create_posttype'); +labels; + $labels->name = 'News'; + $labels->singular_name = 'News'; + $labels->add_new = 'Ajouter une Actu'; + $labels->add_new_item = 'Ajouter une Actu'; + $labels->edit_item = 'Editer l\'actualité'; + $labels->new_item = 'News'; + $labels->view_item = 'Voir l\'actualité'; + $labels->search_items = 'Chercher une Actualité'; + $labels->not_found = 'Pas de News trouvée'; + $labels->not_found_in_trash = 'Pas de News trouvée dans la corbeille'; + $labels->all_items = 'Toutes les Actus'; + $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() +{ + + // Access global variables. + global $menu; + + foreach ($menu as $key => $val) { + + if (__('News', 'homegrade-theme__texte-backoffice') == $val[0]) { + $menu[$key][6] = 'dashicons-welcome-widgets-menus'; + } + } +} +add_action('admin_menu', 'change_menu_icon'); + +// #### POST TYPES +function create_posttype() +{ + + if (get_current_blog_id() != 1) { + return; + } + // **** CONSEILS + register_post_type( + 'conseils', + array( + 'labels' => array( + 'name' => __('Conseils', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Conseil', 'homegrade-theme__texte-backoffice') + ), + 'template' => [ + array('homegrade-content-blocks/chapter-header'), + array('core/paragraph', ['placeholder' => 'Add truc Description…',]), + ], + 'hierarchical' => true, + 'public' => true, + 'has_archive' => false, + 'show_in_rest' => true, + 'menu_icon' => 'dashicons-pressthis', + 'menu_position' => 2, + 'supports' => array('title', 'editor', 'page-attributes', 'thumbnail', 'revisions', 'excerpt'), + + // 'supports' => array('title', 'custom-fields', 'editor'), + ) + ); + + // **** BROCHURES + register_post_type( + 'brochures', + array( + 'labels' => array( + 'name' => __('Brochures', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Brochure', 'homegrade-theme__texte-backoffice') + ), + 'hierarchical' => true, + 'show_in_rest' => true, + 'public' => true, + 'has_archive' => false, + 'menu_icon' => 'dashicons-book', + 'menu_position' => 2, + 'position' => 2, + 'supports' => array('custom-fields', 'page-attributes', 'title'), + ) + ); + + // **** QUESTIONS + register_post_type( + 'questions', + array( + 'labels' => array( + 'name' => __('Questions', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Question', 'homegrade-theme__texte-backoffice') + ), + 'public' => true, + 'has_archive' => false, + 'show_in_rest' => true, + 'menu_icon' => 'dashicons-editor-help', + 'menu_position' => 2.1, + 'supports' => array('title', 'custom-fields', 'editor', 'excerpt', 'revisions'), + + // 'rewrite' => array('slug' => 'questions'), + // 'rewrite' => array('slug' => 'questions/%thematiques%'), + ) + ); + + // **** FICHES-INFOS + register_post_type( + 'fiches-infos', + array( + 'labels' => array( + 'name' => __('Fiches info', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Fiches Info', 'homegrade-theme__texte-backoffice') + ), + 'public' => true, + 'has_archive' => false, + 'show_in_rest' => true, + 'menu_icon' => 'dashicons-info-outline', + 'menu_position' => 2.1, + 'supports' => array('title', 'custom-fields'), + ) + ); + + // **** VOCABULAIRE + register_post_type( + 'vocabulaire', + array( + 'labels' => array( + 'name' => __('Vocabulaire', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Vocabulaire', 'homegrade-theme__texte-backoffice') + ), + 'public' => true, + 'has_archive' => true, + 'show_in_rest' => true, + 'menu_icon' => 'dashicons-testimonial', + 'menu_position' => 5.1, + 'supports' => array('title', 'custom-fields'), + ) + ); + + // **** JOBS + register_post_type( + 'jobs', + array( + 'labels' => array( + 'name' => __('Jobs', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Job', 'homegrade-theme__texte-backoffice') + ), + 'rewrite' => array('slug' => 'job'), + 'public' => true, + 'has_archive' => true, + 'show_in_rest' => true, + 'menu_icon' => 'dashicons-id-alt', + 'menu_position' => 5.1, + 'supports' => array('title', 'editor', 'custom-fields', 'page-attributes'), + + ) + ); + + // **** VIDEOS / WEBINAIRES + register_post_type( + 'videos-webinaires', + array( + 'labels' => array( + 'name' => __('Webinaires', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Webinaire', 'homegrade-theme__texte-backoffice') + ), + 'public' => true, + 'has_archive' => true, + 'show_in_rest' => true, + 'menu_icon' => 'dashicons-video-alt2', + 'menu_position' => 5.1, + 'supports' => array('title', 'custom-fields'), + 'supports' => array('title', 'custom-fields', 'excerpt', 'thumbnail'), + + ) + ); + + // **** VIDEOS / WEBINAIRES + register_post_type( + 'parcours', + array( + 'labels' => array( + 'name' => __('Parcours', 'homegrade-theme__texte-backoffice'), + 'singular_name' => __('Parcours', 'homegrade-theme__texte-backoffice') + ), + 'public' => true, + 'has_archive' => true, + 'hierarchical' => true, + 'show_in_rest' => true, + 'menu_icon' => 'dashicons-forms', + 'supports' => array('title', 'custom-fields'), + 'supports' => array('title', 'editor', 'page-attributes', 'thumbnail', 'revisions', 'excerpt'), + + ) + ); +} + +add_action('init', 'create_posttype'); diff --git a/includes/utilities.php b/includes/utilities.php index 5867914..4acacfa 100644 --- a/includes/utilities.php +++ b/includes/utilities.php @@ -196,8 +196,8 @@ function build_page_chapter_index($blocks) if ($block['blockName'] == 'homegrade-content-blocks/content-heading' && isset($block['attrs']['title']) && isset($block['attrs']['headingLevel']) && $block['attrs']['headingLevel'] == "h2") { array_push($chapterBlockIndex, [ 'block-type' => $block['blockName'], - 'anchor' => "#" . strip_tags($block['attrs']['idName']), - 'title' => strip_tags($block['attrs']['title']), + 'anchor' => "#" . esc_html($block['attrs']['idName']), + 'title' => esc_html($block['attrs']['title']), ]); } if ($block['blockName'] == 'homegrade-content-blocks/chapitrage-thematique') { diff --git a/package.json b/package.json index 2c6167c..610052c 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,10 @@ { - "name": "tailpress", + "name": "Homegrade_Theme", "version": "3.0.0", - "description": "Boilerplate WordPress theme with Tailwind CSS.", - "author": "Jeffrey van Rossum", - "repository": { - "type": "git", - "url": "https://github.com/jeffreyvr/tailpress" - }, - "theme_uri": "https://github.com/jeffreyvr/tailpress", - "author_uri": "https://vanrossum.dev", - "text_domain": "tailpress", + "description": "Homegrade Theme", + "author": "Deligraph — Antoine Martinon", + "author_uri": "https://deligraph.be/", + "text_domain": "homegrade-theme", "license": "MIT", "scripts": { "production:css-app": "cross-env NODE_ENV=development tailwindcss -i ./resources/css/app.css -o ./css/app.css --postcss --minify", diff --git a/resources/css/admin-style.css b/resources/css/admin-style.css index 906d4c2..a64e979 100644 --- a/resources/css/admin-style.css +++ b/resources/css/admin-style.css @@ -224,22 +224,3 @@ @apply bg-patrimoine-sante-securite; } } - -ol { - @apply list-decimal list-inside; - - /* font-family: 'Railway', sans-serif; */ - li { - list-style-type: decimal !important; - list-style-position: inside !important; - position: relative !important; - padding-left: 1.5em !important; - } - li:marker { - position: absolute !important; - left: 0 !important; - } - .block-editor-rich-text__editable { - display: inline-block !important; - } -} diff --git a/resources/css/app.css b/resources/css/app.css index 1581f8b..447bb4b 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -31,8 +31,10 @@ @import './components/thematiques-faq-filters.css'; @import './components/checkboxes.css'; @import './components/search-results.css'; +@import './components/side-card.css'; @import './components/accordeons.css'; @import './components/page-scroller.css'; +@import './components/informative-message.css'; @import './components/previous-next-posts.css'; @import './components/forms/field-order-publications.css'; @import './components/forms/field-homegrade-rating.css'; @@ -121,6 +123,7 @@ @import './blocks/page-card.css'; @import './blocks/lightbox-gallery.css'; @import './blocks/explainer-screen.css'; +@import './blocks/cta-slim.css'; /* Home */ @import './blocks/home-header.css'; diff --git a/resources/css/base/links.css b/resources/css/base/links.css index 3afd392..54bbd8f 100644 --- a/resources/css/base/links.css +++ b/resources/css/base/links.css @@ -26,7 +26,7 @@ main a[target='_blank']:not([href*='homegrade\.local']):not([href*='homegrade\.brussels']):not( :has(img) ) { - &:not(.cta--primary, .cta--secondary, .cta--button, .wp-block-button__link) { + &:not(.cta--primary, .cta--secondary, .cta--button, .share-link, .wp-block-button__link) { @apply inline items-center; @apply px-2 py-1 first-letter:text-primary underline font-bold relative rounded-md; diff --git a/resources/css/blocks/content-page-header.css b/resources/css/blocks/content-page-header.css index fb0e9c5..3bf531d 100644 --- a/resources/css/blocks/content-page-header.css +++ b/resources/css/blocks/content-page-header.css @@ -44,3 +44,9 @@ margin-bottom: unset; } } + +.block-content-page-header { + .homegrade-blocks-cta-slim + .homegrade-blocks-shortcuts { + @apply mt-12; + } +} diff --git a/resources/css/blocks/cta-slim.css b/resources/css/blocks/cta-slim.css new file mode 100644 index 0000000..649e971 --- /dev/null +++ b/resources/css/blocks/cta-slim.css @@ -0,0 +1,14 @@ +.homegrade-blocks-cta-slim { + @apply flex items-center font-bold pt-2 w-fit rounded-md; + &:after { + @apply ml-2; + transition: transform 0.2s ease-in-out; + /* @apply content-[''] w-4 h-4 bg-green-400 inline-block; */ + content: url('../resources/img/graphic-assets/chevron-next.svg'); + } + &:hover:after { + @apply translate-x-1; + transition: transform 0.2s ease-in-out; + /* @apply translate-x-2; */ + } +} diff --git a/resources/css/blocks/show-thematiques.css b/resources/css/blocks/show-thematiques.css index 02dd6db..baf291d 100755 --- a/resources/css/blocks/show-thematiques.css +++ b/resources/css/blocks/show-thematiques.css @@ -81,3 +81,87 @@ pt-16; } } + +.swiper-content { + @apply lg:px-24 relative max-w-screen-2xl mx-auto; + /* @apply bg-fuchsia-100; */ +} +.swiper-container { + height: auto; + @apply px-3 overflow-hidden; + /* @apply bg-yellow-50; */ +} + +.swiper-wrapper { + @apply pt-24 pb-16 w-full flex-col lg:flex-row gap-y-20; +} + +.swiper-slide { + @apply h-auto; + .card-thematique { + @apply h-full; + } +} + +.thematique-button-next, +.thematique-button-prev { + @apply absolute top-1/2 z-50 opacity-80 hidden lg:block; + width: 60px; + height: 60px; + &:hover, + &:focus-visible { + @apply opacity-100; + filter: invert(13%) sepia(71%) saturate(4425%) hue-rotate(338deg) brightness(109%) + contrast(117%); + } + &:focus-visible { + @apply rounded-full; + } +} +.thematique-button-next { + @apply right-0 transform; +} +.thematique-button-prev { + @apply left-0; +} +.swiper-pagination { + @apply hidden lg:block; +} +.swiper-pagination-bullet { + @apply w-5 h-5 !mx-2 opacity-100 bg-white !border-2 !border-solid border-black; +} +.swiper-pagination-bullet:focus-visible { + outline-offset: 4px; +} +.swiper-pagination-bullet-active { + @apply bg-secondary !border-secondary opacity-100; +} + +/* .swiper-slide { + background-color: red !important; + text-align: center; + font-size: 18px; + background: #fff; + display: flex; + justify-content: center; + align-items: center; +} + +.swiper-slide img { + display: block; + width: 100%; + height: 100%; + object-fit: cover; +} */ +.section-show-thematiques { + @apply pt-8 pb-8 px-8 md:px-16; + .thematiques-container { + @apply grid + grid-cols-3 + gap-8 + gap-y-32 + max-w-screen-xl + mx-auto + pt-16; + } +} diff --git a/resources/css/components/cta.css b/resources/css/components/cta.css index a9530ea..71a4507 100644 --- a/resources/css/components/cta.css +++ b/resources/css/components/cta.css @@ -21,6 +21,9 @@ @apply bg-primary text-white hover:bg-primary-hover; } + &--patrimoine { + @apply !bg-patrimoine-sante-securite !text-white; + } &--white { @apply bg-white text-secondary hover:bg-primary-hover; diff --git a/resources/css/components/forms/forms.css b/resources/css/components/forms/forms.css index 98eca9e..7e04aa4 100644 --- a/resources/css/components/forms/forms.css +++ b/resources/css/components/forms/forms.css @@ -1,6 +1,7 @@ form:not(.metabox-location-side):not(.metabox-location-normal):not( .metabox-location-advanced, - .search-module__search-form + .search-module__search-form, + .metier-patrimoine-searchform ) { --secondary: #df1e1e; --secondary-darker: #bd1515; diff --git a/resources/css/layout/footer.css b/resources/css/layout/footer.css index ddf3e77..bdb1898 100644 --- a/resources/css/layout/footer.css +++ b/resources/css/layout/footer.css @@ -38,15 +38,32 @@ } .extra_details { - @apply flex flex-wrap items-center justify-between; + @apply flex flex-wrap items-center justify-between gap-4; + + .sitemap-btn, + .metiers-patrimoine-btn { + @apply !py-3 !px-5; + } + + .metiers-patrimoine-btn { + @apply flex items-center justify-center; + + &::before { + @apply w-6 h-6 mr-2 block bg-contain bg-center bg-no-repeat content-['']; + background-image: url('../resources/img/pictogrammes/Homegrade_artisans-patrimoine.svg'); + } + } .social-networks { - @apply flex gap-4; + @apply flex gap-4 ml-auto; } } } &__partenaires { - @apply flex flex-wrap col-span-4 md:col-span-2 justify-center items-center gap-12; + @apply flex flex-wrap col-span-4 justify-center items-center gap-x-12; + .content-intertitle { + @apply w-full text-center; + } a img { @apply inline-block; } diff --git a/resources/css/layout/menu-homegrade.css b/resources/css/layout/menu-homegrade.css index ba87bb7..01bb8a3 100644 --- a/resources/css/layout/menu-homegrade.css +++ b/resources/css/layout/menu-homegrade.css @@ -182,11 +182,64 @@ @apply hidden; } } - .wpml-ls-item-nl { - @apply xl:ml-8; + /* .wpml-ls-legacy-list-horizontal { + @apply p-0; + } */ + .wpml-ls { + @apply !p-0; } + /* .wpml-ls-item-nl { + @apply xl:ml-8; + } */ + + .wpml-ls-legacy-dropdown-click { + @apply !w-fit mt-4 lg:mt-0; + /* margin-left: -10px !important; */ + + ul { + @apply border-none lg:!px-2; + } + ul.wpml-ls-sub-menu { + @apply !pb-2 bg-primary static lg:absolute; + + @media screen and (max-width: 960px) { + @apply !visible; + } + } + + a { + @apply !bg-transparent !text-white border-none; + } + a:hover { + @apply rounded-lg font-bold; + background-color: rgba(255, 255, 255, 0.1) !important; + } + a.wpml-ls-item-toggle { + @apply lg:!px-5; + } + a.wpml-ls-item-toggle:after { + @apply !content-none lg:!content-['']; + right: 0px; + display: inline-block; + transition: all 0.3s ease-out; + border: unset; + border-bottom: 2px solid white; + border-right: 2px solid white; + height: 8px; + width: 8px; + /* margin-left: 10px; + margin-left: 20px; */ + + transform: rotate(45deg); + } + } + .wpml-ls-item { - @apply px-1 inline-block mb-3 lg:mb-0; + @apply bg-transparent text-white; + } + /* OLD LANGUAGE SELECTOR LOOK */ + /* .wpml-ls-item { + @apply !px-1 inline-block mb-3 lg:mb-0; a { @apply !rounded-full h-10 w-10 border-2 border-white p-0 !flex justify-center items-center font-semibold text-sm; @@ -197,15 +250,15 @@ a:hover { @apply !bg-white text-primary font-bold; } - } - .wpml-ls-current-language { + } */ + /* .wpml-ls-current-language { a { @apply bg-white text-primary font-bold; } a:focus-visible { @apply !bg-white text-primary font-bold; } - } + } */ } .menu-homegrade--footer { diff --git a/resources/js/menus.js b/resources/js/menus.js index 2b2614e..f95ab4b 100644 --- a/resources/js/menus.js +++ b/resources/js/menus.js @@ -140,6 +140,7 @@ export default function menuInit() { HANDLE SEARCH -----------------------------------------------------------*/ function isSearchOpen() { + if (!searchModule) return null; // IF CLOSED if ( searchModule.getAttribute('mobile-closed') != null && diff --git a/searchform.php b/searchform.php index 8e8c4b7..4a4de67 100644 --- a/searchform.php +++ b/searchform.php @@ -6,7 +6,6 @@ -
    - + "> @@ -216,4 +221,8 @@ $logoSRC = wp_get_attachment_image_src($logoID, 'full'); // get_template_part('template-components/header/search-module'); ?>
    - \ No newline at end of file + + + \ No newline at end of file diff --git a/template-components/header/mobile-brand.php b/template-components/header/mobile-brand.php index 94ad435..884a15f 100644 --- a/template-components/header/mobile-brand.php +++ b/template-components/header/mobile-brand.php @@ -1,4 +1,5 @@ @@ -36,4 +37,9 @@ $logoSRC = wp_get_attachment_image_src($logoID, 'full'); - \ No newline at end of file + + + + \ No newline at end of file diff --git a/template-components/header/search-module.php b/template-components/header/search-module.php index 51d9952..1ef1091 100644 --- a/template-components/header/search-module.php +++ b/template-components/header/search-module.php @@ -1,5 +1,5 @@ - \ No newline at end of file + + + diff --git a/template-publications.php b/template-publications.php index 990fe3c..1131b22 100644 --- a/template-publications.php +++ b/template-publications.php @@ -75,6 +75,12 @@ $total_posts_found = $brochuresPosts->found_posts + $fichesInfosPosts->found_pos "pageIcon" => $pageIcon, "title" => get_the_title(get_queried_object_id()), "description" => __("Découvrez toutes nos publications et outils en ligne", "homegrade-theme__texte-fonctionnel"), + "ctaSecondary" => array( + "title" => $receivePrintedPublicationsDatas['cta_title'] ?? null, + "url" => $receivePrintedPublicationsDatas['order_form_url'] ?? null, + "target" => "_blank", + "custom-class" => "paper-button", + ), )); ?> @@ -233,42 +239,15 @@ $total_posts_found = $brochuresPosts->found_posts + $fichesInfosPosts->found_pos - + - - -
    - -
    -
    -
    -

    -
    - -
    -

    -
    -
    -
    - - " alt=""> - - -
    - - -