diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 4bfaa464..b1ed8958 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1483,7 +1483,10 @@ def interactive_agegroupcpchart(age,normalized=False): x_axis_type = 'log' y_axis_type = 'linear' - plot = Figure(plot_width=900,x_axis_type=x_axis_type) + TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair' + + plot = Figure(plot_width=900,x_axis_type=x_axis_type, + tools=TOOLS) plot.sizing_mode = 'scale_width' plot.line('duration','fitpowerfh',source=source, @@ -1665,6 +1668,7 @@ def interactive_agegroup_plot(df,distance=2000,duration=None, TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair' plot = Figure(tools=TOOLS,plot_width=900) + plot.sizing_mode='scale_width' plot.circle('age','power',source=source,fill_color='red',size=15, legend='World Record') diff --git a/rowers/templates/agegroupchart.html b/rowers/templates/agegroupchart.html index f3ecf8b3..2632e3b5 100644 --- a/rowers/templates/agegroupchart.html +++ b/rowers/templates/agegroupchart.html @@ -1,52 +1,44 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} -{% block title %}Rowsandall {% endblock %} +{% block title %}Rowsandall Age Group Records{% endblock %} -{% block content %} +{% block main %} - - + + - {{ interactiveplot |safe }} - - - +{{ interactiveplot |safe }} -
+

Interactive Plot

- -

Interactive Plot

- -

This chart shows the Indoor Rower World Records for your gender and - weight class. The red dots are the official records, and hovering - over them with your mouse shows you the name of the record holder. - The blue line is a fit to the data, which is used by rowsandall.com - to calculate your performance assessment. +

    +
  • +

    This chart shows the + + Indoor Rower World Records + for your gender and + weight class. The red dots are the official records, and hovering + over them with your mouse shows you the name of the record holder. + The blue line is a fit to the data, which is used by rowsandall.com + to calculate your performance assessment. +

    +
  • +
  • {{ the_div|safe }} +
  • + -
+ {% endblock %} + + +{% block sidebar %} +{% include 'menu_analytics.html' %} +{% endblock %} diff --git a/rowers/views.py b/rowers/views.py index 80892eab..c79a015a 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -12336,7 +12336,7 @@ def agegroupcpview(request,age,normalize=0): response = render(request,'agegroupcp.html', { - 'active': 'nav-analysis'; + 'active': 'nav-analysis', 'interactiveplot':script, 'the_div':div, } @@ -12375,8 +12375,9 @@ def agegrouprecordview(request,sex='male',weightcategory='hwt', return render(request, 'agegroupchart.html', { - 'interactiveplot':script, - 'the_div':div, + 'interactiveplot':script, + 'active':'nav-analysis', + 'the_div':div, }) # Cloning sessions diff --git a/static/css/styles2.css b/static/css/styles2.css index 05637b9c..a5b8e547 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -397,7 +397,7 @@ padding: 5px; } -@media (max-width: 449px) { +@media (max-width: 600px) { nav a { font-size: 0px; } @@ -419,6 +419,7 @@ "ad footer"; } +} nav ul { display: flex; justify-content: space-between; @@ -451,7 +452,6 @@ } - @media (min-width: 768px) { .wrapper { grid-template-columns: 1fr 4fr 1fr;