Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix a few minor display issues

Browse source
This commit is contained in:
Your Name 2023-02-04 10:56:14 -05:00 • committed by Henri Dickson
parent ecf6cead49
commit 6cffa069ce
8 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
boofilsic/urls.py
View file

@ -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

2
catalog/templates/item_base.html
View file

@ -144,7 +144,7 @@
<li class="entity-marks__mark">
<a href="{% url 'journal:user_profile' others_mark.owner.mastodon_username %}" class="entity-marks__owner-link">{{ others_mark.owner.username }}</a>
<span>{{ others_mark.shelf_label }}</span>
<span>{{ others_mark.action_label }}</span>
{% if others_mark.rating %}
<span class="entity-marks__rating-star rating-star" data-rating-score="{{ others_mark.rating }}"></span>

2
catalog/templates/item_mark_list.html
View file

@ -34,7 +34,7 @@
<li class="entity-marks__mark">
<a href="{% url 'journal:user_profile' others_mark.owner.mastodon_username %}" class="entity-marks__owner-link">{{ others_mark.owner.username }}</a>
<span>{{ others_mark.mark.get_status_display }}</span>
<span>{{ others_mark.mark.action_label }}</span>
{% if others_mark.mark.rating %}
<span class="entity-marks__rating-star rating-star" data-rating-score="{{ others_mark.mark.rating }}"></span>

33
common/static/lib/css/collection.css
View file

@ -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
}

2
journal/templatetags/collection.py
View file

@ -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 "个游戏"

2
users/forms.py
View file

@ -17,4 +17,4 @@ class ReportForm(forms.ModelForm):
"image": PreviewImageInput()
# 'reported_user': forms.TextInput(),
}
labels = {"reported_user": _("举报的用户"), "image": _("相关证据"), "message": _("详情")}
labels = {"reported_user": _("投诉对象"), "image": _("相关证据"), "message": _("详情")}

2
users/templates/users/manage_report.html
View file

@ -10,7 +10,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ site_name }} - {% trans '管理举报' %}</title>
<title>{{ site_name }} - {% trans '管理投诉' %}</title>
{% include "common_libs.html" with jquery=0 %}
</head>

2
users/templates/users/relation_list.html
View file

@ -73,7 +73,7 @@
{% if request.user != user %}
<a href="{% url 'users:report' %}?user_id={{ user.id }}"
class="user-profile__report-link">{% trans '举报用户' %}</a>
class="user-profile__report-link">{% trans '投诉用户' %}</a>
{% endif %}
</div>