Fixes double body tag render #11237

archesproject · Jul 25, 2024 · 4d348ba · 4d348ba
1 parent 3007658
commit 4d348ba
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 61 deletions.
diff --git a/arches/app/templates/base-root.htm b/arches/app/templates/base-root.htm
@@ -30,27 +30,30 @@
         {% block title %}{% endblock title %}
     </title>
 
-        <!-- Meta -->
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="description" content="">
-        <meta name="author" content="">
-    
-        <link rel="shortcut icon" href="{% webpack_static 'favicons/favicon.ico' %}" type="image/x-icon" />
-        <link rel="apple-touch-icon" href="{% webpack_static 'favicons/apple-touch-icon.png' %}" />
-        <link rel="apple-touch-icon" sizes="76x76" href="{% webpack_static 'favicons/apple-touch-icon-76x76.png' %}" />
-        <link rel="apple-touch-icon" sizes="120x120" href="{% webpack_static 'favicons/apple-touch-icon-120x120.png' %}" />
-        <link rel="apple-touch-icon" sizes="152x152" href="{% webpack_static 'favicons/apple-touch-icon-152x152.png' %}" />
-        <link rel="apple-touch-icon" sizes="180x180" href="{% webpack_static 'favicons/apple-touch-icon-180x180.png' %}" />
-    
-        {% block css %}
-            <link rel="stylesheet" href="{% webpack_static 'node_modules/font-awesome/css/font-awesome.min.css' %}" />
-        {% endblock css %}
+    <!-- Meta -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <link rel="shortcut icon" href="{% webpack_static 'favicons/favicon.ico' %}" type="image/x-icon" />
+    <link rel="apple-touch-icon" href="{% webpack_static 'favicons/apple-touch-icon.png' %}" />
+    <link rel="apple-touch-icon" sizes="76x76" href="{% webpack_static 'favicons/apple-touch-icon-76x76.png' %}" />
+    <link rel="apple-touch-icon" sizes="120x120" href="{% webpack_static 'favicons/apple-touch-icon-120x120.png' %}" />
+    <link rel="apple-touch-icon" sizes="152x152" href="{% webpack_static 'favicons/apple-touch-icon-152x152.png' %}" />
+    <link rel="apple-touch-icon" sizes="180x180" href="{% webpack_static 'favicons/apple-touch-icon-180x180.png' %}" />
+
+    {% block css %}
+        <link rel="stylesheet" href="{% webpack_static 'node_modules/font-awesome/css/font-awesome.min.css' %}" />
+    {% endblock css %}
 </head>
 {% endblock head %}
 
 {% block body_content %}
-<body>
+<body dir="{{ app_settings.ACTIVE_LANGUAGE_DIR }}" {% block body_attributes %}class="scroll-y-auto"{% endblock %}>
+    {% block loading_mask %}
+    {% endblock loading_mask %}
+
     {% block body %}
     {% endblock body %}
 </body>

diff --git a/arches/app/templates/base.htm b/arches/app/templates/base.htm
@@ -31,51 +31,33 @@
     <script>document.write('<script src="http://' + (location.host || 'localhost').split(':')[0] + ':{{ livereload_port }}/livereload.js?snipver=1"></' + 'script>')</script>
 {% endif %}
 
-{% block head %}
-{{ block.super }}
-<head>
-    <title>{% block title %}{{ app_settings.APP_NAME }} - {% endblock title %}</title>
+{% block title %}{{ app_settings.APP_NAME }} - {% endblock title %}
 
-    {% block css %}
-        {% render_bundle 'css/arches' 'css' %}
-        {% render_bundle 'css/core' 'css' %}
+{% block css %}
+    {% render_bundle 'css/arches' 'css' %}
+    {% render_bundle 'css/core' 'css' %}
 
-        {% if app_settings.ACTIVE_LANGUAGE_DIR == "rtl" %}
-            {% render_bundle 'css/rtl' 'css' %}
-        {% endif %}
-
-        {% if app_settings.ACCESSIBILITY_MODE %}
-            {% render_bundle 'css/accessibility' 'css' %}
-        {% endif %}
+    {% if app_settings.ACTIVE_LANGUAGE_DIR == "rtl" %}
+        {% render_bundle 'css/rtl' 'css' %}
+    {% endif %}
 
-        {% render_bundle 'css/package' 'css' %}
-        {% render_bundle 'css/project' 'css' %}
-    {% endblock css %}
-
-</head>
-{% endblock head %}
-
-{% block body_content %}
-{{ block.super }}
-<body dir="{{ app_settings.ACTIVE_LANGUAGE_DIR }}" {% block body_attributes %}class="scroll-y-auto"{% endblock %}>
-    {% block loading_mask %}
-    <div class="loading-mask" data-bind="visible: typeof(loading()) === 'boolean' && loading()"></div>
-
-    <div class="loading-mask" style="display: none;" data-bind="visible: typeof(loading()==='string') && loading().length > 0">
-        <div class="loading-mask-string" data-bind="text: loading"></div>
-    </div>
-    {% endblock loading_mask %}
-
-    {% block body %}
-    {% endblock body %}
-</body>
-{% endblock body_content %}
-
-{% block javascript %}
-    {{ block.super }}
-
-    {% block arches_modules %}
-        {% include 'javascript.htm' %}
-    {% endblock arches_modules %}
-{% endblock javascript %}
+    {% if app_settings.ACCESSIBILITY_MODE %}
+        {% render_bundle 'css/accessibility' 'css' %}
+    {% endif %}
+
+    {% render_bundle 'css/package' 'css' %}
+    {% render_bundle 'css/project' 'css' %}
+{% endblock css %}
+
+{% block loading_mask %}
+<div class="loading-mask" data-bind="visible: typeof(loading()) === 'boolean' && loading()"></div>
+
+<div class="loading-mask" style="display: none;" data-bind="visible: typeof(loading()==='string') && loading().length > 0">
+    <div class="loading-mask-string" data-bind="text: loading"></div>
+</div>
+{% endblock loading_mask %}
+
+{% block arches_modules %}
+    {% include 'javascript.htm' %}
+{% endblock arches_modules %}
 </html>