default landing page toggle button on workflow config
This commit is contained in:
@@ -43,7 +43,16 @@
|
|||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="grid_2 suffix_8 omega">
|
<div class="grid_2">
|
||||||
|
{% if user.is_authenticated and user == rower.user %}
|
||||||
|
<p>
|
||||||
|
<a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}/workflow">Workflow View</a>
|
||||||
|
</p>
|
||||||
|
{% else %}
|
||||||
|
<p> </p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
<div class="grid_2 suffix_6 omega">
|
||||||
{% if user.is_authenticated and user == rower.user %}
|
{% if user.is_authenticated and user == rower.user %}
|
||||||
<p>
|
<p>
|
||||||
<a class="button red small" href="/rowers/graph/{{ graph.id }}/deleteconfirm">Delete Chart</a>
|
<a class="button red small" href="/rowers/graph/{{ graph.id }}/deleteconfirm">Delete Chart</a>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<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".
|
||||||
You can add one new element at a time.</p>
|
You can add one new element at a time.</p>
|
||||||
<div class="grid_6 alpha">
|
<div class="grid_4 alpha">
|
||||||
<h2>Left Panel</h2>
|
<h2>Left Panel</h2>
|
||||||
<form enctype="multipart/form-data" action="" method="post">
|
<form enctype="multipart/form-data" action="" method="post">
|
||||||
{{ leftpanel_formset.management_form }}
|
{{ leftpanel_formset.management_form }}
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grid_6 omega ">
|
<div class="grid_4">
|
||||||
<h2>Middle Panel</h2>
|
<h2>Middle Panel</h2>
|
||||||
<form enctype="multipart/form-data" action="" method="post">
|
<form enctype="multipart/form-data" action="" method="post">
|
||||||
{{ middlepanel_formset.management_form }}
|
{{ middlepanel_formset.management_form }}
|
||||||
@@ -45,6 +45,18 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="grid_4 omega">
|
||||||
|
<div class="grid_2 prefix_2 alpha">
|
||||||
|
{% if rower.defaultlandingpage == 'workout_edit_view' %}
|
||||||
|
<p>Default landing page is Edit View. Set default landing page to</p>
|
||||||
|
<a class="button green small" href="/rowers/me/workflowdefault">Workflow View</a>
|
||||||
|
{% else %}
|
||||||
|
<p>Default landing page is Workflow View. Set default landing page to</p>
|
||||||
|
<a class="button green small" href="/rowers/me/workflowdefault">Edit View</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -320,6 +320,7 @@ urlpatterns = [
|
|||||||
url(r'^me/favoritecharts/$',views.rower_favoritecharts_view),
|
url(r'^me/favoritecharts/$',views.rower_favoritecharts_view),
|
||||||
url(r'^me/workflowconfig$',views.workout_workflow_config_view),
|
url(r'^me/workflowconfig$',views.workout_workflow_config_view),
|
||||||
url(r'^me/workflowconfig2$',views.workout_workflow_config2_view),
|
url(r'^me/workflowconfig2$',views.workout_workflow_config2_view),
|
||||||
|
url(r'^me/workflowdefault$',views.workflow_default_view),
|
||||||
url(r'^email/send/$', views.sendmail),
|
url(r'^email/send/$', views.sendmail),
|
||||||
url(r'^email/thankyou/$', TemplateView.as_view(template_name='thankyou.html'), name='thankyou'),
|
url(r'^email/thankyou/$', TemplateView.as_view(template_name='thankyou.html'), name='thankyou'),
|
||||||
url(r'^email/$', TemplateView.as_view(template_name='email.html'), name='email'),
|
url(r'^email/$', TemplateView.as_view(template_name='email.html'), name='email'),
|
||||||
|
|||||||
@@ -6147,7 +6147,23 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance',
|
|||||||
'plottype':plottype,
|
'plottype':plottype,
|
||||||
'promember':promember,
|
'promember':promember,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Change default landing page
|
||||||
|
@login_required()
|
||||||
|
def workflow_default_view(request):
|
||||||
|
r = getrower(request.user)
|
||||||
|
if r.defaultlandingpage == 'workout_edit_view':
|
||||||
|
r.defaultlandingpage = 'workout_workflow_view'
|
||||||
|
else:
|
||||||
|
r.defaultlandingpage = 'workout_edit_view'
|
||||||
|
|
||||||
|
r.save()
|
||||||
|
|
||||||
|
url = reverse(workout_workflow_config2_view)
|
||||||
|
|
||||||
|
return HttpResponseRedirect(url)
|
||||||
|
|
||||||
|
|
||||||
# Workflow Configuration
|
# Workflow Configuration
|
||||||
@login_required()
|
@login_required()
|
||||||
def workout_workflow_config_view(request):
|
def workout_workflow_config_view(request):
|
||||||
@@ -6257,10 +6273,10 @@ def workout_workflow_config2_view(request):
|
|||||||
|
|
||||||
|
|
||||||
tmplt = 'workflowconfig2.html'
|
tmplt = 'workflowconfig2.html'
|
||||||
|
|
||||||
return render(request,tmplt,
|
return render(request,tmplt,
|
||||||
{
|
{
|
||||||
'rower':r,
|
'rower':getrower(request.user),
|
||||||
'leftpanel_formset':leftpanel_formset,
|
'leftpanel_formset':leftpanel_formset,
|
||||||
'middlepanel_formset':middlepanel_formset,
|
'middlepanel_formset':middlepanel_formset,
|
||||||
'workoutid': workoutid,
|
'workoutid': workoutid,
|
||||||
|
|||||||
Reference in New Issue
Block a user