fix overlapping ids and add missing divs for presentations

nikolasibalic · Jan 20, 2025 · 77b9de2 · 77b9de2
1 parent 4769661
commit 77b9de2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,6 @@ dist
 my_deploy.sh
 .parcel-cache
 /newcaroline
-/caroline/html/caroline
+/caroline/html/caroline
+/neweditor
+/test
diff --git a/caroline/html/index.html b/caroline/html/index.html
@@ -172,6 +172,7 @@ <h2 id="confirmmessage"></h2>
 		<div class="control" title="Clear surface"></div>
 		<div class="control" title="Add slide surface"></div>
 	</div>
+	<div id="semaphore"></div>
 	<div id="cameraspace">
 		<div class="camera" title="Add camera in the corner"></div>
 	</div>
@@ -180,6 +181,8 @@ <h2 id="confirmmessage"></h2>
 	<div id="notify">
 		<span></span>
 	</div>
+	<div id="carolinelogo">
+	</div>
 	<script type="module">
 		MathJax = {
 			tex: {
@@ -217,23 +220,24 @@ <h2 id="confirmmessage"></h2>
 		.then((data) => {
 			const init = YAML.parse(data);
 
-			window.roundTable = init.roundTable; //false;
+			window.roundTable = false; init.roundTable; //false;
 			window.username = init.username;
-			window.room = init.room;  // roundtable room
+			window.room = null; //init.room;  // roundtable room
 			window.data = init.data;
-			window.logoURL = init.logoURL;
+			window.logoURL = init.logo;
 			window.leftHanded = init.leftHanded;
 			window.drawingHelp = init.drawingHelp;
 			window.drawingHelpIntensity = init.drawingHelpIntensity;
-			window.roundTableCallBack = init.roundTableCallBack;
+			window.roundTableCallBack = null; //init.roundTableCallBack;
 			window.roundTableServer = init.roundTableServer;
 			window.roundTableAuth = init.roundTableAuth;
-			window.roundTableExit = init.roundTableExit;
+			window.roundTableExit = null;
 			window.presentationServer = init.presentationServer;
 			window.presenter = init.presenter;
 			window.presentationSemaphore = init.presentationSemaphore;
 			if (init.startPresentation){
 				document.getElementById("intro").style.display = "none";
+				document.getElementById("carolinelogo").style.display = "block";
 				initApp();
 			}
 			else {

diff --git a/caroline/html/js/caroline.js b/caroline/html/js/caroline.js
@@ -424,8 +424,8 @@ function audienceConnection() {
 function showPresentationLink() {
   slideIndex = -1;
   document.getElementById("slidespace").innerHTML =
-    "<div class='slide'><div class='spancenter'><h2>Follow presentation with your annotations on</h2><div id='qr'>connecting to server...</div></div></div>";
-  document.getElementById("qr").innerHTML = "<img src='"
+    "<div class='slide'><div class='spancenter'><h2>Follow presentation with your annotations on</h2><div id='qr-presentation'>connecting to server...</div></div></div>";
+  document.getElementById("qr-presentation").innerHTML = "<img src='"
     + roundTableServer + "/api/qrpres/?q=" + encodeURIComponent(presentationServer)
     + "&a=" + roundTableAuth
     + "&r=" + encodeURIComponent(roundTableServer)

diff --git a/caroline/html/style/style_bright.css b/caroline/html/style/style_bright.css
@@ -1024,6 +1024,7 @@ div.carolinelogo{
   background-repeat: no-repeat;
   background-position: center;
   background-size: contain;
+  display: none;
 }
 a.carolinelink{
   font-weight: 700;
@@ -1037,11 +1038,11 @@ a.carolinelink{
   padding:0.4em 10px;
   width:90%;
 }
-#slidespace #qr img{
+#slidespace #qr img, #slidespace #qr-presentation img{
   max-height:40%;
   max-width: 40%;
 }
-#slidespace #qr{
+#slidespace #qr, #slidespace #qr-presentation{
   max-height: 80%;
 }