Standardize search result templates (#1092)

* Standardize search result templates * Apply suggestions from code review * Update search/templates/search/online_worship.html * Update search/templates/search/online_worship.html * Update search/templates/search/online_worship.html * Remove empty conditional
WesternFriend · Jun 27, 2024 · 3643c5f · 3643c5f
1 parent 695cfd0
commit 3643c5f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 23 deletions.
diff --git a/search/templates/search/community_directory.html b/search/templates/search/community_directory.html
@@ -2,11 +2,11 @@
 
 <div class="card my-1">
     <div class="card-body">
-        <h3 class="panel-title">
+        <h2 class="card-title h5">
             <a href="{% pageurl entity %}">
                 {{ entity.title }}
             </a>
-        </h3>
+        </h2>
 
         {% if entity.specific.description %}
             {{ entity.specific.description | truncatewords_html:10 | richtext }}

diff --git a/search/templates/search/event.html b/search/templates/search/event.html
@@ -2,11 +2,11 @@
 
 <div class="card my-1">
     <div class="card-body">
-        <h3 class="panel-title">
+        <h2 class="card-title h5">
             <a href="{% pageurl entity %}">
                 {{ entity.title }}
             </a>
-        </h3>
+        </h2>
 
         {% if entity.specific.date %}
             {{ entity.specific.date }}

diff --git a/search/templates/search/magazine_article.html b/search/templates/search/magazine_article.html
@@ -1,9 +1,11 @@
 {% load wagtailcore_tags %}
 <div class="card my-2">
     <div class="card-body">
-        <a href="{% pageurl entity %}" class="card-title lead">
-            {{ entity.title }}
-        </a>
+        <h2 class="card-title h5">
+            <a href="{% pageurl entity %}">
+                {{ entity.title }}
+            </a>
+        </h2>
 
         {% if entity.specific.authors.count %}
             <ul class="list-inline mb-1">

diff --git a/search/templates/search/magazine_issue.html b/search/templates/search/magazine_issue.html
@@ -2,11 +2,11 @@
 
 <div class="card my-1">
     <div class="card-body">
-        <h3 class="panel-title">
+        <h2 class="card-title h5">
             <a href="{% pageurl entity %}">
                 {{ entity.title }}
             </a>
-        </h3>
+        </h2>
 
         {% if entity.specific.publication_date %}
             <p class="card-text">

diff --git a/search/templates/search/meeting.html b/search/templates/search/meeting.html
@@ -2,11 +2,11 @@
 
 <div class="card my-1">
     <div class="card-body">
-        <h3 class="panel-title">
+        <h2 class="card-title h5">
             <a href="{% pageurl entity %}">
                 {{ entity.title }}
             </a>
-        </h3>
+        </h2>
 
         {% if entity.specific.description %}
             {{ entity.specific.description | truncatewords_html:10 | richtext }}

diff --git a/search/templates/search/online_worship.html b/search/templates/search/online_worship.html
@@ -2,19 +2,14 @@
 
 <div class="card my-1">
     <div class="card-body">
-        <h3 class="panel-title">
+        <h2 class="card-title h5">
             <a href="{% pageurl entity %}">
                 {{ entity.title }}
             </a>
-        </h3>
+        </h2>
 
         {% if entity.specific.description %}
             {{ entity.specific.description | truncatewords_html:10 | richtext }}
         {% endif %}
-
-        {% if entity.specific.times_of_worship %}
-            <strong>Times of worship:</strong>
-            {{ entity.specific.times_of_worship | richtext }}
-        {% endif %}
     </div>
 </div>
diff --git a/search/templates/search/organization.html b/search/templates/search/organization.html
@@ -2,11 +2,11 @@
 
 <div class="card my-1">
     <div class="card-body">
-        <h3 class="panel-title">
+        <h2 class="card-title h5">
             <a href="{% pageurl entity %}">
                 {{ entity.title }}
             </a>
-        </h3>
+        </h2>
 
         {% if entity.specific.description %}
             {{ entity.specific.description | truncatewords_html:10 | richtext }}

diff --git a/search/templates/search/search.html b/search/templates/search/search.html
@@ -34,9 +34,9 @@ <h1>Search</h1>
             {% else %}
                 <div class="card my-1">
                     <div class="card-body">
-                        <h2 class="card-title">
+                        <h2 class="card-title h5">
                             <a href="{% pageurl result %}">
-                                {{result}} ({{ result.content_type.name }})
+                                {{result}}
                             </a>
                         </h2>
                     </div>

diff --git a/search/views.py b/search/views.py
@@ -11,7 +11,7 @@ def search(request: HttpRequest) -> HttpResponse:
     number_per_page = 10
 
     # Search
-    # Using the `or` operator to search for pages that contain any of the words
+    # Using the 'or' operator to search for pages that contain any of the words
     if search_query:
         search_results = Page.objects.live().search(
             search_query,