From 9b0d37fa6af40838f2323e7ae8b4b1f5927b7c6f Mon Sep 17 00:00:00 2001
From: Peter Stockings <pstockings@jadeworld.com>
Date: Fri, 13 Oct 2023 20:57:41 +1100
Subject: [PATCH] Minor refactor to calendar template

---
 templates/partials/calendar.html | 13 ++-----------
 templates/workouts_list.html     |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/templates/partials/calendar.html b/templates/partials/calendar.html
index 02a1cf5..096d4f6 100644
--- a/templates/partials/calendar.html
+++ b/templates/partials/calendar.html
@@ -65,23 +65,14 @@
             <div class="py-3 px-4">
                 <p
                     class="text-base {% if d.is_current_month %} text-gray-500 {% else %} text-gray-300 {% endif %} dark:text-gray-100 font-medium text-center">
-                    {% if d.is_current_date %}
                 <div class="w-full h-full">
                     <div class="flex items-center justify-center w-full rounded-full cursor-pointer">
                         <a role="link" tabindex="0"
-                            class="focus:outline-none  focus:ring-2 focus:ring-offset-2 focus:ring-indigo-700 focus:bg-indigo-500 hover:bg-indigo-500 text-base w-8 h-8 flex items-center justify-center font-medium text-white bg-indigo-700 rounded-full">{{
+                            class="{% if d.is_workout %}focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-700 focus:bg-indigo-500 hover:bg-indigo-500{% endif %} {% if d.is_current_date %}bg-indigo-700{% elif d.is_workout %}bg-indigo-300{% endif %} text-base w-8 h-8 px-2 flex items-center justify-center font-medium text-white rounded-full">{{
                             d.day_of_month }}</a>
+
                     </div>
                 </div>
-                {% elif d.is_workout %}
-                <div class="flex items-center justify-center w-full rounded-full cursor-pointer"><a role="link"
-                        tabindex="0"
-                        class="focus:outline-none  focus:ring-2 focus:ring-offset-2 focus:ring-indigo-700 focus:bg-indigo-200 hover:bg-indigo-200 text-base w-8 h-8 flex items-center justify-center font-medium border border-indigo-700 rounded-full">{{
-                        d.day_of_month }}</a>
-                </div>
-                {% else %}
-                {{ d.day_of_month }}
-                {% endif %}
 
                 </p>
             </div>
diff --git a/templates/workouts_list.html b/templates/workouts_list.html
index 87ed298..7bddf1b 100644
--- a/templates/workouts_list.html
+++ b/templates/workouts_list.html
@@ -65,7 +65,7 @@
     <div class="!visible collapse p-4 hidden">
         {{ render_partial('partials/calendar.html', calendar_month=u.calendar_month, user_id = u.id) }}
 
-        {{ render_partial('partials/workouts_list_fragment.html', workouts=workouts[:5], user_id = u.id) }}
+        {{ render_partial('partials/workouts_list_fragment.html', workouts=workouts[:7], user_id = u.id) }}
     </div>
     {% endif %}
 </div>
\ No newline at end of file