diff --git a/PROJECT.org b/PROJECT.org index 5540c7b..fcfb4c5 100644 --- a/PROJECT.org +++ b/PROJECT.org @@ -18,7 +18,7 @@ tasks, Todoist tasks, web pages I've read and trails I've hiked has turned out to be sometimes cathartic and sometimes functional as I try to remember when I did a thing. -* Backlog [1/31] :vrobbler:project:personal: +* Backlog [2/32] :vrobbler:project:personal: ** TODO [#C] Configure IMAP folder/start in user profile :imap:settings: *** Description @@ -595,3 +595,8 @@ The Edit log form should have from top to bottom: :PROPERTIES: :ID: ed744d3f-86fb-e9f8-acb9-0e4200c99c7f :END: + +** DONE Standarize the toolbar buttons :templates:ui: +:PROPERTIES: +:ID: 3780d203-85f2-32a1-ded2-9895bc969c3c +:END: diff --git a/tests/scrobbles_tests/test_toolbar.py b/tests/scrobbles_tests/test_toolbar.py new file mode 100644 index 0000000..56b35c5 --- /dev/null +++ b/tests/scrobbles_tests/test_toolbar.py @@ -0,0 +1,52 @@ +import pytest +from django.contrib.auth import get_user_model +from django.utils import timezone +from scrobbles.models import Scrobble +from tasks.models import Task + + +@pytest.mark.django_db +def test_standard_toolbar_on_base_list_page(client): + user = get_user_model().objects.create_user( + username="toolbaruser", password="testpass" + ) + task = Task.objects.create(title="Ship the toolbar") + Scrobble.objects.create( + user=user, + task=task, + media_type="Task", + timestamp=timezone.now(), + ) + client.force_login(user) + response = client.get(f"/tasks/{task.uuid}/") + assert response.status_code == 200 + content = response.content.decode() + # Standard toolbar present on a base_list-based detail page + assert "Search..." in content + assert "Calendar" in content + assert "Admin" in content + assert "Charts" in content + assert "Live" in content + assert "Browse" in content + assert "media-browser-menu" in content + # Grid view toggle kept + assert "Grid View" in content + + +@pytest.mark.django_db +def test_standard_toolbar_on_home(client): + user = get_user_model().objects.create_user( + username="toolbarhome", password="testpass" + ) + task = Task.objects.create(title="Task") + Scrobble.objects.create( + user=user, task=task, media_type="Task", timestamp=timezone.now() + ) + client.force_login(user) + response = client.get("/") + assert response.status_code == 200 + content = response.content.decode() + assert "Search..." in content + assert "Calendar" in content + assert "Live" in content + assert "media-browser-menu" in content diff --git a/vrobbler/templates/agents/agent_session_search.html b/vrobbler/templates/agents/agent_session_search.html index e092d16..c46a91c 100644 --- a/vrobbler/templates/agents/agent_session_search.html +++ b/vrobbler/templates/agents/agent_session_search.html @@ -32,12 +32,10 @@

Search Agent Sessions

{% if user.is_authenticated %} + {% include "scrobbles/_toolbar.html" %}
Agent sessions
-
- Search scrobbles -
{% endif %}
diff --git a/vrobbler/templates/base_detail.html b/vrobbler/templates/base_detail.html index fb29711..194d7c0 100644 --- a/vrobbler/templates/base_detail.html +++ b/vrobbler/templates/base_detail.html @@ -6,12 +6,7 @@

{% block title %}{% endblock %}

{% if user.is_authenticated %} -
- Admin -
-
- Charts -
+ {% include "scrobbles/_toolbar.html" %}
diff --git a/vrobbler/templates/base_list.html b/vrobbler/templates/base_list.html index a6e1749..0d2cbff 100644 --- a/vrobbler/templates/base_list.html +++ b/vrobbler/templates/base_list.html @@ -7,14 +7,7 @@ class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">

{% block title %}{% endblock %}

- {% if user.is_authenticated %} -
- Admin -
-
- Charts -
- {% endif %} + {% include "scrobbles/_toolbar.html" %} {% block grid_view_button %}
{% if view == 'grid' %} diff --git a/vrobbler/templates/scrobbles/_toolbar.html b/vrobbler/templates/scrobbles/_toolbar.html new file mode 100644 index 0000000..30b2490 --- /dev/null +++ b/vrobbler/templates/scrobbles/_toolbar.html @@ -0,0 +1,27 @@ +{% if user.is_authenticated %} +
+ +
+
+ Calendar +
+
+ Admin +
+
+ Charts +
+
+ Live +
+{% include "scrobbles/_media_browser.html" %} +{% if not user.profile.trends_disabled %} +
+ Trends +
+{% endif %} +{% endif %} \ No newline at end of file diff --git a/vrobbler/templates/scrobbles/scrobble_list.html b/vrobbler/templates/scrobbles/scrobble_list.html index 5aedff1..dfeaf96 100644 --- a/vrobbler/templates/scrobbles/scrobble_list.html +++ b/vrobbler/templates/scrobbles/scrobble_list.html @@ -65,46 +65,13 @@

{% if date %}{{date|naturaltime}}{% else %}{{title}}{% endif %}

{% if user.is_authenticated %} -
- -
-
- Calendar -
-
- Admin -
-
- Charts -
-
- Live -
- {% include "scrobbles/_media_browser.html" %} - {% if not user.profile.trends_disabled %} -
- Trends -
- {% endif %} + {% include "scrobbles/_toolbar.html" %}
{% if user.profile.lastfm_username and not user.profile.lastfm_auto_import %}
{% endif %} - -
-
- {% if user.profile.lastfm_username and not user.profile.lastfm_auto_import %} - -
- -
- {% endif %}