From 80cdd24913914d85a26fd76a668d02341d75c0c0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 13 Oct 2017 14:30:16 +0200 Subject: [PATCH] fine tuning headers --- rowers/templates/flexthumbnails.html | 7 +++++-- rowers/templates/panel_editbuttons.html | 3 +++ rowers/templates/panel_statcharts.html | 3 +++ rowers/templates/panel_staticchart.html | 3 +++ rowers/templates/panel_summary.html | 1 + rowers/templates/workflow.html | 5 ++++- rowers/views.py | 5 +++-- static/css/rowsandall.css | 19 ++++++++++++++++++- 8 files changed, 40 insertions(+), 6 deletions(-) diff --git a/rowers/templates/flexthumbnails.html b/rowers/templates/flexthumbnails.html index d6a5016a..24d88ffc 100644 --- a/rowers/templates/flexthumbnails.html +++ b/rowers/templates/flexthumbnails.html @@ -1,6 +1,8 @@ - {% for chart in charts %} +{% if charts %} +

Flex Charts

+{% for chart in charts %}
-

{{ forloop.counter }}

+ {{ forloop.counter }}
{% endfor %} +{% endif %} diff --git a/rowers/templates/panel_editbuttons.html b/rowers/templates/panel_editbuttons.html index e2c836ea..a79cb80a 100644 --- a/rowers/templates/panel_editbuttons.html +++ b/rowers/templates/panel_editbuttons.html @@ -1,3 +1,6 @@ +
+

Navigation

+

Edit Workout diff --git a/rowers/templates/panel_statcharts.html b/rowers/templates/panel_statcharts.html index 141fd15e..e1e44ea9 100644 --- a/rowers/templates/panel_statcharts.html +++ b/rowers/templates/panel_statcharts.html @@ -1,3 +1,5 @@ +{% if statcharts %} +

Static Charts

{% for graph in statcharts %} {% endfor %} +{% endif %} diff --git a/rowers/templates/panel_staticchart.html b/rowers/templates/panel_staticchart.html index 90095d8d..60da93a4 100644 --- a/rowers/templates/panel_staticchart.html +++ b/rowers/templates/panel_staticchart.html @@ -1,3 +1,6 @@ +
+

Create Charts

+

Add Time Plot diff --git a/rowers/templates/panel_summary.html b/rowers/templates/panel_summary.html index 759fd39b..47ad211e 100644 --- a/rowers/templates/panel_summary.html +++ b/rowers/templates/panel_summary.html @@ -1,3 +1,4 @@ +

Summary

     {{ workout.summary }}
diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html
index a4fe822f..a7de9675 100644
--- a/rowers/templates/workflow.html
+++ b/rowers/templates/workflow.html
@@ -33,8 +33,11 @@
     {% block left_panel %}
      {% for templateName in leftTemplates %}
       {% include templateName %}
-     {% endfor %}
+    {% endfor %}
     {% endblock %}
+    
+

Click on the thumbnails to view the full chart

+
{% block middle_panel %} diff --git a/rowers/views.py b/rowers/views.py index 88ed6029..efc20124 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -5887,8 +5887,9 @@ def workout_workflow_view(request,id): middleTemplates = ['panel_statcharts.html','flexthumbnails.html', 'panel_summary.html'] leftTemplates = [ - 'panel_editbuttons.html','panel_staticchart.html', - 'panel_stats.html' + 'panel_editbuttons.html', + 'panel_stats.html', + 'panel_staticchart.html', ] return render(request, diff --git a/static/css/rowsandall.css b/static/css/rowsandall.css index 7dfd9851..7be4294f 100644 --- a/static/css/rowsandall.css +++ b/static/css/rowsandall.css @@ -62,11 +62,28 @@ h1 { font-weight: normal; /* padding-top: 20px; */ text-align: left; + font-size: 2em; } h2 { -/* padding-top: 20px; */ + /* padding-top: 20px; */ + font-weight: normal; text-align: left; + font-size: 1.5em; +} + +h3 { + /* padding-top: 20px; */ + font-weight: normal; + text-align: left; + font-size: 1em; +} + +h3 { + /* padding-top: 20px; */ + font-weight: normal; + text-align: left; + font-size: 1em; } p {