From 98c4e5a612e671320cdc2f0405a626ebfbca9044 Mon Sep 17 00:00:00 2001 From: Erick Otenyo Date: Thu, 4 Apr 2024 13:39:40 +0300 Subject: [PATCH] Show weather widget only when there is forecast data --- .../home/forecast_widget_include.html | 265 +++++++++--------- 1 file changed, 133 insertions(+), 132 deletions(-) diff --git a/pages/home/templates/home/forecast_widget_include.html b/pages/home/templates/home/forecast_widget_include.html index b9ff794c..8dc65686 100644 --- a/pages/home/templates/home/forecast_widget_include.html +++ b/pages/home/templates/home/forecast_widget_include.html @@ -1,154 +1,155 @@ {% load i18n wagtailiconchooser_tags %} -
-
- {% with default_city_forecasts|first as earliest %} - {% if city_detail_page_url %} -
-
-
- - - - +{% if default_city_forecasts %} +
+
+ {% with default_city_forecasts|first as earliest %} + {% if city_detail_page_url %} +
+
+
+ + + + +
-
- -
- {% endif %} -
-
-
- - - -
- {{ earliest.city.name }} +
-
- {{ earliest.forecast_date|date:"l, j M Y" }} -
- {% if city_detail_page_url %} - - - Detail - - - + {% endif %} +
+
+
+ + - - {% endif %} -
-
-
- {% if earliest.data_values_dict.temperature %} -
- {% if earliest.data_values_dict.temperature.temp %} - {{ earliest.data_values_dict.temperature.temp.value_with_units }} - {% else %} - {% if earliest.data_values_dict.temperature.max_temp %} -
- {{ earliest.data_values_dict.temperature.max_temp.value_with_units }} -
- {% endif %} - {% if earliest.data_values_dict.temperature.min_temp %} -
- {{ earliest.data_values_dict.temperature.min_temp.value_with_units }} -
- {% endif %} - {% endif %} +
+ {{ earliest.city.name }}
+
+
+ {{ earliest.forecast_date|date:"l, j M Y" }} +
+ {% if city_detail_page_url %} + + + Detail + + + + + {% endif %}
-
- {{ earliest.condition.label }} -
{{ earliest.condition.label }}
-
-
- {% for key, data_value in earliest.data_values_dict.items %} - {% if key != "temperature" %} -
-
- {% svg_icon data_value.icon %} -
-
- {{ data_value.value_with_units }} -
+
+
+ {% if earliest.data_values_dict.temperature %} +
+ {% if earliest.data_values_dict.temperature.temp %} + {{ earliest.data_values_dict.temperature.temp.value_with_units }} + {% else %} + {% if earliest.data_values_dict.temperature.max_temp %} +
+ {{ earliest.data_values_dict.temperature.max_temp.value_with_units }} +
+ {% endif %} + {% if earliest.data_values_dict.temperature.min_temp %} +
+ {{ earliest.data_values_dict.temperature.min_temp.value_with_units }} +
+ {% endif %} + {% endif %}
{% endif %} - {% endfor %} +
+
+ {{ earliest.condition.label }} +
{{ earliest.condition.label }}
+
+
+ {% for key, data_value in earliest.data_values_dict.items %} + {% if key != "temperature" %} +
+
+ {% svg_icon data_value.icon %} +
+
+ {{ data_value.value_with_units }} +
+
+ {% endif %} + {% endfor %} +
-
- {% endwith %} - {% if default_city_forecasts|length > 2 %} -
- {% for forecast in default_city_forecasts %} - {% if not forloop.first %} -
-
- {{ forecast.forecast_date|date:"D, j M" }} -
- {{ forecast.condition.label }} -
- {% if forecast.data_values_dict.temperature %} - {% if forecast.data_values_dict.temperature.temp %} - {{ forecast.data_values_dict.temperature.temp.value_with_units }} - {% else %} - {% if forecast.data_values_dict.temperature.max_temp %} - - {{ forecast.data_values_dict.temperature.max_temp.value_with_units }} - - {% endif %} - {% if forecast.data_values_dict.temperature.min_temp %} - - {{ forecast.data_values_dict.temperature.min_temp.value_with_units }} - + {% endwith %} + {% if default_city_forecasts|length > 2 %} +
+ {% for forecast in default_city_forecasts %} + {% if not forloop.first %} +
+
+ {{ forecast.forecast_date|date:"D, j M" }} +
+ {{ forecast.condition.label }} +
+ {% if forecast.data_values_dict.temperature %} + {% if forecast.data_values_dict.temperature.temp %} + {{ forecast.data_values_dict.temperature.temp.value_with_units }} + {% else %} + {% if forecast.data_values_dict.temperature.max_temp %} + + {{ forecast.data_values_dict.temperature.max_temp.value_with_units }} + + {% endif %} + {% if forecast.data_values_dict.temperature.min_temp %} + + {{ forecast.data_values_dict.temperature.min_temp.value_with_units }} + + {% endif %} {% endif %} {% endif %} - {% endif %} +
-
- {% endif %} - {% endfor %} -
- {% endif %} -
- {% if all_city_detail_page_url %} - - - - - - {% trans "All Locations" %} - - - {% endif %} - {% if weather_reports_page_url %} - - - - - - {% trans "Daily Weather Reports" %} - - + {% endif %} + {% endfor %} + {% endif %} +
+ {% if all_city_detail_page_url %} + + + + + + {% trans "All Locations" %} + + + {% endif %} + {% if weather_reports_page_url %} + + + + + + {% trans "Daily Weather Reports" %} + + + {% endif %} +
-
- +{% endif %}