sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

small improvements

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-17 08:04:03 +02:00
parent f6cddd9baa
commit cbe09c95b5
4 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rowers/templates/laboratory.html
View File

@@ -1,41 +1,19 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Rowsandall - Analysis {% endblock %} {% block title %}Rowsandall - Analysis {% endblock %}
{% block content %} {% block main %}
<h1>The Labs</h1> <h1>The Labs</h1>
<p>This is where whacky new ideas are tested</p> <p>This is where whacky new ideas are tested</p>
<p>Rower: {{ rower.user.first_name }}</p>
<div class="grid_12 alpha">
<div class="grid_6 suffix_6 alpha">
<img src="/static/img/rivercurrent.jpg" width="400">
</div>
<div class="grid_6 alpha">
<h2>Basic</h2>
</div>
<div class="grid_6 omega">
<h2>Pro</h2>
<div class="grid_2 alpha">
<p>
{% if user|is_planmember %}
<a class="button blue small" href="/rowers/createplan">Training Target</a>
{% else %}
<a class="button blue small" href="/rowers/promembership">Training Target</a>
{% endif %}
</p>
<p>
Experiments with a training target and plan builder
</p>
</div>
</div>
</div>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_analytics.html' %}
{% endblock %}

2
rowers/templates/menu_analytics.html
View File

@@ -63,7 +63,7 @@
</a> </a>
</li> </li>
<li> <li>
<a href="/rowers/laboratory"> <a href="/rowers/laboratory/">
<i class="fas fa-flask fa-fw"></i>&nbsp;Laboratory</a> <i class="fas fa-flask fa-fw"></i>&nbsp;Laboratory</a>
</li> </li>
</ul><!-- cd-accordion-menu --> </ul><!-- cd-accordion-menu -->

8
rowers/urls.py
View File

@@ -391,10 +391,10 @@ urlpatterns = [
url(r'^developers', TemplateView.as_view(template_name='developers.html'),name='about'), url(r'^developers', TemplateView.as_view(template_name='developers.html'),name='about'),
# url(r'^compatibility', TemplateView.as_view(template_name='compatibility.html'),name='about'), # url(r'^compatibility', TemplateView.as_view(template_name='compatibility.html'),name='about'),
# url(r'^videos', TemplateView.as_view(template_name='videos.html'),name='videos'), # url(r'^videos', TemplateView.as_view(template_name='videos.html'),name='videos'),
url(r'^analysis/user/(?P<userid>\d+)', views.analysis_view,name='analysis'), url(r'^analysis/user/(?P<userid>\d+)$', views.analysis_view,name='analysis'),
url(r'^laboratory/user/(?P<userid>\d+)', views.laboratory_view,name='laboratory'), url(r'^laboratory/user/(?P<userid>\d+)$', views.laboratory_view,name='laboratory'),
url(r'^analysis', views.analysis_view,name='analysis'), url(r'^analysis/$', views.analysis_view,name='analysis'),
url(r'^laboratory', views.laboratory_view,name='laboratory'), url(r'^laboratory/$', views.laboratory_view,name='laboratory'),
url(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'), url(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'),
url(r'^starttrial$',views.start_trial_view), url(r'^starttrial$',views.start_trial_view),
url(r'^startplantrial$',views.start_plantrial_view), url(r'^startplantrial$',views.start_plantrial_view),

8
rowers/views.py
View File

@@ -1025,8 +1025,8 @@ def rower_register_view(request):
{'form':form,}) {'form':form,})
# Shows analysis page # Shows analysis page
def analysis_view(request): def analysis_view(request,userid=0):
r = getrequestrower(request) r = getrequestrower(request,userid=userid)
return render(request, return render(request,
"analysis.html", "analysis.html",
{ {
@@ -1036,8 +1036,8 @@ def analysis_view(request):
) )
# Shows laboratory page # Shows laboratory page
def laboratory_view(request): def laboratory_view(request,userid=0):
r = getrequestrower(request) r = getrequestrower(request,userid=userid)
return render(request, return render(request,
"laboratory.html", "laboratory.html",
{ {