- {{ drupal_block("weathergov_location_search") }} + {% include(directory ~ "/templates/partials/location-search.html.twig") with { place: point.place } %} - {% if weather.alerts %} + {% if point.alerts.items | length > 0 %}
- {{ drupal_block("weathergov_local_alert_list") }} + {% include(directory ~ "/templates/point/alert-summary.html.twig") with { alerts: point.alerts.items } %}
{% endif %} @@ -39,7 +39,7 @@
- {% if weather.alerts %} + {% if point.alerts.items | length > 0 %} {% endif %} @@ -49,22 +49,21 @@
- {% if weather.alerts %} + {% if point.alerts.items | length > 0 %}
- {{ drupal_block("weathergov_local_alerts") }} + {% include(directory ~ "/templates/point/alerts.html.twig") with { alerts: point.alerts.items } %}
{% endif %}
- {{ drupal_block("weathergov_current_conditions") }} - {% include '@new_weather_theme/partials/radar.html.twig' with { 'point': weather.point } %} - + {% include '@new_weather_theme/point/observations.html.twig' with { obs: point.observed } %} + {% include '@new_weather_theme/partials/radar.html.twig' with { point: point.point } %} {% include '@new_weather_theme/partials/satellite.html.twig' %}

7 days

- {{ drupal_block("weathergov_weather_story") }} + {{ drupal_block("weathergov_weather_story", { wfo: point.grid.wfo }) }}
@@ -86,11 +85,10 @@
-

Daily forecast

- {{ drupal_block("weathergov_daily_forecast") }} + {% include '@new_weather_theme/point/forecast.html.twig' with { forecast: point.forecast } %} - {{ drupal_block("weathergov_wfo_promo") }} + {{ drupal_block("weathergov_wfo_promo", { wfo: point.grid.wfo }) }}
diff --git a/web/themes/new_weather_theme/templates/layout/page.html.twig b/web/themes/new_weather_theme/templates/layout/page.html.twig index 35b411379..a756c2c0a 100644 --- a/web/themes/new_weather_theme/templates/layout/page.html.twig +++ b/web/themes/new_weather_theme/templates/layout/page.html.twig @@ -85,6 +85,7 @@ {% if path('') == "/home" %} {% include(directory ~ "/templates/layout/frontpage.html.twig") %} {% else %} + {% include(directory ~ "/templates/partials/location-search.html.twig") with { place: point.place } %} {{ page.content }} {% endif %}