-
-
-
-
-
You haven't {% if "/saved/" in request.path %}saved{% elif "/subscribed/" in request.path %}subscribed to{% else %}made{% endif %} a post yet
-
Your {% if "/saved/" in request.path %}saved posts{% elif "/subscribed/" in request.path %}subscribed posts{% else %}posting history{% endif %} will show here.
- {% if "/saved/" not in request.path and "/subscribed/" not in request.path %}
Create a post{% endif %}
+
+
+
+ {% if u %}
+ {% if "/saved/" in request.path %}
+ {% set text = "You haven't saved any posts yet!" %}
+ {% elif "/subscribed/" in request.path %}
+ {% set text = "You haven't subscribed to any posts yet!" %}
+ {% elif v and v.id == u.id %}
+ {% set text = "You haven't made any posts yet!" %}
+ {% else %}
+ {% set text = "@" ~ u.username ~ " hasn't made any posts yet!" %}
+ {% endif %}
+ {% else %}
+ {% set text = "No posts found!" if request.path.startswith('/search') else "" %}
+ {% endif %}
+ {{macros.ghost_box(text, '', 1)}}
+
-
-
-{% endif %}
{% endfor %}
diff --git a/files/templates/userpage/comments.html b/files/templates/userpage/comments.html
index 409d15ddd..e3ce0d55f 100644
--- a/files/templates/userpage/comments.html
+++ b/files/templates/userpage/comments.html
@@ -1,31 +1,26 @@
{% extends "userpage/userpage.html" %}
{% block userpage_content %}
-
You haven't saved any comments yet
- {% elif v and v.id == u.id %} -You haven't made any comments yet
-Your commenting history will show here.
+@{{u.username}} hasn't made any comments yet
-Their commenting history will show here.
+There's no comments on {% if u.id == v.id %}your{% else %}@{{u.username}}'s{% endif %} wall yet!
+