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

Merge branch 'release/v7.59'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-23 18:04:23 +02:00
parent 40fb1bbd37 c1c6ea50da
commit fe29c4511a
21 changed files with 509 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/templates/help.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_help.html' %}
{% endblock %}

67
rowers/templates/menu_analytics.html Normal file
View File

@@ -0,0 +1,67 @@
<h1>Analysis</h1>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="fitness">
<input type="checkbox" name="group-fitness" id="group-fitness">
<label for="group-fitness">
<i class="fas fa-watch-fitness fa-fw"></i>&nbsp;Fitness</label>
<ul>
<li id="fitness-ranking">
<a href="">
<i class="fas fa-star fa-fw"></i>&nbsp;Ranking Pieces
</a>
</li>
<li id="fitness-otecp">
<a href="">
<i class="fas fa-user-chart fa-fw"></i>&nbsp;CP Chart OTE
</a>
</li>
<li id="fitness-otwcp">
<a href="">
<i class="far fa-user-chart fa-fw"></i>&nbsp;CP Chart OTW
</a>
</li>
<li id="fitness-powerprogress">
<a href="">
<i class="far fa-watch-fitness fa-fw"></i>&nbsp;Power Progress
</a>
</li>
</ul>
</li>
<li class="has-children" id="stats">
<input type="checkbox" name="group-stats" id="group-stats">
<label for="group-stats">
<i class="far fa-table fa-fw"></i>&nbsp;Statistics
</label>
<ul>
<li id="stats-boxchart">
<a href="">
<i class="fas fa-box-open fa-fw"></i>&nbsp;Box Chart
</a>
</li>
<li id="stats-trendflex">
<a href="">
<i class="far fa-chart-line fa-fw"></i>&nbsp;Trend Flex
</a>
</li>
<li id="stats-cumstats">
<a href="">
<i class="fal fa-table fa-fw"></i>&nbsp;Statistics
</a>
</li>
<li id="stats-histopower">
<a href="">
<i class="fas fa-chart-bar"></i>&nbsp;Power Histogram
</a>
</li>
</ul>
</li>
<li>
<a href="">
<i class="fas fa-chart-line fa-fw"></i>&nbsp;Cumulative Flex Chart
</a>
</li>
<li>
<a href="">
<i class="fas fa-flask fa-fw"></i>&nbsp;Laboratory</a>
</li>
</ul><!-- cd-accordion-menu -->

24
rowers/templates/menu_help.html Normal file
View File

@@ -0,0 +1,24 @@
<h1>Help</h1>
<ul class="cd-accordion-menu animated">
<li id="gettingstarted">
<a href="">
<i class="fas fa-question-circle fa-fw"></i>&nbsp;Getting Started
</a>
</li>
<li id="blog">
<a href="">
<i class="fab fa-wordpress-simple fa-fw"></i>&nbsp;Blog
</a>
</li>
<li id="contact">
<a href="">
<i class="fas fa-envelope fa-fw"></i>&nbsp;Contact
</a>
</li>
<li id="videos">
<a href="">
<i class="fab fa-youtube fa-fw"></i>&nbsp;Videos
</a>
</li>
</ul><!-- cd-accordion-menu -->

49
rowers/templates/menu_plan.html Normal file
View File

@@ -0,0 +1,49 @@
<h1>Plan</h1>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="sessions">
<input type="checkbox" name="group-sessions" id="group-sessions">
<label for="group-sessions">
<i class="fas fa-calendar-alt fa-fw"></i>&nbsp;Sessions
</label>
<ul>
<li id="sessions-list">
<a href="">
<i class="far fa-calendar-alt fa-fw"></i>&nbsp;Sessions
</a>
</li>
<li id="sessions-link">
<a href="">
<i class="fas fa-tasks fa-fw"></i>&nbsp;Link Workouts
</a>
</li>
<li id="sessions-coach">
<a href="">
<i class="fas fa-bullhorn fa-fw"></i>&nbsp;Coach View
</a>
</li>
</ul>
</li>
<li class="has-children" id="plan">
<input type="checkbox" name="group-plan" id="group-plan">
<label for="group-plan">
<i class="fas fa-calendar-plus fa-fw"></i>&nbsp;Plan Sessions
</label>
<ul>
<li id="plan-session">
<a href="">
<i class="far fa-calendar-plus fa-fw"></i>&nbsp;Add Session
</a>
</li>
<li id="plan-teamsession">
<a href="">
<i class="fas fa-whistle fa-fw"></i>&nbsp;Add Team Session
</a>
</li>
<li id="plan-microcycle">
<a href="">
<i class="fas fa-expand fa-fw"></i>Plan Microcycle
</a>
</li>
</ul>
</li>
</ul><!-- cd-accordion-menu -->

19
rowers/templates/menu_profile.html Normal file
View File

@@ -0,0 +1,19 @@
<h1>Profile</h1>
<ul class="cd-accordion-menu animated">
<li id="manage-account">
<a href="">
<i class="fas fa-user fa-fw"></i>&nbsp;Account
</a>
</li>
<li id="manage-impex">
<a href="">
<i class="fas fa-cloud-download fa-fw"></i>&nbsp;Import/Export
</a>
</li>
<li id="manage-prefs">
<a href="">
<i class="fas fa-cog fa-fw"></i>&nbsp;Preferences
</a>
</li>
</ul><!-- cd-accordion-menu -->

18
rowers/templates/menu_racing.html Normal file
View File

@@ -0,0 +1,18 @@
<h1>Racing</h1>
<ul class="cd-accordion-menu animated">
<li id="races-list">
<a href="#0">
<i class="fas fa-flag-checkered fa-fw"></i>&nbsp;Races
</a>
</li>
<li id="races-new">
<a href="#0">
<i class="far fa-flag fa-fw"></i>&nbsp;New Race
</a>
</li>
<li id="courses">
<a href="#0">
<i class="fas fa-map-marked fa-fw"></i>&nbsp;Courses
</a>
</li>
</ul> <!-- cd-accordion-menu -->

24
rowers/templates/menu_teams.html Normal file
View File

@@ -0,0 +1,24 @@
<h1>Teams</h1>
<ul class="cd-accordion-menu animated">
<li id="manage">
<a href="">
<i class="fas fa-cog fa-fw"></i>&nbsp;Manage
</a>
</li>
{% if teams %}
<li class="has-children" id="teams">
<input type="checkbox" name="group-teams" id="group-teams">
<label for="group-teams">Teams</label>
<ul>
{% for team in teams %}
<li id="team-{{ team.id }}">
<a href="">
<i class="fas fa-user-friends fa-fw"></i>&nbsp;{{ team.name }}
</a>
</li>
{% endfor %}
</ul>
</li>
{% endif %}
</ul><!-- cd-accordion-menu -->

135
rowers/templates/menu_workout.html Normal file
View File

@@ -0,0 +1,135 @@
<h1>Workout</h1>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="workout">
<input type="checkbox" name="group-workout" id="group-workout">
<label for="group-workout">Workout</label>
<ul>
<li id="workout-dashboard">
<a href="">
<i class="fas fa-tachometer-alt fa-fw"></i>&nbsp;View
</a>
</li>
<li id="workout-edit">
<a href="">
<i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Edit
</a>
</li>
<li id="workout-intervals">
<a href="">
<i class="fas fa-pause fa-fw"></i>&nbsp;Intervals
</a>
</li>
<li id="workout-stats">
<a href="">
<i class="fal fa-table fa-fw"></i>&nbsp;Statistics
</a>
</li>
<li id="compare">
<a href="#0">
<i class="fas fa-balance-scale fa-fw"></i>&nbsp;Compare
</a>
</li>
<li id="workout-delete">
<a href="">
<i class="fas fa-trash-alt fa-fw"></i>&nbsp;Delete
</a>
</li>
</ul>
</li>
<li class="has-children" id="chart">
<input type="checkbox" name="group-chart" id="group-chart">
<label for="group-chart">Charts</label>
<ul>
<li id="chart-time">
<a href="">
<i class="fas fa-stopwatch fa-fw"></i>&nbsp;Time
</a>
</li>
<li id="chart-distance">
<a href="">
<i class="fas fa-ruler fa-fw"></i>&nbsp;Distance
</a>
</li>
<li id="chart-powerpie">
<a href="">
<i class="far fa-chart-pie fa-fw"></i>&nbsp;Power (Pie)
</a>
</li>
<li id="chart-hrpie">
<a href="">
<i class="fas fa-heartbeat fa-fw"></i>&nbsp;Heart Rate (Pie)
</a>
</li>
<li id="chart-otwpower">
<a href="">
<i class="fas fa-chart-area fa-fw"></i>&nbsp;OTW Power
</a>
</li>
</ul>
</li>
<li class="has-children" id="export">
<input type="checkbox" name="group-export" id="group-export">
<label for="group-export">Export</label>
<ul>
<li id="export-c2"><a href="">Concept2</a></li>
<li id="export-strava"><a href="">Strava</a></li>
<li id="export-st"><a href="">SportTracks</a></li>
<li id="export-rk"><a href="">Runkeeper</a></li>
<li id="export-mmf"><a href="">MapMyFitness</a></li>
<li id="export-tp"><a href="">TrainingPeaks</a></li>
<li id="export-csv"><a href="">CSV</a></li>
<li id="export-gpx"><a href="">GPX</a></li>
<li id="export-tcx"><a href="">TCX</a></li>
</ul>
</li>
<li class="has-children" id="data">
<input type="checkbox" name="group-data" id="group-data">
<label for="group-data">Data</label>
<ul>
<li id="data-smoothen">
<a href="">
<i class="fas fa-magic fa-fw"></i>&nbsp;Smoothen
</a>
</li>
<li id="data-raw">
<a href="">
<i class="fas fa-undo fa-fw"></i>&nbsp;Restore Raw
</a>
</li>
<li id="data-fusion">
<a href="">
<i class="fas fa-blender fa-fw"></i>&nbsp;Sensor Fusion
</a>
</li>
<li id="data-split">
<a href="">
<i class="fas fa-cut fa-fw"></i>&nbsp;Split Workout
</a>
</li>
</ul>
</li>
<li class="has-children" id="advanced">
<input type="checkbox" name="group-advanced" id="group-advanced">
<label for="group-advanced">Advanced</label>
<ul>
<li id="advanced-wind">
<a href="">
<i class="fas fa-pennant fa-fw"></i>&nbsp;Wind
</a>
</li>
<li id="advanced-stream">
<a href="">
<i class="fas fa-stream fa-fw"></i>&nbsp;Stream
</a>
</li>
<li id="advanced-otwpower">
<a href="">
<i class="fas fa-calculator-alt fa-fw"></i>&nbsp;OTW Power
</a>
</li>
<li id="advanced-instroke">
<a href="">
<i class="fas fa-search-plus fa-fw"></i>&nbsp;In-Stroke Metrics</a></li>
</ul>
</li>
</ul><!-- cd-accordion-menu -->

1
rowers/templates/menu_workouts.html
View File

@@ -1,3 +1,4 @@
<h1>Workouts</h1>
<ul class="cd-accordion-menu animated">
<li id="workouts-list">
<a href="#0"><i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Workouts List</a>

15
rowers/templates/redesign_analysis.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_analytics.html' %}
{% endblock %}

15
rowers/templates/redesign_plan.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_plan.html' %}
{% endblock %}

15
rowers/templates/redesign_profile.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_profile.html' %}
{% endblock %}

15
rowers/templates/redesign_racing.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_racing.html' %}
{% endblock %}

15
rowers/templates/redesign_teams.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_teams.html' %}
{% endblock %}

15
rowers/templates/redesign_workout.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_workout.html' %}
{% endblock %}

15
rowers/templates/redesign_workouts.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block main %}
<h1>Main</h1>
<p>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 <a href="">fermentum</a> in.
</p>
<p>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 <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
{% include 'menu_workouts.html' %}
{% endblock %}

24
rowers/urls.py
View File

@@ -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<id>\d+)/$',views.workout_view),

2
static/css/rowsandall2.css
View File

@@ -53,7 +53,7 @@ body {
color: #333;
font-size: 1.2em;
height: auto;
padding-bottom: 20px;
/* padding-bottom: 20px; */
}
.notyellow {

24
static/css/styles2.css
View File

@@ -65,6 +65,14 @@
left: 15px;
}
aside h1 {
font-weight: bold;
text-align: left;
font-size: 1.4em;
color: #dddddd;
padding: 15px;
}
aside ul label,
aside ul a {
padding-left: 15px;
@@ -150,11 +158,11 @@
position: relative;
display: block;
color: #dddddd;
font-size: 1.2em;
font-size: 1.0em;
}
aside i {
font-size: 1.2em;
font-size: 1.0em;
}
aside a::before {
@@ -170,7 +178,7 @@
aside .cd-accordion-menu label::before
{
/* icons */
font: normal normal normal 1.2em/1 FontAwesome;
font: normal normal normal 1.0em/1 FontAwesome;
font-size: inherit;
text-rendering: auto;
content: '\f0da';
@@ -224,19 +232,22 @@
}
nav li {
padding: 0.2em 0.0em 0.2em 0.0em;
margin: 0.2em;
}
nav a {
color: white;
transition: all .2s ease-in-out;
}
nav a i {
color: white;
}
.main-head {
grid-area: header;
background: #ededed;
}
.main-user {
grid-area: user;
@@ -305,7 +316,7 @@
nav ul {
display: flex;
justify-content: space-between;
justify-content: space-between;
}
header ul {
@@ -327,13 +338,12 @@
"nav nav nav"
"sidebar content content"
"sidebar content content"
"sidebar footer footer"
"ad footer footer"
}
nav ul {
flex-direction: row;
/* display: flex;
justify-content: space-between; */
}
header ul {

2
static/css/text2.css
View File

@@ -131,6 +131,6 @@ p {
i {
font-size: 2em;
font-size: 1.5em;
}

17
templates/newbase.html
View File

@@ -143,7 +143,7 @@
</li>
{% if user.is_authenticated %}
<li>
<a href="/rowers/me/edit" title="Profile">
<a href="/rowers/new_profile" title="Profile">
{% if user.rower.rowerplan == 'pro' %}
<i class="fas fa-user-ninja "></i>
{% elif user.rower.rowerplan == 'coach' %}
@@ -151,8 +151,9 @@
{% elif user.rower.rowerplan == 'plan' %}
<i class="fas fa-user-tie "></i>
{% else %}
<i class="fas fa-user"></i>
{% endif %}
<a href="/rowers/new_profile" title="Profile">
<i class="fas fa-user"></i>
{% endif %}
</a>
</li>
<li>
@@ -178,27 +179,27 @@
<nav class="main-nav">
<ul>
<li>
<a href="">
<a href="/rowers/new_workouts">
<i class="fas fa-clipboard-list"></i>&nbsp;Workouts
</a>
</li>
<li>
<a href="">
<a href="/rowers/new_racing">
<i class="fas fa-flag-checkered"></i>&nbsp;Racing
</a>
</li>
<li>
<a href="">
<a href="/rowers/new_analysis">
<i class="fas fa-analytics"></i>&nbsp;Analysis
</a>
</li>
<li>
<a href="">
<a href="/rowers/new_plan">
<i class="fas fa-calendar-alt"></i>&nbsp;Plan
</a>
</li>
<li>
<a href="">
<a href="/rowers/new_teams">
<i class="fas fa-bullhorn"></i>&nbsp;Teams
</a>
</li>