adding third setting
This commit is contained in:
@@ -998,6 +998,12 @@ class Rower(models.Model):
|
|||||||
choices=landingpages2,
|
choices=landingpages2,
|
||||||
verbose_name="Alternative Landing Page")
|
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
|
# Access tokens
|
||||||
c2token = models.CharField(default='',max_length=200,blank=True,null=True)
|
c2token = models.CharField(default='',max_length=200,blank=True,null=True)
|
||||||
tokenexpirydate = models.DateTimeField(blank=True,null=True)
|
tokenexpirydate = models.DateTimeField(blank=True,null=True)
|
||||||
@@ -4285,6 +4291,7 @@ class AccountRowerForm(ModelForm):
|
|||||||
'usersmooth',
|
'usersmooth',
|
||||||
'defaultlandingpage',
|
'defaultlandingpage',
|
||||||
'defaultlandingpage2',
|
'defaultlandingpage2',
|
||||||
|
'defaultlandingpage3',
|
||||||
'offercoaching','autojoin','emailalternatives']
|
'offercoaching','autojoin','emailalternatives']
|
||||||
|
|
||||||
widgets = {
|
widgets = {
|
||||||
|
|||||||
@@ -90,8 +90,8 @@
|
|||||||
{% if workout.name != '' %}
|
{% if workout.name != '' %}
|
||||||
<h3>
|
<h3>
|
||||||
<a
|
<a
|
||||||
href={% url rower.defaultlandingpage id=workout.id|encode %}
|
href={% url rower.defaultlandingpage3 id=workout.id|encode %}
|
||||||
title="{{ rower.defaultlandingpage|verbose }}">
|
title="{{ rower.defaultlandingpage3|verbose }}">
|
||||||
{{ workout.name }}
|
{{ workout.name }}
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h3>
|
||||||
|
|||||||
@@ -10,13 +10,6 @@
|
|||||||
<h1>Change Workflow Page Layout for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
|
<h1>Change Workflow Page Layout for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
|
||||||
|
|
||||||
<ul class="main-content">
|
<ul class="main-content">
|
||||||
{% if workoutid %}
|
|
||||||
<li class="grid_4">
|
|
||||||
<p>
|
|
||||||
<a class="button gray small" href="/rowers/workout/{{ workoutid }}/workflow/">Return to Workout</a>
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
<li>
|
<li>
|
||||||
<p>On this page, you can configure the content of your "Workflow" page
|
<p>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".
|
for each workout. If you want to remove an element, change it to "None".
|
||||||
@@ -32,15 +25,13 @@
|
|||||||
<input class="grid_2 alpha button" type="submit" value="Save">
|
<input class="grid_2 alpha button" type="submit" value="Save">
|
||||||
</form>
|
</form>
|
||||||
</li>
|
</li>
|
||||||
|
{% if workoutid %}
|
||||||
<li>
|
<li>
|
||||||
{% if rower.defaultlandingpage == 'workout_edit_view' %}
|
<p>
|
||||||
<p>Default landing page is Edit View. Set default landing page to</p>
|
<a class="button" href="/rowers/workout/{{ workoutid }}/workflow/">Return to Workout</a>
|
||||||
<a class="button small" href="/rowers/me/workflowdefault/">Workflow View</a>
|
</p>
|
||||||
{% else %}
|
|
||||||
<p>Default landing page is Workflow View. Set default landing page to</p>
|
|
||||||
<a class="button small" href="/rowers/me/workflowdefault/">Edit View</a>
|
|
||||||
{% endif %}
|
|
||||||
</li>
|
</li>
|
||||||
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user