From 38bb113e8d44c374e7a1939a6aa632892d64ccb2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 2 Mar 2019 16:51:43 +0100 Subject: [PATCH] bokeh over https --- rowers/templates/agegroupchart.html | 2 +- rowers/templates/agegroupcp.html | 2 +- rowers/templates/boxplot.html | 2 +- rowers/templates/cum_flex.html | 8 +- rowers/templates/cumstats.html | 8 +- rowers/templates/disqualification_view.html | 2 +- rowers/templates/fitnessmetric.html | 2 +- rowers/templates/flexchart3otw.html | 4 +- rowers/templates/forcecurve_single.html | 4 +- rowers/templates/histo.html | 8 +- rowers/templates/histo_single.html | 2 +- rowers/templates/list_workouts.html | 2 +- rowers/templates/map_view.html | 2 +- rowers/templates/multicompare.html | 2 +- rowers/templates/multiflex.html | 2 +- rowers/templates/oterankings.html | 2 +- rowers/templates/otwgeeky.html | 2 +- rowers/templates/otwinteractive.html | 2 +- rowers/templates/otwrankings.html | 2 +- rowers/templates/rankings.html | 2 +- rowers/templates/splitworkout.html | 2 +- rowers/templates/streamedit.html | 2 +- rowers/templates/summary_edit.html | 2 +- rowers/templates/windedit.html | 2 +- rowers/templates/workflow.html | 2 +- rowers/templates/workout_comments.html | 2 +- rowers/templates/workout_form.html | 2 +- rowers/templates/workout_view.html | 2 +- templates/basebase.html | 339 -------------------- templates/newbase.html | 4 +- 30 files changed, 41 insertions(+), 380 deletions(-) delete mode 100644 templates/basebase.html diff --git a/rowers/templates/agegroupchart.html b/rowers/templates/agegroupchart.html index 2a8e0cc3..e33c0f88 100644 --- a/rowers/templates/agegroupchart.html +++ b/rowers/templates/agegroupchart.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/agegroupcp.html b/rowers/templates/agegroupcp.html index 183db44c..36870c7b 100644 --- a/rowers/templates/agegroupcp.html +++ b/rowers/templates/agegroupcp.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/boxplot.html b/rowers/templates/boxplot.html index 341bfb21..eeea25c6 100644 --- a/rowers/templates/boxplot.html +++ b/rowers/templates/boxplot.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/cum_flex.html b/rowers/templates/cum_flex.html index 50a26c5b..1bf49dfe 100644 --- a/rowers/templates/cum_flex.html +++ b/rowers/templates/cum_flex.html @@ -59,12 +59,12 @@
- - + +
- - + +
diff --git a/rowers/templates/cumstats.html b/rowers/templates/cumstats.html index c92eb7ea..9e3d214b 100644 --- a/rowers/templates/cumstats.html +++ b/rowers/templates/cumstats.html @@ -60,12 +60,12 @@
- - + +
- - + +
diff --git a/rowers/templates/disqualification_view.html b/rowers/templates/disqualification_view.html index 3ad7b75e..78ad3c76 100644 --- a/rowers/templates/disqualification_view.html +++ b/rowers/templates/disqualification_view.html @@ -98,7 +98,7 @@ {% endif %}
  • - + diff --git a/rowers/templates/fitnessmetric.html b/rowers/templates/fitnessmetric.html index aa7abc5b..7939ed15 100644 --- a/rowers/templates/fitnessmetric.html +++ b/rowers/templates/fitnessmetric.html @@ -48,7 +48,7 @@ }); - + diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index aa45a735..0f5db1b5 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -11,8 +11,8 @@ {{ js_res | safe }} {{ css_res| safe }} - - + + diff --git a/rowers/templates/forcecurve_single.html b/rowers/templates/forcecurve_single.html index 7d7a06a9..652e563c 100644 --- a/rowers/templates/forcecurve_single.html +++ b/rowers/templates/forcecurve_single.html @@ -11,8 +11,8 @@ {{ js_res | safe }} {{ css_res| safe }} - - + + diff --git a/rowers/templates/histo.html b/rowers/templates/histo.html index 5fe9f287..b7b2d7d2 100644 --- a/rowers/templates/histo.html +++ b/rowers/templates/histo.html @@ -60,12 +60,12 @@
    - - + +
    - - + +
    diff --git a/rowers/templates/histo_single.html b/rowers/templates/histo_single.html index 17f59dc1..ddd1ac99 100644 --- a/rowers/templates/histo_single.html +++ b/rowers/templates/histo_single.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index fff5afdb..6d4c4672 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -59,7 +59,7 @@
    • - + diff --git a/rowers/templates/map_view.html b/rowers/templates/map_view.html index 06da45d9..2d24ccf8 100644 --- a/rowers/templates/map_view.html +++ b/rowers/templates/map_view.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/multicompare.html b/rowers/templates/multicompare.html index 9cb78fd5..774cd5ba 100644 --- a/rowers/templates/multicompare.html +++ b/rowers/templates/multicompare.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/multiflex.html b/rowers/templates/multiflex.html index 4a981481..1fbe007b 100644 --- a/rowers/templates/multiflex.html +++ b/rowers/templates/multiflex.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/oterankings.html b/rowers/templates/oterankings.html index 6dca78f9..7778bcf2 100644 --- a/rowers/templates/oterankings.html +++ b/rowers/templates/oterankings.html @@ -10,7 +10,7 @@ {% block main %} - + diff --git a/rowers/templates/otwgeeky.html b/rowers/templates/otwgeeky.html index 855b8aea..6c65fe08 100644 --- a/rowers/templates/otwgeeky.html +++ b/rowers/templates/otwgeeky.html @@ -138,7 +138,7 @@
      - + diff --git a/rowers/templates/otwinteractive.html b/rowers/templates/otwinteractive.html index 43ec3507..809208b1 100644 --- a/rowers/templates/otwinteractive.html +++ b/rowers/templates/otwinteractive.html @@ -6,7 +6,7 @@ {% block main %} - + diff --git a/rowers/templates/otwrankings.html b/rowers/templates/otwrankings.html index ca4d2b62..7a9443db 100644 --- a/rowers/templates/otwrankings.html +++ b/rowers/templates/otwrankings.html @@ -10,7 +10,7 @@ {% block main %} - + diff --git a/rowers/templates/rankings.html b/rowers/templates/rankings.html index aa85aa07..16b04cae 100644 --- a/rowers/templates/rankings.html +++ b/rowers/templates/rankings.html @@ -13,7 +13,7 @@ {% block main %} - + diff --git a/rowers/templates/splitworkout.html b/rowers/templates/splitworkout.html index e00aac01..f54a64f4 100644 --- a/rowers/templates/splitworkout.html +++ b/rowers/templates/splitworkout.html @@ -23,7 +23,7 @@
    • - + diff --git a/rowers/templates/streamedit.html b/rowers/templates/streamedit.html index d2df3584..301cf033 100644 --- a/rowers/templates/streamedit.html +++ b/rowers/templates/streamedit.html @@ -31,7 +31,7 @@
    • - + diff --git a/rowers/templates/summary_edit.html b/rowers/templates/summary_edit.html index 71416879..bae6de41 100644 --- a/rowers/templates/summary_edit.html +++ b/rowers/templates/summary_edit.html @@ -62,7 +62,7 @@
    • - + diff --git a/rowers/templates/windedit.html b/rowers/templates/windedit.html index 22020333..fa071e4c 100644 --- a/rowers/templates/windedit.html +++ b/rowers/templates/windedit.html @@ -53,7 +53,7 @@
    • - + diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html index f2b5e5b8..13e93bf4 100644 --- a/rowers/templates/workflow.html +++ b/rowers/templates/workflow.html @@ -13,7 +13,7 @@ {{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %} {% block meta %} - + diff --git a/rowers/templates/workout_comments.html b/rowers/templates/workout_comments.html index 8a514aad..a74b4664 100644 --- a/rowers/templates/workout_comments.html +++ b/rowers/templates/workout_comments.html @@ -86,7 +86,7 @@
    • - + diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html index 05e61f1b..047a8a2c 100644 --- a/rowers/templates/workout_form.html +++ b/rowers/templates/workout_form.html @@ -130,7 +130,7 @@ $('#id_workouttype').change(); {% endif %} {% if mapdiv %}
    • - + diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html index 0edfc280..b55e25cc 100644 --- a/rowers/templates/workout_view.html +++ b/rowers/templates/workout_view.html @@ -121,7 +121,7 @@
      • {% endif %}
    • - + diff --git a/templates/basebase.html b/templates/basebase.html deleted file mode 100644 index 9b77e322..00000000 --- a/templates/basebase.html +++ /dev/null @@ -1,339 +0,0 @@ -{% load leaflet_tags %} -{% load cookielaw_tags %} -{% load rowerfilters %} -{% load tz_detect %} -{% tz_detect %} -{% load analytical %} -{% block filters %} -{% endblock %} - - - - {% block scripts %} {% endblock %} - - - - - - - - - - - - - - - - {% analytical_head_top %} - - - - - - - - - - - - {% block title %}Rowsandall Rowing Data Analytics{% endblock %} - - {% block image_src %}{% endblock %} - - {% block og_image %} - - - {% endblock %} - - - - - - - - - - - - {% block meta %} {% endblock %} - {% leaflet_js %} - {% leaflet_css %} -
      - - - - - {% analytical_head_bottom %} - - - {% analytical_body_top %} - {% block body_top %}{% endblock %} -
      -
      -   -
      -
      -
      - {% if user|is_promember %} -

      Rowsandall logo

      - {% else %} -

      Rowsandall logo

      - {% endif %} -
      -
      -
      -
      -

      - Videos

      -
      -
      -

      - Rowing Analytics BLOG

      -
      -
      -

      - Contact -

      -
      -
      -

      Free Data and Analysis. For Rowers. By Rowers.

      -
      -
      - -
      -
      - {% if user.is_authenticated %} -

      - {% if user.first_name %} - {{ user.first_name }} - {% else %} - {{ user }} - {% endif %} -

      - Edit user account, e.g. heart rate zones, power zones, email, teams - - {% else %} -

      login

      - {% endif %} -
      -
      - {% if user.is_authenticated %} -

      logout

      - {% else %} -

       

      - {% endif %} -
      -
      -
      - {% if user.rower.rowerplan == 'pro' %} -
      Pro Member
      - {% elif user.rower.rowerplan == 'coach' %} -
      Coach
      - {% elif user.rower.rowerplan == 'plan' %} -
      Self-Coach
      - {% else %} -

      Upgrade

      - {% endif %} - {% if user.rower.rowerplan == 'basic' and user.rower.protrialexpires|date_dif == 1 %} -

      Start Free Pro trial

      - {% elif user.rower.rowerplan == 'basic' and user.rower.plantrialexpires|date_dif == 1 %} -

      Start Free Plan trial

      - {% endif %} -
      -
      -
      - - -
      -
      - {% if user.is_authenticated %} -

      Upload

      - Upload CSV, TCX, FIT data files to rowsandall.com - {% else %} -

      Register (free)

      - {% endif %} -
      -
      - {% if user.is_authenticated %} -

      - Import -

      - Import workouts from Strava, SportTracks, and C2 logbook - {% else %} -

       

      - {% endif %} -
      -
      - {% if user.is_authenticated %} -

      - Workouts -

      - See your list of workouts - {% else %} -

       

      - {% endif %} -
      -
      - {% if user.is_authenticated %} -

      - Graphs -

      - See your most recent charts - {% else %} -

       

      - {% endif %} -
      -
      - {% if user.is_authenticated %} -

      Plans

      - {% else %} -

       

      - {% endif %} -
      -
      - {% if user.is_authenticated %} - {% include "analysismenu.html" %} - {% else %} -

       

      - {% endif %} -
      -
      - {% block challenges %} - {% endblock %} -
      -
      - {% block teams %} - {% endblock %} -
      -
      - - -
      -
      - {% if WARNING_MESSAGE != '' %} -

      - {{ WARNING_MESSAGE }} -

      - {% endif %} - {% if user.rower.protrialexpires and user.rower.protrialexpires|is_future_date %} - {% if user.rower.plantrialexpires %} -

      - {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Self-Coach trial - Would you like to upgrade now? - - {% else %} -

      - {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Pro trial - Would you like to upgrade now? - {% endif %} -

      - {% endif %} - {% if user.rower.emailbounced %} -

      - Your email bounced. Please update your email address in the user settings -

      - {% endif %} - {% if messages %} - {% for message in messages %} - {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %} -

      - {% else %} -

      - {% endif %} - {{ message|safe }} -

      - {% endfor %} - {% endif %} - {% block message %} - {% if message %} -

      - {{ message }} -

      - {% endif %} - {% if successmessage %} -

      - {{ successmessage }} -

      - {% endif %} -
      -
      - {% endblock %} -
      -
      - {% load tz %} - - {% block content %}{% endblock %} -
      -
      - -
      - {% block footer %} -

      {{ versionstring }}

      -
      -

      © Rowsandall s.r.o.

      -
      -
      -

      - About

      -
      -
      -

      - Brochure

      -
      -
      -

      - Develop

      -
      -
      -

      - Legal

      -
      -
      -

      - Partners

      -
      -
      -

      - Physics

      -
      -
      -

      - Rowing Analytics BLOG

      -
      -
      -

      - Facebook group

      -
      - {% endblock %} -
      - {% cookielaw_banner %} -
      - - {% analytical_body_bottom %} - {% block body_bottom %}{% endblock %} - - diff --git a/templates/newbase.html b/templates/newbase.html index 5d1cc3a6..5ae54c80 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -29,8 +29,8 @@ {% analytical_head_top %} - - + +