diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html index d478773a..f1d01f32 100644 --- a/catalog/templates/item_base.html +++ b/catalog/templates/item_base.html @@ -11,7 +11,7 @@ {% load user_actions %} {% load duration %} - + diff --git a/common/static/scss/_item.scss b/common/static/scss/_item.scss index 06e48a64..68959125 100644 --- a/common/static/scss/_item.scss +++ b/common/static/scss/_item.scss @@ -1,4 +1,4 @@ -#item-page { +.item-page { .muted { color: var(--pico-muted-color); diff --git a/common/static/scss/_layout.scss b/common/static/scss/_layout.scss index ada5e7f2..6528aa52 100644 --- a/common/static/scss/_layout.scss +++ b/common/static/scss/_layout.scss @@ -29,7 +29,7 @@ } } -#item-page { +.item-page { main { width: 100vw; padding: calc(1*var(--pico-spacing)) calc(3*var(--pico-spacing)); @@ -188,7 +188,7 @@ margin: var(--pico-spacing); } - >div:has(article) { + >div:has(>article) { margin: 0; } diff --git a/journal/templates/collection.html b/journal/templates/collection.html index d7b77459..9800d40d 100644 --- a/journal/templates/collection.html +++ b/journal/templates/collection.html @@ -29,64 +29,63 @@ {% include "_header.html" %}
-
-
-
-

-
- {% if request.user.is_authenticated %} - - {% liked_piece collection as liked %} - {% include 'like_stats.html' with liked=liked piece=collection label='关注' icon='fa-bookmark' %} - - {% include '_feature_stats.html' with featured=featured_since %} - - - - {% endif %} -
- {{ collection.title }} - {% if collection.visibility > 0 %}{% endif %} -

-
-
-
- - {{ collection.owner.username }} - -
-
-

- {{ collection.owner.mastodon_account.display_name }} - @{{ collection.owner.mastodon_username }} -

-

- {% for cat, count in collection.get_summary.items %} - {% if count %}{{ count }} {{ cat|prural_items }}  {% endif %} - {% endfor %} -

- {% if featured_since %} -

- -

+
+
+

+
+ {% if request.user.is_authenticated %} + + {% liked_piece collection as liked %} + {% include 'like_stats.html' with liked=liked piece=collection label='关注' icon='fa-bookmark' %} + + {% include '_feature_stats.html' with featured=featured_since %} + + + {% endif %} -
{{ collection.html | safe }}
-
-
- -
+ {{ collection.title }} + {% if collection.visibility > 0 %}{% endif %} +

+
+
+
+ + {{ collection.owner.username }} + +
+
+

+ {{ collection.owner.mastodon_account.display_name }} + @{{ collection.owner.mastodon_username }} +

+

+ {% for cat, count in collection.get_summary.items %} + {% if count %}{{ count }} {{ cat|prural_items }}  {% endif %} + {% endfor %} +

+ {% if featured_since %} +

+ +

+ {% endif %} +
{{ collection.html | safe }}
+
+
+
+
-
- {% comment %} +
+ + {% comment %} {% if featured_since %}
@@ -108,28 +107,27 @@
{% endif %} - {% endcomment %} -
-
-
- - + {% endcomment %} +
+
+
+
+
+ {% if request.user == collection.owner %} + + {% trans '编辑' %} + + + {% trans '删除' %} + + {% elif editable %} + {% trans '协助整理' %} + {% endif %} +
+ 创建于 {{ collection.created_time | date }} +
{% include "_sidebar.html" with user=collection.owner show_profile=1 %}
diff --git a/journal/templates/list_item_base.html b/journal/templates/list_item_base.html index 992ec4d1..471ab456 100644 --- a/journal/templates/list_item_base.html +++ b/journal/templates/list_item_base.html @@ -39,7 +39,7 @@ {% endif %} {% include "_item_card.html" with item=item %} -{% if mark or collection_member %} +{% if mark or collection_edit or collection_member.note %}