force week view to display Monday by default (#1137)

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index ee673f476db0af24a88dee270f0adf762cdc5d13..90b108de602a0d080226262e2dc93f53ea150e1e 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -152,7 +152,7 @@ def weekview(year=None, week=None):
 def weeknav(year=None, week=None, weekday=None):
     year = year if year else datetime.today().isocalendar()[0]
     week = week if week else datetime.today().isocalendar()[1]
-    weekday = weekday if weekday else datetime.today().weekday()
+    weekday = weekday if weekday is not None else datetime.today().weekday()
 
     date = utils.tofirstdayinisoweek(year, week)
     date = datetime(*date.timetuple()[:3])

diff --git a/panikweb_templates/templates/program.html b/panikweb_templates/templates/program.html
index 388458f0013381e8224ea7c7c6cdebb53e7935a2..e1b1e4078f6cf80f981f8f803c8d1dfc3e8a159f 100644 (file)
--- a/panikweb_templates/templates/program.html
+++ b/panikweb_templates/templates/program.html
@@ -16,7 +16,7 @@
                                Du {{week_first_day|date:"l j N"}} au {{week_last_day|date:"l j N"}}
                </nav>
        </div>
-       {% weeknav year=year week=week %}
+       {% weeknav year=year week=week weekday=0 %}
 </div>
 <div class="wrapper">
        <div class="program">