diff --git a/app/WYGIWYH/settings.py b/app/WYGIWYH/settings.py index 84c9749..cf5db80 100644 --- a/app/WYGIWYH/settings.py +++ b/app/WYGIWYH/settings.py @@ -379,7 +379,7 @@ DEBUG_TOOLBAR_PANELS = [ "debug_toolbar.panels.signals.SignalsPanel", "debug_toolbar.panels.redirects.RedirectsPanel", "debug_toolbar.panels.profiling.ProfilingPanel", - "cachalot.panels.CachalotPanel", + # "cachalot.panels.CachalotPanel", ] INTERNAL_IPS = [ "127.0.0.1", diff --git a/app/apps/users/urls.py b/app/apps/users/urls.py index faf0b4f..6576bb8 100644 --- a/app/apps/users/urls.py +++ b/app/apps/users/urls.py @@ -17,6 +17,11 @@ urlpatterns = [ views.toggle_sound_playing, name="toggle_sound_playing", ), + path( + "user/toggle-sidebar/", + views.toggle_sidebar_status, + name="toggle_sidebar_status", + ), path( "user/settings/", views.update_settings, diff --git a/app/apps/users/views.py b/app/apps/users/views.py index 535f6ec..6460a09 100644 --- a/app/apps/users/views.py +++ b/app/apps/users/views.py @@ -116,6 +116,21 @@ def update_settings(request): return render(request, "users/fragments/user_settings.html", {"form": form}) +@only_htmx +@htmx_login_required +def toggle_sidebar_status(request): + if request.session["sidebar_status"] == "floating": + request.session["sidebar_status"] = "fixed" + elif request.session["sidebar_status"] == "fixed": + request.session["sidebar_status"] = "floating" + else: + request.session["sidebar_status"] = "fixed" + + return HttpResponse( + status=204, + ) + + @htmx_login_required @is_superuser @require_http_methods(["GET"]) diff --git a/app/templates/common/placeholder.html b/app/templates/common/placeholder.html new file mode 100644 index 0000000..c01e132 --- /dev/null +++ b/app/templates/common/placeholder.html @@ -0,0 +1,3 @@ +{#This is here so we can add dynamic Tailwind classes that will be required via JS/hyperscript but Tailwind has no knowledge of#} +
+
diff --git a/app/templates/cotton/components/sidebar_menu_header.html b/app/templates/cotton/components/sidebar_menu_header.html index 678e7d6..6c8c70e 100644 --- a/app/templates/cotton/components/sidebar_menu_header.html +++ b/app/templates/cotton/components/sidebar_menu_header.html @@ -1,6 +1,6 @@
  • - {{ title }} + {{ title }}
    • diff --git a/app/templates/cotton/components/sidebar_menu_item.html b/app/templates/cotton/components/sidebar_menu_item.html index f360815..c2dc437 100644 --- a/app/templates/cotton/components/sidebar_menu_item.html +++ b/app/templates/cotton/components/sidebar_menu_item.html @@ -1,7 +1,7 @@ {% load active_link %}
  • {{ title }} + class="ms-3 fw-medium tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">{{ title }}
    • diff --git a/app/templates/cotton/components/sidebar_menu_url_item.html b/app/templates/cotton/components/sidebar_menu_url_item.html index 30870d1..911d671 100644 --- a/app/templates/cotton/components/sidebar_menu_url_item.html +++ b/app/templates/cotton/components/sidebar_menu_url_item.html @@ -2,7 +2,7 @@
  • {{ title }} + class="ms-3 fw-medium tw:lg:group-hover:truncate tw:lg:group-focus:truncate tw:lg:group-hover:text-ellipsis tw:lg:group-focus:text-ellipsis">{{ title }}
    • diff --git a/app/templates/includes/sidebar.html b/app/templates/includes/sidebar.html index 29c57ad..1059c11 100644 --- a/app/templates/includes/sidebar.html +++ b/app/templates/includes/sidebar.html @@ -5,31 +5,56 @@ {% load static %}
    + class="sidebar {% if request.session.sidebar_status == 'floating' %}tw:group sidebar-floating{% elif request.session.sidebar_status == 'fixed' %}sidebar-fixed{% else %}tw:group sidebar-floating{% endif %}" + id="sidebar-container">
    @@ -140,14 +165,13 @@
    -
    -
    + class="tw:justify-between tw:items-center tw:p-4 tw:border-b tw:border-gray-600 sidebar-submenu-header"> +
    {% trans 'Management' %}
    -
    -