diff --git a/app/templates/users/account.html b/app/templates/users/account.html index 9d6fb31..69439af 100644 --- a/app/templates/users/account.html +++ b/app/templates/users/account.html @@ -28,8 +28,8 @@ Forums {% if user.forums_username %} - - Connected + + Connected [{{ user.forums_username }}] {% else %} Please PM rubenwardy @@ -41,17 +41,15 @@ GitHub {% if user.github_username %} -

- Connected -

+ + Connected [{{ user.github_username }}] + {% if user == current_user %} -

- View ContentDB's GitHub Permissions -

+ View ContentDB's GitHub Permissions {% endif %} {% elif user == current_user %} - Link Github + Link Github {% else %} None {% endif %} diff --git a/app/templates/users/delete.html b/app/templates/users/delete.html index 3aa0dd3..9e9057f 100644 --- a/app/templates/users/delete.html +++ b/app/templates/users/delete.html @@ -17,11 +17,12 @@ {{ _("This will delete your account, removing %(threads)d threads and %(replies)d replies.", threads=user.threads.count(), replies=user.replies.count()) }}

- {% else %} + {% else %}

- {{ _("As you have packages and/or forum threads, your account can be fully deleted.") }} + {{ _("As you have packages and/or forum threads, your account cannot be fully deleted.") }} {{ _("Instead, your account will be deactivated and all personal information wiped - including %(threads)d threads and %(replies)d replies.", threads=user.threads.count(), replies=user.replies.count()) }} + {{ _("See the privacy policy for more information.") }}

{% endif %} diff --git a/app/templates/users/profile.html b/app/templates/users/profile.html index 4a12b71..dbbf1a3 100644 --- a/app/templates/users/profile.html +++ b/app/templates/users/profile.html @@ -6,17 +6,23 @@ {% block content %} -{% if user.can_see_edit_profile(current_user) %} - - Edit Profile - -{% endif %} -
- + Profile picture
+ {% if user.can_see_edit_profile(current_user) %} + + {{ _("Edit Profile") }} + + {% endif %} + + {% if current_user.rank.atLeast(current_user.rank.MODERATOR) and user.email %} + + {{ _("Send Email") }} + + {% endif %} +

{{ user.display_name }}