← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands-website/inbox_link into lp:widelands-website

 

kaputtnik has proposed merging lp:~widelands-dev/widelands-website/inbox_link into lp:widelands-website.

Commit message:
Link directly to PMs inbox if new message(s) are avialable.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1804993 in Widelands Website: "Click target for accessing PMs is too small"
  https://bugs.launchpad.net/widelands-website/+bug/1804993

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/inbox_link/+merge/359673

I new PMs are available the link 'Your Profile (#)' links directly to the inbox, otherwise the link 'Your Profile' links to the profile page.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/inbox_link into lp:widelands-website.
=== modified file 'templates/header.html'
--- templates/header.html	2018-10-30 14:46:45 +0000
+++ templates/header.html	2018-11-28 08:13:37 +0000
@@ -31,9 +31,10 @@
 	<li class="loginBox small">
 	<!-- Login form / User information -->
 		{% if user.is_authenticated %}
-			<a href="{% url 'profile_view' %}" title="You are logged in as {{ user }}">Your Profile</a>
-			{% if messages_inbox_count > 0 %}
-				<a href="{% url 'messages_inbox' %}" title="Number of Private Messages">({{ messages_inbox_count }})</a>
+			{% if messages_inbox_count %}
+				<a href="{% url 'messages_inbox' %}" title="Show Inbox">Your Profile ({{ messages_inbox_count }})</a>
+			{% else %}
+				<a href="{% url 'profile_view' %}" title="Show Profile">Your Profile</a>
 			{% endif %}
 			<br />
 			<a href="{% url 'scheduling_find' %}?next={{ request.path|iriencode }}" title="Show other users playtimes">Playtimes</a>


Follow ups