From 0c538a1a8f4b6a977a3df5c29d3542d4f8b0105a Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Tue, 6 Jul 2021 08:46:03 +0200
Subject: [PATCH] Optimize widget layout #203

---
 project/templates/layout.html                 | 10 +++++++---
 project/templates/layout_widget.html          | 19 +++++++++++++++++++
 project/templates/widget/event_date/list.html | 13 +++----------
 project/templates/widget/event_date/read.html |  8 +-------
 .../widget/event_suggestion/create.html       |  9 +++------
 project/templates/widget/infoscreen/read.html |  6 +++---
 6 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 project/templates/layout_widget.html

diff --git a/project/templates/layout.html b/project/templates/layout.html
index eb53217..74b718c 100644
--- a/project/templates/layout.html
+++ b/project/templates/layout.html
@@ -57,6 +57,7 @@
     {%- block styles %}
     {%- endblock styles %}
 
+    {%- block gtm_header %}
     {% set gtm_id = None | env_override('GTM_ID') %}
     {% if gtm_id %}
     <script>
@@ -72,6 +73,7 @@
       <script defer type="application/javascript" src="https://cdn.kiprotect.com/klaro/v0.7/klaro-no-css.js"></script>
       <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='klaro.css')}}" />
     {% endif %}
+    {%- endblock gtm_header %}
 
     <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
     <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
@@ -171,9 +173,11 @@
   </head>
   <body{% block body_attribs %}{% endblock body_attribs %}>
     {% block body -%}
-      {% if gtm_id %}
-        <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ gtm_id }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-      {% endif %}
+      {%- block gtm_body %}
+        {% if gtm_id %}
+          <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ gtm_id }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+        {% endif %}
+      {%- endblock gtm_body %}
       {% block navbar %}
       <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
           <a class="navbar-brand" href="{{ url_for('home') }}">
diff --git a/project/templates/layout_widget.html b/project/templates/layout_widget.html
new file mode 100644
index 0000000..dae7b73
--- /dev/null
+++ b/project/templates/layout_widget.html
@@ -0,0 +1,19 @@
+{% extends "layout.html" %}
+{% from "_macros.html" import render_widget_styles %}
+
+{% block styles %}
+<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='widget.css')}}" />
+{{ render_widget_styles(styles) }}
+{% endblock %}
+
+{% block navbar %}
+{% endblock %}
+
+{%- block gtm_header %}
+{%- endblock gtm_header %}
+
+{%- block gtm_body %}
+{%- endblock gtm_body %}
+
+{% block footer %}
+{% endblock %}
\ No newline at end of file
diff --git a/project/templates/widget/event_date/list.html b/project/templates/widget/event_date/list.html
index 07ed2a2..fc48c5b 100644
--- a/project/templates/widget/event_date/list.html
+++ b/project/templates/widget/event_date/list.html
@@ -1,14 +1,9 @@
-{% extends "layout.html" %}
-{% from "_macros.html" import render_widget_styles, render_pagination, render_event_warning_pills, render_event_warning_pills, render_place, render_events_sub_menu %}
+{% extends "layout_widget.html" %}
+{% from "_macros.html" import render_pagination, render_event_warning_pills, render_event_warning_pills, render_place %}
 {%- block title -%}
 {{ _('Widget') }}
 {%- endblock -%}
-{% block styles %}
-<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='widget.css')}}" />
-{{ render_widget_styles(styles) }}
-{% endblock %}
-{% block navbar %}
-{% endblock %}
+
 {% block content %}
 
     <form action="{{ request.url }}" class="form-inline mb-4" method="GET" autocomplete="off">
@@ -109,6 +104,4 @@
 
     <button class="btn btn-outline-secondary d-print-none btn-print"><i class="fa fa-print"></i> {{ _('Print') }}</button>
 
-{% endblock %}
-{% block footer %}
 {% endblock %}
\ No newline at end of file
diff --git a/project/templates/widget/event_date/read.html b/project/templates/widget/event_date/read.html
index 0f1ac37..2373007 100644
--- a/project/templates/widget/event_date/read.html
+++ b/project/templates/widget/event_date/read.html
@@ -1,15 +1,9 @@
-{% extends "layout.html" %}
+{% extends "layout_widget.html" %}
 {% from "_macros.html" import render_audit_container, render_widget_styles, render_event_props, render_image_with_link, render_place, render_link_prop %}
 {% set event = event_date.event %}
 {%- block title -%}
 {{ event.name }}
 {%- endblock -%}
-{% block styles %}
-<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='widget.css')}}" />
-{{ render_widget_styles(styles) }}
-{% endblock %}
-{% block navbar %}
-{% endblock %}
 {% block content %}
 
 <div class="w-normal">
diff --git a/project/templates/widget/event_suggestion/create.html b/project/templates/widget/event_suggestion/create.html
index 9c402df..53839e3 100644
--- a/project/templates/widget/event_suggestion/create.html
+++ b/project/templates/widget/event_suggestion/create.html
@@ -1,14 +1,11 @@
-{% extends "layout.html" %}
-{% from "_macros.html" import render_widget_styles, render_logo, render_cropper_code, render_crop_image_form, render_jquery_steps_header, render_cropper_header, render_radio_buttons, render_datepicker_js, render_field_with_errors, render_field %}
+{% extends "layout_widget.html" %}
+{% from "_macros.html" import render_logo, render_cropper_code, render_crop_image_form, render_jquery_steps_header, render_cropper_header, render_radio_buttons, render_datepicker_js, render_field_with_errors, render_field %}
 {%- block title -%}
 {{ _('Create event suggestion') }}
 {%- endblock -%}
 {% block styles %}
 <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='jquery-steps.css')}}" />
-<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='widget.css')}}" />
-{{ render_widget_styles(styles) }}
-{% endblock %}
-{% block navbar %}
+{{ super() }}
 {% endblock %}
 {% block header_before_site_js %}
 {{ render_jquery_steps_header() }}
diff --git a/project/templates/widget/infoscreen/read.html b/project/templates/widget/infoscreen/read.html
index 181d4ca..8b046b8 100644
--- a/project/templates/widget/infoscreen/read.html
+++ b/project/templates/widget/infoscreen/read.html
@@ -1,11 +1,11 @@
-{% extends "layout.html" %}
-{% from "_macros.html" import render_widget_styles, render_location, render_location_prop, render_logo, render_pagination, render_event_warning_pills, render_place, render_events_sub_menu %}
+{% extends "layout_widget.html" %}
+{% from "_macros.html" import render_location, render_location_prop, render_logo, render_pagination, render_event_warning_pills, render_place, render_events_sub_menu %}
 {%- block title -%}
 {{ admin_unit.name }} Infoscreen
 {%- endblock -%}
 {% block styles %}
 <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='infoscreen.css')}}" />
-{{ render_widget_styles(styles) }}
+{{ super() }}
 {% endblock %}
 {% block navbar %}
 {% endblock %}