diff --git a/catalog/templates/common_libs.html b/catalog/templates/common_libs.html index 769e942d..49864f2f 100644 --- a/catalog/templates/common_libs.html +++ b/catalog/templates/common_libs.html @@ -35,7 +35,7 @@ - + diff --git a/catalog/templates/edition.html b/catalog/templates/edition.html index e09d946c..8c219956 100644 --- a/catalog/templates/edition.html +++ b/catalog/templates/edition.html @@ -98,8 +98,8 @@
{% trans '借阅或购买' %}
- {% trans 'WorldCat' %} - {% trans 'Open Library' %} + {% trans 'WorldCat' %} + {% trans 'Open Library' %}
diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html index 5e0d62d6..d4cb71bd 100644 --- a/catalog/templates/item_base.html +++ b/catalog/templates/item_base.html @@ -41,7 +41,7 @@
- + {{ item.title }} @@ -148,7 +148,7 @@ {% endif %} {% if others_mark.shelfmember.metadata.shared_link %} - {{ others_mark.created_time | date }} + {{ others_mark.created_time | date }} {% else %} {{ others_mark.created_time | date }} {% endif %} diff --git a/catalog/templates/item_mark_list.html b/catalog/templates/item_mark_list.html index 75395a50..8645f240 100644 --- a/catalog/templates/item_mark_list.html +++ b/catalog/templates/item_mark_list.html @@ -47,7 +47,7 @@ {% endif %} {% if others_mark.metadata.shared_link %} - {{ others_mark.mark.created_time|date }} + {{ others_mark.mark.created_time|date }} {% else %} {{ others_mark.mark.created_time|date }} {% endif %} diff --git a/catalog/templates/movie.html b/catalog/templates/movie.html index 45635703..4cd79cab 100644 --- a/catalog/templates/movie.html +++ b/catalog/templates/movie.html @@ -45,7 +45,7 @@ {% endif %}
{% if item.imdb %} - {% trans 'IMDb：' %}{{ item.imdb }} + {% trans 'IMDb：' %}{{ item.imdb }} {% endif %}
{% if item.director %}{% trans '导演：' %} @@ -144,7 +144,7 @@ {% endfor %} {% endif %}
{% if item.site %}{% trans '网站：' %} - {{ item.site|strip_scheme }} + {{ item.site|strip_scheme }} {% endif %}
{% if item.other_info %} {% for k, v in item.other_info.items %} diff --git a/catalog/templates/podcast_episode_data.html b/catalog/templates/podcast_episode_data.html index c00cb5d7..fb9c3728 100644 --- a/catalog/templates/podcast_episode_data.html +++ b/catalog/templates/podcast_episode_data.html @@ -32,7 +32,7 @@ - +
diff --git a/catalog/templates/tvseason.html b/catalog/templates/tvseason.html index 8a4dde7d..e18b3816 100644 --- a/catalog/templates/tvseason.html +++ b/catalog/templates/tvseason.html @@ -45,7 +45,7 @@ {% endif %}
{% if item.imdb %} - {% trans 'IMDb：' %}{{ item.imdb }} + {% trans 'IMDb：' %}{{ item.imdb }} {% endif %}
{% if item.director %}{% trans '导演：' %} @@ -158,7 +158,7 @@ {% endfor %} {% endif %}
{% if item.site %}{% trans '网站：' %} - {{ item.site|strip_scheme }} + {{ item.site|strip_scheme }} {% endif %}
{% if item.other_info %} {% for k, v in item.other_info.items %} diff --git a/catalog/templates/tvshow.html b/catalog/templates/tvshow.html index 3ce7dcd3..a1fbe321 100644 --- a/catalog/templates/tvshow.html +++ b/catalog/templates/tvshow.html @@ -45,7 +45,7 @@ {% endif %}
{% if item.imdb %} - {% trans 'IMDb：' %}{{ item.imdb }} + {% trans 'IMDb：' %}{{ item.imdb }} {% endif %}
{% if item.director %}{% trans '导演：' %} @@ -156,7 +156,7 @@ {% endfor %} {% endif %}
{% if item.site %}{% trans '网站：' %} - {{ item.site|strip_scheme }} + {{ item.site|strip_scheme }} {% endif %}
{% if item.other_info %} {% for k, v in item.other_info.items %} diff --git a/common/static/js/mastodon.js b/common/static/js/mastodon.js index 0ef0a187..ce1d8a58 100644 --- a/common/static/js/mastodon.js +++ b/common/static/js/mastodon.js @@ -100,38 +100,6 @@ async function getFollowing(id, mastodonURI, token, callback) { callback(json, nextUrl); } -// { -// "id": "1", -// "username": "Gargron", -// "acct": "Gargron", -// "display_name": "Eugen", -// "locked": false, -// "bot": false, -// "created_at": "2016-03-16T14:34:26.392Z", -// "note": "

Developer of Mastodon and administrator of mastodon.social. I post service announcements, development updates, and personal stuff.

", -// "url": "https://mastodon.social/@Gargron", -// "avatar": "https://files.mastodon.social/accounts/avatars/000/000/001/original/d96d39a0abb45b92.jpg", -// "avatar_static": "https://files.mastodon.social/accounts/avatars/000/000/001/original/d96d39a0abb45b92.jpg", -// "header": "https://files.mastodon.social/accounts/headers/000/000/001/original/c91b871f294ea63e.png", -// "header_static": "https://files.mastodon.social/accounts/headers/000/000/001/original/c91b871f294ea63e.png", -// "followers_count": 318699, -// "following_count": 453, -// "statuses_count": 61013, -// "last_status_at": "2019-11-30T20:02:08.277Z", -// "emojis": [], -// "fields": [ -// { -// "name": "Patreon", -// "value": "https://www.patreon.com/mastodon", -// "verified_at": null -// }, -// { -// "name": "Homepage", -// "value": "https://zeonfederated.com", -// "verified_at": "2019-07-15T18:29:57.191+00:00" -// } -// ] -// } function getUserInfo(id, mastodonURI, token, callback) { let url = mastodonURI + API_GET_ACCOUNT.replace(":id", id); fetch(url, {headers: {'Authorization': 'Bearer ' + token}}).then((response) => response.json()).then(callback); diff --git a/common/templates/partial/_footer.html b/common/templates/partial/_footer.html index d10a5a4b..0c0b3702 100644 --- a/common/templates/partial/_footer.html +++ b/common/templates/partial/_footer.html @@ -2,14 +2,14 @@
{% if social_link %} - 关注我们 + 关注我们 {% endif %} {% if support_link %} - 问题反馈 + 问题反馈 {% endif %} - 源代码 + 源代码 {% if donation_link %} - 捐助本站 + 捐助本站 {% endif %} 公告栏
diff --git a/common/templates/partial/_sidebar.html b/common/templates/partial/_sidebar.html index c7d157cf..84a6974a 100644 --- a/common/templates/partial/_sidebar.html +++ b/common/templates/partial/_sidebar.html @@ -19,7 +19,7 @@
-

@{{ user.username }}@{{ user.mastodon_site }} +

@{{ user.username }}@{{ user.mastodon_site }} {% current_user_relationship user as relationship %} {% if relationship %} diff --git a/social/templates/activity/comment_focus_item.html b/social/templates/activity/comment_focus_item.html index 14588bb0..6a662aff 100644 --- a/social/templates/activity/comment_focus_item.html +++ b/social/templates/activity/comment_focus_item.html @@ -44,7 +44,7 @@ {% if activity.action_object.metadata.shared_link %} - + {{ activity.action_object.created_time|prettydate }} diff --git a/social/templates/activity/create_collection.html b/social/templates/activity/create_collection.html index e7b690e0..94732212 100644 --- a/social/templates/activity/create_collection.html +++ b/social/templates/activity/create_collection.html @@ -22,7 +22,7 @@

{% if activity.action_object.metadata.shared_link %} - + {{ activity.action_object.created_time|prettydate }} diff --git a/social/templates/activity/feature_collection.html b/social/templates/activity/feature_collection.html index 6423c1ce..b9cb0937 100644 --- a/social/templates/activity/feature_collection.html +++ b/social/templates/activity/feature_collection.html @@ -23,7 +23,7 @@
{% if activity.action_object.metadata.shared_link %} - + {{ activity.action_object.created_time|prettydate }} diff --git a/social/templates/activity/like_collection.html b/social/templates/activity/like_collection.html index 06902cd2..7c4784e6 100644 --- a/social/templates/activity/like_collection.html +++ b/social/templates/activity/like_collection.html @@ -22,7 +22,7 @@
{% if activity.action_object.metadata.shared_link %} - + {{ activity.action_object.created_time|prettydate }} diff --git a/social/templates/activity/mark_item.html b/social/templates/activity/mark_item.html index 926e92e8..d3660ede 100644 --- a/social/templates/activity/mark_item.html +++ b/social/templates/activity/mark_item.html @@ -44,7 +44,7 @@ {% if activity.action_object.metadata.shared_link %} - + {{ activity.action_object.created_time|prettydate }} diff --git a/social/templates/activity/review_item.html b/social/templates/activity/review_item.html index 14f5c8e7..dd277d7c 100644 --- a/social/templates/activity/review_item.html +++ b/social/templates/activity/review_item.html @@ -42,7 +42,7 @@ {% if activity.action_object.metadata.shared_link %} - + {{ activity.action_object.created_time|prettydate }} diff --git a/users/templates/users/data.html b/users/templates/users/data.html index 278f9f37..412b55ce 100644 --- a/users/templates/users/data.html +++ b/users/templates/users/data.html @@ -38,7 +38,7 @@
请在豆伴(豆坟)导出时勾选「书影音游剧」和「评论」。
- 从豆伴(豆坟)备份导出的.xlsx文件: + 从豆伴(豆坟)备份导出的.xlsx文件: