From cbc9fd7db7d71465b818c05b54559bcfdec673f0 Mon Sep 17 00:00:00 2001
From: Aroy-Art <Aroy-Art@pm.me>
Date: Wed, 26 Jun 2024 11:26:45 +0200
Subject: [PATCH 1/2] Fix: paginator to include other GET variables

---
 .../apps/templates/includes/pageination.html  | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/archivist/apps/templates/includes/pageination.html b/archivist/apps/templates/includes/pageination.html
index 63a23c7..a472ebb 100644
--- a/archivist/apps/templates/includes/pageination.html
+++ b/archivist/apps/templates/includes/pageination.html
@@ -5,14 +5,15 @@
     <div class="col">
         <nav aria-label="Page navigation">
             <ul class="pagination justify-content-center">
+                
                 {% if page_obj.has_previous %}
                     <li class="page-item">
-                        <a class="page-link fs-4 lh-1" href="?page=1" aria-label="First">
+                        <a class="page-link" href="?{{ request.GET.urlencode }}&page=1" aria-label="First">
                             «
                         </a>
                     </li>
                     <li class="page-item">
-                        <a class="page-link fs-4 lh-1" href="?page={{ page_obj.previous_page_number }}" aria-label="Previous">
+                        <a class="page-link" href="?{{ request.GET.urlencode }}&page={{ page_obj.previous_page_number }}" aria-label="Previous">
                             <span aria-hidden="true">
                                 ‹
                             </span>
@@ -21,45 +22,45 @@
 
                 {% else %}
                     <li class="page-item disabled">
-                        <span class="page-link fs-4 lh-1 text-decoration-line-through">
+                        <span class="page-link text-decoration-line-through">
                             «
                         </span>
                     </li>
                     <li class="page-item disabled">
-                        <span class="page-link fs-4 lh-1 text-decoration-line-through">
+                        <span class="page-link text-decoration-line-through">
                             ‹
                         </span>
                     </li>
                 {% endif %}
                 
                 <li class="page-item disabled">
-                    <span class="page-link text-nowrap fs-4 lh-1">
+                    <span class="page-link text-nowrap">
                         Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}.
                     </span>
                     </li>
             
                 {% if page_obj.has_next %}
                     <li class="page-item">
-                        <a class="page-link fs-4 lh-1" href="?page={{ page_obj.next_page_number }}" aria-label="Next">
+                        <a class="page-link" href="?{{ request.GET.urlencode }}&page={{ page_obj.next_page_number }}" aria-label="Next">
                             <span aria-hidden="true">
                                 ›
                             </span>
                         </a>
                     </li>
                     <li class="page-item">
-                        <a class="page-link fs-4 lh-1" href="?page={{ page_obj.paginator.num_pages }}" aria-label="Last">
+                        <a class="page-link" href="?{{ request.GET.urlencode }}&page={{ page_obj.paginator.num_pages }}" aria-label="Last">
                             »
                         </a>
                     </li>
 
                 {% else %}
                     <li class="page-item disabled">
-                        <span class="page-link fs-4 lh-1 text-decoration-line-through">
+                        <span class="page-link text-decoration-line-through">
                             ›
                         </span>
                     </li>
                     <li class="page-item disabled">
-                        <span class="page-link fs-4 lh-1 text-decoration-line-through">
+                        <span class="page-link text-decoration-line-through">
                             »
                         </span>
                     </li>
@@ -72,14 +73,15 @@
 
     <!-- Jump-to field -->
     <div class="col ">
-        <form method="get" class="d-flex flex-row flex-nowrap g-3 justify-content-center ">
-            <label for="jumpToPage" class="col-auto col-form-label">Jump to:</label>
-            <div class="col-4 col-sm-3 col-md-3 col-lg-2 col-xl-1 mx-2">
-              <input type="number" name="page" id="jumpToPage" class="form-control" min="1" max="{{ page_obj.paginator.num_pages }}" value="{{ page_obj.number }}"">
-            </div>
-            <div class="col-auto">
-                <button type="submit" class="btn btn-primary">Go</button>
-            </div>
+        <form method="get" class="d-flex flex-row flex-nowrap flex-grow-1 justify-content-center ">
+            {% for key, value in request.GET.items %}
+                {% if key != "page" %}
+                    <input type="hidden" name="{{ key }}" value="{{ value }}">
+                {% endif %}
+            {% endfor %}
+            <label for="jumpToPage" class="col-auto col-form-label mx-1">Jump to:</label>
+            <input type="number" name="page" id="jumpToPage" class="form-control mx-1" min="1" max="{{ page_obj.paginator.num_pages }}" value="{{ page_obj.number }}" style="width: 5rem">
+            <button type="submit" class="btn btn-primary mx-1">Go</button>
         </form>
     </div>
     <!-- Jump to field End -->

From 7716359e0beb048dd1a036c9301d57f0ac45373f Mon Sep 17 00:00:00 2001
From: Aroy-Art <Aroy-Art@pm.me>
Date: Wed, 26 Jun 2024 15:32:44 +0200
Subject: [PATCH 2/2] Fix: use title if available instead of description

---
 archivist/apps/templates/includes/gallery.html | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/archivist/apps/templates/includes/gallery.html b/archivist/apps/templates/includes/gallery.html
index c7a19b9..089cb92 100644
--- a/archivist/apps/templates/includes/gallery.html
+++ b/archivist/apps/templates/includes/gallery.html
@@ -70,10 +70,20 @@
         {% endif %}
         <a href='{% url "sites:submission" submission.submission_hash %}' class="stretched-link"></a>
         <div class="overlay p-2 text-center">
-            {% if submission.content_object.description|length > 64 %}
-                <p>{{ submission.content_object.description|html_to_text|slice:"0:64"|add:"..." }}</p>
+            {% if submission.content_object.title %}
+                {% if submission.content_object.title|length > 64 %}
+                    <p title="{{ submission.content_object.title }}">{{ submission.content_object.title|slice:"0:64"|add:"..." }}</p>
+                {% else %}
+                    <p title="{{ submission.content_object.title }}">{{ submission.content_object.title }}</p>
+                {% endif %}
+
             {% else %}
-                <p>{{ submission.content_object.description|html_to_text }}</p>
+                {% if submission.content_object.description|length > 64 %}
+                    <p>{{ submission.content_object.description|html_to_text|slice:"0:64"|add:"..." }}</p>
+                {% else %}
+                    <p>{{ submission.content_object.description|html_to_text }}</p>
+                {% endif %}
+
             {% endif %}
             <a href="{% url 'sites:artist_profile' submission.author.user_hash %}" class="z-2">
                 {% if submission.category.name == "furaffinity" %}