diff --git a/rowers/templates/splitworkout.html b/rowers/templates/splitworkout.html index a264f626..0a186a56 100644 --- a/rowers/templates/splitworkout.html +++ b/rowers/templates/splitworkout.html @@ -1,131 +1,77 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% load tz %} {% block title %}Change Workout {% endblock %} -{% block content %} -
- - {% if form.errors %} -

- Please correct the error{{ form.errors|pluralize }} below. -

- {% endif %} - +{% block main %}

Edit Workout Interval Data

-
-
-

- Edit -

-
-
-

- Export - -

-
-
-

- Advanced -

- Advanced Functionality (More interactive Charts) - -
-
- {% localtime on %} - -

-

- - {{ form.as_table }} -
- {% csrf_token %} -
- -
-
-

-

Workout Split

-

Split your workout in half at the given time using the form above. - Use the chart on - the right to find the point where you want to split.

-

Use any of the following formats: -

    -
  • H:MM:SS.d, e.g. 1:45:00.0 for one hour and 45 minutes
  • -
  • H:MM:SS, e.g. 1:45:00 for one hour and 45 minutes
  • -
  • MM:SS.d, e.g. 30:00.0 for thirty minutes
  • -
  • MM, e.g. 30 for thirty minutes
  • -
-

-

Warning: If you deselect, "Keep Original", the original workout - cannot be restored afterwards.

- -
- -
-
+
    +
  • +

    +

    + + {{ form.as_table }} +
    + {% csrf_token %} + +
    +

    +
  • +
  • - - - - {{ thescript |safe }} - - - - - -
    + + + + {{ thescript |safe }} + {{ thediv |safe }} -
    - - - - - - - - - - - -
    Date/Time:{{ workout.startdatetime }}
    Distance:{{ workout.distance }}m
    Duration:{{ workout.duration |durationprint:"%H:%M:%S.%f" }}
    Public link to this workout - https://rowsandall.com/rowers/workout/{{ workout.id }} - -
    Public link to interactive chart - https://rowsandall.com/rowers/workout/{{ workout.id }}/interactiveplot - -
    - {% endlocaltime %} + + Date/Time:{{ workout.startdatetime }} + + Distance:{{ workout.distance }}m + + Duration:{{ workout.duration |durationprint:"%H:%M:%S.%f" }} + + Public link to this workout + + https://rowsandall.com/rowers/workout/{{ workout.id }} + + + + {% endlocaltime %} +
  • +
  • +

    Workout Split

    +

    Split your workout in half at the given time using the form above. + Use the chart on + the right to find the point where you want to split.

    +

    Use any of the following formats: +

      +
    • H:MM:SS.d, e.g. 1:45:00.0 for one hour and 45 minutes
    • +
    • H:MM:SS, e.g. 1:45:00 for one hour and 45 minutes
    • +
    • MM:SS.d, e.g. 30:00.0 for thirty minutes
    • +
    • MM, e.g. 30 for thirty minutes
    • +
    +

    +

    + Warning: If you deselect, "Keep Original", the original workout + cannot be restored afterwards. +

    +
  • +
-
-
- +{% endblock %} + + {% block sidebar %} +{% include 'menu_workout.html' %} {% endblock %} diff --git a/rowers/templates/summary_edit.html b/rowers/templates/summary_edit.html index a23238f1..d4de5063 100644 --- a/rowers/templates/summary_edit.html +++ b/rowers/templates/summary_edit.html @@ -21,11 +21,6 @@ https://rowsandall.com/rowers/workout/{{ workout.id }} - - Public link to interactive chart - - https://rowsandall.com/rowers/workout/{{ workout.id }}/interactiveplot -

Interval Shorthand

diff --git a/rowers/urls.py b/rowers/urls.py index a0c06061..fad10bd2 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -259,7 +259,7 @@ urlpatterns = [ url(r'^workout/(?P\d+)/editintervals$',views.workout_summary_edit_view), url(r'^workout/(?P\d+)/restore$',views.workout_summary_restore_view), url(r'^workout/(?P\d+)/split$',views.workout_split_view), - url(r'^workout/(?P\d+)/interactiveplot$',views.workout_biginteractive_view), +# url(r'^workout/(?P\d+)/interactiveplot$',views.workout_biginteractive_view), url(r'^workout/(?P\d+)/view$',views.workout_view), url(r'^workout/(?P\d+)$',views.workout_view), url(r'^workout/fusion/(?P\d+)/(?P\d+)$',views.workout_fusion_view), diff --git a/rowers/views.py b/rowers/views.py index 9bcf32b5..a8c39f98 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -10933,6 +10933,21 @@ def workout_split_view(request,id=id): r = row.user + breadcrumbs = [ + { + 'url':'/rowers/list-workouts', + 'name':'Workouts' + }, + { + 'url':get_workout_default_page(request,row.id), + 'name': str(row.id) + }, + { + 'url':reverse(graph_show_view,kwargs={'id':id}), + 'name': 'Chart' + } + + ] if request.method == 'POST': form = WorkoutSplitForm(request.POST) if form.is_valid(): @@ -10993,6 +11008,9 @@ def workout_split_view(request,id=id): return render(request, 'splitworkout.html', {'form':form, + 'rower':r, + 'breadcrumbs':breadcrumbs, + 'active':'nav-workouts', 'workout':row, 'thediv':script, 'thescript':div,