From 6cffa069cec4a51499310d0a08dc5de18f014505 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 4 Feb 2023 10:56:14 -0500 Subject: [PATCH] fix a few minor display issues --- boofilsic/urls.py | 5 ++-- catalog/templates/item_base.html | 2 +- catalog/templates/item_mark_list.html | 2 +- common/static/lib/css/collection.css | 33 ++++++++++++++++++++++++ journal/templatetags/collection.py | 2 +- users/forms.py | 2 +- users/templates/users/manage_report.html | 2 +- users/templates/users/relation_list.html | 2 +- 8 files changed, 41 insertions(+), 9 deletions(-) diff --git a/boofilsic/urls.py b/boofilsic/urls.py index 4add5367..101357ac 100644 --- a/boofilsic/urls.py +++ b/boofilsic/urls.py @@ -19,7 +19,6 @@ from django.conf import settings from users.views import login urlpatterns = [ - path(settings.ADMIN_URL + "/", admin.site.urls), path("login/", login), path("markdownx/", include("markdownx.urls")), path("users/", include("users.urls")), @@ -31,10 +30,10 @@ urlpatterns = [ path("", include("common.urls")), path("", include("legacy.urls")), path("tz_detect/", include("tz_detect.urls")), + path(settings.ADMIN_URL + "/", admin.site.urls), + path(settings.ADMIN_URL + "-rq/", include("django_rq.urls")), ] -urlpatterns += [path(settings.ADMIN_URL + "-rq/", include("django_rq.urls"))] - if settings.DEBUG: from django.conf.urls.static import static diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html index a7c1578e..04483bdb 100644 --- a/catalog/templates/item_base.html +++ b/catalog/templates/item_base.html @@ -144,7 +144,7 @@
  • {{ others_mark.owner.username }} - {{ others_mark.shelf_label }} + {{ others_mark.action_label }} {% if others_mark.rating %} diff --git a/catalog/templates/item_mark_list.html b/catalog/templates/item_mark_list.html index eeb61650..8d804d61 100644 --- a/catalog/templates/item_mark_list.html +++ b/catalog/templates/item_mark_list.html @@ -34,7 +34,7 @@
  • {{ others_mark.owner.username }} - {{ others_mark.mark.get_status_display }} + {{ others_mark.mark.action_label }} {% if others_mark.mark.rating %} diff --git a/common/static/lib/css/collection.css b/common/static/lib/css/collection.css index 9ea3fce9..8246cf61 100644 --- a/common/static/lib/css/collection.css +++ b/common/static/lib/css/collection.css @@ -28,6 +28,11 @@ border-radius: 0 0 0 8px; padding: 0 4px; cursor: pointer; + opacity: 0.2; +} + +.entity-list__entity-action-icon:hover { + opacity: 1; } .helptext{ @@ -339,3 +344,31 @@ summary::-webkit-details-marker { bottom: -6px; height: 6px } + +.gg-bookmark, +.gg-bookmark::after { + display: inline-block; + box-sizing: border-box; + border-top-right-radius: 3px +} +.gg-bookmark { + border: 2px solid; + border-bottom: 0; + border-top-left-radius: 3px; + overflow: hidden; + position: relative; + transform: scale(var(--ggs,1)); + width: 14px; + height: 16px +} +.gg-bookmark::after { + content: ""; + position: absolute; + width: 12px; + height: 12px; + border-top: 2px solid; + border-right: 2px solid; + transform: rotate(-45deg); + top: 9px; + left: -1px +} diff --git a/journal/templatetags/collection.py b/journal/templatetags/collection.py index 44558142..39c3370d 100644 --- a/journal/templatetags/collection.py +++ b/journal/templatetags/collection.py @@ -29,7 +29,7 @@ def prural_items(category): return "部电影" elif category == "tv": return "部剧集" - elif category == "album": + elif category == "album" or category == "music": return "张专辑" elif category == "game": return "个游戏" diff --git a/users/forms.py b/users/forms.py index 3d33de32..48ab2ad6 100644 --- a/users/forms.py +++ b/users/forms.py @@ -17,4 +17,4 @@ class ReportForm(forms.ModelForm): "image": PreviewImageInput() # 'reported_user': forms.TextInput(), } - labels = {"reported_user": _("举报的用户"), "image": _("相关证据"), "message": _("详情")} + labels = {"reported_user": _("投诉对象"), "image": _("相关证据"), "message": _("详情")} diff --git a/users/templates/users/manage_report.html b/users/templates/users/manage_report.html index e11f164d..11c1c9bb 100644 --- a/users/templates/users/manage_report.html +++ b/users/templates/users/manage_report.html @@ -10,7 +10,7 @@ - {{ site_name }} - {% trans '管理举报' %} + {{ site_name }} - {% trans '管理投诉' %} {% include "common_libs.html" with jquery=0 %} diff --git a/users/templates/users/relation_list.html b/users/templates/users/relation_list.html index cdfdb3e1..7604ff0b 100644 --- a/users/templates/users/relation_list.html +++ b/users/templates/users/relation_list.html @@ -73,7 +73,7 @@ {% if request.user != user %} + class="user-profile__report-link">{% trans '投诉用户' %} {% endif %}