diff --git a/dm_regional_app/charts.py b/dm_regional_app/charts.py
index 81e30a6..e23fd36 100644
--- a/dm_regional_app/charts.py
+++ b/dm_regional_app/charts.py
@@ -90,9 +90,9 @@ def prediction_chart(historic_data: PopulationStats, prediction: Prediction, **k
width=0,
),
label=dict(
- text="Reference period", textposition="top center", font=dict(size=15)
+ text="Reference period", textposition="top center", font=dict(size=14)
),
- fillcolor="rgba(0,0,255,0.1)",
+ fillcolor="rgba(105,105,105,0.1)",
layer="above",
)
diff --git a/dm_regional_app/forms.py b/dm_regional_app/forms.py
index 801cca3..d5afd1b 100644
--- a/dm_regional_app/forms.py
+++ b/dm_regional_app/forms.py
@@ -10,6 +10,7 @@ class PredictFilter(forms.Form):
widget=DatePickerInput(),
label="Reference Start Date",
required=True,
+ help_text="Select the period you would like the model to reference",
)
reference_end_date = forms.DateField(
widget=DatePickerInput(),
@@ -20,6 +21,7 @@ class PredictFilter(forms.Form):
widget=DatePickerInput(),
label="Prediction Start Date",
required=False,
+ help_text="Select the future date-range you want to apply your forecast to",
)
prediction_end_date = forms.DateField(
widget=DatePickerInput(),
diff --git a/dm_regional_app/templates/dm_regional_app/includes/navbar-item.html b/dm_regional_app/templates/dm_regional_app/includes/navbar-item.html
index 0b57427..9512fd0 100644
--- a/dm_regional_app/templates/dm_regional_app/includes/navbar-item.html
+++ b/dm_regional_app/templates/dm_regional_app/includes/navbar-item.html
@@ -1,5 +1,5 @@
{{ name }}
diff --git a/dm_regional_app/templates/dm_regional_app/includes/navbar.html b/dm_regional_app/templates/dm_regional_app/includes/navbar.html
index 58597ad..7edf615 100644
--- a/dm_regional_app/templates/dm_regional_app/includes/navbar.html
+++ b/dm_regional_app/templates/dm_regional_app/includes/navbar.html
@@ -11,12 +11,12 @@
-
+
{% if user.is_authenticated %}
{% include 'dm_regional_app/includes/navbar-item.html' with url='home' name='Home' url_names="['home']" %}
- {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=historic_data" name='Historic' url_names="['historic_data']" %}
- {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=prediction" name='Prediction' url_names="['prediction']" %}
- {% include 'dm_regional_app/includes/navbar-item.html' with url='scenarios' name='Scenarios' url_names="['scenarios', 'scenario_detail']" %}
+ {% include 'dm_regional_app/includes/navbar-item.html' with url='scenarios' name='Saved Scenarios' url_names="['scenarios', 'scenario_detail']" %}
+ {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=historic_data" name='Historic Data' url_names="['historic_data']" %}
+ {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=prediction" name='Start Modelling' url_names="['prediction']" %}
{% else %}
{% include 'dm_regional_app/includes/navbar-item.html' with url='home' name='Home' url_names="['home']" %}
{% endif %}