Leaflet outside of pipeline b/c of paths.

diff --git a/src/references/templates/references/map.html b/src/references/templates/references/map.html
index d4569c7..7cd391c 100644 (file)
--- a/src/references/templates/references/map.html
+++ b/src/references/templates/references/map.html
@@ -1,4 +1,5 @@
 {% extends "2022/base.html" %}
 {% extends "2022/base.html" %}

+{% load static %}

 {% load l10n %}
 
 {% block global-content %}
 {% load l10n %}
 
 {% block global-content %}


@@ -8,7 +9,16 @@
 {% endblock %}
 
 
 {% endblock %}
 
 

+{% block extrahead %}
+  <link rel="stylesheet" type="text/css" media="all" href="{% static 'contrib/leaflet-1.9.4/leaflet.css' %}">
+  <link rel="stylesheet" type="text/css" media="all" href="{% static 'contrib/leaflet.markercluster-1.4.1/MarkerCluster.css' %}">
+  <link rel="stylesheet" type="text/css" media="all" href="{% static 'contrib/leaflet.markercluster-1.4.1/MarkerCluster.Default.css' %}">
+{% endblock %}
+
+

 {% block extrabody %}
 {% block extrabody %}

+  <script src="{% static 'contrib/leaflet-1.9.4/leaflet.js' %}"></script>
+  <script src="{% static 'contrib/leaflet.markercluster-1.4.1/leaflet.markercluster.js' %}"></script>

   <script>
    var map = L.map('references-map').setView([52, 20], 7);
 
   <script>
    var map = L.map('references-map').setView([52, 20], 7);
 


@@ -38,7 +48,6 @@
        );
    }
 
        );
    }
 

-

    {% localize off %}
    {% for e in entities %}
    L.marker(
    {% localize off %}
    {% for e in entities %}
    L.marker(

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index 6d12fbd..15f758a 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -24,9 +24,6 @@ PIPELINE = {
         '2022': {
             'source_filenames': [
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.css',
         '2022': {
             'source_filenames': [
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.css',

-                'contrib/leaflet-1.9.4/leaflet.css',
-                'contrib/leaflet.markercluster-1.4.1/MarkerCluster.css',
-                'contrib/leaflet.markercluster-1.4.1/MarkerCluster.Default.css',

                 'css/jquery.countdown.css',
 
                 '2022/styles/main.scss',
                 'css/jquery.countdown.css',
 
                 '2022/styles/main.scss',


@@ -145,8 +142,6 @@ PIPELINE = {
             'source_filenames': [
                 '2022/scripts/vendor.js',
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.js',
             'source_filenames': [
                 '2022/scripts/vendor.js',
                 'contrib/jquery-ui-1.13.1.custom/jquery-ui.js',

-                'contrib/leaflet-1.9.4/leaflet.js',
-                'contrib/leaflet.markercluster-1.4.1/leaflet.markercluster.js',

 
                 'js/search.js',
                 'js/2022.js',
 
                 'js/search.js',
                 'js/2022.js',