Merge branch 'query-builder' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into query-builder

.vscode/extensions.json

@@ -1,7 +1,8 @@
 {
     "recommendations": [
-        "samuelcolvin.jinjahtml",
+        "irongeek.vscode-env",
         "ms-azuretools.vscode-docker",
-        "ms-python.python"
+        "ms-python.python",
+        "samuelcolvin.jinjahtml"
     ]
 }

.vscode/settings.json

@@ -1,13 +1,9 @@
 {
     "editor.rulers": [79],
     "files.insertFinalNewline": true,
-    "python.terminal.activateEnvironment": false,
     "[css]": {
         "editor.tabSize": 2
     },
-    "[scss]": {
-        "editor.tabSize": 2
-    },
     "[html]": {
         "editor.tabSize": 2
     },
@@ -17,7 +13,7 @@
     "[jinja-html]": {
         "editor.tabSize": 2
     },
-    "[jinja-js]": {
+    "[scss]": {
         "editor.tabSize": 2
     }
 }

app/templates/_base/_modals/manual.html.j2

@@ -13,35 +13,35 @@
     </ul>
     <div id="manual-modal-introduction">
       <br>
-      {% include "_base/_modals/_manual/_01_introduction.html.j2" %}
+      {% include "_base/_modals/_manual/01_introduction.html.j2" %}
     </div>
     <div id="manual-modal-registration-and-log-in">
       <br>
-      {% include "_base/_modals/_manual/_02_registration_and_log_in.html.j2" %}
+      {% include "_base/_modals/_manual/02_registration_and_log_in.html.j2" %}
     </div>
     <div id="manual-modal-dashboard">
       <br>
-      {% include "_base/_modals/_manual/_03_dashboard.html.j2" %}
+      {% include "_base/_modals/_manual/03_dashboard.html.j2" %}
     </div>
     <div id="manual-modal-services">
       <br>
-      {% include "_base/_modals/_manual/_06_services.html.j2" %}
+      {% include "_base/_modals/_manual/06_services.html.j2" %}
     </div>
     <div id="manual-modal-a-closer-look-at-the-corpus-analysis">
       <br>
-      {% include "_base/_modals/_manual/_07_a_closer_look_at_the_corpus_analysis.html.j2" %}
+      {% include "_base/_modals/_manual/07_a_closer_look_at_the_corpus_analysis.html.j2" %}
     </div>
     <div id="manual-modal-cqp-query-language">
       <br>
-      {% include "_base/_modals/_manual/_08_cqp_query_language.html.j2" %}
+      {% include "_base/_modals/_manual/08_cqp_query_language.html.j2" %}
     </div>
     <div id="manual-modal-query-builder">
       <br>
-      {% include "_base/_modals/_manual/_09_query_builder.html.j2" %}
+      {% include "_base/_modals/_manual/09_query_builder.html.j2" %}
     </div>
     <div id="manual-modal-tagsets">
       <br>
-      {% include "_base/_modals/_manual/_10_tagsets.html.j2" %}
+      {% include "_base/_modals/_manual/10_tagsets.html.j2" %}
     </div>
   </div>
   <div class="modal-footer">

app/templates/workshops/fgho_sommerschule_2023.html.j2

@@ -12,11 +12,11 @@
     </div>
 
     <div class="col s12" id="fgho-sommerschule-2023-vorbereitungen">
-      {% include "workshops/_fgho_sommerschule_2023/_vorbereitungen.html.j2" %}
+      {% include "workshops/_fgho_sommerschule_2023/vorbereitungen.html.j2" %}
     </div>
 
     <div class="col s12" id="fgho-sommerschule-2023-workshop-aufgaben">
-      {% include "workshops/_fgho_sommerschule_2023/_aufgaben.html.j2" %}
+      {% include "workshops/_fgho_sommerschule_2023/aufgaben.html.j2" %}
     </div>
   </div>
 </div>