mirror of
https://github.com/pacnpal/thrillwiki_django_no_react.git
synced 2025-12-20 16:31:08 -05:00
Fix moderation submission display:
- Fix location map display in view mode - Remove duplicate location map - Fix grid layout and closing tags - Show location map before other fields
This commit is contained in:
@@ -101,8 +101,15 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<!-- View Mode -->
|
<!-- View Mode -->
|
||||||
<div x-show="!isEditing"
|
<div x-show="!isEditing">
|
||||||
class="grid grid-cols-1 gap-3 md:grid-cols-2">
|
<!-- Location Map (View Mode) -->
|
||||||
|
{% if submission.content_type.model == 'park' and submission.changes.latitude and submission.changes.longitude %}
|
||||||
|
<div class="mb-4">
|
||||||
|
{% include "moderation/partials/location_map.html" with location=submission.changes %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 gap-3 md:grid-cols-2">
|
||||||
{% for field, value in submission.changes.items %}
|
{% for field, value in submission.changes.items %}
|
||||||
{% if field != 'model_name' and field != 'latitude' and field != 'longitude' and field != 'street_address' and field != 'city' and field != 'state' and field != 'postal_code' and field != 'country' %}
|
{% if field != 'model_name' and field != 'latitude' and field != 'longitude' and field != 'street_address' and field != 'city' and field != 'state' and field != 'postal_code' and field != 'country' %}
|
||||||
<div class="p-4 bg-gray-100 border rounded-lg dark:bg-gray-900 border-gray-200/50 dark:border-gray-700/50">
|
<div class="p-4 bg-gray-100 border rounded-lg dark:bg-gray-900 border-gray-200/50 dark:border-gray-700/50">
|
||||||
@@ -160,13 +167,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
<!-- Location Map (View Mode) -->
|
|
||||||
{% if submission.content_type.model == 'park' and submission.changes.latitude and submission.changes.longitude %}
|
|
||||||
<div class="col-span-2">
|
|
||||||
{% include "moderation/partials/location_map.html" with location=submission.changes %}
|
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Edit Mode -->
|
<!-- Edit Mode -->
|
||||||
@@ -441,56 +442,4 @@
|
|||||||
hx-target="#submissions-content"
|
hx-target="#submissions-content"
|
||||||
hx-include="closest .review-notes"
|
hx-include="closest .review-notes"
|
||||||
hx-confirm="Are you sure you want to approve this submission?"
|
hx-confirm="Are you sure you want to approve this submission?"
|
||||||
hx-indicator="#loading-indicator">
|
hx-indicator="#loading-indicator
|
||||||
<i class="mr-2 fas fa-check"></i>
|
|
||||||
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"
|
|
||||||
hx-post="{% url 'moderation:reject_submission' submission.id %}"
|
|
||||||
hx-target="#submissions-content"
|
|
||||||
hx-include="closest .review-notes"
|
|
||||||
hx-confirm="Are you sure you want to reject this submission?"
|
|
||||||
hx-indicator="#loading-indicator">
|
|
||||||
<i class="mr-2 fas fa-times"></i>
|
|
||||||
Reject
|
|
||||||
</button>
|
|
||||||
{% 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"
|
|
||||||
hx-post="{% url 'moderation:escalate_submission' submission.id %}"
|
|
||||||
hx-target="#submissions-content"
|
|
||||||
hx-include="closest .review-notes"
|
|
||||||
hx-confirm="Are you sure you want to escalate this submission?"
|
|
||||||
hx-indicator="#loading-indicator">
|
|
||||||
<i class="mr-2 fas fa-arrow-up"></i>
|
|
||||||
Escalate
|
|
||||||
</button>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% empty %}
|
|
||||||
<div class="relative p-8 text-center bg-white border rounded-lg dark:bg-gray-800 border-gray-200/50 dark:border-gray-700/50">
|
|
||||||
<div class="text-gray-600 dark:text-gray-400">
|
|
||||||
<i class="mb-4 text-5xl fas fa-inbox"></i>
|
|
||||||
<p class="text-lg">No submissions found matching your filters.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="loading-indicator"
|
|
||||||
class="absolute inset-0 flex items-center justify-center rounded-lg htmx-indicator bg-white/80 dark:bg-gray-900/80">
|
|
||||||
<div class="flex items-center p-6 space-x-4">
|
|
||||||
<div class="w-8 h-8 border-4 border-blue-500 rounded-full animate-spin border-t-transparent"></div>
|
|
||||||
<span class="text-gray-900 dark:text-gray-300">Loading...</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
{% block extra_js %}
|
|
||||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
|
||||||
{% endblock %}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user