diff --git a/tildes/tildes/templates/invite.jinja2 b/tildes/tildes/templates/invite.jinja2
index 7ae3d49..09afb0f 100644
--- a/tildes/tildes/templates/invite.jinja2
+++ b/tildes/tildes/templates/invite.jinja2
@@ -1,4 +1,6 @@
-{% extends 'base_no_sidebar.jinja2' %}
+{% extends 'base.jinja2' %}
+
+{% from 'macros/user_menu.jinja2' import render_user_menu with context %}
{% block title %}Invite someone{% endblock %}
@@ -37,3 +39,7 @@
You don't currently have any invite codes available.
{% endif %}
{% endblock %}
+
+{% block sidebar %}
+ {{ render_user_menu('misc_invite') }}
+{% endblock %}
diff --git a/tildes/tildes/templates/macros/user_menu.jinja2 b/tildes/tildes/templates/macros/user_menu.jinja2
new file mode 100644
index 0000000..3b1ed4d
--- /dev/null
+++ b/tildes/tildes/templates/macros/user_menu.jinja2
@@ -0,0 +1,67 @@
+{% macro render_user_menu(current_page) %}
+ User menu
+
+ - Profile
+
+
+ - Notifications
+
+
+ - Messages
+
+
+ - Misc
+
+
+{% endmacro %}
diff --git a/tildes/tildes/templates/messages.jinja2 b/tildes/tildes/templates/messages.jinja2
index d9df80b..4ebc3b8 100644
--- a/tildes/tildes/templates/messages.jinja2
+++ b/tildes/tildes/templates/messages.jinja2
@@ -1,7 +1,8 @@
-{% extends 'base_no_sidebar.jinja2' %}
+{% extends 'base.jinja2' %}
{% from 'macros/datetime.jinja2' import time_ago_responsive %}
{% from 'macros/links.jinja2' import username_linked %}
+{% from 'macros/user_menu.jinja2' import render_user_menu with context %}
{% block title %}Message Inbox{% endblock %}
@@ -34,3 +35,7 @@
{% endfor %}
{% endblock %}
+
+{% block sidebar %}
+ {{ render_user_menu('messages_inbox') }}
+{% endblock %}
diff --git a/tildes/tildes/templates/messages_sent.jinja2 b/tildes/tildes/templates/messages_sent.jinja2
index 4cd3e0e..633abe3 100644
--- a/tildes/tildes/templates/messages_sent.jinja2
+++ b/tildes/tildes/templates/messages_sent.jinja2
@@ -3,3 +3,7 @@
{% block title %}Sent Messages{% endblock %}
{% block main_heading %}Sent Messages{% endblock %}
+
+{% block sidebar %}
+ {{ render_user_menu('messages_sent') }}
+{% endblock %}
diff --git a/tildes/tildes/templates/messages_unread.jinja2 b/tildes/tildes/templates/messages_unread.jinja2
index 708f685..87b2968 100644
--- a/tildes/tildes/templates/messages_unread.jinja2
+++ b/tildes/tildes/templates/messages_unread.jinja2
@@ -3,3 +3,7 @@
{% block title %}Unread Messages{% endblock %}
{% block main_heading %}Unread Messages{% endblock %}
+
+{% block sidebar %}
+ {{ render_user_menu('messages_unread') }}
+{% endblock %}
diff --git a/tildes/tildes/templates/notifications.jinja2 b/tildes/tildes/templates/notifications.jinja2
index 9cec6a6..7f01acf 100644
--- a/tildes/tildes/templates/notifications.jinja2
+++ b/tildes/tildes/templates/notifications.jinja2
@@ -8,3 +8,7 @@
This page shows your most recent, previously read notifications (up to a max of 100, pagination coming soon)
{{ super() }}
{% endblock %}
+
+{% block sidebar %}
+ {{ render_user_menu('notifications_prev') }}
+{% endblock %}
diff --git a/tildes/tildes/templates/notifications_unread.jinja2 b/tildes/tildes/templates/notifications_unread.jinja2
index 7ae6a63..f46df19 100644
--- a/tildes/tildes/templates/notifications_unread.jinja2
+++ b/tildes/tildes/templates/notifications_unread.jinja2
@@ -1,7 +1,8 @@
-{% extends 'base_no_sidebar.jinja2' %}
+{% extends 'base.jinja2' %}
{% from 'macros/comments.jinja2' import comment_tag_options_template, render_single_comment with context %}
{% from 'macros/links.jinja2' import group_linked %}
+{% from 'macros/user_menu.jinja2' import render_user_menu with context %}
{% block title %}Unread notifications{% endblock %}
@@ -39,3 +40,7 @@
{{ comment_tag_options_template(comment_tag_options) }}
{% endblock %}
+
+{% block sidebar %}
+ {{ render_user_menu('notifications_unread') }}
+{% endblock %}
diff --git a/tildes/tildes/templates/settings.jinja2 b/tildes/tildes/templates/settings.jinja2
index 0b6c85f..f704428 100644
--- a/tildes/tildes/templates/settings.jinja2
+++ b/tildes/tildes/templates/settings.jinja2
@@ -1,4 +1,6 @@
-{% extends 'base_no_sidebar.jinja2' %}
+{% extends 'base.jinja2' %}
+
+{% from 'macros/user_menu.jinja2' import render_user_menu with context %}
{% block title %}User settings{% endblock %}
@@ -51,3 +53,7 @@
Define a list of topic tags to filter out of listings by default
{% endblock %}
+
+{% block sidebar %}
+ {{ render_user_menu('misc_settings') }}
+{% endblock %}
diff --git a/tildes/tildes/templates/user.jinja2 b/tildes/tildes/templates/user.jinja2
index 1bb53d6..17eb33e 100644
--- a/tildes/tildes/templates/user.jinja2
+++ b/tildes/tildes/templates/user.jinja2
@@ -3,6 +3,7 @@
{% from 'macros/comments.jinja2' import render_single_comment with context %}
{% from 'macros/links.jinja2' import group_linked, username_linked %}
{% from 'macros/topics.jinja2' import render_topic_for_listing with context %}
+{% from 'macros/user_menu.jinja2' import render_user_menu with context %}
{% block title %}User: {{ user.username }}{% endblock %}
@@ -37,40 +38,7 @@
{% block sidebar %}
{% if user == request.user %}
- User menu
-
- - Notifications
-
-
- - Messages
-
-
- - Misc
-
-
+ {{ render_user_menu('profile_activity') }}
{% endif %}