widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

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

Commit message:
Loginbox rework

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/loginbox_rework/+merge/365005

Change the links in the loginbox after a user has logged in to:

Profile | Messages
Playtime Scheduler
    Logout

'Profile'and 'Messages' are links to the corresponding pages. The 'Messages' string get enhanced with '(# Number of unread messages)' if there are any.

'Playtime Scheduler' now links to the start page: https://wl.widelands.org/scheduling/main/ 


-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/loginbox_rework into lp:widelands-website.

=== modified file 'mainpage/templates/mainpage/header.html'
--- mainpage/templates/mainpage/header.html	2019-03-18 19:06:29 +0000
+++ mainpage/templates/mainpage/header.html	2019-03-24 16:57:05 +0000
@@ -30,18 +30,20 @@
 		</a>
 	</li>
 	<li class="loginBox small">
-	<!-- Login form / User information -->
 		{% if user.is_authenticated %}
+			<!-- Logged in -->
+			<a href="{% url 'profile_view' %}" title="Your Profile">Profile</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>
+				<a href="{% url 'messages_inbox' %}" title="New Messages">Messages ({{ messages_inbox_count }})</a>
+			{% else %}			
+				<a href="{% url 'messages_inbox' %}" title="Show Inbox">Messages</a>
 			{% endif %}
 			<br />
-			<a href="{% url 'scheduling_find' %}?next={{ request.path|iriencode }}" title="Show other users playtimes">Playtimes</a>
+			<a href="{% url 'scheduling_main' %}" title="Playtime Scheduler">Playtime Scheduler</a>
 			<br />
 			<a href="{% url 'logout' %}?next=/">Logout</a>
 		{% else %}
+			<!-- Not logged in -->
 			<a href="{% url 'login' %}?next={{ request.get_full_path|urlencode }}">Login/Register</a>
 		{% endif %}
 	</li>