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( diff --git a/static/css/styles2.css b/static/css/styles2.css index 254d6276..5cc391ec 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -366,10 +366,12 @@ background: white; } + /* nav li.selected { color: #1c75bc; background: white; - } + } + */ .nav-active, .nav-active a,