From d0194e6245d2b3e88e2bf6277f918511461d2761 Mon Sep 17 00:00:00 2001
From: sovanna <sovanna.hing@gmail.com>
Date: Mon, 22 Jul 2019 12:46:55 +0200
Subject: [PATCH] refactor(Solvespace): Creates own tpl and moves js at the
 bottom

---
 content/software/solvespace.md | 67 +---------------------------------
 templates/_base.html           |  3 ++
 templates/page-solvespace.html | 67 ++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 66 deletions(-)
 create mode 100644 templates/page-solvespace.html

diff --git a/content/software/solvespace.md b/content/software/solvespace.md
index ba1339bf..9c27953c 100644
--- a/content/software/solvespace.md
+++ b/content/software/solvespace.md
@@ -1,7 +1,7 @@
 +++
 title = "SolveSpace"
 weight = 1
-template = "page.html"
+template = "page-solvespace.html"
 
 [extra]
 layout_css = "col-12 col-md-10 mx-auto"
@@ -124,68 +124,3 @@ Currently, the focus of development is to improve SolveSpace's handling of compl
 
 **For commercial support and licensing**, please contact sales@m-l***s.hk.
 
-
-
-{% div() %}
-<script src="/js/models/kf25.js"></script>
-<script src="/js/models/viewport.js"></script>
-<script src="/js/models/multiport.js"></script>
-<script src="/js/models/chamber.js"></script>
-<script src="/js/models/k526s-body.js"></script>
-<script src="/js/models/k526s-head.js"></script>
-<script src="/js/models/k526s-fixture.js"></script>
-<script src="/js/models/k526s-adapter.js"></script>
-<script src="/js/models/k526s-adapter-assy.js"></script>
-
-
-<script>
-  (function () {
-
-    var nodes = [{
-      id: 'kf25',
-      model: solvespace_model_kf25,
-      params: {width: 400, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)},
-    }, {
-      id: 'viewport',
-      model: solvespace_model_viewport,
-      params: {width: 400, height: 300, scale: 3},
-    }, {
-      id: 'multiport',
-      model: solvespace_model_multiport,
-      params: {width: 400, height: 300, scale: 3},
-    }, {
-      id: 'chamber',
-      model: solvespace_model_chamber,
-      params: {width: 800, height: 600, scale: 3},
-    }, {
-      id: 'k526s-body',
-      model: solvespace_model_k526s_body,
-      params: {width: 400, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)},
-    }, {
-      id: 'k526s-head',
-      model: solvespace_model_k526s_head,
-      params: {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)},
-    }, {
-      id: 'k526s-fixture',
-      model: solvespace_model_k526s_fixture,
-      params: {width: 800, height: 400, scale: 12},
-    }, {
-      id: 'k526s-adapter',
-      model: solvespace_model_k526s_adapter,
-      params: {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)},
-    }, {
-      id: 'k526s-adapter-assy',
-      model: solvespace_model_k526s_adapter_assy,
-      params: {width: 400, height: 300, scale: 8},
-    }];
-
-    var node;
-
-    for (var i = nodes.length - 1; i >= 0; i--) {
-      node = document.getElementById(nodes[i].id);
-      node.parentNode.replaceChild(solvespace(nodes[i].model, nodes[i].params), node);
-    }
-
-  })();
-</script>
-{% end %}
\ No newline at end of file
diff --git a/templates/_base.html b/templates/_base.html
index c5de8d91..218c37cb 100644
--- a/templates/_base.html
+++ b/templates/_base.html
@@ -178,6 +178,9 @@
       });
     </script>
 
+    {% block js %}
+    {% endblock %}
+
   </body>
 
 </html>
diff --git a/templates/page-solvespace.html b/templates/page-solvespace.html
new file mode 100644
index 00000000..d6c1fa2d
--- /dev/null
+++ b/templates/page-solvespace.html
@@ -0,0 +1,67 @@
+{% extends 'page.html' %}
+
+
+{% block js %}
+
+  <script src="/js/models/kf25.js"></script>
+  <script src="/js/models/viewport.js"></script>
+  <script src="/js/models/multiport.js"></script>
+  <script src="/js/models/chamber.js"></script>
+  <script src="/js/models/k526s-body.js"></script>
+  <script src="/js/models/k526s-head.js"></script>
+  <script src="/js/models/k526s-fixture.js"></script>
+  <script src="/js/models/k526s-adapter.js"></script>
+  <script src="/js/models/k526s-adapter-assy.js"></script>
+
+  <script>
+    (function () {
+
+      var nodes = [{
+        id: 'kf25',
+        model: solvespace_model_kf25,
+        params: {width: 400, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)},
+      }, {
+        id: 'viewport',
+        model: solvespace_model_viewport,
+        params: {width: 400, height: 300, scale: 3},
+      }, {
+        id: 'multiport',
+        model: solvespace_model_multiport,
+        params: {width: 400, height: 300, scale: 3},
+      }, {
+        id: 'chamber',
+        model: solvespace_model_chamber,
+        params: {width: 800, height: 600, scale: 3},
+      }, {
+        id: 'k526s-body',
+        model: solvespace_model_k526s_body,
+        params: {width: 400, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)},
+      }, {
+        id: 'k526s-head',
+        model: solvespace_model_k526s_head,
+        params: {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)},
+      }, {
+        id: 'k526s-fixture',
+        model: solvespace_model_k526s_fixture,
+        params: {width: 800, height: 400, scale: 12},
+      }, {
+        id: 'k526s-adapter',
+        model: solvespace_model_k526s_adapter,
+        params: {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)},
+      }, {
+        id: 'k526s-adapter-assy',
+        model: solvespace_model_k526s_adapter_assy,
+        params: {width: 400, height: 300, scale: 8},
+      }];
+
+      var node;
+
+      for (var i = nodes.length - 1; i >= 0; i--) {
+        node = document.getElementById(nodes[i].id);
+        node.parentNode.replaceChild(solvespace(nodes[i].model, nodes[i].params), node);
+      }
+
+    })();
+  </script>
+
+{% endblock %}
\ No newline at end of file