diff --git a/rowers/forms.py b/rowers/forms.py index ebcceaea..3f2ab3ca 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -58,10 +58,11 @@ class DocumentsForm(forms.Form): class Meta: fields = ['title','file','workouttype','fileformat'] -from utils import workflowleftpanel,workflowmiddlepanel +from utils import ( + workflowleftpanel,workflowmiddlepanel, + defaultleft,defaultmiddle + ) -defaultleft = [p[0] for p in workflowleftpanel] -defaultmiddle = [p[0] for p in workflowmiddlepanel] # Form to change Workflow page layout class WorkFlowLeftPanelForm(forms.Form): diff --git a/rowers/models.py b/rowers/models.py index dae97b14..5b7a89ac 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -196,10 +196,10 @@ class TeamRequest(models.Model): issuedate = models.DateField(default=timezone.now) code = models.CharField(max_length=150,unique=True) -from utils import workflowleftpanel,workflowmiddlepanel - -defaultleft = [p[0] for p in workflowleftpanel] -defaultmiddle = [p[0] for p in workflowmiddlepanel] +from utils import ( + workflowleftpanel,workflowmiddlepanel, + defaultleft,defaultmiddle + ) # Extension of User with rowing specific data class Rower(models.Model): diff --git a/rowers/templates/panel_advancededit.html b/rowers/templates/panel_advancededit.html new file mode 100644 index 00000000..58f0182c --- /dev/null +++ b/rowers/templates/panel_advancededit.html @@ -0,0 +1,5 @@ +
+

+ Advanced +

+
diff --git a/rowers/templates/panel_editbuttons.html b/rowers/templates/panel_editbuttons.html index a79cb80a..45f04ddf 100644 --- a/rowers/templates/panel_editbuttons.html +++ b/rowers/templates/panel_editbuttons.html @@ -1,18 +1,5 @@ -
-

Navigation

-

Edit Workout

-
-

- Advanced -

-
-
-

- Edit Intervals -

-
diff --git a/rowers/templates/panel_editintervals.html b/rowers/templates/panel_editintervals.html new file mode 100644 index 00000000..c29472b2 --- /dev/null +++ b/rowers/templates/panel_editintervals.html @@ -0,0 +1,5 @@ +
+

+ Edit Intervals +

+
diff --git a/rowers/templates/panel_editstream.html b/rowers/templates/panel_editstream.html new file mode 100644 index 00000000..d237c47c --- /dev/null +++ b/rowers/templates/panel_editstream.html @@ -0,0 +1,5 @@ +
+

+ Edit Stream Data +

+
diff --git a/rowers/templates/panel_editwind.html b/rowers/templates/panel_editwind.html new file mode 100644 index 00000000..38969060 --- /dev/null +++ b/rowers/templates/panel_editwind.html @@ -0,0 +1,5 @@ +
+

+ Edit Wind Data +

+
diff --git a/rowers/templates/panel_geekyheader.html b/rowers/templates/panel_geekyheader.html new file mode 100644 index 00000000..0195aff3 --- /dev/null +++ b/rowers/templates/panel_geekyheader.html @@ -0,0 +1,3 @@ +
+

Geeky Stuff

+
diff --git a/rowers/templates/panel_navigationheader.html b/rowers/templates/panel_navigationheader.html new file mode 100644 index 00000000..42faa204 --- /dev/null +++ b/rowers/templates/panel_navigationheader.html @@ -0,0 +1,3 @@ +
+

Navigation

+
diff --git a/rowers/templates/panel_otwpower.html b/rowers/templates/panel_otwpower.html new file mode 100644 index 00000000..974536e3 --- /dev/null +++ b/rowers/templates/panel_otwpower.html @@ -0,0 +1,5 @@ +
+

+ OTW Power +

+
diff --git a/rowers/templates/workflow.html b/rowers/templates/workflow.html index a7de9675..ebd65dd1 100644 --- a/rowers/templates/workflow.html +++ b/rowers/templates/workflow.html @@ -31,6 +31,11 @@
{% block left_panel %} +
+

+ Configure this page +

+
{% for templateName in leftTemplates %} {% include templateName %} {% endfor %} diff --git a/rowers/templates/workflowconfig.html b/rowers/templates/workflowconfig.html index bba78091..595f25e5 100644 --- a/rowers/templates/workflowconfig.html +++ b/rowers/templates/workflowconfig.html @@ -10,7 +10,12 @@

Workflow Page Configuration

- +

On this page, you can add and remove elements from the left and middle + panels of your Workflow page. + Use the arrows on the right to move selected elements up and down to + determine the order. + In this way, you can configure the page to + streamline your regular workout analysis workflow.

Left Panel

diff --git a/rowers/utils.py b/rowers/utils.py index ef460420..719df3d4 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -11,12 +11,33 @@ workflowmiddlepanel = ( ('panel_summary.html','Summary'), ) +defaultmiddle = ['panel_statcharts.html', + 'flexthumbnails.html', + 'panel_summary.html'] + workflowleftpanel = ( - ('panel_editbuttons.html','Edit Links'), - ('panel_stats.html','Stats'), - ('panel_staticchart.html','Create Static Charts') + ('panel_navigationheader.html','Navigation Header'), + ('panel_editbuttons.html','Edit Workout Button'), + ('panel_advancededit.html','Advanced Workout Edit Button'), + ('panel_editintervals.html','Edit Intervals Button'), + ('panel_stats.html','Workout Statistics Button'), + ('panel_staticchart.html','Create Static Charts Buttons'), + ('panel_geekyheader.html','Geeky Header'), + ('panel_editwind.html','Edit Wind Data'), + ('panel_editstream.html','Edit Stream Data'), + ('panel_otwpower.html','Run OTW Power Calculations') ) +defaultleft = [ + 'panel_navigationheader.html', + 'panel_editbuttons.html', + 'panel_advancededit.html', + 'panel_editintervals.html' + 'panel_stats.html', + 'panel_staticchart.html', +] + + def absolute(request): urls = { 'ABSOLUTE_ROOT': request.build_absolute_uri('/')[:-1].strip("/"),