Merge branch 'development' into 'master'

Deploy small fixes

See merge request !696

src/main/resources/static/js/map_loader.js

@@ -25,6 +25,7 @@ $(() => {
 
 function updateRequestInfo(roomId) {
     const imageHolder = document.getElementById("image-holder");
+    if (imageHolder == null) return;
     const image = imageHolder.querySelector("img");
     $.get({
         url: "/room/map/" + roomId,

src/main/resources/templates/lab/edit/components/lab-general.html

@@ -260,8 +260,8 @@
 
         <section th:fragment="lab-extra">
             <h3 class="font-500 mb-3"><label for="markdown-editor">Extra lab info</label></h3>
-            <div>
-                <textarea id="markdown-editor" name="extraInfo" th:text="${extraInfo}">some extra info!</textarea>
+            <div class="article">
+                <textarea id="markdown-editor" name="extraInfo" th:text="${qSession.extraInfo}">some extra info!</textarea>
             </div>
 
             <div class="mt-500 underlined"></div>

src/main/resources/templates/lab/edit/slotted.html

@@ -43,6 +43,10 @@
             <th:block th:replace="~{lab/edit/components/lab-general :: lab-general}"></th:block>
         </section>
 
+        <th:block layout:fragment="extra-config">
+            <th:block th:replace="~{lab/edit/components/lab-general :: lab-extra}"></th:block>
+        </th:block>
+
         <section layout:fragment="advanced-config">
             <th:block th:replace="~{lab/edit/components/advanced-slotted :: advanced}"></th:block>
         </section>