diff --git a/catalog/templates/catalog_edit.html b/catalog/templates/catalog_edit.html index f9e2fa3e..1600d872 100644 --- a/catalog/templates/catalog_edit.html +++ b/catalog/templates/catalog_edit.html @@ -56,6 +56,6 @@ {% include "_sidebar_edit.html" %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/catalog/templates/discover.html b/catalog/templates/discover.html index 910adc4f..8ee6c09b 100644 --- a/catalog/templates/discover.html +++ b/catalog/templates/discover.html @@ -107,6 +107,6 @@ {% include "partial/_sidebar_anonymous.html" %} {% endif %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/catalog/templates/fetch_pending.html b/catalog/templates/fetch_pending.html index ab670404..1cd2ef56 100644 --- a/catalog/templates/fetch_pending.html +++ b/catalog/templates/fetch_pending.html @@ -33,6 +33,6 @@ {% include "_sidebar_search.html" %} - {% include 'partial/_footer.html' %} + {% include '_footer.html' %} diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html index 417e0851..1d51a029 100644 --- a/catalog/templates/item_base.html +++ b/catalog/templates/item_base.html @@ -415,6 +415,6 @@
- {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/catalog/templates/item_mark_list.html b/catalog/templates/item_mark_list.html index e07fc6a5..6d9e783c 100644 --- a/catalog/templates/item_mark_list.html +++ b/catalog/templates/item_mark_list.html @@ -88,6 +88,6 @@ {% include "_sidebar_item.html" %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/catalog/templates/item_review_list.html b/catalog/templates/item_review_list.html index 073bab3b..e4fe2563 100644 --- a/catalog/templates/item_review_list.html +++ b/catalog/templates/item_review_list.html @@ -82,6 +82,6 @@ {% include "_sidebar_item.html" %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/catalog/templates/search_results.html b/catalog/templates/search_results.html index 68d86460..3b3a8a0f 100644 --- a/catalog/templates/search_results.html +++ b/catalog/templates/search_results.html @@ -130,6 +130,6 @@ {% include "_sidebar_search.html" %} - {% include 'partial/_footer.html' %} + {% include '_footer.html' %} diff --git a/common/static/scss/_header.scss b/common/static/scss/_header.scss index 1c6432ad..def20879 100644 --- a/common/static/scss/_header.scss +++ b/common/static/scss/_header.scss @@ -142,20 +142,18 @@ body { padding-top: 0.4em !important; text-align: center; margin-bottom: 4px !important; - width: 100%; - .footer__border { - width: 100%; + >div { padding-top: 4px; - } - .footer__link { - margin: 0 12px; - white-space: nowrap; - min-width: 15vw; + >div { + white-space: nowrap; + min-width: 15vw; + } } @media (min-width: 769px) { + width: 60%; clear: both; position: absolute !important; left: 50%; diff --git a/common/templates/400.html b/common/templates/400.html index ac15ee85..403c8959 100644 --- a/common/templates/400.html +++ b/common/templates/400.html @@ -30,6 +30,6 @@ - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/common/templates/403.html b/common/templates/403.html index 130e08d2..11d8a213 100644 --- a/common/templates/403.html +++ b/common/templates/403.html @@ -25,6 +25,6 @@ 您可能访问了错误的网址，或者相关内容已被作者删除。如果您确信这是我们的错误，请通过页面底部的链接联系我们。 - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/common/templates/404.html b/common/templates/404.html index b550f0ee..acc18a3c 100644 --- a/common/templates/404.html +++ b/common/templates/404.html @@ -24,6 +24,6 @@ 您可能输入了一个无效的网址，或者相关内容已被作者删除。如果您确信这是我们的错误，请通过页面底部的链接联系我们。 - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/common/templates/500.html b/common/templates/500.html index 5c027123..b6e424cc 100644 --- a/common/templates/500.html +++ b/common/templates/500.html @@ -24,6 +24,6 @@ 发生了一个内部错误，如果这个错误多次出现，后台会记录并会由人工处理。如果您有紧急情况或任何疑问，请通过页面底部的链接联系我们。 - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/common/templates/_footer.html b/common/templates/_footer.html new file mode 100644 index 00000000..ce48839e --- /dev/null +++ b/common/templates/_footer.html @@ -0,0 +1,34 @@ + +
+ diff --git a/common/templates/common/error.html b/common/templates/common/error.html index 721d6dc4..17f5ec43 100644 --- a/common/templates/common/error.html +++ b/common/templates/common/error.html @@ -24,6 +24,6 @@ {{ secondary_msg|default:"" }} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/catalog/templates/common_libs.html b/common/templates/common_libs.html similarity index 100% rename from catalog/templates/common_libs.html rename to common/templates/common_libs.html diff --git a/common/templates/developer.html b/common/templates/developer.html index 8368f0be..ddf14095 100644 --- a/common/templates/developer.html +++ b/common/templates/developer.html @@ -65,6 +65,6 @@ }) - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/common/templates/partial/_announcement.html b/common/templates/partial/_announcement.html deleted file mode 100644 index 82b407ba..00000000 --- a/common/templates/partial/_announcement.html +++ /dev/null @@ -1,52 +0,0 @@ -{% load static %} -{% load i18n %} -{% load admin_url %} -{% load mastodon %} -{% load oauth_token %} -{% load truncate %} -{% load thumb %} -
- -
-
-

{% trans '公告' %}

- - - -
-
-
    - {% for ann in request.user.unread_announcements %} -
  • - -
    {{ ann.title }}
    -     - {{ ann.created_time }} -

    {{ ann.get_plain_content | truncate:200 }}

    -
    • - {% if not forloop.last %}
    {% endif %} - {% endfor %} -
-
- {% trans '查看全部公告' %} -
-
-
-
-
- diff --git a/common/templates/partial/_footer.html b/common/templates/partial/_footer.html deleted file mode 100644 index ddefdc83..00000000 --- a/common/templates/partial/_footer.html +++ /dev/null @@ -1,36 +0,0 @@ - -
- diff --git a/common/templates/partial/_navbar.html b/common/templates/partial/_navbar.html deleted file mode 100644 index 4841e0c6..00000000 --- a/common/templates/partial/_navbar.html +++ /dev/null @@ -1,97 +0,0 @@ -{% load static %} -{% load i18n %} -{% load admin_url %} -
- -
-{% if messages %} -
- -
-{% endif %} diff --git a/journal/templates/collection.html b/journal/templates/collection.html index a3a2068a..acf26988 100644 --- a/journal/templates/collection.html +++ b/journal/templates/collection.html @@ -131,6 +131,6 @@ {% include "_sidebar.html" with user=collection.owner show_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/collection_edit.html b/journal/templates/collection_edit.html index 9c0a9bfe..70414b2d 100644 --- a/journal/templates/collection_edit.html +++ b/journal/templates/collection_edit.html @@ -55,6 +55,6 @@ {% include "_sidebar.html" with show_profile=1 fold_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/piece_delete.html b/journal/templates/piece_delete.html index 804b6f05..946931eb 100644 --- a/journal/templates/piece_delete.html +++ b/journal/templates/piece_delete.html @@ -37,6 +37,6 @@ - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/profile.html b/journal/templates/profile.html index 4d61870c..1c9f3b40 100644 --- a/journal/templates/profile.html +++ b/journal/templates/profile.html @@ -186,6 +186,6 @@ {% include "_sidebar.html" with show_progress=1 show_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/review.html b/journal/templates/review.html index 441b32a9..5d51b13b 100644 --- a/journal/templates/review.html +++ b/journal/templates/review.html @@ -88,6 +88,6 @@ $(this).toggleClass('revealed'); }) - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/review_edit.html b/journal/templates/review_edit.html index f057cfa6..e5effe32 100644 --- a/journal/templates/review_edit.html +++ b/journal/templates/review_edit.html @@ -125,6 +125,6 @@ Content Cell | Content Cell $(this).toggleClass('revealed'); }) - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/user_collection_list.html b/journal/templates/user_collection_list.html index 6eac7cf5..9e75e0d4 100644 --- a/journal/templates/user_collection_list.html +++ b/journal/templates/user_collection_list.html @@ -54,6 +54,6 @@ {% include "_sidebar.html" with show_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/user_item_list_base.html b/journal/templates/user_item_list_base.html index cd7765ec..b7aa51a1 100644 --- a/journal/templates/user_item_list_base.html +++ b/journal/templates/user_item_list_base.html @@ -54,6 +54,6 @@ {% include "_sidebar.html" with show_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/journal/templates/user_tag_list.html b/journal/templates/user_tag_list.html index 4f66e12f..0e321f03 100644 --- a/journal/templates/user_tag_list.html +++ b/journal/templates/user_tag_list.html @@ -36,6 +36,6 @@ {% include "_sidebar.html" with show_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/management/templates/management/detail.html b/management/templates/management/detail.html index 712feb42..188395f7 100644 --- a/management/templates/management/detail.html +++ b/management/templates/management/detail.html @@ -28,6 +28,6 @@ - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/management/templates/management/list.html b/management/templates/management/list.html index f0fe06ab..66eaf0c0 100644 --- a/management/templates/management/list.html +++ b/management/templates/management/list.html @@ -62,6 +62,6 @@

{% trans '暂无公告' %}

{% endfor %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/social/templates/feed.html b/social/templates/feed.html index e2bd09d4..11150a51 100644 --- a/social/templates/feed.html +++ b/social/templates/feed.html @@ -33,6 +33,6 @@ {% include "_sidebar.html" with show_progress=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/users/templates/users/data.html b/users/templates/users/data.html index eb1b4638..2c7f295a 100644 --- a/users/templates/users/data.html +++ b/users/templates/users/data.html @@ -232,6 +232,6 @@ {% include "_sidebar.html" with show_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/users/templates/users/manage_report.html b/users/templates/users/manage_report.html index 6ff90d7f..9c2bda0e 100644 --- a/users/templates/users/manage_report.html +++ b/users/templates/users/manage_report.html @@ -28,6 +28,6 @@ {% endfor %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html index 6fdc48a0..e888b987 100644 --- a/users/templates/users/preferences.html +++ b/users/templates/users/preferences.html @@ -142,6 +142,6 @@ {% include "_sidebar.html" with show_profile=1 %} - {% include "partial/_footer.html" %} + {% include "_footer.html" %} diff --git a/users/templates/users/relation_list.html b/users/templates/users/relation_list.html index e714f99d..09535669 100644 --- a/users/templates/users/relation_list.html +++ b/users/templates/users/relation_list.html @@ -49,7 +49,7 @@ {% include "_sidebar.html" with show_profile=1 %} - {% include 'partial/_footer.html' %} + {% include '_footer.html' %} diff --git a/users/templates/users/report.html b/users/templates/users/report.html index 46344a84..7f95b909 100644 --- a/users/templates/users/report.html +++ b/users/templates/users/report.html @@ -24,7 +24,7 @@ - {% include "partial/_footer.html" %} + {% include "_footer.html" %}