From 51d403d3c075a6f57d5d2687d8459044c3c5e045 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 11 Jun 2022 00:31:33 -0400 Subject: [PATCH] show timeline and profile link on nav bar --- common/templates/partial/_navbar.html | 3 ++- common/views.py | 4 ++-- users/templates/users/preferences.html | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/templates/partial/_navbar.html b/common/templates/partial/_navbar.html index 660bba39..5af05c18 100644 --- a/common/templates/partial/_navbar.html +++ b/common/templates/partial/_navbar.html @@ -26,7 +26,8 @@ {% if request.user.is_authenticated %} - {% trans '首页' %} + {% trans '动态' %} + {% trans '主页' %} {% trans '数据' %} {% trans '设置' %} {% trans '登出' %} diff --git a/common/views.py b/common/views.py index befe54d8..bba71936 100644 --- a/common/views.py +++ b/common/views.py @@ -35,9 +35,9 @@ logger = logging.getLogger(__name__) @login_required def home(request): if request.user.get_preference().classic_homepage: - return user_home(request, request.user.id) + return redirect(reverse("users:home", args=[request.user.mastodon_username])) else: - return user_timeline(request) + return redirect(reverse("timeline:timeline")) @login_required diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html index 4e83cec0..6a0c115a 100644 --- a/users/templates/users/preferences.html +++ b/users/templates/users/preferences.html @@ -43,10 +43,10 @@ 仅自己
- {% trans '使用个人主页作为首页:' %} + {% trans '登录后显示个人主页:' %}
- +