+
+
+ {{ site_name }}
+ {% include "common_libs.html" with jquery=0 v2=1 %}
+
+
+ {% include "_header.html" %}
+
+
+
+
{{ msg }}
+
+ {{ secondary_msg|default:"" }}
+
+
+ {% include "_footer.html" %}
+
+
diff --git a/doc/configuration.md b/doc/configuration.md
index d5689ca6..59302814 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -10,12 +10,12 @@ most settings resides in `settings.py`, a few notable ones:
- `SITE_INFO['site_name']` change by you need
- `CLIENT_NAME` site name shown in Mastodon app page
- `APP_WEBSITE` external root url for your side
- - `REDIRECT_URIS` this should be `APP_WEBSITE + "/users/OAuth2_login/"` . It can be multiple urls separated by `\n` , but not all Fediverse software support it well. Also note changing this later may invalidate app token granted previously
+ - `REDIRECT_URIS` this should be `APP_WEBSITE + "/account/login/oauth"` . It can be multiple urls separated by `\n` , but not all Fediverse software support it well. Also note changing this later may invalidate app token granted previously
- `MASTODON_ALLOW_ANY_SITE` set to `True` so that user can login via any Mastodon API compatible sites (e.g. Mastodon/Pleroma)
- `MASTODON_CLIENT_SCOPE` change it later may invalidate app token granted previously
- `ADMIN_URL` admin page url, keep it private
- `SEARCH_BACKEND` should be either `TYPESENSE` or `MEILISEARCH` so that search and index can function. `None` will use default database search, which is for development only and may gets deprecated soon.
-
+
Settings for Scrapers
---------------------
diff --git a/journal/forms.py b/journal/forms.py
index 8dbc419d..479b9383 100644
--- a/journal/forms.py
+++ b/journal/forms.py
@@ -16,7 +16,7 @@ class ReviewForm(forms.ModelForm):
title = forms.CharField(label=_("评论标题"))
body = MarkdownxFormField(label=_("评论正文 (Markdown格式可参考下方语法范例)"), strip=False)
share_to_mastodon = forms.BooleanField(
- label=_("分享到联邦网络"), initial=False, required=False
+ label=_("分享到联邦宇宙"), initial=False, required=False
)
id = forms.IntegerField(required=False, widget=forms.HiddenInput())
visibility = forms.TypedChoiceField(
@@ -38,7 +38,7 @@ class CollectionForm(forms.ModelForm):
# id = forms.IntegerField(required=False, widget=forms.HiddenInput())
title = forms.CharField(label=_("标题"))
brief = MarkdownxFormField(label=_("介绍 (Markdown)"), strip=False)
- # share_to_mastodon = forms.BooleanField(label=_("分享到联邦网络"), initial=True, required=False)
+ # share_to_mastodon = forms.BooleanField(label=_("分享到联邦宇宙"), initial=True, required=False)
visibility = forms.TypedChoiceField(
label=_("可见性"),
initial=0,
diff --git a/journal/templates/_list_item.html b/journal/templates/_list_item.html
index 91d34176..72804dc6 100644
--- a/journal/templates/_list_item.html
+++ b/journal/templates/_list_item.html
@@ -55,7 +55,7 @@
+ {% if mark.metadata.shared_link %} href="{{ mark.metadata.shared_link }}" title="打开联邦宇宙分享链接" {% else %} class="disabled" {% endif %}>
{{ mark.created_time|date }}
@@ -91,7 +91,7 @@
+ {% if mark.review.metadata.shared_link %} href="{{ mark.review.metadata.shared_link }}" title="打开联邦宇宙分享链接" {% else %} class="disabled" {% endif %}>
{{ mark.review.created_time|date }}
diff --git a/journal/templates/collection.html b/journal/templates/collection.html
index 170ce85c..8d7edda2 100644
--- a/journal/templates/collection.html
+++ b/journal/templates/collection.html
@@ -44,7 +44,7 @@
hx-get="{% url 'journal:collection_share' collection.uuid %}"
hx-target="body"
hx-swap="beforeend"
- title="分享到联邦网络">
+ title="分享到联邦宇宙">
{% endif %}
diff --git a/journal/templates/comment.html b/journal/templates/comment.html
index e490d5e0..5adbd1d8 100644
--- a/journal/templates/comment.html
+++ b/journal/templates/comment.html
@@ -36,7 +36,7 @@
id="id_share_to_mastodon"
value="1"
{% if not request.user.preference.default_no_share %}checked{% endif %}>
- 分享到联邦网络
+ 分享到联邦宇宙