Changeset 12096 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/archive-course.php

Timestamp:

09/28/2022 11:18:13 PM (2 years ago)

Author:

adamwood

Message:

Learn: Sync with git WordPress/learn@f49e45d

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/archive-course.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/archive-course.php

@@ -21 +21 @@
 
     <section>
-        <div class="row align-middle between section-heading section-heading--with-space">
-            <?php the_archive_title( '<h1 class="section-heading_title h2">', '</h1>' ); ?>
+        <div class="row align-middle between section-heading section-heading--with-space gutters">
+            <?php the_archive_title( '<h1 class="section-heading_title h2 col-8">', '</h1>' ); ?>
             <?php get_template_part( 'template-parts/component', 'archive-search' ); ?>
         </div>
@@ -28 +28 @@
         <hr>
 
-        <div class="card-grid card-grid_2">
             <?php if ( have_posts() ) : ?>
                 <?php while ( have_posts() ) :
                     the_post();
 
-                    $display_category_header = false;
-                    $categories = get_the_terms( get_the_ID(), 'course-category' );
+                    $prev_category;
+                    $begin_new_category = false;
+                    $categories         = get_the_terms( get_the_ID(), 'course-category' );
+
                     if ( isset( $categories[0] ) ) {
-                        $category_title = $categories[0]->name;
+                        $category_title       = $categories[0]->name;
                         $category_description = $categories[0]->description;
-                        if ( $category_title != $prev_category ) {
-                            $display_category_header = true;
-                            $prev_category = $category_title;
-                        }
+                        $begin_new_category   = $category_title !== $prev_category;
                     }
 
-                    if ( $display_category_header ) {
-                        echo '<h2 class="h4 course-category-header">' . esc_html( $category_title ) . '</h2>';
+                    if ( $begin_new_category ) {
+                        // Close the previous card-grid if there was a previous category
+                        if ( ! empty( $prev_category ) ) {
+                            echo '</div>';
+                        }
+                        ?>
+        <h2 class="h4 course-category-header"><?php echo esc_html( $category_title ); ?></h2>
+                        <?php
                         if ( $category_description ) {
                             echo '<div class="course-category-description">' . esc_html( $category_description ) . '</div>';
                         }
+                        ?>
+        <div class="card-grid card-grid_2">
+                        <?php
+                        $prev_category = $category_title;
                     }
 
@@ -57 +65 @@
                     );
                 endwhile; ?>
+        </div>
             <?php else : ?>
                 <?php get_template_part( 'template-parts/content', 'none' ); ?>
             <?php endif; ?>
-        </div>
 
         <?php the_posts_pagination(); ?>