major changes, including tailwind v4

templates/account/login.html

@@ -53,7 +53,7 @@
           {% trans "Don't have an account?" %}
           <a
             href="{% url 'account_signup' %}"
-            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-none focus:underline"
+            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-hidden focus:underline"
           >
             {% trans "Sign up" %}
           </a>

templates/account/partials/login_form.html

@@ -69,7 +69,7 @@
     <div class="text-sm">
       <a
         href="{% url 'account_reset_password' %}"
-        class="font-medium transition-colors text-primary hover:text-primary/80 focus:outline-none focus:underline"
+        class="font-medium transition-colors text-primary hover:text-primary/80 focus:outline-hidden focus:underline"
       >
         {% trans "Forgot Password?" %}
       </a>

templates/account/partials/login_modal.html

@@ -4,7 +4,7 @@
 
 <div 
   id="login-modal"
-  class="fixed inset-0 z-50 flex items-center justify-center p-4 overflow-y-auto bg-black/50 backdrop-blur-sm"
+  class="fixed inset-0 z-50 flex items-center justify-center p-4 overflow-y-auto bg-black/50 backdrop-blur-xs"
 >
   <div class="w-full max-w-lg my-auto bg-white rounded-lg shadow-xl dark:bg-gray-800 max-h-[90vh] overflow-y-auto">
     <div class="sticky top-0 flex justify-between p-6 bg-white border-b dark:bg-gray-800 dark:border-gray-700">
@@ -60,7 +60,7 @@
           {% trans "Don't have an account?" %}
           <a
             href="{% url 'account_signup' %}"
-            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-none focus:underline"
+            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-hidden focus:underline"
           >
             {% trans "Sign up" %}
           </a>

templates/account/partials/signup_modal.html

@@ -5,7 +5,7 @@
 
 <div 
   id="signup-modal"
-  class="fixed inset-0 z-50 flex items-center justify-center p-4 overflow-y-auto bg-black/50 backdrop-blur-sm"
+  class="fixed inset-0 z-50 flex items-center justify-center p-4 overflow-y-auto bg-black/50 backdrop-blur-xs"
   @click.away="document.getElementById('signup-modal').remove()"
 >
   <div class="w-full max-w-lg my-auto bg-white rounded-lg shadow-xl dark:bg-gray-800 max-h-[90vh] overflow-y-auto">
@@ -186,7 +186,7 @@
           {% trans "Already have an account?" %}
           <a
             href="{% url 'account_login' %}"
-            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-none focus:underline"
+            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-hidden focus:underline"
             onkeydown="if(event.key === 'Enter') { this.click(); }"
           >
             {% trans "Sign in" %}

templates/account/signup.html

@@ -165,7 +165,7 @@
           {% trans "Already have an account?" %}
           <a
             href="{% url 'account_login' %}"
-            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-none focus:underline"
+            class="ml-1 font-medium transition-colors text-primary hover:text-primary/80 focus:outline-hidden focus:underline"
             onkeydown="if(event.key === 'Enter') { this.click(); }"
           >
             {% trans "Sign in" %}

templates/accounts/email_required.html

@@ -20,11 +20,11 @@
             <div>
                 <label for="email" class="block text-sm font-medium text-gray-700">Email Address</label>
                 <input type="email" name="email" id="email" required
-                    class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500">
+                    class="mt-1 block w-full rounded-md border-gray-300 shadow-xs focus:border-blue-500 focus:ring-blue-500">
             </div>
             
             <button type="submit"
-                class="w-full bg-blue-600 text-white py-2 px-4 rounded hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2">
+                class="w-full bg-blue-600 text-white py-2 px-4 rounded hover:bg-blue-700 focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:ring-offset-2">
                 Submit
             </button>
         </form>

templates/accounts/profile.html

@@ -109,13 +109,13 @@
                 <h2 class="text-xl font-semibold">Recent Reviews</h2>
             </div>
             <div class="card-body">
-                {% for review in recent_reviews %}
+                {% for review in park_reviews %}
                     <div class="mb-4 last:mb-0">
                         <div class="flex items-start justify-between">
                             <div>
                                 <h3 class="font-medium">{{ review.title }}</h3>
                                 <p class="text-sm text-gray-600 dark:text-gray-400">
-                                    {{ review.content_object.name }}
+                                    {{ review.park.name }}
                                 </p>
                             </div>
                             <div class="flex items-center">
@@ -124,9 +124,26 @@
                             </div>
                         </div>
                     </div>
-                {% empty %}
-                    <p class="text-gray-500 dark:text-gray-400">No reviews yet.</p>
                 {% endfor %}
+                {% for review in ride_reviews %}
+                    <div class="mb-4 last:mb-0">
+                        <div class="flex items-start justify-between">
+                            <div>
+                                <h3 class="font-medium">{{ review.title }}</h3>
+                                <p class="text-sm text-gray-600 dark:text-gray-400">
+                                    {{ review.ride.name }}
+                                </p>
+                            </div>
+                            <div class="flex items-center">
+                                <span class="mr-1 text-yellow-400">★</span>
+                                <span>{{ review.rating }}/10</span>
+                            </div>
+                        </div>
+                    </div>
+                {% endfor %}
+                {% if not park_reviews and not ride_reviews %}
+                    <p class="text-gray-500 dark:text-gray-400">No reviews yet.</p>
+                {% endif %}
             </div>
         </div>
 

templates/accounts/settings.html

@@ -16,7 +16,7 @@
 
             <div class="mb-4">
                 <label for="display_name" class="block text-sm font-medium text-gray-700 dark:text-gray-300">Display Name</label>
-                <input type="text" name="display_name" id="display_name" value="{{ user.profile.display_name }}" class="block w-full mt-1 border-gray-300 rounded-md shadow-sm dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300">
+                <input type="text" name="display_name" id="display_name" value="{{ user.profile.display_name }}" class="block w-full mt-1 border-gray-300 rounded-md shadow-xs dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300">
             </div>
 
             <div class="mb-4">
@@ -37,7 +37,7 @@
 
             <div class="mb-4">
                 <label for="new_email" class="block text-sm font-medium text-gray-700 dark:text-gray-300">New Email</label>
-                <input type="email" name="new_email" id="new_email" class="block w-full mt-1 border-gray-300 rounded-md shadow-sm dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300">
+                <input type="email" name="new_email" id="new_email" class="block w-full mt-1 border-gray-300 rounded-md shadow-xs dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300">
             </div>
 
             <button type="submit" class="px-4 py-2 text-white bg-blue-500 rounded-md">Change Email</button>
@@ -63,7 +63,7 @@
 
             <div class="mb-4">
                 <label for="old_password" class="block text-sm font-medium text-gray-700 dark:text-gray-300">Current Password</label>
-                <input type="password" name="old_password" id="old_password" required class="block w-full mt-1 border-gray-300 rounded-md shadow-sm dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300">
+                <input type="password" name="old_password" id="old_password" required class="block w-full mt-1 border-gray-300 rounded-md shadow-xs dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300">
             </div>
 
             <div class="mb-4">
@@ -74,7 +74,7 @@
                     id="new_password" 
                     x-model="newPassword"
                     required
-                    class="block w-full mt-1 border-gray-300 rounded-md shadow-sm dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300"
+                    class="block w-full mt-1 border-gray-300 rounded-md shadow-xs dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300"
                 >
                 <div class="mt-1 text-sm text-gray-500 dark:text-gray-400" x-show="newPassword && !isValidPassword()">
                     Password must be at least 8 characters and contain uppercase, lowercase, and numbers
@@ -89,7 +89,7 @@
                     id="confirm_password" 
                     x-model="confirmPassword"
                     required
-                    class="block w-full mt-1 border-gray-300 rounded-md shadow-sm dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300"
+                    class="block w-full mt-1 border-gray-300 rounded-md shadow-xs dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300"
                 >
                 <div class="mt-1 text-sm text-red-500" x-show="confirmPassword && !passwordsMatch()">
                     Passwords do not match

templates/core/search/components/filter_form.html

@@ -0,0 +1,111 @@
+{% load static %}
+{% load filter_utils %}
+
+<div class="filter-container" x-data="{ open: false }">
+    {# Mobile Filter Toggle #}
+    <div class="lg:hidden bg-white rounded-lg shadow p-4 mb-4">
+        <button @click="open = !open" type="button" class="w-full flex items-center justify-between p-2">
+            <span class="font-medium text-gray-900">
+                <span class="mr-2">
+                    <svg class="w-5 h-5 inline-block" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4"></path>
+                    </svg>
+                </span>
+                Filter Options
+            </span>
+            <span class="text-gray-500">
+                <svg class="w-5 h-5 transition-transform duration-200" :class="{'rotate-180': open}" fill="currentColor" viewBox="0 0 20 20">
+                    <path d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"></path>
+                </svg>
+            </span>
+        </button>
+    </div>
+
+    {# Filter Form #}
+    <form hx-get="{{ request.path }}" 
+          hx-trigger="change delay:500ms"
+          hx-target="#results-container"
+          hx-push-url="true"
+          class="space-y-6"
+          x-show="open || $screen('lg')"
+          x-transition>
+        
+        {# Active Filters Summary #}
+        {% if applied_filters %}
+        <div class="bg-blue-50 rounded-lg p-4 shadow-xs border border-blue-100">
+            <div class="flex justify-between items-center">
+                <div>
+                    <h3 class="text-sm font-medium text-blue-800">Active Filters</h3>
+                    <p class="text-xs text-blue-600 mt-1">{{ applied_filters|length }} filter{{ applied_filters|length|pluralize }} applied</p>
+                </div>
+                <a href="{{ request.path }}" 
+                   class="text-sm font-medium text-blue-600 hover:text-blue-500 hover:underline"
+                   hx-get="{{ request.path }}"
+                   hx-target="#results-container"
+                   hx-push-url="true">
+                    Clear All
+                </a>
+            </div>
+        </div>
+        {% endif %}
+
+        {# Filter Groups #}
+        <div class="bg-white rounded-lg shadow divide-y divide-gray-200">
+            {% for fieldset in filter.form|groupby_filters %}
+            <div class="p-6" x-data="{ expanded: true }">
+                {# Group Header #}
+                <button type="button" 
+                        @click="expanded = !expanded"
+                        class="w-full flex justify-between items-center text-left">
+                    <h3 class="text-lg font-medium text-gray-900">{{ fieldset.name }}</h3>
+                    <svg class="w-5 h-5 text-gray-500 transform transition-transform duration-200"
+                         :class="{'rotate-180': !expanded}"
+                         fill="currentColor" 
+                         viewBox="0 0 20 20">
+                        <path d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"/>
+                    </svg>
+                </button>
+
+                {# Group Content #}
+                <div class="mt-4 space-y-4" x-show="expanded" x-collapse>
+                    {% for field in fieldset.fields %}
+                    <div class="filter-field">
+                        <label for="{{ field.id_for_label }}" 
+                               class="block text-sm font-medium text-gray-700 mb-1">
+                            {{ field.label }}
+                        </label>
+                        <div class="mt-1">
+                            {{ field|add_field_classes }}
+                        </div>
+                        {% if field.help_text %}
+                        <p class="mt-1 text-sm text-gray-500">{{ field.help_text }}</p>
+                        {% endif %}
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+
+        {# Mobile Apply Button #}
+        <div class="lg:hidden">
+            <button type="submit" 
+                    class="w-full bg-blue-600 text-white px-4 py-2 rounded-md hover:bg-blue-700 focus:outline-hidden focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 transition duration-150 ease-in-out">
+                Apply Filters
+            </button>
+        </div>
+    </form>
+</div>
+
+{# Required Scripts #}
+<script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
+<script>
+    document.addEventListener('alpine:init', () => {
+        Alpine.data('filterForm', () => ({
+            expanded: true,
+            toggle() {
+                this.expanded = !this.expanded
+            }
+        }))
+    })
+</script>

templates/core/search/filters.html

@@ -0,0 +1,28 @@
+<form hx-get="{% url 'search:search' %}" hx-target="#search-results" hx-swap="outerHTML" class="space-y-4">
+    {% for field in filters.form %}
+    <div class="flex flex-col">
+        <label for="{{ field.id_for_label }}" class="text-sm font-medium text-gray-700">
+            {{ field.label }}
+        </label>
+        <div class="mt-1">
+            {{ field }}
+        </div>
+        {% if field.help_text %}
+        <p class="text-sm text-gray-500">{{ field.help_text }}</p>
+        {% endif %}
+    </div>
+    {% endfor %}
+    
+    <div class="flex justify-between">
+        <button type="submit" 
+                class="inline-flex justify-center py-2 px-4 border border-transparent shadow-xs text-sm font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+            Apply Filters
+        </button>
+        {% if applied_filters %}
+        <a href="{% url 'search:search' %}" 
+           class="inline-flex justify-center py-2 px-4 border border-gray-300 shadow-xs text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+            Clear Filters
+        </a>
+        {% endif %}
+    </div>
+</form>

templates/core/search/layouts/filtered_list.html

@@ -0,0 +1,61 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}{{ view.model|model_name_plural|title }} - ThrillWiki{% endblock %}
+
+{% block content %}
+<div class="container mx-auto px-4 py-8">
+    <div class="flex flex-col lg:flex-row gap-8">
+        {# Filters Sidebar #}
+        <div class="lg:w-1/4">
+            {% include "search/components/filter_form.html" %}
+        </div>
+
+        {# Results Section #}
+        <div class="lg:w-3/4">
+            <div id="results-container">
+                {# Result count and sorting #}
+                <div class="bg-white rounded-lg shadow mb-4">
+                    <div class="p-4 border-b">
+                        <div class="flex justify-between items-center">
+                            <h2 class="text-xl font-bold">
+                                {{ view.model|model_name_plural|title }}
+                                <span class="text-sm font-normal text-gray-500">({{ page_obj.paginator.count }} found)</span>
+                            </h2>
+                            
+                            {% block list_actions %}
+                            {# Custom actions can be added here by extending views #}
+                            {% endblock %}
+                        </div>
+                    </div>
+                </div>
+
+                {# Results list #}
+                {% block results_list %}
+                <div class="bg-white rounded-lg shadow">
+                    {% include results_template|default:"search/partials/generic_results.html" %}
+                </div>
+                {% endblock %}
+
+                {# Pagination #}
+                {% if is_paginated %}
+                <div class="mt-4">
+                    {% include "search/components/pagination.html" %}
+                </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
+
+{% block extra_scripts %}
+<script>
+    // Handle browser back/forward with HTMX
+    document.body.addEventListener('htmx:beforeOnLoad', function(evt) {
+        if (evt.detail.requestConfig.verb === "get") {
+            history.replaceState(null, '', evt.detail.requestConfig.path);
+        }
+    });
+</script>
+{% endblock %}

templates/core/search/partials/generic_results.html

@@ -0,0 +1,134 @@
+<div class="divide-y">
+    {% for object in object_list %}
+    <div class="p-4">
+        <h3 class="text-lg font-semibold">
+            <a href="{{ object.get_absolute_url }}" class="hover:text-blue-600">
+                {{ object }}
+            </a>
+        </h3>
+
+        {% if object.description %}
+        <p class="mt-2 text-sm text-gray-600">
+            {{ object.description|truncatewords:30 }}
+        </p>
+        {% endif %}
+
+        {% block object_metadata %}
+        <div class="mt-2 flex flex-wrap gap-2">
+            {% if object.created_at %}
+            <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800">
+                Added {{ object.created_at|date }}
+            </span>
+            {% endif %}
+
+            {% if object.average_rating %}
+            <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800">
+                {{ object.average_rating }} ★
+            </span>
+            {% endif %}
+
+            {% if object.location.exists %}
+            <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800">
+                {{ object.location.first.get_formatted_address }}
+            </span>
+            {% endif %}
+        </div>
+        {% endblock %}
+    </div>
+    {% empty %}
+    <div class="p-8 text-center text-gray-500">
+        <p>No {{ view.model|model_name_plural }} found matching your criteria.</p>
+        {% if applied_filters %}
+        <p class="mt-2">
+            <a href="{{ request.path }}" 
+               class="text-blue-600 hover:text-blue-500"
+               hx-get="{{ request.path }}"
+               hx-target="#results-container"
+               hx-push-url="true">
+                Clear all filters
+            </a>
+        </p>
+        {% endif %}
+    </div>
+    {% endfor %}
+</div>
+
+{% if is_paginated %}
+<div class="px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+    <div class="flex-1 flex justify-between sm:hidden">
+        {% if page_obj.has_previous %}
+        <a href="?page={{ page_obj.previous_page_number }}"
+           class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+           hx-get="?page={{ page_obj.previous_page_number }}"
+           hx-target="#results-container"
+           hx-push-url="true">
+            Previous
+        </a>
+        {% endif %}
+        {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}"
+           class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+           hx-get="?page={{ page_obj.next_page_number }}"
+           hx-target="#results-container"
+           hx-push-url="true">
+            Next
+        </a>
+        {% endif %}
+    </div>
+    <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+        <div>
+            <p class="text-sm text-gray-700">
+                Showing <span class="font-medium">{{ page_obj.start_index }}</span>
+                to <span class="font-medium">{{ page_obj.end_index }}</span>
+                of <span class="font-medium">{{ page_obj.paginator.count }}</span>
+                results
+            </p>
+        </div>
+        <div>
+            <nav class="relative z-0 inline-flex rounded-md shadow-xs -space-x-px" aria-label="Pagination">
+                {% if page_obj.has_previous %}
+                <a href="?page={{ page_obj.previous_page_number }}"
+                   class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                   hx-get="?page={{ page_obj.previous_page_number }}"
+                   hx-target="#results-container"
+                   hx-push-url="true">
+                    <span class="sr-only">Previous</span>
+                    <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                        <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                    </svg>
+                </a>
+                {% endif %}
+
+                {% for i in page_obj.paginator.page_range %}
+                {% if i == page_obj.number %}
+                <span class="relative inline-flex items-center px-4 py-2 border border-gray-300 bg-blue-50 text-sm font-medium text-blue-600">
+                    {{ i }}
+                </span>
+                {% elif i > page_obj.number|add:"-3" and i < page_obj.number|add:"3" %}
+                <a href="?page={{ i }}"
+                   class="relative inline-flex items-center px-4 py-2 border border-gray-300 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50"
+                   hx-get="?page={{ i }}"
+                   hx-target="#results-container"
+                   hx-push-url="true">
+                    {{ i }}
+                </a>
+                {% endif %}
+                {% endfor %}
+
+                {% if page_obj.has_next %}
+                <a href="?page={{ page_obj.next_page_number }}"
+                   class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                   hx-get="?page={{ page_obj.next_page_number }}"
+                   hx-target="#results-container"
+                   hx-push-url="true">
+                    <span class="sr-only">Next</span>
+                    <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                        <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                    </svg>
+                </a>
+                {% endif %}
+            </nav>
+        </div>
+    </div>
+</div>
+{% endif %}

templates/core/search/partials/ride_search_results.html

@@ -0,0 +1,78 @@
+{% load static %}
+
+<div id="ride-search-results" class="mt-4">
+    {% if rides %}
+        <div class="space-y-4">
+            <div class="text-sm text-gray-600 dark:text-gray-400">
+                Found {{ rides|length }} ride{{ rides|length|pluralize }}
+            </div>
+            
+            {% for ride in rides %}
+                <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xs border border-gray-200 dark:border-gray-700 p-4 hover:shadow-md transition-shadow">
+                    <div class="flex items-start justify-between">
+                        <div class="flex-1">
+                            <h3 class="text-lg font-semibold text-gray-900 dark:text-white">
+                                <a href="{% url 'parks:rides:ride_detail' park_slug=ride.park.slug ride_slug=ride.slug %}" 
+                                   class="hover:text-blue-600 dark:hover:text-blue-400">
+                                    {{ ride.name }}
+                                </a>
+                            </h3>
+                            
+                            <div class="mt-1 text-sm text-gray-600 dark:text-gray-400">
+                                at <a href="{% url 'parks:park_detail' slug=ride.park.slug %}" 
+                                      class="text-blue-600 dark:text-blue-400 hover:underline">
+                                    {{ ride.park.name }}
+                                </a>
+                            </div>
+                            
+                            {% if ride.description %}
+                                <p class="mt-2 text-sm text-gray-700 dark:text-gray-300 line-clamp-2">
+                                    {{ ride.description|truncatewords:20 }}
+                                </p>
+                            {% endif %}
+                            
+                            <div class="mt-2 flex flex-wrap gap-2">
+                                {% if ride.get_category_display %}
+                                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-200">
+                                        {{ ride.get_category_display }}
+                                    </span>
+                                {% endif %}
+                                
+                                {% if ride.status %}
+                                    <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium 
+                                        {% if ride.status == 'OPERATING' %}bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200
+                                        {% elif ride.status == 'CLOSED_TEMP' %}bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200
+                                        {% else %}bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200{% endif %}">
+                                        {{ ride.get_status_display }}
+                                    </span>
+                                {% endif %}
+                            </div>
+                        </div>
+                        
+                        {% if ride.photos.exists %}
+                            <div class="ml-4 shrink-0">
+                                {% with ride.photos.first as photo %}
+                                    <img src="{{ photo.image.url }}" 
+                                         alt="{{ ride.name }}"
+                                         class="w-16 h-16 rounded-lg object-cover">
+                                {% endwith %}
+                            </div>
+                        {% endif %}
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    {% else %}
+        <div class="text-center py-8">
+            <div class="text-gray-500 dark:text-gray-400">
+                <svg class="mx-auto h-12 w-12 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+                </svg>
+                <h3 class="mt-2 text-sm font-medium text-gray-900 dark:text-white">No rides found</h3>
+                <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
+                    Try adjusting your search criteria.
+                </p>
+            </div>
+        </div>
+    {% endif %}
+</div>

templates/core/search/results.html

@@ -0,0 +1,100 @@
+{% extends "base.html" %}
+{% load static %}
+
+{% block title %}Search Parks - ThrillWiki{% endblock %}
+
+{% block content %}
+<div class="container mx-auto px-4 py-8">
+    <div class="flex flex-col lg:flex-row gap-8">
+        <!-- Filters Sidebar -->
+        <div class="lg:w-1/4">
+            <div class="bg-white p-6 rounded-lg shadow">
+                <h2 class="text-xl font-bold mb-4">Filter Parks</h2>
+                {% include "search/filters.html" %}
+            </div>
+        </div>
+
+        <!-- Results Section -->
+        <div class="lg:w-3/4" id="search-results">
+            <div class="bg-white rounded-lg shadow">
+                <div class="p-6 border-b">
+                    <div class="flex justify-between items-center">
+                        <h2 class="text-xl font-bold">
+                            Search Results 
+                            <span class="text-sm font-normal text-gray-500">({{ results.count }} found)</span>
+                        </h2>
+                    </div>
+                </div>
+
+                <div class="divide-y">
+                    {% for park in results %}
+                    <div class="p-6 flex flex-col md:flex-row gap-4">
+                        <!-- Park Image -->
+                        <div class="md:w-48 h-32 bg-gray-200 rounded-lg overflow-hidden">
+                            {% if park.photos.exists %}
+                            <img src="{{ park.photos.first.image.url }}" 
+                                 alt="{{ park.name }}"
+                                 class="w-full h-full object-cover">
+                            {% else %}
+                            <div class="w-full h-full flex items-center justify-center text-gray-400">
+                                No Image
+                            </div>
+                            {% endif %}
+                        </div>
+
+                        <!-- Park Details -->
+                        <div class="flex-1">
+                            <h3 class="text-lg font-semibold">
+                                <a href="{{ park.get_absolute_url }}" class="hover:text-blue-600">
+                                    {{ park.name }}
+                                </a>
+                            </h3>
+                            
+                            <div class="mt-2 text-sm text-gray-600">
+                                {% if park.formatted_location %}
+                                <p>{{ park.formatted_location }}</p>
+                                {% endif %}
+                            </div>
+
+                            <div class="mt-2 flex flex-wrap gap-2">
+                                {% if park.average_rating %}
+                                <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800">
+                                    {{ park.average_rating }} ★
+                                </span>
+                                {% endif %}
+                                
+                                <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800">
+                                    {{ park.get_status_display }}
+                                </span>
+
+                                {% if park.ride_count %}
+                                <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-purple-100 text-purple-800">
+                                    {{ park.ride_count }} Rides
+                                </span>
+                                {% endif %}
+
+                                {% if park.coaster_count %}
+                                <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800">
+                                    {{ park.coaster_count }} Coasters
+                                </span>
+                                {% endif %}
+                            </div>
+
+                            {% if park.description %}
+                            <p class="mt-2 text-sm text-gray-600 line-clamp-2">
+                                {{ park.description }}
+                            </p>
+                            {% endif %}
+                        </div>
+                    </div>
+                    {% empty %}
+                    <div class="p-6 text-center text-gray-500">
+                        No parks found matching your criteria.
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/core/search/ride_search.html

@@ -0,0 +1,87 @@
+{% extends "base/base.html" %}
+{% load static %}
+
+{% block title %}Search Rides - ThrillWiki{% endblock %}
+
+{% block content %}
+<div class="container mx-auto px-4 py-8">
+    <div class="max-w-4xl mx-auto">
+        <div class="mb-8">
+            <h1 class="text-3xl font-bold text-gray-900 dark:text-white mb-2">Search Rides</h1>
+            <p class="text-gray-600 dark:text-gray-400">Find rides across all theme parks</p>
+        </div>
+
+        <!-- Search Form -->
+        <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xs border border-gray-200 dark:border-gray-700 p-6 mb-6">
+            <form method="get" 
+                  hx-get="{% url 'search:ride_search' %}" 
+                  hx-target="#ride-search-results" 
+                  hx-trigger="input changed delay:300ms from:input[name='ride'], submit"
+                  hx-indicator="#search-loading">
+                
+                <div class="space-y-4">
+                    <div>
+                        <label for="{{ search_form.ride.id_for_label }}" 
+                               class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                            Search Rides
+                        </label>
+                        {{ search_form.ride }}
+                        {% if search_form.ride.help_text %}
+                            <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ search_form.ride.help_text }}</p>
+                        {% endif %}
+                        {% if search_form.ride.errors %}
+                            <div class="mt-1 text-sm text-red-600 dark:text-red-400">
+                                {{ search_form.ride.errors }}
+                            </div>
+                        {% endif %}
+                    </div>
+
+                    <div class="flex items-center justify-between">
+                        <button type="submit" 
+                                class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-xs text-white bg-blue-600 hover:bg-blue-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 dark:bg-blue-500 dark:hover:bg-blue-600">
+                            <svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"></path>
+                            </svg>
+                            Search
+                        </button>
+                        
+                        <div id="search-loading" class="htmx-indicator">
+                            <div class="flex items-center text-sm text-gray-500 dark:text-gray-400">
+                                <svg class="animate-spin -ml-1 mr-2 h-4 w-4 text-blue-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                                </svg>
+                                Searching...
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+
+        <!-- Search Results -->
+        <div id="ride-search-results">
+            {% include "search/partials/ride_search_results.html" %}
+        </div>
+    </div>
+</div>
+{% endblock %}
+
+{% block extra_js %}
+<script>
+    // Clear search results when input is empty
+    document.addEventListener('DOMContentLoaded', function() {
+        const searchInput = document.querySelector('input[name="ride"]');
+        if (searchInput) {
+            searchInput.addEventListener('input', function() {
+                if (this.value.trim() === '') {
+                    const resultsContainer = document.getElementById('ride-search-results');
+                    if (resultsContainer) {
+                        resultsContainer.innerHTML = '<div class="text-center text-gray-500 dark:text-gray-400 py-8">Start typing to search for rides...</div>';
+                    }
+                }
+            });
+        }
+    });
+</script>
+{% endblock %}

templates/manufacturers/manufacturer_detail.html

@@ -18,20 +18,20 @@
         <!-- Manufacturer Details -->
         <div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
             {% if manufacturer.founded_year %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
+            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-xs">
                 <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Founded</h3>
                 <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ manufacturer.founded_year }}</p>
             </div>
             {% endif %}
             
             {% if manufacturer.headquarters %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
+            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-xs">
                 <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Headquarters</h3>
                 <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ manufacturer.headquarters }}</p>
             </div>
             {% endif %}
             
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
+            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-xs">
                 <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Rides Manufactured</h3>
                 <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ rides.count }}</p>
             </div>
@@ -91,7 +91,7 @@
     {% if manufacturer.website %}
     <div class="mb-8">
         <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-4">Links</h2>
-        <div class="bg-white dark:bg-gray-800 rounded-lg p-6 shadow-sm">
+        <div class="bg-white dark:bg-gray-800 rounded-lg p-6 shadow-xs">
             <a href="{{ manufacturer.website }}" target="_blank" rel="noopener noreferrer" 
                class="inline-flex items-center text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300">
                 Official Website

templates/media/partials/photo_display.html

@@ -82,7 +82,7 @@
 
     <!-- Fullscreen Photo Modal -->
     <div x-show="fullscreenPhoto" 
-         class="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-90"
+         class="fixed inset-0 z-50 flex items-center justify-center bg-black/90"
          @click.self="fullscreenPhoto = null"
          @keydown.escape.window="fullscreenPhoto = null">
         <div class="relative p-4 mx-auto max-w-7xl">
@@ -99,7 +99,7 @@
                      class="max-h-[90vh] w-auto mx-auto rounded-lg">
 
                 <!-- Photo Info Overlay -->
-                <div class="absolute bottom-0 left-0 right-0 p-4 text-white bg-black bg-opacity-50 rounded-b-lg">
+                <div class="absolute bottom-0 left-0 right-0 p-4 text-white bg-black/50 rounded-b-lg">
                     <!-- Caption -->
                     <div x-show="fullscreenPhoto?.caption" 
                          class="mb-2 text-lg font-medium"

templates/media/partials/photo_upload.html

@@ -95,7 +95,7 @@
 
     <!-- Caption Edit Modal -->
     <div x-show="showCaptionModal" 
-         class="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50"
+         class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
          @click.self="showCaptionModal = false">
         <div class="w-full max-w-md p-6 bg-white rounded-lg shadow-xl dark:bg-gray-800">
             <h3 class="mb-4 text-lg font-semibold text-gray-900 dark:text-white">Edit Photo Caption</h3>

templates/moderation/dashboard.html

@@ -99,7 +99,7 @@
 
 /* Accessibility Enhancements */
 :focus-visible {
-    @apply outline-none ring-2 ring-blue-500 ring-offset-2 ring-offset-white dark:ring-offset-gray-900;
+    @apply outline-hidden ring-2 ring-blue-500 ring-offset-2 ring-offset-white dark:ring-offset-gray-900;
 }
 
 @media (prefers-reduced-motion: reduce) {
@@ -115,7 +115,7 @@
 /* Touch Device Optimizations */
 @media (hover: none) {
     .hover\:shadow-md {
-        @apply shadow-sm;
+        @apply shadow-xs;
     }
     
     .action-buttons > * {

templates/moderation/partials/dashboard_content.html

@@ -91,7 +91,7 @@
                     </label>
                     <select name="submission_type"
                             aria-labelledby="submission-type-label"
-                            class="w-full px-3 py-2 text-gray-900 bg-white border rounded-lg dark:text-gray-300 dark:bg-gray-800 border-gray-200/50 dark:border-gray-700/50 focus:outline-none focus:ring-2 focus:ring-blue-500"
+                            class="w-full px-3 py-2 text-gray-900 bg-white border rounded-lg dark:text-gray-300 dark:bg-gray-800 border-gray-200/50 dark:border-gray-700/50 focus:outline-hidden focus:ring-2 focus:ring-blue-500"
                             @change="$dispatch('filter-changed')">
                         <option value="">All Submissions</option>
                         <option value="text" {% if request.GET.submission_type == 'text' %}selected{% endif %}>Text Submissions</option>
@@ -106,7 +106,7 @@
                     </label>
                     <select name="type"
                             aria-labelledby="type-label"
-                            class="w-full px-3 py-2 text-gray-900 bg-white border rounded-lg dark:text-gray-300 dark:bg-gray-800 border-gray-200/50 dark:border-gray-700/50 focus:outline-none focus:ring-2 focus:ring-blue-500"
+                            class="w-full px-3 py-2 text-gray-900 bg-white border rounded-lg dark:text-gray-300 dark:bg-gray-800 border-gray-200/50 dark:border-gray-700/50 focus:outline-hidden focus:ring-2 focus:ring-blue-500"
                             @change="$dispatch('filter-changed')">
                         <option value="">All Types</option>
                         <option value="CREATE" {% if request.GET.type == 'CREATE' %}selected{% endif %}>New Submissions</option>
@@ -121,7 +121,7 @@
                     </label>
                     <select name="content_type"
                             aria-labelledby="content-type-label"
-                            class="w-full px-3 py-2 text-gray-900 bg-white border rounded-lg dark:text-gray-300 dark:bg-gray-800 border-gray-200/50 dark:border-gray-700/50 focus:outline-none focus:ring-2 focus:ring-blue-500"
+                            class="w-full px-3 py-2 text-gray-900 bg-white border rounded-lg dark:text-gray-300 dark:bg-gray-800 border-gray-200/50 dark:border-gray-700/50 focus:outline-hidden focus:ring-2 focus:ring-blue-500"
                             @change="$dispatch('filter-changed')">
                         <option value="">All Content</option>
                         <option value="park" {% if request.GET.content_type == 'park' %}selected{% endif %}>Parks</option>
@@ -180,7 +180,7 @@
          x-transition:leave-start="opacity-100 translate-y-0"
          x-transition:leave-end="opacity-0 translate-y-full"
          class="flex items-center w-full max-w-xs p-4 text-gray-400 bg-gray-800 rounded-lg shadow">
-        <div class="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 rounded-lg"
+        <div class="inline-flex items-center justify-center shrink-0 w-8 h-8 rounded-lg"
              :class="{
                 'text-green-400 bg-green-900/40': color === 'green',
                 'text-red-400 bg-red-900/40': color === 'red',

templates/moderation/partials/location_widget.html

@@ -278,7 +278,7 @@ document.addEventListener('DOMContentLoaded', function() {
             document.getElementById(`postalCode-${submissionId}`).value = address.postcode || '';
 
             // Update search input
-            const locationString = [
+            const locationString-3 = [
                 document.getElementById(`streetAddress-${submissionId}`).value,
                 document.getElementById(`city-${submissionId}`).value,
                 document.getElementById(`state-${submissionId}`).value,

templates/moderation/partials/submission_list.html

@@ -425,20 +425,20 @@
                 </div>
 
                 <div class="flex items-center justify-end gap-3 action-buttons">
-                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-gray-700 transition-all duration-200 bg-gray-100 rounded-lg hover:bg-gray-200 hover:text-gray-900 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600 dark:hover:text-white shadow-sm hover:shadow-md"
+                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-gray-700 transition-all duration-200 bg-gray-100 rounded-lg hover:bg-gray-200 hover:text-gray-900 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600 dark:hover:text-white shadow-xs hover:shadow-md"
                             @click="showNotes = !showNotes">
                         <i class="mr-2 fas fa-comment-alt"></i>
                         Add Notes
                     </button>
 
-                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-gray-700 transition-all duration-200 bg-gray-100 rounded-lg hover:bg-gray-200 hover:text-gray-900 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600 dark:hover:text-white shadow-sm hover:shadow-md"
+                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-gray-700 transition-all duration-200 bg-gray-100 rounded-lg hover:bg-gray-200 hover:text-gray-900 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600 dark:hover:text-white shadow-xs hover:shadow-md"
                             @click="isEditing = !isEditing">
                         <i class="mr-2 fas fa-edit"></i>
                         Edit
                     </button>
                     
                     {% if submission.status != 'ESCALATED' or user.role in 'ADMIN,SUPERUSER' %}
-                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-white transition-all duration-200 bg-green-600 rounded-lg hover:bg-green-500 dark:bg-green-700 dark:hover:bg-green-600 shadow-sm hover:shadow-md"
+                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-white transition-all duration-200 bg-green-600 rounded-lg hover:bg-green-500 dark:bg-green-700 dark:hover:bg-green-600 shadow-xs hover:shadow-md"
                             hx-post="{% url 'moderation:approve_submission' submission.id %}"
                             hx-target="#submissions-content"
                             hx-include="closest .review-notes"
@@ -448,7 +448,7 @@
                         Approve
                     </button>
 
-                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-white transition-all duration-200 bg-red-600 rounded-lg hover:bg-red-500 dark:bg-red-700 dark:hover:bg-red-600 shadow-sm hover:shadow-md"
+                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-white transition-all duration-200 bg-red-600 rounded-lg hover:bg-red-500 dark:bg-red-700 dark:hover:bg-red-600 shadow-xs hover:shadow-md"
                             hx-post="{% url 'moderation:reject_submission' submission.id %}"
                             hx-target="#submissions-content"
                             hx-include="closest .review-notes"
@@ -460,7 +460,7 @@
                     {% endif %}
                     
                     {% if user.role == 'MODERATOR' and submission.status != 'ESCALATED' %}
-                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-white transition-all duration-200 bg-yellow-600 rounded-lg hover:bg-yellow-500 dark:bg-yellow-700 dark:hover:bg-yellow-600 shadow-sm hover:shadow-md"
+                    <button class="inline-flex items-center px-4 py-2.5 font-medium text-white transition-all duration-200 bg-yellow-600 rounded-lg hover:bg-yellow-500 dark:bg-yellow-700 dark:hover:bg-yellow-600 shadow-xs hover:shadow-md"
                             hx-post="{% url 'moderation:escalate_submission' submission.id %}"
                             hx-target="#submissions-content"
                             hx-include="closest .review-notes"

templates/operators/operator_detail.html

@@ -1,96 +0,0 @@
-{% extends "base/base.html" %}
-{% load static %}
-
-{% block title %}{{ operator.name }} - ThrillWiki{% endblock %}
-
-{% block content %}
-<div class="container px-4 mx-auto sm:px-6 lg:px-8">
-    <!-- Operator Header -->
-    <div class="mb-8">
-        <h1 class="text-4xl font-bold text-gray-900 dark:text-white mb-4">{{ operator.name }}</h1>
-        
-        {% if operator.description %}
-        <div class="prose dark:prose-invert max-w-none mb-6">
-            <p class="text-lg text-gray-600 dark:text-gray-400">{{ operator.description }}</p>
-        </div>
-        {% endif %}
-        
-        <!-- Operator Details -->
-        <div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
-            {% if operator.founded_year %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
-                <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Founded</h3>
-                <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ operator.founded_year }}</p>
-            </div>
-            {% endif %}
-            
-            {% if operator.headquarters %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
-                <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Headquarters</h3>
-                <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ operator.headquarters }}</p>
-            </div>
-            {% endif %}
-            
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
-                <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Parks Operated</h3>
-                <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ parks.count }}</p>
-            </div>
-        </div>
-    </div>
-
-    <!-- Parks Section -->
-    {% if parks %}
-    <div class="mb-8">
-        <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-6">Parks Operated</h2>
-        <div class="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-            {% for park in parks %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg shadow-md overflow-hidden">
-                {% if park.main_image %}
-                <img src="{{ park.main_image.url }}" alt="{{ park.name }}" class="w-full h-48 object-cover">
-                {% endif %}
-                
-                <div class="p-6">
-                    <h3 class="text-xl font-semibold text-gray-900 dark:text-white mb-2">
-                        <a href="{% url 'parks:park_detail' park.slug %}" class="hover:text-blue-600 dark:hover:text-blue-400">
-                            {{ park.name }}
-                        </a>
-                    </h3>
-                    
-                    {% if park.location_display %}
-                    <p class="text-gray-600 dark:text-gray-400 mb-2">{{ park.location_display }}</p>
-                    {% endif %}
-                    
-                    {% if park.opened_date %}
-                    <p class="text-sm text-gray-500 dark:text-gray-500">Opened {{ park.opened_date|date:"Y" }}</p>
-                    {% endif %}
-                </div>
-            </div>
-            {% endfor %}
-        </div>
-    </div>
-    {% else %}
-    <div class="mb-8">
-        <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-6">Parks Operated</h2>
-        <div class="bg-gray-50 dark:bg-gray-800 rounded-lg p-8 text-center">
-            <p class="text-gray-500 dark:text-gray-400">No parks currently operated by this company.</p>
-        </div>
-    </div>
-    {% endif %}
-
-    <!-- Additional Information -->
-    {% if operator.website %}
-    <div class="mb-8">
-        <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-4">Links</h2>
-        <div class="bg-white dark:bg-gray-800 rounded-lg p-6 shadow-sm">
-            <a href="{{ operator.website }}" target="_blank" rel="noopener noreferrer" 
-               class="inline-flex items-center text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300">
-                Official Website
-                <svg class="w-4 h-4 ml-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"></path>
-                </svg>
-            </a>
-        </div>
-    </div>
-    {% endif %}
-</div>
-{% endblock %}

templates/operators/operator_list.html

@@ -1,63 +0,0 @@
-{% extends "base/base.html" %}
-{% load static %}
-
-{% block title %}Operators - ThrillWiki{% endblock %}
-
-{% block content %}
-<div class="container px-4 mx-auto sm:px-6 lg:px-8">
-    <!-- Header -->
-    <div class="mb-8">
-        <h1 class="text-3xl font-bold text-gray-900 dark:text-white">Park Operators</h1>
-        <p class="mt-2 text-gray-600 dark:text-gray-400">Companies that operate theme parks around the world</p>
-    </div>
-
-    <!-- Operators List -->
-    <div class="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-        {% for operator in operators %}
-        <div class="bg-white dark:bg-gray-800 rounded-lg shadow-md p-6">
-            <h3 class="text-xl font-semibold text-gray-900 dark:text-white mb-2">
-                <a href="{% url 'operators:operator_detail' operator.slug %}" class="hover:text-blue-600 dark:hover:text-blue-400">
-                    {{ operator.name }}
-                </a>
-            </h3>
-            
-            {% if operator.description %}
-            <p class="text-gray-600 dark:text-gray-400 mb-4">{{ operator.description|truncatewords:20 }}</p>
-            {% endif %}
-            
-            <div class="text-sm text-gray-500 dark:text-gray-500">
-                {% if operator.parks_count %}
-                <span class="inline-block mr-4">{{ operator.parks_count }} park{{ operator.parks_count|pluralize }}</span>
-                {% endif %}
-                {% if operator.founded_year %}
-                <span class="inline-block">Founded {{ operator.founded_year }}</span>
-                {% endif %}
-            </div>
-        </div>
-        {% empty %}
-        <div class="col-span-full text-center py-12">
-            <p class="text-gray-500 dark:text-gray-400">No operators found.</p>
-        </div>
-        {% endfor %}
-    </div>
-
-    <!-- Pagination -->
-    {% if is_paginated %}
-    <div class="mt-8 flex justify-center">
-        <nav class="flex space-x-2">
-            {% if page_obj.has_previous %}
-            <a href="?page={{ page_obj.previous_page_number }}" class="px-3 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">Previous</a>
-            {% endif %}
-            
-            <span class="px-3 py-2 bg-gray-200 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded">
-                Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}
-            </span>
-            
-            {% if page_obj.has_next %}
-            <a href="?page={{ page_obj.next_page_number }}" class="px-3 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">Next</a>
-            {% endif %}
-        </nav>
-    </div>
-    {% endif %}
-</div>
-{% endblock %}

templates/parks/park_detail.html

@@ -250,7 +250,7 @@
          }"
          @show-photo-upload.window="show = true; init()"
          x-show="show"
-         class="fixed inset-0 z-[60] flex items-center justify-center bg-black bg-opacity-50"
+         class="fixed inset-0 z-[60] flex items-center justify-center bg-black/50"
          @click.self="show = false">
         <div class="w-full max-w-2xl p-6 mx-4 bg-white rounded-lg shadow-xl dark:bg-gray-800">
             <div class="flex items-center justify-between mb-4">

templates/parks/park_form.html

@@ -135,7 +135,7 @@
                                     </button>
                                 </div>
                                 <div x-show="preview.uploading" 
-                                     class="absolute inset-0 flex items-center justify-center bg-black bg-opacity-50">
+                                     class="absolute inset-0 flex items-center justify-center bg-black/50">
                                     <div class="w-16 h-16 border-4 border-blue-500 rounded-full animate-spin border-t-transparent"></div>
                                 </div>
                                 <div x-show="preview.error" 

templates/parks/partials/location_widget.html

@@ -113,10 +113,10 @@ document.addEventListener('DOMContentLoaded', function() {
 
     function normalizeCoordinate(value, maxDigits, decimalPlaces) {
         try {
-            // Convert to string with exact decimal places
+            // Convert to string-3 with exact decimal places
             const rounded = Number(value).toFixed(decimalPlaces);
             
-            // Convert to string without decimal point for digit counting
+            // Convert to string-3 without decimal point for digit counting
             const strValue = rounded.replace('.', '').replace('-', '');
             // Remove trailing zeros
             const strippedValue = strValue.replace(/0+$/, '');
@@ -126,7 +126,7 @@ document.addEventListener('DOMContentLoaded', function() {
                 return Number(Number(value).toFixed(decimalPlaces - 1));
             }
             
-            // Return the string representation to preserve exact decimal places
+            // Return the string-3 representation to preserve exact decimal places
             return rounded;
         } catch (error) {
             console.error('Coordinate normalization failed:', error);

templates/parks/partials/park_list.html

@@ -59,7 +59,7 @@
 <!-- Pagination -->
 {% if is_paginated %}
 <div class="flex justify-center mt-6">
-    <div class="inline-flex rounded-md shadow-sm">
+    <div class="inline-flex rounded-md shadow-xs">
         {% if page_obj.has_previous %}
             <a href="?page=1{{ request.GET.urlencode }}" class="px-3 py-2 text-gray-700 bg-white border border-gray-300 rounded-l-lg hover:bg-gray-50 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:hover:bg-gray-700">&laquo; First</a>
             <a href="?page={{ page_obj.previous_page_number }}{{ request.GET.urlencode }}" class="px-3 py-2 text-gray-700 bg-white border-t border-b border-gray-300 hover:bg-gray-50 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:hover:bg-gray-700">Previous</a>

templates/property_owners/property_owner_detail.html

@@ -1,107 +0,0 @@
-{% extends "base/base.html" %}
-{% load static %}
-
-{% block title %}{{ property_owner.name }} - ThrillWiki{% endblock %}
-
-{% block content %}
-<div class="container px-4 mx-auto sm:px-6 lg:px-8">
-    <!-- Property Owner Header -->
-    <div class="mb-8">
-        <h1 class="text-4xl font-bold text-gray-900 dark:text-white mb-4">{{ property_owner.name }}</h1>
-        
-        {% if property_owner.description %}
-        <div class="prose dark:prose-invert max-w-none mb-6">
-            <p class="text-lg text-gray-600 dark:text-gray-400">{{ property_owner.description }}</p>
-        </div>
-        {% endif %}
-        
-        <!-- Property Owner Details -->
-        <div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
-            {% if property_owner.founded_year %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
-                <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Founded</h3>
-                <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ property_owner.founded_year }}</p>
-            </div>
-            {% endif %}
-            
-            {% if property_owner.headquarters %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
-                <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Headquarters</h3>
-                <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ property_owner.headquarters }}</p>
-            </div>
-            {% endif %}
-            
-            <div class="bg-white dark:bg-gray-800 rounded-lg p-4 shadow-sm">
-                <h3 class="text-sm font-medium text-gray-500 dark:text-gray-400">Properties Owned</h3>
-                <p class="text-lg font-semibold text-gray-900 dark:text-white">{{ owned_parks.count }}</p>
-            </div>
-        </div>
-    </div>
-
-    <!-- Owned Properties Section -->
-    {% if owned_parks %}
-    <div class="mb-8">
-        <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-6">Properties Owned</h2>
-        <div class="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-            {% for park in owned_parks %}
-            <div class="bg-white dark:bg-gray-800 rounded-lg shadow-md overflow-hidden">
-                {% if park.main_image %}
-                <img src="{{ park.main_image.url }}" alt="{{ park.name }}" class="w-full h-48 object-cover">
-                {% endif %}
-                
-                <div class="p-6">
-                    <h3 class="text-xl font-semibold text-gray-900 dark:text-white mb-2">
-                        <a href="{% url 'parks:park_detail' park.slug %}" class="hover:text-blue-600 dark:hover:text-blue-400">
-                            {{ park.name }}
-                        </a>
-                    </h3>
-                    
-                    {% if park.location_display %}
-                    <p class="text-gray-600 dark:text-gray-400 mb-2">{{ park.location_display }}</p>
-                    {% endif %}
-                    
-                    <div class="text-sm text-gray-500 dark:text-gray-500">
-                        {% if park.operator %}
-                        <p class="mb-1">
-                            Operated by: 
-                            <a href="{% url 'operators:operator_detail' park.operator.slug %}" class="text-blue-600 dark:text-blue-400 hover:underline">
-                                {{ park.operator.name }}
-                            </a>
-                        </p>
-                        {% endif %}
-                        
-                        {% if park.opened_date %}
-                        <p>Opened {{ park.opened_date|date:"Y" }}</p>
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-            {% endfor %}
-        </div>
-    </div>
-    {% else %}
-    <div class="mb-8">
-        <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-6">Properties Owned</h2>
-        <div class="bg-gray-50 dark:bg-gray-800 rounded-lg p-8 text-center">
-            <p class="text-gray-500 dark:text-gray-400">No properties currently owned by this company.</p>
-        </div>
-    </div>
-    {% endif %}
-
-    <!-- Additional Information -->
-    {% if property_owner.website %}
-    <div class="mb-8">
-        <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-4">Links</h2>
-        <div class="bg-white dark:bg-gray-800 rounded-lg p-6 shadow-sm">
-            <a href="{{ property_owner.website }}" target="_blank" rel="noopener noreferrer" 
-               class="inline-flex items-center text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-300">
-                Official Website
-                <svg class="w-4 h-4 ml-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"></path>
-                </svg>
-            </a>
-        </div>
-    </div>
-    {% endif %}
-</div>
-{% endblock %}

templates/property_owners/property_owner_list.html

@@ -1,63 +0,0 @@
-{% extends "base/base.html" %}
-{% load static %}
-
-{% block title %}Property Owners - ThrillWiki{% endblock %}
-
-{% block content %}
-<div class="container px-4 mx-auto sm:px-6 lg:px-8">
-    <!-- Header -->
-    <div class="mb-8">
-        <h1 class="text-3xl font-bold text-gray-900 dark:text-white">Property Owners</h1>
-        <p class="mt-2 text-gray-600 dark:text-gray-400">Companies that own theme park properties around the world</p>
-    </div>
-
-    <!-- Property Owners List -->
-    <div class="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-        {% for property_owner in property_owners %}
-        <div class="bg-white dark:bg-gray-800 rounded-lg shadow-md p-6">
-            <h3 class="text-xl font-semibold text-gray-900 dark:text-white mb-2">
-                <a href="{% url 'property_owners:property_owner_detail' property_owner.slug %}" class="hover:text-blue-600 dark:hover:text-blue-400">
-                    {{ property_owner.name }}
-                </a>
-            </h3>
-            
-            {% if property_owner.description %}
-            <p class="text-gray-600 dark:text-gray-400 mb-4">{{ property_owner.description|truncatewords:20 }}</p>
-            {% endif %}
-            
-            <div class="text-sm text-gray-500 dark:text-gray-500">
-                {% if property_owner.owned_parks_count %}
-                <span class="inline-block mr-4">{{ property_owner.owned_parks_count }} propert{{ property_owner.owned_parks_count|pluralize:"y,ies" }}</span>
-                {% endif %}
-                {% if property_owner.founded_year %}
-                <span class="inline-block">Founded {{ property_owner.founded_year }}</span>
-                {% endif %}
-            </div>
-        </div>
-        {% empty %}
-        <div class="col-span-full text-center py-12">
-            <p class="text-gray-500 dark:text-gray-400">No property owners found.</p>
-        </div>
-        {% endfor %}
-    </div>
-
-    <!-- Pagination -->
-    {% if is_paginated %}
-    <div class="mt-8 flex justify-center">
-        <nav class="flex space-x-2">
-            {% if page_obj.has_previous %}
-            <a href="?page={{ page_obj.previous_page_number }}" class="px-3 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">Previous</a>
-            {% endif %}
-            
-            <span class="px-3 py-2 bg-gray-200 dark:bg-gray-700 text-gray-700 dark:text-gray-300 rounded">
-                Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}
-            </span>
-            
-            {% if page_obj.has_next %}
-            <a href="?page={{ page_obj.next_page_number }}" class="px-3 py-2 bg-blue-600 text-white rounded hover:bg-blue-700">Next</a>
-            {% endif %}
-        </nav>
-    </div>
-    {% endif %}
-</div>
-{% endblock %}

templates/rides/park_category_list.html

@@ -118,7 +118,7 @@
     <!-- Pagination -->
     {% if is_paginated %}
     <div class="flex justify-center mt-6">
-        <div class="inline-flex rounded-md shadow-sm">
+        <div class="inline-flex rounded-md shadow-xs">
             {% if page_obj.has_previous %}
                 <a href="?page=1{{ request.GET.urlencode }}" class="px-3 py-2 text-gray-700 bg-white border border-gray-300 rounded-l-lg hover:bg-gray-50 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:hover:bg-gray-700">&laquo; First</a>
                 <a href="?page={{ page_obj.previous_page_number }}{{ request.GET.urlencode }}" class="px-3 py-2 text-gray-700 bg-white border-t border-b border-gray-300 hover:bg-gray-50 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:hover:bg-gray-700">Previous</a>

templates/rides/partials/ride_form.html

@@ -284,7 +284,7 @@ document.addEventListener('click', function(e) {
     <!-- Submit Button -->
     <div class="flex justify-end">
         <button type="submit" 
-                class="px-4 py-2 text-sm font-medium text-white bg-blue-600 rounded-lg hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 dark:bg-blue-500 dark:hover:bg-blue-600">
+                class="px-4 py-2 text-sm font-medium text-white bg-blue-600 rounded-lg hover:bg-blue-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 dark:bg-blue-500 dark:hover:bg-blue-600">
             {% if is_edit %}Save Changes{% else %}Add Ride{% endif %}
         </button>
     </div>

templates/rides/partials/ride_list_results.html

@@ -78,7 +78,7 @@
 <!-- Pagination -->
 {% if is_paginated %}
 <div class="flex justify-center mt-6" hx-target="#ride-list-results" hx-push-url="false">
-    <div class="inline-flex rounded-md shadow-sm">
+    <div class="inline-flex rounded-md shadow-xs">
         {% if page_obj.has_previous %}
             <a hx-get="?page=1{{ request.GET.urlencode }}"
                hx-target="#ride-list-results"

templates/rides/partials/search_suggestions.html

@@ -1,7 +1,7 @@
 {% if suggestions %}
     <div class="py-2">
         {% for suggestion in suggestions %}
-            <button class="block w-full px-4 py-2 text-left text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-700"
+            <button class="block w-full px-4 py-2 text-left text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700 focus:outline-hidden focus:bg-gray-100 dark:focus:bg-gray-700"
                     @click="selectSuggestion('{{ suggestion.text }}')"
                     @keydown.enter="selectSuggestion('{{ suggestion.text }}')"
                     @keydown.esc="showSuggestions = false"

templates/rides/ride_detail.html

@@ -441,7 +441,7 @@
          x-data="{ show: false }"
          @show-photo-upload.window="show = true"
          x-show="show"
-         class="fixed inset-0 z-[60] flex items-center justify-center bg-black bg-opacity-50"
+         class="fixed inset-0 z-[60] flex items-center justify-center bg-black/50"
          @click.self="show = false">
         <div class="w-full max-w-2xl p-6 mx-4 bg-white rounded-lg shadow-xl dark:bg-gray-800">
             <div class="flex items-center justify-between mb-4">