From 74752754df42d4363e010a63878ab83790dd568d Mon Sep 17 00:00:00 2001 From: Shenyuan Jin Date: Tue, 30 Nov 2021 22:31:28 +0800 Subject: [PATCH] display --- app/templates/post.html | 31 ++++++++++++++++++++++++++----- app/templates/user.html | 12 ++++++------ 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/app/templates/post.html b/app/templates/post.html index da7f3ac..2af7903 100644 --- a/app/templates/post.html +++ b/app/templates/post.html @@ -122,7 +122,7 @@ })"> Share
+ border-bottom: 1px solid #ddd;margin: 30px;"> {{ post.body_html| safe }}
@@ -162,8 +162,12 @@ {% endif %} -
-

+
+

+ + + + {{ post.author.username }} {% if post.author.can(Permission.ACTIVITY) %} @@ -175,10 +179,27 @@ {% endif %}

+

+ + + + + + {{ post.author.email }} + +

-
{{ post.author.grade }}
-
{{ post.author.college }}
+
+ + + +  {{ post.author.grade }}
+
+ + + +  {{ post.author.college }}
{% if current_user.can(Permission.FOLLOW) and post.author != current_user %} {% if not current_user.is_following(post.author) %} diff --git a/app/templates/user.html b/app/templates/user.html index 0260be2..63c19c7 100644 --- a/app/templates/user.html +++ b/app/templates/user.html @@ -119,24 +119,24 @@ {% if user.can(Permission.ACTIVITY) %}
  • - MyAnnouncements + My Announcements
    • {% else %}
  • - MyTransactions + My Transactions
  • - ShoppingCart + Shopping Cart
    • {% endif %}
  • - WantToGo + Want To Go
  • - ConcernQuestion + Concern Question
  • - ConcernAnswer + Concern Answer