From 1ec95bb7d08347d3363d11e8a98e997247b7eaa4 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 22 May 2023 12:41:27 -0400
Subject: [PATCH] more visual tweaks

---
 catalog/templates/item_base.html     | 2 +-
 catalog/templates/item_comments.html | 8 ++++++--
 catalog/templates/item_reviews.html  | 5 +++--
 common/static/scss/_common.scss      | 4 ----
 journal/views.py                     | 1 -
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html
index 7ed238bb..ffd7693d 100644
--- a/catalog/templates/item_base.html
+++ b/catalog/templates/item_base.html
@@ -67,7 +67,7 @@
             {% endfor %}
           </div>
           <div class="tv-tip" style="display:none;">
-            这里是全剧条目，建议选择单季标记
+            这是全剧条目，以下是可标记的单季
             {% if item.class_name == 'tvshow' %}
               {% with item.all_seasons as seasons %}
                 {% if seasons %}
diff --git a/catalog/templates/item_comments.html b/catalog/templates/item_comments.html
index ef1f5e94..f957a598 100644
--- a/catalog/templates/item_comments.html
+++ b/catalog/templates/item_comments.html
@@ -20,16 +20,20 @@
              rel="noopener"
              {% if comment.metadata.shared_link %} href="{{ comment.metadata.shared_link }}" title="打开联邦网络分享链接" {% else %} class="disabled" {% endif %}><i class="fa-solid {% if comment.visibility > 0 %} fa-lock {% else %} fa-globe {% endif %}"></i></a>
         </span>
-        <span class="timestamp">{{ comment.created_time|date }}</span>
       </span>
       <span>
         {% if comment.rating_grade %}{{ comment.rating_grade|rating_star }}{% endif %}
         <a href="{% url 'journal:user_profile' comment.owner.mastodon_username %}"
            class="nickname"
            title="@{{ comment.owner.mastodon_username }}">{{ comment.owner.display_name }}</a>
-        {{ comment.mark.action_label }}
         {% if comment.focus_item %}<a href="{{ comment.focus_item.url }}">{{ comment.focus_item.title }}</a>{% endif %}
       </span>
+      <span class="action inline">
+        <span class="timestamp">
+          {{ comment.created_time|date }}
+          {{ comment.mark.action_label }}
+        </span>
+      </span>
       <div>{{ comment.html|safe }}</div>
     </section>
   {% else %}
diff --git a/catalog/templates/item_reviews.html b/catalog/templates/item_reviews.html
index 9b0c6b19..99ad4075 100644
--- a/catalog/templates/item_reviews.html
+++ b/catalog/templates/item_reviews.html
@@ -20,14 +20,15 @@
              rel="noopener"
              {% if review.metadata.shared_link %} href="{{ review.metadata.shared_link }}" title="打开联邦网络分享链接" {% else %} class="disabled" {% endif %}><i class="fa-solid {% if review.visibility > 0 %} fa-lock {% else %} fa-globe {% endif %}"></i></a>
         </span>
-        <span class="timestamp">{{ review.created_time|date }}</span>
       </span>
       <span>
         {% if review.rating_grade %}{{ review.rating_grade|rating_star }}{% endif %}
         <a href="{% url 'journal:user_profile' review.owner.mastodon_username %}"
            class="nickname"
            title="@{{ review.owner.mastodon_username }}">{{ review.owner.display_name }}</a>
-        {{ review.mark.action_label | default:"" }}
+      </span>
+      <span class="action inline">
+        <span class="timestamp">{{ review.created_time|date }}</span>
       </span>
       <div>
         <span>
diff --git a/common/static/scss/_common.scss b/common/static/scss/_common.scss
index f39ab1ce..79254bbc 100644
--- a/common/static/scss/_common.scss
+++ b/common/static/scss/_common.scss
@@ -53,10 +53,6 @@ details {
   margin: 0;
 }
 
-section section {
-  margin-bottom: var(--pico-spacing) !important;
-}
-
 .empty {
   font-style: italic;
   font-size: 80%;
diff --git a/journal/views.py b/journal/views.py
index 6b2e34d1..1abeeec1 100644
--- a/journal/views.py
+++ b/journal/views.py
@@ -376,7 +376,6 @@ def collection_share(request, collection_uuid):
         raise BadRequest()
 
 
-@login_required
 def collection_retrieve_items(request, collection_uuid, edit=False, msg=None):
     collection = get_object_or_404(Collection, uid=get_uuid_or_404(collection_uuid))
     if not collection.is_visible_to(request.user):