Trimardio has proposed merging 
lp:~widelands-dev/widelands-website/scheduling_minor_fix into 
lp:widelands-website.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/scheduling_minor_fix/+merge/341060
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands-website/scheduling_minor_fix into 
lp:widelands-website.
=== modified file 'media/js/scheduling.js'
--- media/js/scheduling.js	2018-02-16 15:38:34 +0000
+++ media/js/scheduling.js	2018-03-07 18:12:33 +0000
@@ -22,12 +22,13 @@
     var browserTimeZone = - new Date().getTimezoneOffset()/60
     if ( browserTimeZone != userTimeZone) {
         document.getElementById('timezone-error').removeAttribute("hidden");
-        profilTime = document.getElementsByClassName('profil-time');
-        for (var element in profilTime) {
-            profilTime[element].innerHTML = cleanAndAddSign(userTimeZone);
-        }
-        document.getElementById('browser-time').innerHTML = cleanAndAddSign(browserTimeZone);
-    }
+    }
+    profilTime = document.getElementsByClassName('profil-time');
+    for (var element in profilTime) {
+        profilTime[element].innerHTML = cleanAndAddSign(userTimeZone);
+    }
+
+    document.getElementById('browser-time').innerHTML = cleanAndAddSign(browserTimeZone);
 }
 
 function addPreviousDateFromUser(calendar) {

=== modified file 'templates/login_box.html'
--- templates/login_box.html	2018-02-17 11:29:38 +0000
+++ templates/login_box.html	2018-03-07 18:12:33 +0000
@@ -2,6 +2,7 @@
 
 <!-- Login form / User information -->
 {% if user.is_authenticated %}
+<<<<<<< TREE
 	<div class="small posLeft">
 		Welcome {{ user|user_link }},<br/>
 		<a href="{% url 'scheduling_main' %}">Playtime Scheduler</a>
@@ -20,6 +21,26 @@
 			<li><a href="{% url 'auth_logout' %}?next={{ request.path|iriencode }}">Logout</a></li>
 		</ul>
 	</div>
+=======
+<div class="small posLeft">
+	Welcome {{ user|user_link }}<br/>
+    <a href="{% url 'scheduling_main' %}">Playtime scheduler</a>
+</div>
+<div class="right small posRight">
+	<ul>
+		<li>
+			{% if messages_inbox_count %}
+			<a href="{% url 'messages_inbox' %}" title="You have {{ messages_inbox_count }} new messages">Messages ({{ messages_inbox_count }})</a>
+			{% else %}
+			<a href="{% url 'messages_inbox' %}" title="No new message">Messages</a>
+			{% endif %}
+		</li>
+		<li><a href="{% url 'notification_notices' %}">Notifications</a></li>
+		<li><a href="{% url 'profile_edit' %}">Edit Profile</a></li>
+		<li><a href="{% url 'auth_logout' %}?next={{ request.path|iriencode }}">Logout</a></li>
+	</ul>
+</div>
+>>>>>>> MERGE-SOURCE
 {% else %}
 	<h4>Login</h4>
 	<div class="small center">

_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to     : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to