From e50276ac341c1ab36cf6a8bb34b1c1c9ed781c82 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 2 Sep 2019 11:33:51 +0200 Subject: [PATCH 1/3] active links --- static/css/styles2.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/css/styles2.css b/static/css/styles2.css index 254d6276..47abb303 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -355,6 +355,7 @@ } nav a, + nav a:active, a:visited, nav a i { color: white; } @@ -366,10 +367,12 @@ background: white; } + /* nav li.selected { color: #1c75bc; background: white; - } + } +*/ .nav-active, .nav-active a, From 273cf0931bc43f8577173e4b754bdb9deb05e6e4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 2 Sep 2019 11:38:31 +0200 Subject: [PATCH 2/3] small datetime bug fix --- rowers/views/workoutviews.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 4a53bce4..2e2da11d 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -3417,10 +3417,15 @@ def workout_edit_view(request,id=0,message="",successmessage=""): privacy = 'private' else: privacy = 'visible' - - startdatetime = datetime.datetime.combine( - date,starttime + + try: + startdatetime = datetime.datetime.combine( + date,starttime ) + except TypeError: + startdatetime = datetime.datetime.combine( + date,datetime.datetime.min.time() + ) try: startdatetime = pytz.timezone(thetimezone).localize( From 73ffbf7e75b6e1131b941609691de3bc4bb8755f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 2 Sep 2019 11:50:14 +0200 Subject: [PATCH 3/3] rommelen met styles --- static/css/styles2.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/static/css/styles2.css b/static/css/styles2.css index 47abb303..5cc391ec 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -355,7 +355,6 @@ } nav a, - nav a:active, a:visited, nav a i { color: white; } @@ -372,7 +371,7 @@ color: #1c75bc; background: white; } -*/ + */ .nav-active, .nav-active a,