Merge branch 'TMS-1163' into stage

Author: eebbi

assets/styles/views/_search.scss

@@ -46,15 +46,8 @@ $search-item-hover: $primary-dark !default;
         display: flex;
         flex-direction: column;
         align-items: flex-start;
-
-        .search-item__meta-container {
-            order: -1;
-        }
     }
 
-    &__breadcrumbs {
-        order: -1;
-    }
 
     &__meta-item,
     &__title {

models/search.php

@@ -303,7 +303,7 @@ private function enrich_results(
 
             switch ( $post_item->post_type ) {
                 case Page::SLUG:
-                    $post_item->content_type = get_post_type_object( Page::SLUG )->labels->singular_name;
+                    $post_item->page_content_type = \get_post_type_object( Page::SLUG )->labels->singular_name;
                     $post_item->breadcrumbs  = $this->prepare_by_type(
                         Page::SLUG,
                         $post_item->ID,
@@ -317,16 +317,14 @@ private function enrich_results(
 
                     break;
                 case Post::SLUG:
-                    $post_item->content_type = get_post_type_object( Post::SLUG )->labels->singular_name;
-
                     $meta = $this->format_result_item_meta(
                         $post_item,
                         Post::get_primary_category( $post_item->ID )
                     );
 
                     break;
                 case BlogArticle::SLUG:
-                    $post_item->content_type = get_post_type_object( BlogArticle::SLUG )->labels->singular_name;
+                    $post_item->content_type = \get_post_type_object( BlogArticle::SLUG )->labels->singular_name;
 
                     $meta = $this->format_result_item_meta(
                         $post_item,
@@ -341,9 +339,9 @@ private function enrich_results(
             }
 
             $post_item->meta      = $meta;
-            $post_item->permalink = get_permalink( $post_item->ID );
+            $post_item->permalink = \get_permalink( $post_item->ID );
 
-            apply_filters( 'tms/theme/base/search_result_item', $post_item );
+            \apply_filters( 'tms/theme/base/search_result_item', $post_item );
         }
 
         return $posts;

partials/views/search/results.dust

@@ -15,7 +15,7 @@
                     </h2>
 
                     {?meta}
-                        <div class="search-item__meta-container has-text-weight-medium">
+                        <div class="search-item__meta-container has-text-weight-medium mt-4">
                             {>"views/search/search-item-meta"  /}
                         </div>
                     {/meta}
@@ -33,12 +33,12 @@
                     {/post_excerpt}
                 </div>
 
-                <div class="search-item__breadcrumbs">
+                <div class="search-item__breadcrumbs mt-4">
                     {?breadcrumbs}
                         <div class="search-item__meta-container has-text-weight-medium">
                             <span class="is-sr-only">{Strings.s.search.breadcrumbs|html} </span>
                             <div class="breadcrumb has-succeeds-separator">
-                                <ul class="breadcrumbs__nav is-relative is-flex m-0 p-0 is-family-secondary">
+                                <ul class="breadcrumbs__nav is-relative is-flex p-0 is-family-secondary">
                                     {#breadcrumbs}
                                         <li class="{?is_active}is-active{/is_active} {?class}{class|attr}{/class}">
                                             {?permalink}
@@ -68,6 +68,14 @@
                     {/breadcrumbs}
                 </div>
 
+                <div class="search-item__content">
+                    {?page_content_type}
+                        <span class="mt-4 pill has-background-primary-invert has-text-primary is-bordered">
+                            {page_content_type|html}
+                        </span>
+                    {/page_content_type}
+                </div>
+
             </div>
         </div>
     {/results.posts}