igs-slm 0.1.4b0__py3-none-any.whl → 0.1.5b0__py3-none-any.whl

slm/static/slm/js/form.js

@@ -1,6 +1,4 @@
-import { Persistable } from "./persistable.js";
-
-export class Form extends Persistable {
+class Form extends slm.Persistable {
     /**
      * This class encapsulates reading and writing json data to/from html forms.
      * This is less trivial than you might assume and there are some special case
@@ -402,3 +400,5 @@ export class Form extends Persistable {
         this.#changeCallbacks.push(callback);
     }
 }
+
+slm.Form = Form;

slm/static/slm/js/formWidget.js

@@ -1,6 +1,4 @@
-import { Persistable } from './persistable.js'
-
-export class FormWidget extends Persistable {
+class FormWidget extends slm.Persistable {
 
     #container;
 
@@ -21,3 +19,5 @@ export class FormWidget extends Persistable {
     }
 
 }
+
+slm.FormWidget = FormWidget;

slm/static/slm/js/persistable.js

@@ -1,4 +1,6 @@
-export class Persistable {
+if (typeof slm === 'undefined' || slm == null) { var slm = {}; }
+
+class Persistable {
     /**
      * A simple interface defining a persistable component. Data is persisted
      * in session memory.
@@ -31,3 +33,5 @@ export class Persistable {
          */
     }
 }
+
+slm.Persistable = Persistable;

slm/templates/admin/base.html

@@ -4,4 +4,5 @@
 {% block extrahead %}
 {{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% static 'slm/css/admin.css' %}">
+<link rel="icon" href="{% static 'slm/img/favicon.ico' %}" type="image/x-icon">
 {% endblock extrahead %}

slm/templates/rest_framework/base.html

@@ -24,14 +24,14 @@
         <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/>
         <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/default.css" %}"/>
 
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/themes/base/jquery-ui.min.css" integrity="sha512-ELV+xyi8IhEApPS/pSj66+Jiw+sOT1Mqkzlh8ExXihe4zfqbWkxPRi8wptXIO9g73FSlhmquFlUOuMSoXz5IRw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css" integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.14.1/themes/base/jquery-ui.min.css" integrity="sha512-TFee0335YRJoyiqz8hA8KV3P0tXa5CpRBSoM0Wnkn7JoJx1kaq1yXL/rb8YFpWXkMOjRcv5txv+C6UluttluCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
         <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap" rel="stylesheet">
 
         <!-- https://github.com/lipis/flag-icons -->
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@6.6.6/css/flag-icons.min.css"/>
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icons/7.3.2/css/flag-icons.min.css" integrity="sha512-+WVTaUIzUw5LFzqIqXOT3JVAc5SrMuvHm230I9QAZa6s+QRk8NDPswbHo2miIZj3yiFyV9lAgzO1wVrjdoO4tw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
         {% compress css %}
         <link rel='stylesheet' type='text/css' media='screen' href='{% static "slm/css/style.css" %}'>
@@ -304,14 +304,26 @@
           csrfToken: "{% if request %}{{ csrf_token }}{% endif %}"
         };
       </script>
-      <script src="{% static "rest_framework/js/jquery-3.5.1.min.js" %}"></script>
-      <script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
-      <script src="{% static "rest_framework/js/csrf.js" %}"></script>
-      <script src="{% static "rest_framework/js/bootstrap.bundle.min.js" %}"></script>
-      <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
-      <script src="{% static "rest_framework/js/default.js" %}"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js" integrity="sha512-57oZ/vW8ANMjR/KQ6Be9v/+/h6bq9/l3f0Oc7vn6qMqyhvPd1cvKBRWWpzu0QoneImqr2SkmO4MSqU+RpHom3Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-      <script src="{% static "slm/js/autocomplete.js" %}" type="module"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.14.1/jquery-ui.min.js" integrity="sha512-MSOo1aY+3pXCOCdGAYoBZ6YGI0aragoQsg1mKKBHXCYPIWxamwOE7Drh+N5CPgGI5SA9IEKJiPjdfqWFWmZtRA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>  
+      {% compress js %}
+        <script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
+        <script src="{% static "rest_framework/js/csrf.js" %}"></script>
+        <script src="{% static "rest_framework/js/bootstrap.bundle.min.js" %}"></script>
+        <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
+        <script src="{% static "rest_framework/js/default.js" %}"></script>
+      {% endcompress %}
+      {% compress js %}
+          <script src="{% static 'slm/js/fileIcons.js' %}"></script>
+          <script src="{% static 'slm/js/slm.js' %}"></script>
+          <script src="{% static 'urls.js' %}"></script>
+          <script src="{% static 'slm/js/time24.js' %}"></script>
+          <script src="{% static 'slm/js/enums.js' %}"></script>
+          <script src="{% static 'slm/js/persistable.js' %}"></script>
+          <script src="{% static 'slm/js/form.js' %}"></script>
+          <script src="{% static 'slm/js/formWidget.js' %}"></script>
+          <script src="{% static 'slm/js/autocomplete.js' %}"></script>
+      {% endcompress %}
 
       <script>
         $(document).ready(function() {

slm/templates/slm/base.html

@@ -26,15 +26,15 @@ https://docs.djangoproject.com/en/3.2/topics/templates/
     <link rel="shortcut icon" type="image/png" href="{% static 'slm/img/favicon.ico' %}"/>
 
     {% block stylesheets %}
-        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css" integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
         <link rel="preconnect" href="https://fonts.googleapis.com">
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
         <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/themes/base/jquery-ui.min.css" integrity="sha512-ELV+xyi8IhEApPS/pSj66+Jiw+sOT1Mqkzlh8ExXihe4zfqbWkxPRi8wptXIO9g73FSlhmquFlUOuMSoXz5IRw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.14.1/themes/base/jquery-ui.min.css" integrity="sha512-TFee0335YRJoyiqz8hA8KV3P0tXa5CpRBSoM0Wnkn7JoJx1kaq1yXL/rb8YFpWXkMOjRcv5txv+C6UluttluCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
         <!-- https://github.com/lipis/flag-icons -->
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@6.6.6/css/flag-icons.min.css"/>
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icons/7.3.2/css/flag-icons.min.css" integrity="sha512-+WVTaUIzUw5LFzqIqXOT3JVAc5SrMuvHm230I9QAZa6s+QRk8NDPswbHo2miIZj3yiFyV9lAgzO1wVrjdoO4tw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.7/jquery.fancybox.min.css" integrity="sha512-H9jrZiiopUdsLpg94A333EfumgUBpO9MdbxStdeITo+KEIMaNfHNvwyjjDJb+ERPaRS6DpyRlKbvPUasNItRyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
         {% compress css %}
@@ -45,29 +45,34 @@ https://docs.djangoproject.com/en/3.2/topics/templates/
 
 
     {% block javascript %}
-        <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.13.2/jquery-ui.min.js" integrity="sha512-57oZ/vW8ANMjR/KQ6Be9v/+/h6bq9/l3f0Oc7vn6qMqyhvPd1cvKBRWWpzu0QoneImqr2SkmO4MSqU+RpHom3Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.14.1/jquery-ui.min.js" integrity="sha512-MSOo1aY+3pXCOCdGAYoBZ6YGI0aragoQsg1mKKBHXCYPIWxamwOE7Drh+N5CPgGI5SA9IEKJiPjdfqWFWmZtRA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.7/jquery.fancybox.min.js" integrity="sha512-uURl+ZXMBrF4AwGaWmEetzrd+J5/8NRkWAvJx5sbPSSuOb0bZLqf+tOzniObO00BjHa/dD7gub9oCGMLPQHtQA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
         {% compress js %}
-            <script src="{% static 'slm/js/enums.js' %}"></script>
-            <script src="{% static 'slm/js/slm.js' %}"></script>
             <script src="{% static 'slm/js/fileIcons.js' %}"></script>
+            <script src="{% static 'slm/js/slm.js' %}"></script>
             <script src="{% static 'urls.js' %}"></script>
             <script src="{% static 'slm/js/time24.js' %}"></script>
-            <script>
-                slm.isModerator = {% if is_moderator %}true{% else %}false{% endif %};
-                slm.canPublish = {% if can_publish %}true{% else %}false{% endif %};
-                $.ajaxSetup({
-                    beforeSend: function (xhr)
-                    {
-                       xhr.setRequestHeader(
-                           'X-CSRFToken', '{{ csrf_token }}');
-                    }
-                });
-            </script>
+            <script src="{% static 'slm/js/enums.js' %}"></script>
+            <script src="{% static 'slm/js/persistable.js' %}"></script>
+            <script src="{% static 'slm/js/form.js' %}"></script>
+            <script src="{% static 'slm/js/formWidget.js' %}"></script>
+            <script src="{% static 'slm/js/autocomplete.js' %}"></script>
         {% endcompress %}
+
+        <script>
+            slm.isModerator = {% if is_moderator %}true{% else %}false{% endif %};
+            slm.canPublish = {% if can_publish %}true{% else %}false{% endif %};
+            $.ajaxSetup({
+                beforeSend: function (xhr)
+                {
+                    xhr.setRequestHeader(
+                        'X-CSRFToken', '{{ csrf_token }}');
+                }
+            });
+        </script>
     {% endblock javascript %}
     {% endblock head %}
 </head>
@@ -104,7 +109,7 @@ https://docs.djangoproject.com/en/3.2/topics/templates/
       <div class="container-fluid mx-4">
         {% block branding %}
         <div class="d-flex align-items-center w-50">
-          <a href="{% url "slm:home" %}" class="navbar-brand"><img id="logo" class="me-4" src="{% static 'slm/img/slm-logo.svg' %}" alt="SLM"> Site Log Manager 2.0</a>
+          <a href="{% url "slm:home" %}" class="navbar-brand"><img id="logo" class="me-4" src="{% static 'slm/img/slm-logo.svg' %}" alt="SLM"> Site Log Manager {{ slm_version }}</a>
         </div>
         {% endblock branding %}
           <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#collapsingNavbar3" title="Navigation">
@@ -175,7 +180,7 @@ https://docs.djangoproject.com/en/3.2/topics/templates/
   </div>
 </body>
 
-  {% compress js %}
+  {% compress js inline %}
   <script type='text/javascript'>
     $(document).ready(function() {
       var options = {

slm/templates/slm/forms/widgets/auto_complete.html

@@ -6,16 +6,17 @@
     <label for="{{ widget.attrs.id }}-input" style="display: none">{{ label }}</label>
     <input id="{{ widget.attrs.id }}-input" name="{{ widget.name }}" {% if widget.value != None %} value="{{ widget.value|stringformat:'s' }}"{% endif %} type="text" style="display: none">
 
-    <script type="module">
-        import { AutoComplete } from "{% static 'slm/js/autocomplete.js' %}";
-        let widget = new AutoComplete({container: $('fieldset#{{ widget.attrs.id }}-container')});
-        let ipt = $('fieldset#{{ widget.attrs.id }}-container input');
-        ipt.data('widget', widget);
-        if (ipt.val() && !widget.textInput.html()) {
-            widget.add(widget.getSuggestion(ipt.val()));
-        }
-        {% for value in widget|autocomplete_values %}
-        widget.add(widget.makeSuggestion(JSON.parse('{{ value|safe }}')));
-        {% endfor %}
+    <script>
+        (() => {
+            let widget = new slm.AutoComplete({container: $('fieldset#{{ widget.attrs.id }}-container')});
+            let ipt = $('fieldset#{{ widget.attrs.id }}-container input');
+            ipt.data('widget', widget);
+            if (ipt.val() && !widget.textInput.html()) {
+                widget.add(widget.getSuggestion(ipt.val()));
+            }
+            {% for value in widget|autocomplete_values %}
+            widget.add(widget.makeSuggestion(JSON.parse('{{ value|safe }}')));
+            {% endfor %}
+        })();
     </script>
 </fieldset>

slm/templates/slm/forms/widgets/auto_complete_multiple.html

@@ -7,12 +7,13 @@
         <select id='{{widget.attrs.id}}-select' name="{{ widget.name }}" multiple></select>
     </div>
     <div class="select-display"></div>
-    <script type="module">
-        import { AutoCompleteMultiple } from "{% static 'slm/js/autocomplete.js' %}";
-        let widget = new AutoCompleteMultiple({container: $('fieldset#{{ widget.attrs.id }}-container')});
-        $('fieldset#{{ widget.attrs.id }}-container select').data('widget', widget);
-        {% for value in widget|autocomplete_values %}
-        widget.add(widget.makeSuggestion(JSON.parse('{{ value|safe }}')));
-        {% endfor %}
+    <script>
+        (() => {
+            let widget = new slm.AutoCompleteMultiple({container: $('fieldset#{{ widget.attrs.id }}-container')});
+            $('fieldset#{{ widget.attrs.id }}-container select').data('widget', widget);
+            {% for value in widget|autocomplete_values %}
+            widget.add(widget.makeSuggestion(JSON.parse('{{ value|safe }}')));
+            {% endfor %}
+        })();
     </script>
 </fieldset>

slm/templates/slm/station/download.html

@@ -29,7 +29,7 @@ Template for Download page.
             <i class="bi bi-file-text slm-published" style="font-size:60px;"></i>
             <h2 class="mb-3">{% trans "ASCII (.log)" %}</h2>
             <p class="mb-4">{% trans "Text-based description of the metadata of a GNSS station" %}</p>
-            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='log' %}"{% endif %} download>Download</a>
+            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='log' %}?lower_case=1"{% endif %} download>Download</a>
           </div>
         </div>
         <div class="col-12 col-md-6 col-xl-4 my-3">
@@ -37,7 +37,7 @@ Template for Download page.
             <i class="bi bi-filetype-xml slm-published" style="font-size:60px;"></i>
             <h2 class="mb-3">{% trans "GeodesyML (.xml)" %}</h2>
             <p class="mb-4">{% trans "Machine-readable XML format of the data and metadata of a GNSS station" %}</p>
-            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='xml' %}"{% endif %} download>Download</a>
+            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='xml' %}?lower_case=1"{% endif %} download>Download</a>
           </div>
         </div>
         <div class="col-12 col-md-6 col-xl-4 my-3">
@@ -45,7 +45,7 @@ Template for Download page.
             <i class="bi bi-filetype-json slm-published" style="font-size:60px;"></i>
             <h2 class="mb-3">{% trans "JSON (.json)" %}</h2>
             <p class="mb-4">{% trans "This is still under development. JavaScript Object Notation format of the data and metadata of a GNSS station" %}</p>
-            <a class="btn btn-primary disabled {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='json' %}?published=False"{% endif %} download>Download</a>
+            <a class="btn btn-primary disabled {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='json' %}?lower_case=1"{% endif %} download>Download</a>
           </div>
         </div>
       </div>
@@ -59,7 +59,7 @@ Template for Download page.
             <h2 class="mb-3">{% trans "ASCII (.log)" %}</h2>
             <h3 class="mb-3 fs-4">{% trans "MODIFIED/UNPUBLISHED" %}</h3>
             <p class="mb-4">{% trans "Text-based description of the metadata of a GNSS station" %}</p>
-            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='log' %}?unpublished=True"{% endif %} download>Download</a>
+            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='log' %}?unpublished=True&lower_case=1"{% endif %} download>Download</a>
           </div>
         </div>
         <div class="col-12 col-md-6 col-xl-4 my-3">
@@ -68,7 +68,7 @@ Template for Download page.
             <h2 class="mb-3">{% trans "GeodesyML (.xml)" %}</h2>
             <h3 class="mb-3 fs-4">{% trans "MODIFIED/UNPUBLISHED" %}</h3>
             <p class="mb-4">{% trans "Machine-readable XML format of the data and metadata of a GNSS station" %}</p>
-            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='xml' %}?unpublished=True"{% endif %} download>Download</a>
+            <a class="btn btn-primary {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='xml' %}?unpublished=True&lower_case=1"{% endif %} download>Download</a>
           </div>
         </div>
         <div class="col-12 col-md-6 col-xl-4 my-3">
@@ -77,7 +77,7 @@ Template for Download page.
             <h2 class="mb-3">{% trans "JSON (.json)" %}</h2>
             <h3 class="mb-3 fs-4">{% trans "MODIFIED/UNPUBLISHED" %}</h3>
             <p class="mb-4">{% trans "This is still under development. JavaScript Object Notation format of the data and metadata of a GNSS station" %}</p>
-            <a class="btn btn-primary disabled {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='json' %}?unpublished=True"{% endif %} download>Download</a>
+            <a class="btn btn-primary disabled {% if not station %}disabled{% endif %}" {% if station %}href="{% url 'slm_edit_api:download-detail' site=station format='json' %}?unpublished=True&lower_case=1"{% endif %} download>Download</a>
           </div>
         </div>
       </div>

slm/templates/slm/station/edit.html

@@ -8,7 +8,7 @@ Add new section capability is not functional.
 -->
 
 {% extends "slm/station/base.html" %}
-{% load widget_tweaks slm i18n compress %}
+{% load widget_tweaks slm i18n %}
 
 {% block action_content %}
 <!-- Station Metadata Forms -->
@@ -108,13 +108,9 @@ Add new section capability is not functional.
                           <div class="accordion-body">
                             {% with flag_id=section_id|to_id:form.instance.id|to_id:"flags" %}
                             {{ form.instance.flags }}
-                            {% compress css inline %}
-                                {{ form.media.css }}
-                            {% endcompress %}
-                            {% compress js inline %}
-                                {{ form.media.js }}
-                                {{ form.flags|json_script:flag_id }}
-                            {% endcompress %}
+                            {{ form.media.css }}
+                            {{ form.media.js }}
+                            {{ form.flags|json_script:flag_id }}
                             {% include 'slm/station/form.html' with form=form form_id=form_inst_id flag_id=flag_id %}
                             {% endwith %}
                           </div>
@@ -181,7 +177,7 @@ Add new section capability is not functional.
                 const newForm = $('#new-form').children().first().clone();
                 newForm.find('script').each(function() {
                     const newScript = document.createElement('script');
-                    newScript.type = 'module';
+                    //newScript.type = 'module';
                     $(newScript).html($(this).html().replaceAll('new_form_id', formId));
                     $(this).replaceWith(newScript);
                 });
@@ -208,13 +204,9 @@ Add new section capability is not functional.
         {% elif forms %}
             {% with form=forms|first %}
               {% with flag_id=section_id|to_id:form.instance.id|to_id:"flags" %}
-              {% compress css inline %}
-                {{ form.media.css }}
-              {% endcompress %}
-              {% compress js inline %}
-                {{ form.media.js }}
-                {{ form.flags|json_script:flag_id }}
-              {% endcompress %}
+              {{ form.media.css }}
+              {{ form.media.js }}
+              {{ form.flags|json_script:flag_id }}
               {% include 'slm/station/form.html' with form=form form_id=section_id flag_id=flag_id %}
               {% endwith %}
             </div>
@@ -236,7 +228,7 @@ Add new section capability is not functional.
         {% block station_images %}
         {% if station_images %}
 
-        {% load slm static compress i18n %}
+        {% load slm static i18n %}
 
         <div class="col-12">
             <h2>{% trans "Images" %}</h2>

slm/templates/slm/station/review.html

@@ -5,11 +5,15 @@ Template for View/Diff page.
 -->
 
 {% extends "slm/station/base.html" %}
-{% load compress slm i18n static %}
+{% load slm i18n static %}
 
 {% block head %}
     {{ block.super }}
 
+    {% comment %}there is a bug in diff-match-patch where nodejs snippet at the end throws an error - this code allows that to proceed silently{% endcomment %}
+    <script>
+        var module = {exports: {}}
+    </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/diff-match-patch/1.0.5/index.min.js" integrity="sha512-s/r2YIRA8VD7KT0c9uJqKrZFrNFgKlOPeLyVXp7noa6+F8vw5LMvR+hxteawjCpp6+5A4nTYoWtwLcXEJW1YzA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
 {% endblock head %}
@@ -92,7 +96,6 @@ Template for View/Diff page.
 
 {{ review_stack|json_script:"slm-review-stack" }}
 
-{% compress js inline %}
 <script>
     const reviewActions = $('#review-actions');
     const submitBtn = reviewActions.find('button[name="submit"]');
@@ -457,5 +460,4 @@ Template for View/Diff page.
 
     setDiff(1, 0);
 </script>
-{% endcompress %}
 {% endblock %}

slm/templates/slm/station/upload.html

@@ -269,7 +269,10 @@ Template for Download page.
                 error: function(file, message, xhr) {
                     console.log(xhr);
                     completedFiles += 1;
-                    if (numFiles === 1) {
+                    if (xhr.status === 500) {
+                        document.write(`<pre>${message}</pre>`);
+                    }
+                    if (numFiles === 1 && message.file) {
                         window.location = slm.urls.reverse(
                             'slm:upload', {
                                 kwargs: {

slm/templates/slm/station/uploads/legacy.html

@@ -1,7 +1,7 @@
 {% load slm compress i18n %}
 
 <pre id="slm-parsed-legacy">{% for line in file|file_lines %}{% with idx=forloop.counter0 %}
-<span data-line-number={{ idx }} class="{{ findings|finding_class:idx }}" {% if findings|finding_content:idx %}data-bs-toggle="popover" title="{{ findings|finding_title:idx }}" data-bs-custom-class="{{ findings|finding_class:idx }}" data-bs-html="true" data-bs-content="<pre>{{ findings|finding_content:idx }}</pre>"{% endif %}>{{ line }}</span>{% endwith %}{% endfor %}
+<span data-line-number={{ idx }}>{{ findings|clear_prefix:idx|get_part:line }}<span class="{{ findings|finding_class:idx }}" {% if findings|finding_content:idx %}data-bs-toggle="popover" title="{{ findings|finding_title:idx }}" data-bs-custom-class="{{ findings|finding_class:idx }}" data-bs-html="true" data-bs-content="<pre>{{ findings|finding_content:idx }}</pre>"{% endif %}>{{ findings|marked_part:idx|get_part:line }}</span>{{ findings|clear_postfix:idx|get_part:line }}</span>{% endwith %}{% endfor %}
 </pre>
 
 {% compress css inline %}

slm/templates/slm/widgets/alert_scroll.html

@@ -1,4 +1,4 @@
-{% load compress i18n %}
+{% load i18n %}
 
 <div class="slm-scroll-container">
     <div
@@ -13,7 +13,6 @@
     </div>
 </div>
 
-{% compress js inline %}
 <script>
     const deleteAlert = function(alertId) {
         this.event.stopPropagation();
@@ -125,11 +124,8 @@
         /* this is a little clunky - avoid double init when station
          * filter is present on the page
          */
-        if ($('#filter-stations').length === 0) {
-            init();
-        } else {
-            slm.stationFilterCallbacks.push(stationsFiltered);
-        }
+        init();
+        slm.stationFilterCallbacks.push(stationsFiltered);
     });
 </script>
-{% endcompress %}
+

slm/templates/slm/widgets/filelist.html

@@ -118,10 +118,6 @@ Template for stations list.
     </div>
 </div>
 
-
-{% load compress %}
-
-{% compress js inline %}
 <script>
     const fileFilter = $('#slm-file-filter');
     const filterFiles = $('#filter-files');
@@ -255,4 +251,3 @@ Template for stations list.
     });
 
 </script>
-{% endcompress %}

slm/templates/slm/widgets/log_scroll.html

@@ -1,5 +1,3 @@
-{% load compress %}
-
 <div class="slm-scroll-container">
     <div
         id='slm-log-scroll'
@@ -13,14 +11,12 @@
     </div>
 </div>
 
-{% compress js inline %}
 <script>
     $(document).ready(function() {
         let reinitialize = true;
         const scrollDiv = $("#slm-log-scroll");
         const drawLogs = function(position, data) {
             if (reinitialize) {
-                console.log(reinitialize);
                 scrollDiv.find('.slm-log-item').remove();
                 scrollDiv.find('h3').remove();
             }
@@ -75,14 +71,7 @@
             scrollDiv.data('slmQuery', queryParams);
             init();
         }
-        /* this is a little clunky - avoid double init when station
-         * filter is present on the page
-         */
-        if ($('#filter-stations').length === 0) {
-            init();
-        } else {
-            slm.stationFilterCallbacks.push(stationsFiltered);
-        }
+        init();
+        slm.stationFilterCallbacks.push(stationsFiltered);
     });
 </script>
-{% endcompress %}

slm/templates/slm/widgets/stationlist.html

@@ -71,14 +71,9 @@
     </div>
 </div>
 
-{% load compress %}
+<script>
 
-{% compress js inline %}
-
-<script type="module">
-
-    import { Form } from '{% static "slm/js/form.js" %}';
-    const filterForm = new Form($('div#filter form'));
+    const filterForm = new slm.Form($('div#filter form'));
 
     let keyupTimeoutID = 0;
     const stationFilter = $('#slm-station-filter');
@@ -230,4 +225,3 @@
     });
 
 </script>
-{% endcompress %}