From 02dbe48443c46a88ea1ae5f317cf53831a717f05 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 22 Sep 2018 22:59:22 +0200 Subject: [PATCH 1/4] created all the menus --- rowers/templates/menu_analytics.html | 28 ++++++++++++++ rowers/templates/menu_help.html | 23 +++++++++++ rowers/templates/menu_plan.html | 32 +++++++++++++++ rowers/templates/menu_profile.html | 18 +++++++++ rowers/templates/menu_racing.html | 11 ++++++ rowers/templates/menu_teams.html | 15 +++++++ rowers/templates/menu_workout.html | 58 ++++++++++++++++++++++++++++ rowers/templates/redesign.html | 2 +- 8 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 rowers/templates/menu_analytics.html create mode 100644 rowers/templates/menu_help.html create mode 100644 rowers/templates/menu_plan.html create mode 100644 rowers/templates/menu_profile.html create mode 100644 rowers/templates/menu_racing.html create mode 100644 rowers/templates/menu_teams.html create mode 100644 rowers/templates/menu_workout.html diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html new file mode 100644 index 00000000..3135d325 --- /dev/null +++ b/rowers/templates/menu_analytics.html @@ -0,0 +1,28 @@ + diff --git a/rowers/templates/menu_help.html b/rowers/templates/menu_help.html new file mode 100644 index 00000000..b47e0471 --- /dev/null +++ b/rowers/templates/menu_help.html @@ -0,0 +1,23 @@ + + diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html new file mode 100644 index 00000000..debccd1d --- /dev/null +++ b/rowers/templates/menu_plan.html @@ -0,0 +1,32 @@ + diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html new file mode 100644 index 00000000..7744eea6 --- /dev/null +++ b/rowers/templates/menu_profile.html @@ -0,0 +1,18 @@ + + diff --git a/rowers/templates/menu_racing.html b/rowers/templates/menu_racing.html new file mode 100644 index 00000000..cd2ca482 --- /dev/null +++ b/rowers/templates/menu_racing.html @@ -0,0 +1,11 @@ + diff --git a/rowers/templates/menu_teams.html b/rowers/templates/menu_teams.html new file mode 100644 index 00000000..cd3c948e --- /dev/null +++ b/rowers/templates/menu_teams.html @@ -0,0 +1,15 @@ + + diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html new file mode 100644 index 00000000..eb429c92 --- /dev/null +++ b/rowers/templates/menu_workout.html @@ -0,0 +1,58 @@ + diff --git a/rowers/templates/redesign.html b/rowers/templates/redesign.html index 79779d35..4ac81a70 100644 --- a/rowers/templates/redesign.html +++ b/rowers/templates/redesign.html @@ -11,5 +11,5 @@ {% endblock %} {% block sidebar %} -{% include 'menu_workouts.html' %} +{% include 'menu_plan.html' %} {% endblock %} From eccb3233ea4329880937545a068acae0a5e9d6ff Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 23 Sep 2018 10:01:27 +0200 Subject: [PATCH 2/4] test pages --- rowers/templates/help.html | 15 +++++++++++++++ rowers/templates/redesign.html | 2 +- rowers/templates/redesign_analysis.html | 15 +++++++++++++++ rowers/templates/redesign_plan.html | 15 +++++++++++++++ rowers/templates/redesign_profile.html | 15 +++++++++++++++ rowers/templates/redesign_racing.html | 15 +++++++++++++++ rowers/templates/redesign_teams.html | 15 +++++++++++++++ rowers/templates/redesign_workout.html | 15 +++++++++++++++ rowers/templates/redesign_workouts.html | 15 +++++++++++++++ rowers/urls.py | 24 ++++++++++++++++++++++++ templates/newbase.html | 17 +++++++++-------- 11 files changed, 154 insertions(+), 9 deletions(-) create mode 100644 rowers/templates/help.html create mode 100644 rowers/templates/redesign_analysis.html create mode 100644 rowers/templates/redesign_plan.html create mode 100644 rowers/templates/redesign_profile.html create mode 100644 rowers/templates/redesign_racing.html create mode 100644 rowers/templates/redesign_teams.html create mode 100644 rowers/templates/redesign_workout.html create mode 100644 rowers/templates/redesign_workouts.html diff --git a/rowers/templates/help.html b/rowers/templates/help.html new file mode 100644 index 00000000..d3e3f858 --- /dev/null +++ b/rowers/templates/help.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_help.html' %} +{% endblock %} diff --git a/rowers/templates/redesign.html b/rowers/templates/redesign.html index 4ac81a70..79779d35 100644 --- a/rowers/templates/redesign.html +++ b/rowers/templates/redesign.html @@ -11,5 +11,5 @@ {% endblock %} {% block sidebar %} -{% include 'menu_plan.html' %} +{% include 'menu_workouts.html' %} {% endblock %} diff --git a/rowers/templates/redesign_analysis.html b/rowers/templates/redesign_analysis.html new file mode 100644 index 00000000..7fc572de --- /dev/null +++ b/rowers/templates/redesign_analysis.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_analytics.html' %} +{% endblock %} diff --git a/rowers/templates/redesign_plan.html b/rowers/templates/redesign_plan.html new file mode 100644 index 00000000..4ac81a70 --- /dev/null +++ b/rowers/templates/redesign_plan.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_plan.html' %} +{% endblock %} diff --git a/rowers/templates/redesign_profile.html b/rowers/templates/redesign_profile.html new file mode 100644 index 00000000..896712fa --- /dev/null +++ b/rowers/templates/redesign_profile.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_profile.html' %} +{% endblock %} diff --git a/rowers/templates/redesign_racing.html b/rowers/templates/redesign_racing.html new file mode 100644 index 00000000..a5f72774 --- /dev/null +++ b/rowers/templates/redesign_racing.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_racing.html' %} +{% endblock %} diff --git a/rowers/templates/redesign_teams.html b/rowers/templates/redesign_teams.html new file mode 100644 index 00000000..46e03a4b --- /dev/null +++ b/rowers/templates/redesign_teams.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_teams.html' %} +{% endblock %} diff --git a/rowers/templates/redesign_workout.html b/rowers/templates/redesign_workout.html new file mode 100644 index 00000000..96b24cb4 --- /dev/null +++ b/rowers/templates/redesign_workout.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_workout.html' %} +{% endblock %} diff --git a/rowers/templates/redesign_workouts.html b/rowers/templates/redesign_workouts.html new file mode 100644 index 00000000..79779d35 --- /dev/null +++ b/rowers/templates/redesign_workouts.html @@ -0,0 +1,15 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block main %} +

Main

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+

Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh fermentum in. +

+{% endblock %} + +{% block sidebar %} +{% include 'menu_workouts.html' %} +{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index 5af2a07f..24fe4aeb 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -285,6 +285,30 @@ urlpatterns = [ url(r'^redesign$',TemplateView.as_view( template_name='redesign.html'),name='redesign' ), + url(r'^new_workouts$',TemplateView.as_view( + template_name='redesign_workouts.html'),name='redesign' + ), + url(r'^new_workout$',TemplateView.as_view( + template_name='redesign_workout.html'),name='redesign' + ), + url(r'^new_plan$',TemplateView.as_view( + template_name='redesign_plan.html'),name='redesign' + ), + url(r'^new_profile$',TemplateView.as_view( + template_name='redesign_profile.html'),name='redesign' + ), + url(r'^new_racing$',TemplateView.as_view( + template_name='redesign_racing.html'),name='redesign' + ), + url(r'^new_teams$',TemplateView.as_view( + template_name='redesign_teams.html'),name='redesign' + ), + url(r'^help$',TemplateView.as_view( + template_name='help.html'),name='help' + ), + url(r'^new_analysis$',TemplateView.as_view( + template_name='redesign_analysis.html'),name='redesign' + ), url(r'^physics$',TemplateView.as_view(template_name='physics.html'),name='physics'), url(r'^partners$',TemplateView.as_view(template_name='partners.html'),name='partners'), url(r'^workout/(?P\d+)/$',views.workout_view), diff --git a/templates/newbase.html b/templates/newbase.html index bdf55e77..04a0c6c8 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -143,7 +143,7 @@ {% if user.is_authenticated %}
  • - + {% if user.rower.rowerplan == 'pro' %} {% elif user.rower.rowerplan == 'coach' %} @@ -151,8 +151,9 @@ {% elif user.rower.rowerplan == 'plan' %} {% else %} - - {% endif %} + + + {% endif %}
  • @@ -178,27 +179,27 @@