From da50e3389979664256e717764b956fda1d4e641a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 17 Jan 2022 20:56:32 +0100 Subject: [PATCH] adding third setting --- rowers/models.py | 7 +++++++ rowers/templates/list_workouts.html | 4 ++-- rowers/templates/workflowconfig2.html | 19 +++++-------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 1659f849..ff201d6e 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -998,6 +998,12 @@ class Rower(models.Model): choices=landingpages2, verbose_name="Alternative Landing Page") + defaultlandingpage3 = models.CharField(default='workout_view', + max_length=200, + choices=landingpages2, + verbose_name="Title link on workout list") + + # Access tokens c2token = models.CharField(default='',max_length=200,blank=True,null=True) tokenexpirydate = models.DateTimeField(blank=True,null=True) @@ -4285,6 +4291,7 @@ class AccountRowerForm(ModelForm): 'usersmooth', 'defaultlandingpage', 'defaultlandingpage2', + 'defaultlandingpage3', 'offercoaching','autojoin','emailalternatives'] widgets = { diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 8f159808..43227cc6 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -90,8 +90,8 @@ {% if workout.name != '' %}

+ href={% url rower.defaultlandingpage3 id=workout.id|encode %} + title="{{ rower.defaultlandingpage3|verbose }}"> {{ workout.name }}

diff --git a/rowers/templates/workflowconfig2.html b/rowers/templates/workflowconfig2.html index 3924505a..209d32c2 100644 --- a/rowers/templates/workflowconfig2.html +++ b/rowers/templates/workflowconfig2.html @@ -10,13 +10,6 @@

Change Workflow Page Layout for {{ rower.user.first_name }} {{ rower.user.last_name }}

    - {% if workoutid %} -
  • -

    - Return to Workout -

    -
  • - {% endif %}
  • On this page, you can configure the content of your "Workflow" page for each workout. If you want to remove an element, change it to "None". @@ -32,15 +25,13 @@

  • + {% if workoutid %}
  • - {% if rower.defaultlandingpage == 'workout_edit_view' %} -

    Default landing page is Edit View. Set default landing page to

    - Workflow View - {% else %} -

    Default landing page is Workflow View. Set default landing page to

    - Edit View - {% endif %} +

    + Return to Workout +

  • + {% endif %}