widelands-dev team mailing list archive

[Trimardio <gschmitlin@xxxxxxxxx>]

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/341061
-- 
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:27:14 +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:27:14 +0000
@@ -3,7 +3,7 @@
 <!-- Login form / User information -->
 {% if user.is_authenticated %}
 	<div class="small posLeft">
-		Welcome {{ user|user_link }},<br/>
+		Welcome {{ user|user_link }}<br/>
 		<a href="{% url 'scheduling_main' %}">Playtime Scheduler</a>
 	</div>
 	<div class="right small posRight">