From 1f5cc4ac3ff29b0bf482747a8d12a2736945d2bb Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Mon, 7 Aug 2023 16:21:40 -0700
Subject: [PATCH 01/64] [story/VSPC-242]UI changes

---
 .../views/staff/modules/slides/slide.html     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 810bbdc55..3fa2472c5 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -700,6 +700,25 @@
                     editVideoClk=0;
                 });
                 
+                $("#addExternalLinkButton").click(function(e) {
+                    $("#bgImage").off("click");
+                    $("#bgImage").on("click", function(e){
+                        e.preventDefault();
+                        $("#link").remove();
+                        $("#external-arrow").remove();
+                        $("#ext_label").remove();
+                        var icon;
+                        var posX = $(this).position().left
+                        var posY = $(this).position().top;
+                        storeX = e.pageX - $(this).offset().left;
+                        storeY = e.pageY - $(this).offset().top + 25;
+                        showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
+                    });
+                    hideLinkInfoTabs();
+                    displayForms("#createExternalLinkAlert");
+                });
+
+                
                 $("#uploadImage").click(function(e) {
                     e.preventDefault();
                     $("#addImgAlert").hide();
@@ -1357,6 +1376,8 @@ <h2 class="heading"><span style="color: var(--dark-grey);">Slide:</span> [[${sli
                 +&nbsp;<span class="icon-image"></span></button>&nbsp;
                 <button type="button" id="addVideo" class="btn pill-btn" data-toggle="tooltip" title="Add Video" data-placement="top">
                 +&nbsp;<span class="icon-video"></span></button>&nbsp;
+                <button type="button" id="addExternalLinkButton" class="btn pill-btn" data-toggle="tooltip" title="Add Link to External" data-placement="top">
+                +&nbsp;<span class="fa fa-external-link-alt"></span></button>&nbsp;
                 <button type="button" id="addChoice" style="display: none;" class="btn pill-btn" data-toggle="tooltip" title="Add Sequence Choice" data-placement="top">
                 +&nbsp;<span class="icon-checkmark"></span></button>
             </div>

From ff64e16416e64599bb6940f05c2286b8a505e488 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 8 Aug 2023 16:32:43 -0700
Subject: [PATCH 02/64] [story/VSPC-242]create external link ajax call

---
 .../views/staff/modules/slides/slide.html     | 179 ++++++++++++++++++
 1 file changed, 179 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 3fa2472c5..8e4154119 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -45,6 +45,35 @@
             var defaultValue;
             var addVideoClk=0;
             var editVideoClk=0;
+            $(window).on("load", function() {
+                $( window ).resize(function() {
+                    drawLinks();
+                });
+                drawLinks();
+            });
+            //store where a user clicked on an image
+            var storeX;
+            var storeY;
+            var selectedModuleLinkId;
+            var selectedSpaceLinkId;
+            var selectedExternalLinkId;
+            var selectedTextBlockId;
+            const displaceUnpublishedOnX = 25;
+            const displaceUnpublishedOnY = 13;
+            const displaceUnpublishedOnXModal = 50;
+            const displaceUnpublishedOnYModal = 13;
+            const displaceLableOnX = 10;
+            const displaceLableOnY = 35;
+            var modalBgImageHeight;
+            var modalBgImageWidth;
+            
+            var externalLinkIconReader = new FileReader();
+            var externalLinkIcon;
+            externalLinkIconReader.onload = function(e) {
+                externalLinkIcon = e.target.result;
+                showExternalLinks(createExternalLinkInfo());
+            }
+
             
             $(function () {
             	  $('[data-toggle="tooltip"]').tooltip()
@@ -530,6 +559,154 @@
 		            	}
 	            	}
             	});
+            	
+            	function showExternalLinkEdit(externalLink, show, posX, posY) {
+            	    externalLink["x"]=storeX;
+            	    externalLink["y"]=storeY;
+            	    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
+            	    var selectedLabelClass = '.label-'+selectedExternalLinkId;
+            	    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
+            	}
+
+            	function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
+            	    var posX, posY;
+            	    if(show) {
+            	        posX = $("#main-bgImage").position().left;
+            	        posY = $("#main-bgImage").position().top;
+            	    }
+            	    else{
+            	        posX = $("#bgImage").position().left;
+            	        posY = 0
+            	    }
+            	    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
+            	    $(selectedLinkClass).css({ 'position': 'absolute'});
+            	    $(selectedLinkClass).css({ 'left': x + posX});
+            	    $(selectedLinkClass).css({ 'top': y + posY});
+            	    $(selectedLabelClass+' span').remove();
+            	    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
+            	    feather.replace();    
+            	}
+
+            	function hideLinkInfoTabs(){
+            	    $("#editExternalLinkInfo").hide();
+            	    $("#editSpaceLinkInfo").hide();
+            	    $("#editModuleLinkInfo").hide();
+            	    $("#editTextBlockInfo").hide();
+            	    $("#createExternalLinkAlert").hide();
+            	    $("#createSpaceLinkAlert").hide();
+            	    $("#createModuleLinkAlert").hide();
+            	    $("#errorMsg").text("");
+            	    $('#errorAlert').hide();
+            	}
+
+            	function showExternalLinks(externalLink, show, x, y) {
+            	    $("#ext_label").remove();
+            	    $("#link").remove();
+            	    $("#undefined").remove();
+            	    var posX = $("#bgImage").position().left;
+            	    var posY = $("#bgImage").position().top;
+            	    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
+            	    ext_label.text(externalLink["externalLinkLabel"]);
+
+            	    var link;
+            	    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
+            	        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
+            	    } else {
+            	        $(ext_label).css({
+            	            'position': 'absolute',
+            	            'font-size': "12px",
+            	            'transform': 'rotate(0deg)',
+            	            'color': 'blue'
+            	        });
+            	        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
+            	    }
+            	    
+            	    if(show) {
+            	        link.css('top', externalLink["y"] + posY);
+            	    } else {
+            	    	link.css('top', externalLink["y"]);
+            	    }
+
+            	    link.css('position', 'absolute');
+            	    link.css('left', externalLink["x"] + posX);
+            	    link.css('color', 'blue');
+            	    link.css('font-size', "12px");
+
+            	    if (externalLink["id"]) {
+            			link.attr("data-link-id", externalLink["id"]);
+            			link.css('cursor', 'pointer');
+            			link.attr('href', externalLink["url"]);
+            			link.click(function(e) {
+            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+            			});
+            			
+            			ext_label.attr("data-link-id", externalLink["id"]);
+            			ext_label.css('cursor', 'pointer');
+            			ext_label.attr("class", "label-"+externalLink["id"]);
+            			ext_label.click(function(e) {
+            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+            			});
+            	    }
+
+            	    $("#space").append(link);
+            	    $("#link").append(ext_label);
+            	    $("#external-link").remove();
+
+            	}
+            	
+            	function editExternalLinkInfo() {
+            		var info = {};
+            		info["x"] = storeX;
+            		info["y"] = storeY;
+            		info["tabOpen"] = $("#extTabOpenEdit").val();
+            		info["type"] = $("#extTypeEdit").val();
+            		info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
+            		info["externalLinkURL"] = $("#externalLinkURLEdit").val();
+            		return info;
+            	}
+            	
+            	function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
+            	    selectedExternalLinkId=linkId;
+            	    storeX=posXEdit;
+            	    storeY=posYEdit;
+            	    $("#externalLinkInfoLabel").text(linkName);
+            	    $("#externalLinkId").val(linkId);
+            	    $("#externalLinkDisplayId").val(displayLinkId);
+            	    $("#externalLinkInfoLabelEdit").text(linkName);
+            	    $("#externalLinkLabelEdit").val(linkName);
+            	    $("#externalLinkIdValueEdit").val(linkId);
+            	    $("#externalLinkURLEdit").val(externalLinkURL);
+            	    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
+            	    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
+            	    
+            	    resetHighlighting();
+
+            	    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
+            	    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
+            	    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
+            	    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
+
+            	    $("#bgImage").on("click", function(e){
+            	        e.preventDefault();
+            	        var posX = $(this).position().left;
+            	        var posY = $(this).position().top;    
+            	        storeX = e.pageX - $(this).offset().left;
+            	        storeY = e.pageY - $(this).offset().top + 25;
+            	        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
+            	    });
+            	    hideLinkInfoTabs();
+            	    displayForms("#editExternalLinkInfo");
+            	}
+            	
+            	function displayForms(formToShow){
+            	    drawLinks();
+            	    $("#space").css("display", "-webkit-box");
+            	    $(formToShow).css("display", "flex");
+            	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
+            	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
+            	}
+
+
 
             	function updateContentOrder(jsonObj,token){
 	            		$.ajax({
@@ -1650,6 +1827,8 @@ <h6>You are not logged in, please login.</h6>
                     </div>
                 </div>
             </div>
+            
+            
             <div id="addChoiceAlert" class="modal" tabindex="-1"
                 role="dialog">
                 <div class="modal-dialog" role="document">

From 4ae81d8c83ef0a7b3f7a40c8e53b3d5f399b59e6 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 9 Aug 2023 16:11:32 -0700
Subject: [PATCH 03/64] [story/VSPC-242]external link alert UI

---
 .../views/staff/modules/slides/slide.html     | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 8e4154119..f9eff6018 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -1768,6 +1768,86 @@ <h6>
                     </div>
                 </div>
             </div>
+            
+            <div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;">
+	        <div class="divider"></div>
+	        <form id="createExternalLinkForm" style="z-index: 1;">
+	            <div role="alert" style="margin-top: 30px;">
+                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+                    </div>
+	            	<div class="row">	
+	            		<div class="col">
+	            			<h5 class="alert-heading">Create new External Link</h5>
+			                <p>Please click on the image where you
+			                   want to place the new external link. Then click
+			                   "Create External Link".</p>
+	            		</div>
+	                </div>
+	
+	                <input type="hidden" name="x" id="externalLinkX" /> 
+	                <input type="hidden" name="y" id="externalLinkY" /> 
+	                
+	                <div class="row">
+	                	<div class="col-sm-4">
+	                		<label>Label</label>
+	                	</div>
+	                	<div class="col-sm-8">
+	                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
+	                			 name="externalLinkLabel" id="externalLinkLabel">	
+	                	</div>
+	                </div>
+	                 
+	                <div class="row">
+	                	<div class="col-sm-4">
+	                		<label>External Link</label>
+	                	</div>
+	                	<div class="col-sm-8">
+	                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
+	                    		size="15" name="url" id="externalLink">	
+	                	</div>
+	                </div>               
+					<div class="row">
+	                    <div class="col-sm-4">
+	                        <label>How To Open:</label>
+	                    </div>
+	                    <div class="col-sm-8">
+	                        <select id="extTabOpen" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
+	                            <option th:selected>Choose...</option>
+	                            <option th:value="NEWWINDOW">New Window</option>
+	                            <option th:value="SAMEWINDOW">Same Window</option>
+	                        </select>
+	                    </div>
+	                </div>
+	                <div class="row">
+	                    <div class="col-sm-4">
+	                        <label>Type</label>
+	                    </div>
+	                    <div class="col-sm-8">
+	                        <select id="extType" name="type" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
+	                            <option th:selected>Choose...</option>
+	                            <option th:value="IMAGE">Image</option>
+	                            <option th:value="ARROW">Link</option>
+	                        </select>
+	                    </div>
+	                </div>
+	
+	                <div class="row">
+	                    <div class="col-sm-4">
+	                        <label>Image</label>
+	                    </div>
+	                    <div class="col-sm-8">
+	                        <input type="file" class="form-control-sm" name="externalLinkImage" id="externalLinkImage" style="width: inherit">
+	                    </div>
+	                </div>
+	                <p class="mt-5 text-center">
+	                    <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
+	                    <button id="createExternalLinkBtn" type="submit" class="btn primary-btn btn-sm">Create External Link</button>
+	                </p>
+	            </div>
+	        </form>
+		</div>
+        
             <div id="addVideoAlert" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
 				<div class="modal-dialog" role="document" draggable="true">
 					<div class="modal-content">

From 0225cc289eeb28935a325435e54ff4e564f75331 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Thu, 10 Aug 2023 16:17:41 -0700
Subject: [PATCH 04/64] [story/VSPC-242]Javascript

---
 .../views/staff/modules/slides/slide.html     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index f9eff6018..e2124e6cb 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -698,6 +698,27 @@
             	    displayForms("#editExternalLinkInfo");
             	}
             	
+            	function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
+            		if(link != null){
+            			var externalLink;
+            			if(link.type=="IMAGE" && link.image != null){
+            				var imageURL = [[@{/api/image/}]]+link.image.id;
+            				externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
+            			}else{
+            				externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
+            			}
+            			setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
+            			$(divId).append(externalLink);
+            			if(spanId === "externallinkId-"){
+            				$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
+            				$('#'+spanId+link.externalLink.id).click(function(e) {
+            					var linkData = $('#'+spanId+link.externalLink.id).data();
+            					makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
+            				});
+            			}
+            		}
+            	}
+            	
             	function displayForms(formToShow){
             	    drawLinks();
             	    $("#space").css("display", "-webkit-box");

From 29725e764181f5b92a62a152635ff14aac7ebf54 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 11 Aug 2023 15:56:18 -0700
Subject: [PATCH 05/64] [story/VSPC-242] Edit external link

---
 .../views/staff/modules/slides/slide.html     | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index e2124e6cb..0871929f5 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -1869,6 +1869,105 @@ <h5 class="alert-heading">Create new External Link</h5>
 	        </form>
 		</div>
         
+        <div id="editExternalLinkInfo" class="custom_form_style" style="z-index: 1;">
+            <div class="divider"></div>
+            <form id="editExternalLinkForm" style="z-index: 1;">
+                <p class="float-right">
+                    <a href="#" id="closeEditExternalLinkInfo" class="icon-circle-close"></a>
+                </p>
+                <div role="alert" style="margin-top: 30px;">
+                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <h6 class="alert-heading">
+                                <span style="color: var(--dark-grey)">Modify External
+                                    Link: </span><span
+                                    id="externalLinkInfoLabelEdit"></span>
+                            </h6>
+                            <p>Please click on the image where you
+                                want to place the existing external
+                                link. Then click "Edit External Link".</p>
+                        </div>
+                    </div>
+                    <input type="hidden" name="externalLinkIdValueEdit"
+                        id="externalLinkIdValueEdit" />
+                    <input type="hidden" name="x" id="externalLinkXEdit" />
+                    <input type="hidden" name="y" id="externalLinkYEdit" />
+                    <input type="hidden" name="externalLinkDisplayId"
+                        id="externalLinkDisplayId" />
+
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <label>Label:</label>
+                        </div>
+                        <div class="col-sm-8">
+                            <input
+                                class="form-control-sm externallink-targetEdit"
+                                type="text" name="externalLinkLabel"
+                                id="externalLinkLabelEdit"
+                                style="width: inherit; background: var(--base-grey)"><br>
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-sm-4" style="padding-right: 0;">
+                            <label>External Link
+                            </label>
+                        </div>
+                        <div class="col-sm-8">
+                            <input
+                                class="form-control-sm externallink-targetEdit"
+                                type="text" name="url"
+                                id="externalLinkURLEdit"
+                                style="width: inherit; background: var(--base-grey)">
+                        </div>
+                    </div>
+					<div class="row">
+	                    <div class="col-sm-4">
+	                        <label>How To Open:</label>
+	                    </div>
+	                    <div class="col-sm-8">
+	                        <select id="extTabOpenEdit" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
+	                            <option th:value="NEWWINDOW">New Window</option>
+	                            <option th:value="SAMEWINDOW">Same Window</option>
+	                        </select>
+	                    </div>
+	                </div>
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <label>Type:</label>
+                        </div>
+                        <div class="col-sm-8">
+                            <select id="extTypeEdit" name="type"
+                                class="form-control-sm externallink-targetEdit">
+                                <option th:value="IMAGE">Image</option>
+                                <option th:value="ARROW">Link</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-sm-3" style="padding-right: 0;">
+                            <label>Image:</label>
+                        </div>
+                        <div class="col-sm-9">
+                            <input type="file" class="form-control-sm"
+                                name="externalLinkImage"
+                                id="externalLinkImageEdit" style="width: inherit" />
+                        </div>
+                    </div>
+                    
+                    <p class="mt-5 text-center">
+                        <button id="deleteExternalLinkButton" type="reset" class="btn delete-btn btn-sm"><i class="fa fa-trash"></i>Delete</button>
+                        <button id="editExternalLinkBtn" type="reset" class="btn primary-btn btn-sm">Save External Link</button>
+                    </p>
+                    
+                </div>
+            </form>
+        </div>
+        
             <div id="addVideoAlert" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
 				<div class="modal-dialog" role="document" draggable="true">
 					<div class="modal-content">

From 954d2fb7ec663d75ac136bac0c915ba6c2cfbf9c Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Mon, 14 Aug 2023 16:29:27 -0700
Subject: [PATCH 06/64] [story/VSPC-242] drawlink

---
 .../views/staff/modules/slides/slide.html     | 206 ++++++++++++------
 1 file changed, 145 insertions(+), 61 deletions(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 0871929f5..d85e12c31 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -435,7 +435,151 @@
 					}
 				});
 			}
-            
+            function drawLinks(){
+        	    $(".Info_cz_Class").remove();
+        	    $(".imageLink").remove();
+        	    $(".alertLink").remove();
+        	    $(".ellipse_class").remove();
+        	    $(".unpublishedSpaceClass").remove();
+        	    $(".textBlockClass").remove();
+        	    $(".deletedSpaceClass").remove();
+        	    
+        	    $.ajax({
+        	        type: "GET",
+        	        url: "[(@{'/staff/space/'+${space?.id}+'/links'})]",
+        	        cache       : false,
+        	        contentType : false,
+        	        processData : false,
+        	        beforeSend: function () {
+        	            $("#loader").show();
+        	            },
+        	       	complete: function () {
+        	            $("#loader").hide();
+        	            },
+        	        success: function(data) {
+        	            var spaceLinks = data['spaceLinks'];
+        	            var externalLinks = data['externalLinks'];
+        	            var moduleLinks = data['moduleLinks'];
+        	            var textBlocks = data['textBlocks'];
+        	            
+        	            var posXModal = $("#bgImage").position().left;
+        	            var posYModal = $("#bgImage").position().top;
+        	            var posX = $("#main-bgImage").position().left;
+        	            var posY = $("#main-bgImage").position().top;
+        	            
+        	            spaceLinks.forEach(function(link,index){
+        	                var spanId= "spacelinkModalId-";
+        	                var divId = "#space"
+        	                generateSpaceLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+        	            })
+        	            spaceLinks.forEach(function(link,index){
+        	                var spanId= "spacelinkId-";
+        	                var divId = "#main-space";
+        	                generateSpaceLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+        	            })
+        	            
+        	            moduleLinks.forEach(function(link,index){
+        	                var spanId= "moduleModallinkId-";
+        	                var divId = "#space";
+        	                generateModuleLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+        	            })
+        	            moduleLinks.forEach(function(link,index){
+        	                var spanId= "modulelinkId-";
+        	                var divId = "#main-space";
+        	                generateModuleLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+        	            })
+        	            
+        	            externalLinks.forEach(function(link,index){
+        	                var spanId= "externalModallinkId-";
+        	                var divId = "#space";
+        	                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+        	            })
+        	            
+        	            externalLinks.forEach(function(link,index){
+        	                var spanId= "externallinkId-";
+        	                var divId = "#main-space";
+        	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+        	            })
+        	            
+        	            textBlocks.forEach(function(block,index){
+        	                var spanId= "textModalBlockId-";
+        	                var divId = "#space";
+        	                var imageHeight = modalBgImageHeight;
+        	                var imageWidth = modalBgImageWidth;
+        	                generateTextBlock(block,spanId,divId,true, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
+        	            })
+        	            
+        	            textBlocks.forEach(function(block,index){
+        	                var spanId= "textBlockId-";
+        	                var divId = "#main-space";
+        	                var imageHeight = parseInt($("#main-bgImage").css("height"));
+        	                var imageWidth = parseInt($("#main-bgImage").css("width"));
+        	                generateTextBlock(block,spanId,divId,false, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
+        	            })
+        	        }
+        	    });
+        	}
+        	
+        	function displayForms(formToShow){
+        	    drawLinks();
+        	    $("#space").css("display", "-webkit-box");
+        	    $(formToShow).css("display", "flex");
+        	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
+        	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
+        	}
+
+
+
+        	function updateContentOrder(jsonObj,token){
+            		$.ajax({
+            		 // ------------- adjusting content order of blocks if their position changed after dragging ----------
+	            		url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/blocks/order/update'})]",
+	            		type: 'POST',
+	            		beforeSend: function(){
+		            		$(".loader").remove();
+		            		$('#contOrdUpdStatus').empty();
+		            		$('#contOrdUpdStatus').append($('<div class="loader" style="font-size: 30px;display: none; text-align: center;"><i class="icon-spinner" aria-hidden="true">Saving...</i></div>'));
+		            		$(".loader").show();
+	            		},
+	            		complete: function(){
+		            		$(".loader").hide();
+		            		timeout = null;
+	            		},
+	            		cache       : false,
+	            		contentType: 'application/json; charset=utf-8',
+	            		processData :false,
+	            		headers:{
+	            			'X-CSRF-Token':token
+	            		},
+	            		data: JSON.stringify(jsonObj),
+	            		success: function(data) {
+		            		$(".save").remove();
+		            		for(let i=0;i<data.length;i++) {
+			            		$('#'+data[i].id).attr('data-position',data[i].contentOrder);
+		            		} 
+		            		var successDiv = $('<div style="width: 100%;height: 50px;" class="save alert alert-success alert-dismissible fade show" role="alert">');
+		            		successDiv.append('<p>Successfully Saved.</p>');
+		            		successDiv.append('<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
+		            		successDiv.append('</div>');
+		            		$('#contOrdUpdStatus').empty();
+		            		$('#contOrdUpdStatus').append(successDiv);
+	            		},
+	            		error: function(data) {
+		            		$(".errInSave").remove();
+		            		var errorDiv = $('<div style="width: 100%;height: 50px;" class="errInSave alert alert-danger alert-dismissible fade show" role="alert">');
+		            		errorDiv.append('<p>We are sorry but something went wrong. Please try again later.</p>');
+		            		errorDiv.append('<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
+		            		errorDiv.append('</div>');
+		            		$('#contOrdUpdStatus').empty();
+		            		$('#contOrdUpdStatus').append(errorDiv);
+	            		}
+            		});
+        		}
+            [# th:if="${#strings.equals(slide['class'].simpleName,'BranchingPoint')}"]
+        		$('#addChoice').show();
+        		$('#choiceSpace').show();
+        	[/]
+        	
             function guidedTour() {
             	const tour = new Shepherd.Tour({
             		  defaultStepOptions: {
@@ -719,66 +863,6 @@
             		}
             	}
             	
-            	function displayForms(formToShow){
-            	    drawLinks();
-            	    $("#space").css("display", "-webkit-box");
-            	    $(formToShow).css("display", "flex");
-            	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
-            	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
-            	}
-
-
-
-            	function updateContentOrder(jsonObj,token){
-	            		$.ajax({
-	            		 // ------------- adjusting content order of blocks if their position changed after dragging ----------
-		            		url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/blocks/order/update'})]",
-		            		type: 'POST',
-		            		beforeSend: function(){
-			            		$(".loader").remove();
-			            		$('#contOrdUpdStatus').empty();
-			            		$('#contOrdUpdStatus').append($('<div class="loader" style="font-size: 30px;display: none; text-align: center;"><i class="icon-spinner" aria-hidden="true">Saving...</i></div>'));
-			            		$(".loader").show();
-		            		},
-		            		complete: function(){
-			            		$(".loader").hide();
-			            		timeout = null;
-		            		},
-		            		cache       : false,
-		            		contentType: 'application/json; charset=utf-8',
-		            		processData :false,
-		            		headers:{
-		            			'X-CSRF-Token':token
-		            		},
-		            		data: JSON.stringify(jsonObj),
-		            		success: function(data) {
-			            		$(".save").remove();
-			            		for(let i=0;i<data.length;i++) {
-				            		$('#'+data[i].id).attr('data-position',data[i].contentOrder);
-			            		} 
-			            		var successDiv = $('<div style="width: 100%;height: 50px;" class="save alert alert-success alert-dismissible fade show" role="alert">');
-			            		successDiv.append('<p>Successfully Saved.</p>');
-			            		successDiv.append('<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
-			            		successDiv.append('</div>');
-			            		$('#contOrdUpdStatus').empty();
-			            		$('#contOrdUpdStatus').append(successDiv);
-		            		},
-		            		error: function(data) {
-			            		$(".errInSave").remove();
-			            		var errorDiv = $('<div style="width: 100%;height: 50px;" class="errInSave alert alert-danger alert-dismissible fade show" role="alert">');
-			            		errorDiv.append('<p>We are sorry but something went wrong. Please try again later.</p>');
-			            		errorDiv.append('<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
-			            		errorDiv.append('</div>');
-			            		$('#contOrdUpdStatus').empty();
-			            		$('#contOrdUpdStatus').append(errorDiv);
-		            		}
-	            		});
-            		}
-                [# th:if="${#strings.equals(slide['class'].simpleName,'BranchingPoint')}"]
-            		$('#addChoice').show();
-            		$('#choiceSpace').show();
-            	[/]
-            	
             
                 //-------- edit contentblock description --------
             

From c165ac5d00ee1cc59b047811e22d05fb50727d6b Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 15 Aug 2023 15:21:12 -0700
Subject: [PATCH 07/64] [story/VSPC-242]Entity

---
 .../vspace/core/model/IExternalLink.java      |  4 ++++
 .../vspace/core/model/impl/ExternalLink.java  | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
index 7da4c79c8..72abc3000 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
@@ -11,5 +11,9 @@ public interface IExternalLink extends ILink<ExternalLinkValue> {
     String getExternalLink();
 
     void setExternalLink(String externalLink);
+    
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
 
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
index 0ed9fa8dd..ca4fc3a51 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
@@ -10,6 +10,7 @@
 import org.hibernate.annotations.Parameter;
 
 import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 
 @Entity
@@ -25,6 +26,10 @@ public class ExternalLink extends VSpaceElement implements IExternalLink {
     @ManyToOne(targetEntity=Space.class)
     @JoinColumn(name="space_id", nullable=false)
     private ISpace space;
+    
+    @ManyToOne(targetEntity=Slide.class)
+    @JoinColumn(name="space_id", nullable=false)
+    private ISlide slide;
 
     private String externalLink;
 
@@ -45,8 +50,21 @@ public void setId(String id) {
     }
 
     /* (non-Javadoc)
-     * @see edu.asu.diging.vspace.core.model.impl.IExternalLink#getSpace()
+     * @see edu.asu.diging.vspace.core.model.impl.IExternalLink#getSlide()
+     */
+    @Override
+    public ISlide getSlide() {
+        return slide;
+    }
+
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IExternalLink#setSlide(edu.asu.diging.vspace.core.model.ISlide)
      */
+    @Override
+    public void setSlide(ISlide slide) {
+        this.slide = slide;
+    }
+    
     @Override
     public ISpace getSpace() {
         return space;

From 983cf14d022b86b2fe0dc41d2e31ed284c772600 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 16 Aug 2023 13:17:10 -0700
Subject: [PATCH 08/64] [story/VSPC-242]Entity

---
 .../vspace/core/model/impl/ExternalLink.java  |  2 +-
 .../diging/vspace/core/model/impl/Slide.java  | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
index ca4fc3a51..f5ddc9ca8 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
@@ -28,7 +28,7 @@ public class ExternalLink extends VSpaceElement implements IExternalLink {
     private ISpace space;
     
     @ManyToOne(targetEntity=Slide.class)
-    @JoinColumn(name="space_id", nullable=false)
+    @JoinColumn(name="slide_id", nullable=false)
     private ISlide slide;
 
     private String externalLink;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 350de758e..3e38ba88f 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import edu.asu.diging.vspace.core.model.IContentBlock;
+import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISequence;
@@ -35,6 +36,9 @@ public class Slide extends VSpaceElement implements ISlide {
 
     @ManyToOne(targetEntity = Module.class)
     private IModule module;
+    
+    @OneToMany(mappedBy = "slide", targetEntity=ExternalLink.class)
+    private List<IExternalLink> externalLinks;
 
     // -------- @JsonIgnore used as this entity will be returned in a controller
     @JsonIgnore
@@ -85,6 +89,23 @@ public IModule getModule() {
     public void setModule(IModule module) {
         this.module = module;
     }
+    
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.ISlide#getExternalLinks()
+     */
+    @Override
+    public List<IExternalLink> getExternalLinks() {
+        return externalLinks;
+    }
+
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.ISplide#setExternalLinks(java.util.List)
+     */
+    @Override
+    public void setExternalLinks(List<IExternalLink> externalLinks) {
+        this.externalLinks = externalLinks;
+    }
+    
 
     /*
      * (non-Javadoc)

From ef6194e9f6c13fce1ef3a2d92abf0037cfa6e618 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Mon, 21 Aug 2023 16:20:41 -0700
Subject: [PATCH 09/64] [story/VSPC-242]Factory Class

---
 .../vspace/core/factory/IExternalLinkFactory.java |  3 +++
 .../core/factory/impl/ExternalLinkFactory.java    | 15 +++++++++++++++
 .../edu/asu/diging/vspace/core/model/ISlide.java  |  4 ++++
 3 files changed, 22 insertions(+)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
index c45dcc27d..434bf95c1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
@@ -1,10 +1,13 @@
 package edu.asu.diging.vspace.core.factory;
 
 import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 
 public interface IExternalLinkFactory {
 
     IExternalLink createExternalLink(String title, ISpace space);
+    
+    IExternalLink createExternalLink(String title, ISlide slide);
 
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
index 14b68b41a..284ab8aca 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
@@ -4,6 +4,7 @@
 
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
 import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 
@@ -23,4 +24,18 @@ public IExternalLink createExternalLink(String title, ISpace space) {
         link.setSpace(space);
         return link;
     }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.factory.impl.IExternalLinkFactory#
+     * createExternalLink(java.lang.String, edu.asu.diging.vspace.core.model.ISlide)
+     */
+    @Override
+    public IExternalLink createExternalLink(String title, ISlide slide) {
+        IExternalLink link = new ExternalLink();
+        link.setName(title);
+        link.setSlide(slide);
+        return link;
+    }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index 59985eee6..0d2b68470 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -15,4 +15,8 @@ public interface ISlide extends IVSpaceElement {
     IImageBlock getFirstImageBlock();
     
     ITextBlock getFirstMatchedTextBlock(String searchTerm);
+    
+    List<IExternalLink> getExternalLinks();
+
+    void setExternalLinks(List<IExternalLink> externalLinks);
 }

From b4e6a3235727633c367d97ac95859c405bab4be1 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 22 Aug 2023 16:27:57 -0700
Subject: [PATCH 10/64] [story/VSPC-242]Repo

---
 .../vspace/core/data/ExternalLinkDisplayRepository.java    | 3 +++
 .../edu/asu/diging/vspace/core/services/ISlideManager.java | 7 +++++++
 .../edu/asu/diging/vspace/web/staff/SlideController.java   | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
index c91fbac33..80454fd6e 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
@@ -19,4 +19,7 @@ public interface ExternalLinkDisplayRepository extends PagingAndSortingRepositor
     public List<IExternalLinkDisplay> findExternalLinkDisplaysForSpace(String spaceId);
 
     public void deleteByExternalLink(IExternalLink link);
+    
+    @Query("SELECT d FROM ExternalLinkDisplay d WHERE d.externalLink.slide.id = ?1")
+    public List<IExternalLinkDisplay> findExternalLinkDisplaysForSlide(String slideId);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
index 947f4c9ce..eeee07ff2 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
@@ -5,10 +5,12 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
 import edu.asu.diging.vspace.core.model.IChoice;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
 import edu.asu.diging.vspace.core.model.impl.Slide;
@@ -33,4 +35,9 @@ public interface ISlideManager {
     List<Sequence> getSlideSequences(String slideId, String moduleId);
     
     Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);
+    
+    IExternalLinkDisplay createExternalLink(String title, ISlide slide, float positionX, float positionY, String externalLink)
+            throws SlideDoesNotExistException;
+    
+    List<IExternalLinkDisplay> getExternalLinkDisplaysonSlide(String slideId);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index e0b533bf8..f5610886d 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -20,6 +20,7 @@
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
+import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.web.staff.forms.SequenceForm;
@@ -36,6 +37,9 @@ public class SlideController {
 
     @Autowired
     private IContentBlockManager contentBlockManager;
+    
+    @Autowired
+    private IExternalLinkManager externalLinkManager;
 
     @RequestMapping("/staff/module/{moduleId}/slide/{id}")
     public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) {
@@ -43,6 +47,7 @@ public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId"
         ISlide slide = slideManager.getSlide(id);
         model.addAttribute("module", moduleManager.getModule(moduleId));
         model.addAttribute("slide", slide);
+        model.addAttribute("externalLinks", externalLinkManager.getLinkDisplays(id));
         model.addAttribute("slideSequences", slideManager.getSlideSequences(id, moduleId));
         List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(id);
         model.addAttribute("slideContents", slideContents);

From e079705edefe00cadf5c19c57ecbf4ea6a88c92b Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 23 Aug 2023 11:59:37 -0700
Subject: [PATCH 11/64] [story/VSPC-214] create external link

---
 .../core/services/impl/SlideManager.java      | 27 +++++++++++++
 .../views/staff/modules/slides/slide.html     | 38 -------------------
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
index fefd99c1e..6abacb33d 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
@@ -18,12 +18,16 @@
 import edu.asu.diging.vspace.core.data.ChoiceRepository;
 import edu.asu.diging.vspace.core.data.SequenceRepository;
 import edu.asu.diging.vspace.core.data.SlideRepository;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
 import edu.asu.diging.vspace.core.factory.impl.ChoiceFactory;
 import edu.asu.diging.vspace.core.factory.impl.SlideFactory;
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
 import edu.asu.diging.vspace.core.model.IChoice;
+import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.model.impl.Choice;
@@ -40,6 +44,9 @@ public class SlideManager implements ISlideManager {
 
     @Autowired
     private SlideRepository slideRepo;
+    
+    @Autowired
+    private IExternalLinkFactory externalLinkFactory;
 
     @Autowired
     private SequenceRepository sequenceRepo;
@@ -167,4 +174,24 @@ public Page<ISlide> findByNameOrDescription(Pageable requestedPage, String searc
 
         return slideRepo.findDistinctByNameContainingOrDescriptionContaining(requestedPage, searchText,searchText);
     }
+    
+    @Override
+    public IExternalLinkDisplay createExternalLink(String title, ISlide source, float positionX, float positionY, String externalLink) throws SlideDoesNotExistException {
+        // we need this to fully load the space
+        Optional<Slide> sourceSpace = slideRepo.findById(source.getId());
+        if(!sourceSpace.isPresent()) {
+            throw new SlideDoesNotExistException();
+        }
+        source = sourceSpace.get();
+        IExternalLink link = externalLinkFactory.createExternalLink(title, source, externalLink);
+        externalLinkRepo.save((ExternalLink) link);
+
+        IExternalLinkDisplay display = externalLinkDisplayFactory.createExternalLinkDisplay(link);
+        display.setPositionX(positionX);
+        display.setPositionY(positionY);
+        display.setName(title);
+        externalLinkDisplayRepo.save((ExternalLinkDisplay) display);
+        return display;
+    }
+
 }
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index d85e12c31..1a618be3e 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -467,28 +467,6 @@
         	            var posX = $("#main-bgImage").position().left;
         	            var posY = $("#main-bgImage").position().top;
         	            
-        	            spaceLinks.forEach(function(link,index){
-        	                var spanId= "spacelinkModalId-";
-        	                var divId = "#space"
-        	                generateSpaceLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-        	            })
-        	            spaceLinks.forEach(function(link,index){
-        	                var spanId= "spacelinkId-";
-        	                var divId = "#main-space";
-        	                generateSpaceLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-        	            })
-        	            
-        	            moduleLinks.forEach(function(link,index){
-        	                var spanId= "moduleModallinkId-";
-        	                var divId = "#space";
-        	                generateModuleLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-        	            })
-        	            moduleLinks.forEach(function(link,index){
-        	                var spanId= "modulelinkId-";
-        	                var divId = "#main-space";
-        	                generateModuleLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-        	            })
-        	            
         	            externalLinks.forEach(function(link,index){
         	                var spanId= "externalModallinkId-";
         	                var divId = "#space";
@@ -500,22 +478,6 @@
         	                var divId = "#main-space";
         	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
         	            })
-        	            
-        	            textBlocks.forEach(function(block,index){
-        	                var spanId= "textModalBlockId-";
-        	                var divId = "#space";
-        	                var imageHeight = modalBgImageHeight;
-        	                var imageWidth = modalBgImageWidth;
-        	                generateTextBlock(block,spanId,divId,true, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
-        	            })
-        	            
-        	            textBlocks.forEach(function(block,index){
-        	                var spanId= "textBlockId-";
-        	                var divId = "#main-space";
-        	                var imageHeight = parseInt($("#main-bgImage").css("height"));
-        	                var imageWidth = parseInt($("#main-bgImage").css("width"));
-        	                generateTextBlock(block,spanId,divId,false, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
-        	            })
         	        }
         	    });
         	}

From bc6c35a0af56dfe3ad05c1aa6037228dd217a655 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Mon, 28 Aug 2023 16:27:38 -0700
Subject: [PATCH 12/64] [story/VSPC-242] Controller

---
 .../core/services/IExternalLinkManager.java   | 10 +++
 .../vspace/core/services/ISlideManager.java   |  5 +-
 .../core/services/impl/SlideManager.java      | 34 ++++-----
 .../staff/AddSlideExternalLinkController.java | 70 +++++++++++++++++++
 4 files changed, 96 insertions(+), 23 deletions(-)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
index 7f7e0a84d..a2067a015 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
@@ -2,6 +2,7 @@
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -19,4 +20,13 @@ IExternalLinkDisplay updateLink(String title, String id, float positionX, float
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
             String imageFilename,ExternalLinkDisplayMode howToOpen)
             throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+    
+    IExternalLinkDisplay createLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
+
+    IExternalLinkDisplay updateLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename,ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
index eeee07ff2..d4378a341 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
@@ -36,8 +36,5 @@ public interface ISlideManager {
     
     Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);
     
-    IExternalLinkDisplay createExternalLink(String title, ISlide slide, float positionX, float positionY, String externalLink)
-            throws SlideDoesNotExistException;
-    
-    List<IExternalLinkDisplay> getExternalLinkDisplaysonSlide(String slideId);
+    List<IExternalLinkDisplay> getExternalLinkDisplaysOnSlide(String slideId);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
index 6abacb33d..515fa1b4c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
@@ -16,9 +16,12 @@
 
 import edu.asu.diging.vspace.core.data.BranchingPointRepository;
 import edu.asu.diging.vspace.core.data.ChoiceRepository;
+import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
+import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
 import edu.asu.diging.vspace.core.data.SequenceRepository;
 import edu.asu.diging.vspace.core.data.SlideRepository;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
 import edu.asu.diging.vspace.core.factory.impl.ChoiceFactory;
 import edu.asu.diging.vspace.core.factory.impl.SlideFactory;
@@ -29,8 +32,10 @@
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.SlideType;
+import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.model.impl.Choice;
+import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
 import edu.asu.diging.vspace.core.model.impl.Slide;
 import edu.asu.diging.vspace.core.services.ISlideManager;
@@ -59,6 +64,16 @@ public class SlideManager implements ISlideManager {
 
     @Autowired
     private ChoiceFactory choiceFactory;
+    
+    @Autowired
+    private ExternalLinkRepository externalLinkRepo;
+    
+    @Autowired
+    private IExternalLinkDisplayFactory externalLinkDisplayFactory;
+    
+    @Autowired
+    private ExternalLinkDisplayRepository externalLinkDisplayRepo;
+
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -174,24 +189,5 @@ public Page<ISlide> findByNameOrDescription(Pageable requestedPage, String searc
 
         return slideRepo.findDistinctByNameContainingOrDescriptionContaining(requestedPage, searchText,searchText);
     }
-    
-    @Override
-    public IExternalLinkDisplay createExternalLink(String title, ISlide source, float positionX, float positionY, String externalLink) throws SlideDoesNotExistException {
-        // we need this to fully load the space
-        Optional<Slide> sourceSpace = slideRepo.findById(source.getId());
-        if(!sourceSpace.isPresent()) {
-            throw new SlideDoesNotExistException();
-        }
-        source = sourceSpace.get();
-        IExternalLink link = externalLinkFactory.createExternalLink(title, source, externalLink);
-        externalLinkRepo.save((ExternalLink) link);
-
-        IExternalLinkDisplay display = externalLinkDisplayFactory.createExternalLinkDisplay(link);
-        display.setPositionX(positionX);
-        display.setPositionY(positionY);
-        display.setName(title);
-        externalLinkDisplayRepo.save((ExternalLinkDisplay) display);
-        return display;
-    }
 
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
new file mode 100644
index 000000000..63e8660ef
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -0,0 +1,70 @@
+package edu.asu.diging.vspace.web.staff;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.services.IExternalLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
+import edu.asu.diging.vspace.core.services.ISpaceManager;
+
+public class AddSlideExternalLinkController {
+    
+    @Autowired
+    private ISlideManager slideManager;
+    
+    @Autowired
+    private IExternalLinkManager externalLinkManager;
+    
+    @RequestMapping(value = "/staff/slide/{id}/externallink", method = RequestMethod.POST)
+    public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
+            @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
+            @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
+            @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
+            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+
+        ISlide slide = slideManager.getSlide(id);
+        if (slide == null) {
+            return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
+        }
+
+        byte[] linkImage = null;
+        String filename = null;
+        if (file != null) {
+            linkImage = file.getBytes();
+            filename = file.getOriginalFilename();
+        }
+        DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
+        ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
+                : ExternalLinkDisplayMode.valueOf(howToOpen);
+        IExternalLinkDisplay display = externalLinkManager.createLinkForSlide(title, id, new Float(x), new Float(y), 0,
+                externalLink, title, type, linkImage, filename, externalLinkOpenMode);
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode linkNode = mapper.createObjectNode();
+        linkNode.put("id", display.getExternalLink().getId());
+        linkNode.put("displayId", display.getId());
+        linkNode.put("x", display.getPositionX());
+        linkNode.put("y", display.getPositionY());
+        linkNode.put("url", display.getExternalLink().getId());
+
+        return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
+    }
+
+}

From a4106ee23da6d63a92822d5b4dad7d2da1031b97 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 29 Aug 2023 16:22:10 -0700
Subject: [PATCH 13/64] [story/VSPC-242] updated controller

---
 .../vspace/core/services/IExternalLinkManager.java    | 11 ++---------
 .../diging/vspace/core/services/ISlideManager.java    |  1 -
 .../core/services/impl/ExternalLinkManager.java       |  8 +++++++-
 .../diging/vspace/core/services/impl/LinkManager.java |  2 +-
 .../vspace/web/staff/AddExternalLinkController.java   |  3 ++-
 .../web/staff/AddSlideExternalLinkController.java     |  5 +++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
index a2067a015..8d6cd4f4b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
@@ -14,19 +14,12 @@ public interface IExternalLinkManager extends ILinkManager<IExternalLink, Extern
 
     IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, SlideDoesNotExistException;
 
     IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
             String imageFilename,ExternalLinkDisplayMode howToOpen)
             throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
-    
-    IExternalLinkDisplay createLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
 
-    IExternalLinkDisplay updateLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+   
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
index d4378a341..3cb86052e 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
@@ -36,5 +36,4 @@ public interface ISlideManager {
     
     Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);
     
-    List<IExternalLinkDisplay> getExternalLinkDisplaysOnSlide(String slideId);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
index 33cd4fb4a..6478b57e5 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
@@ -13,12 +13,14 @@
 import edu.asu.diging.vspace.core.data.ImageRepository;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
 import edu.asu.diging.vspace.core.factory.IImageFactory;
 import edu.asu.diging.vspace.core.file.IStorageEngine;
 import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
@@ -27,6 +29,7 @@
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Transactional
@@ -36,6 +39,9 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
 
     @Autowired
     private ISpaceManager spaceManager;
+    
+    @Autowired
+    private ISlideManager slideManager;
 
     @Autowired
     private ExternalLinkRepository externalLinkRepo;
@@ -69,7 +75,7 @@ protected IExternalLink createLinkObject(String title, String id) {
         IExternalLink link = externalLinkFactory.createExternalLink(title, source);
         return externalLinkRepo.save((ExternalLink) link);
     }
-
+    
     @Override
     protected ExternalLinkValue getTarget(String externalLink) {
         return new ExternalLinkValue(externalLink);
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
index f68cf325e..d5e467130 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
@@ -90,7 +90,7 @@ public void deleteLink(String linkId) {
     protected abstract L getLink(String linkId);
 
     protected abstract L createLinkObject(String title, String id);
-
+   
     protected abstract T getTarget(String linkedId);
 
     protected abstract U createDisplayLink(L link);
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
index daa3bb8da..2cb91e2f6 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -39,7 +40,7 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
 
         ISpace space = spaceManager.getSpace(id);
         if (space == null) {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 63e8660ef..e8a3230bb 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
@@ -38,7 +39,7 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+            throws NumberFormatException, SlideDoesNotExistException, IOException, ImageCouldNotBeStoredException, SpaceDoesNotExistException {
 
         ISlide slide = slideManager.getSlide(id);
         if (slide == null) {
@@ -54,7 +55,7 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
                 : ExternalLinkDisplayMode.valueOf(howToOpen);
-        IExternalLinkDisplay display = externalLinkManager.createLinkForSlide(title, id, new Float(x), new Float(y), 0,
+        IExternalLinkDisplay display = externalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
                 externalLink, title, type, linkImage, filename, externalLinkOpenMode);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();

From 800e22274b722b26cda02f80b75cce4f3232cd8e Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 30 Aug 2023 11:51:51 -0700
Subject: [PATCH 14/64] [story/VSPC-242]create link

---
 .../services/IExternalLinkSlideManager.java   | 24 +++++
 .../impl/ExternalLinkSlideManager.java        | 87 +++++++++++++++++++
 .../staff/AddSlideExternalLinkController.java |  7 +-
 3 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
new file mode 100644
index 000000000..a8de2a26a
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
@@ -0,0 +1,24 @@
+package edu.asu.diging.vspace.core.services;
+
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+
+public interface IExternalLinkSlideManager extends ILinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>{
+    
+    IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
+
+    IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename,ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
new file mode 100644
index 000000000..3329036ad
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
@@ -0,0 +1,87 @@
+package edu.asu.diging.vspace.core.services.impl;
+
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
+import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.impl.ExternalLink;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+import edu.asu.diging.vspace.core.services.IExternalLinkSlideManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
+
+@Transactional
+@Service
+public class ExternalLinkSlideManager extends LinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay> 
+        implements IExternalLinkSlideManager {
+    
+    @Autowired
+    private ISlideManager slideManager;
+    
+    @Autowired
+    private IExternalLinkFactory externalLinkFactory;
+    
+    @Autowired
+    private ExternalLinkRepository externalLinkRepo;
+
+    
+    @Override
+    protected IExternalLink createLinkObject(String title, String id) {
+        ISlide source = slideManager.getSlide(id);
+        IExternalLink link = externalLinkFactory.createExternalLink(title, source);
+        return externalLinkRepo.save((ExternalLink) link);
+    }
+    
+    @Override
+    public IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation,
+            String linkedId, String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,
+            ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
+
+        /*
+         * When createLink is called then inside updateLinkAndDisplay(link, displayLink)
+         * is called to save Link and Display link in the database and return an object
+         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
+         * ExternalLinkDisplay object to set howToOpen field then Hibernate
+         * automatically persist howToOpen in database.
+         */
+        IExternalLinkDisplay externalLinkDisplay = createLink(title, id, positionX, positionY, rotation, linkedId,
+                linkLabel, displayType, linkImage, imageFilename);
+        externalLinkDisplay.setHowToOpen(howToOpen);
+        return externalLinkDisplay;
+
+    }
+
+    @Override
+    public IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation,
+            String linkedId, String linkLabel, String linkId, String linkDisplayId, DisplayType displayType,
+            byte[] linkImage, String imageFilename, ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+
+        /*
+         * When updateLink is called then inside updateLinkAndDisplay(link, displayLink)
+         * is called to save Link and Display link in the database and return an object
+         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
+         * ExternalLinkDisplay object to set howToOpen field then Hibernate
+         * automatically persist howToOpen in database.
+         */
+        IExternalLinkDisplay externalLinkDisplay = updateLink(title, id, positionX, positionY, rotation, linkedId,
+                linkLabel, linkId, linkDisplayId, displayType, linkImage, imageFilename);
+        externalLinkDisplay.setHowToOpen(howToOpen);
+        return externalLinkDisplay;
+    }
+    
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index e8a3230bb..76cf559c2 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -23,6 +23,7 @@
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
+import edu.asu.diging.vspace.core.services.IExternalLinkSlideManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
@@ -32,14 +33,14 @@ public class AddSlideExternalLinkController {
     private ISlideManager slideManager;
     
     @Autowired
-    private IExternalLinkManager externalLinkManager;
+    private IExternalLinkSlideManager externalLinkSlideManager;
     
     @RequestMapping(value = "/staff/slide/{id}/externallink", method = RequestMethod.POST)
     public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SlideDoesNotExistException, IOException, ImageCouldNotBeStoredException, SpaceDoesNotExistException {
+            throws NumberFormatException, SlideDoesNotExistException, IOException, ImageCouldNotBeStoredException {
 
         ISlide slide = slideManager.getSlide(id);
         if (slide == null) {
@@ -55,7 +56,7 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
                 : ExternalLinkDisplayMode.valueOf(howToOpen);
-        IExternalLinkDisplay display = externalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
+        IExternalLinkDisplay display = externalLinkSlideManager.createLink(title, id, new Float(x), new Float(y), 0,
                 externalLink, title, type, linkImage, filename, externalLinkOpenMode);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();

From 91257f7ec0c87bbadaaead9b650f4b2547b1544b Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 5 Sep 2023 16:17:06 -0700
Subject: [PATCH 15/64] [story/VSPC-242]Create and display link

---
 .../services/IExternalLinkSlideManager.java   |  2 +-
 .../impl/ExternalLinkSlideManager.java        | 34 ++++++++++++++++++-
 .../core/services/impl/LinkManager.java       | 15 ++++++++
 .../staff/AddSlideExternalLinkController.java |  2 +-
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
index a8de2a26a..32fcb7b26 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
@@ -11,7 +11,7 @@
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 
 public interface IExternalLinkSlideManager extends ILinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>{
-    
+   
     IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
             throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
index 3329036ad..c1a0ea1f8 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
@@ -1,10 +1,14 @@
 package edu.asu.diging.vspace.core.services.impl;
 
+import java.util.List;
+import java.util.Optional;
+
 import javax.transaction.Transactional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
@@ -17,6 +21,7 @@
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.IExternalLinkSlideManager;
@@ -35,7 +40,34 @@ public class ExternalLinkSlideManager extends LinkManager<IExternalLink, Externa
     
     @Autowired
     private ExternalLinkRepository externalLinkRepo;
+    
+    @Autowired
+    private ExternalLinkDisplayRepository externalLinkDisplayRepo;
+
+    @Override
+    public List<IExternalLinkDisplay> getLinkDisplays(String slideId) {
+        return externalLinkDisplayRepo.findExternalLinkDisplaysForSlide(slideId);
+    }
+    
+    @Override
+    protected ExternalLinkValue getTarget(String externalLink) {
+        return new ExternalLinkValue(externalLink);
+    }
 
+    @Override
+    protected IExternalLinkDisplay updateLinkAndDisplay(IExternalLink link, IExternalLinkDisplay displayLink) {
+        externalLinkRepo.save((ExternalLink) link);
+        return externalLinkDisplayRepo.save((ExternalLinkDisplay) displayLink);
+    }
+
+    @Override
+    protected IExternalLinkDisplay getDisplayLink(String externalLinkDisplayId) {
+        Optional<ExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo.findById(externalLinkDisplayId);
+        if (externalLinkDisplay.isPresent()) {
+            return externalLinkDisplay.get();
+        }
+        return null;
+    }
     
     @Override
     protected IExternalLink createLinkObject(String title, String id) {
@@ -57,7 +89,7 @@ public IExternalLinkDisplay createLink(String title, String id, float positionX,
          * ExternalLinkDisplay object to set howToOpen field then Hibernate
          * automatically persist howToOpen in database.
          */
-        IExternalLinkDisplay externalLinkDisplay = createLink(title, id, positionX, positionY, rotation, linkedId,
+        IExternalLinkDisplay externalLinkDisplay = createLinkForSlide(title, id, positionX, positionY, rotation, linkedId,
                 linkLabel, displayType, linkImage, imageFilename);
         externalLinkDisplay.setHowToOpen(howToOpen);
         return externalLinkDisplay;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
index d5e467130..dd164bf86 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
@@ -8,6 +8,7 @@
 import edu.asu.diging.vspace.core.exception.FileStorageException;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IImageFactory;
 import edu.asu.diging.vspace.core.file.IStorageEngine;
@@ -51,7 +52,21 @@ public U createLink(String title, String id, float positionX, float positionY, i
         return updateLinkAndDisplay(link, displayLink);
 
     }
+    
+    protected U createLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
 
+        L link = createLinkObject(title, id);
+        T target = getTarget(linkedId);
+        link.setName(linkLabel);
+        link.setTarget(target);
+        U displayLink = createDisplayLink(link);
+        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        return updateLinkAndDisplay(link, displayLink);
+
+    }
+   
     @Override
     public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 76cf559c2..29251c029 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -36,7 +36,7 @@ public class AddSlideExternalLinkController {
     private IExternalLinkSlideManager externalLinkSlideManager;
     
     @RequestMapping(value = "/staff/slide/{id}/externallink", method = RequestMethod.POST)
-    public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
+    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)

From fe88dedd79be7c008545b8132a5b73e407d47969 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 6 Sep 2023 16:25:27 -0700
Subject: [PATCH 16/64] [story/VSPC-242]Delete link

---
 .../asu/diging/vspace/core/model/ILink.java   |  4 ++
 .../core/services/IExternalLinkManager.java   |  2 +-
 .../impl/ExternalLinkSlideManager.java        | 38 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
index 20a4c19a6..1fd5dffca 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
@@ -9,4 +9,8 @@ public interface ILink<T extends IVSpaceElement> extends IVSpaceElement{
     T getTarget();
 
     void setTarget(T target);
+    
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
index 8d6cd4f4b..ffde230c4 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
@@ -14,7 +14,7 @@ public interface IExternalLinkManager extends ILinkManager<IExternalLink, Extern
 
     IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException, SlideDoesNotExistException;
+            throws SpaceDoesNotExistException, ImageCouldNotBeStoredException, SpaceDoesNotExistException;
 
     IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
index c1a0ea1f8..fdc2ad95c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
@@ -14,6 +14,7 @@
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.ISlide;
@@ -43,6 +44,9 @@ public class ExternalLinkSlideManager extends LinkManager<IExternalLink, Externa
     
     @Autowired
     private ExternalLinkDisplayRepository externalLinkDisplayRepo;
+    
+    @Autowired
+    private IExternalLinkDisplayFactory externalLinkDisplayFactory;
 
     @Override
     public List<IExternalLinkDisplay> getLinkDisplays(String slideId) {
@@ -76,6 +80,17 @@ protected IExternalLink createLinkObject(String title, String id) {
         return externalLinkRepo.save((ExternalLink) link);
     }
     
+    @Override
+    protected void deleteLinkDisplayRepo(IExternalLink link) {
+        externalLinkDisplayRepo.deleteByExternalLink(link);
+    }
+  
+
+    @Override
+    protected void deleteLinkRepo(IExternalLink link) {
+        externalLinkRepo.delete((ExternalLink) link);
+    }
+    
     @Override
     public IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation,
             String linkedId, String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,
@@ -109,11 +124,32 @@ public IExternalLinkDisplay updateLink(String title, String id, float positionX,
          * ExternalLinkDisplay object to set howToOpen field then Hibernate
          * automatically persist howToOpen in database.
          */
-        IExternalLinkDisplay externalLinkDisplay = updateLink(title, id, positionX, positionY, rotation, linkedId,
+        IExternalLinkDisplay externalLinkDisplay = updateLinkForSlide(title, id, positionX, positionY, rotation, linkedId,
                 linkLabel, linkId, linkDisplayId, displayType, linkImage, imageFilename);
         externalLinkDisplay.setHowToOpen(howToOpen);
         return externalLinkDisplay;
     }
+
+    @Override
+    protected void removeFromLinkList(ISpace space, IExternalLink link) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    protected IExternalLink getLink(String externalLinkID) {
+        Optional<ExternalLink> externalLink = externalLinkRepo.findById(externalLinkID);
+        if (externalLink.isPresent()) {
+            return externalLink.get();
+        }
+        return null;
+    }
+
+    @Override
+    protected IExternalLinkDisplay createDisplayLink(IExternalLink link) {
+        return externalLinkDisplayFactory.createExternalLinkDisplay(link);
+
+    }
     
 
 }

From a5f4d2ce2e4bee57d8c65a815d550a7c8c16a8b3 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Thu, 7 Sep 2023 11:58:00 -0700
Subject: [PATCH 17/64] [story/VSPC-242]update and delete

---
 .../vspace/core/services/ILinkManager.java    |  3 ++
 .../services/impl/ExternalLinkManager.java    |  3 --
 .../core/services/impl/LinkManager.java       | 42 +++++++++++++++++++
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
index b34febced..7ab5695e6 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
@@ -10,6 +10,7 @@
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 
+
 public interface ILinkManager<L extends ILink<T>, T extends IVSpaceElement, U extends ILinkDisplay> {
 
     U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
@@ -25,4 +26,6 @@ U updateLink(String title, String id, float positionX, float positionY, int rota
 
     void deleteLink(String linkId);
 
+    
+
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
index 6478b57e5..289f6cad5 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
@@ -40,9 +40,6 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
     @Autowired
     private ISpaceManager spaceManager;
     
-    @Autowired
-    private ISlideManager slideManager;
-
     @Autowired
     private ExternalLinkRepository externalLinkRepo;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
index dd164bf86..329fedb1a 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
@@ -12,7 +12,9 @@
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IImageFactory;
 import edu.asu.diging.vspace.core.file.IStorageEngine;
+import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.ILink;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
@@ -20,6 +22,7 @@
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.VSImage;
 import edu.asu.diging.vspace.core.services.ILinkManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Transactional
@@ -28,6 +31,9 @@ public abstract class LinkManager<L extends ILink<T>, T extends IVSpaceElement,
 
     @Autowired
     private ISpaceManager spaceManager;
+    
+    @Autowired
+    private ISlideManager slideManager;
 
     @Autowired
     private IImageFactory imageFactory;
@@ -66,6 +72,23 @@ protected U createLinkForSlide(String title, String id, float positionX, float p
         return updateLinkAndDisplay(link, displayLink);
 
     }
+    
+    
+    protected U updateLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+
+        validateSlide(id);
+
+        L link = getLink(linkId);
+        T target = getTarget(linkedId);
+        link.setName(title);
+        link.setTarget(target);
+        U displayLink = getDisplayLink(linkDisplayId);
+        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        return updateLinkAndDisplay(link, displayLink);
+    }
    
     @Override
     public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
@@ -91,6 +114,18 @@ public void deleteLink(String linkId) {
         deleteLinkDisplayRepo(link);
         deleteLinkRepo(link);
     }
+    
+    protected void deleteLinkForSlide(String linkId) {
+        L link = getLink(linkId);
+        removeFromLinkListForSlide(link.getSlide(), link);
+        deleteLinkDisplayRepo(link);
+        deleteLinkRepo(link);
+    }
+    
+    
+    protected void removeFromLinkListForSlide(ISlide slide, L link) {
+        slide.getExternalLinks().remove(link);
+    }
 
     protected abstract void deleteLinkRepo(L link);
 
@@ -116,6 +151,13 @@ protected void validateSpace(String id) throws SpaceDoesNotExistException {
             throw new SpaceDoesNotExistException();
         }
     }
+    
+    protected void validateSlide(String id) throws SlideDoesNotExistException {
+        ISlide source = slideManager.getSlide(id);
+        if (source == null) {
+            throw new SlideDoesNotExistException();
+        }
+    }
 
     protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float positionX, float positionY,
             int rotation, DisplayType displayType, byte[] linkImage, String imageFilename)

From 26406a0a145e3efc31f8bf8d813a5d6f8a49d4c2 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Mon, 11 Sep 2023 16:26:57 -0700
Subject: [PATCH 18/64] [story/VSPC-242]controller

---
 .../staff/AddSlideExternalLinkController.java |  5 +--
 .../views/staff/modules/slides/slide.html     | 41 +++++++++----------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 29251c029..9d907132c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -16,16 +16,13 @@
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.IExternalLinkSlideManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
-import edu.asu.diging.vspace.core.services.ISpaceManager;
+
 
 public class AddSlideExternalLinkController {
     
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 1a618be3e..e850b8eb1 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -40,24 +40,34 @@
         </style>
         <script th:inline="javascript">
             //# sourceURL=click.js
-            var contentCount = [[${#lists.size(slideContents)}]];
-            var markDown = null;
-            var defaultValue;
-            var addVideoClk=0;
-            var editVideoClk=0;
+            
+            $(function () {
+            	  $('[data-toggle="tooltip"]').tooltip()
+            });
+            
             $(window).on("load", function() {
                 $( window ).resize(function() {
                     drawLinks();
                 });
                 drawLinks();
             });
+            
+            $(window).scroll(function(){
+          	  var sticky = $('.sticky'),
+          	      scroll = $(window).scrollTop();
+          	  if (scroll >= 100) sticky.addClass('fixed');
+          	  else sticky.removeClass('fixed');
+          	});
+            
+            var contentCount = [[${#lists.size(slideContents)}]];
+            var markDown = null;
+            var defaultValue;
+            var addVideoClk=0;
+            var editVideoClk=0;
             //store where a user clicked on an image
             var storeX;
             var storeY;
-            var selectedModuleLinkId;
-            var selectedSpaceLinkId;
             var selectedExternalLinkId;
-            var selectedTextBlockId;
             const displaceUnpublishedOnX = 25;
             const displaceUnpublishedOnY = 13;
             const displaceUnpublishedOnXModal = 50;
@@ -67,6 +77,7 @@
             var modalBgImageHeight;
             var modalBgImageWidth;
             
+          //link icons for exterenal links
             var externalLinkIconReader = new FileReader();
             var externalLinkIcon;
             externalLinkIconReader.onload = function(e) {
@@ -74,18 +85,6 @@
                 showExternalLinks(createExternalLinkInfo());
             }
 
-            
-            $(function () {
-            	  $('[data-toggle="tooltip"]').tooltip()
-            });
-            
-            $(window).scroll(function(){
-            	  var sticky = $('.sticky'),
-            	      scroll = $(window).scrollTop();
-            	  if (scroll >= 100) sticky.addClass('fixed');
-            	  else sticky.removeClass('fixed');
-            });
-            
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');
                 imageblock.find('img').attr('src', reader.result);
@@ -446,7 +445,7 @@
         	    
         	    $.ajax({
         	        type: "GET",
-        	        url: "[(@{'/staff/space/'+${space?.id}+'/links'})]",
+        	        url: "[(@{'/staff/slide/'+${slide?.id}+'/links'})]",
         	        cache       : false,
         	        contentType : false,
         	        processData : false,

From 93e1baee65b2988b8435f318a4dddbe8a687ce32 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 13 Sep 2023 16:27:43 -0700
Subject: [PATCH 19/64] [story/VSPC-242]set positions

---
 .../views/staff/modules/slides/slide.html     | 72 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index e850b8eb1..7c6f1510f 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -84,7 +84,77 @@
                 externalLinkIcon = e.target.result;
                 showExternalLinks(createExternalLinkInfo());
             }
-
+            
+            //Set link position 
+            function setLinkPosition(modalLink, link, isSpaceLink, isModal, isExternalLink, posX, posY, posXModal, posYModal, isTextBlock, isModuleLink){
+				modalLink.css('position', 'absolute');
+			    if(isModal){
+			        modalLink.css('left',link.positionX + posXModal);
+			        modalLink.css('top', link.positionY + posYModal);
+			    }else{
+			        modalLink.css('left', link.positionX + posX);
+			        modalLink.css('top', link.positionY + posY);
+			    }
+			    modalLink.css('transform', 'rotate('+link.rotation+'deg)');
+			    modalLink.find("span").css('fill', 'grey');
+			    modalLink.css('color', 'rgba(128,128,128,1)');
+			    modalLink.css('font-size', "16px");
+			    var positionX = isModal ? posXModal : posX;
+			    var positionY = isModal ? posYModal : posY;
+			    if(isSpaceLink && (link.link.targetSpace==null || link.link.targetSpace.spaceStatus=="UNPUBLISHED")){
+				var inactiveLinkId;
+				var inactiveLinkClasses;
+				var inactiveLinkTitle;
+				if(link.link.targetSpace==null) {
+				    inactiveLinkId = "deletedSpace-";
+				    inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
+				    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
+			    	} else {
+				    inactiveLinkId = "unpublished-";
+				    inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
+				    inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
+			    	}
+				var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
+			    	inactiveSpaceElement.css('position', 'absolute');
+				inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+				inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+				inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
+				inactiveSpaceElement.css('font-size', "24px");
+				inactiveSpaceElement.attr('title', inactiveLinkTitle);
+				if(isModal){
+				    $("#space").append(inactiveSpaceElement);
+				} else{
+				    $("#main-space").append(inactiveSpaceElement);
+				}
+			    }
+			    if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
+			    	var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
+			        unpublishedModuleElement.css('position', 'absolute');
+			    	unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+			    	unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+			    	unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
+			    	unpublishedModuleElement.css('font-size', "24px");
+			        if(isModal){
+			            $("#space").append(unpublishedModuleElement);
+			        }else{
+			            $("#main-space").append(unpublishedModuleElement);
+			        }
+			    }
+			    if(!isTextBlock){
+			        var linkId = isExternalLink ? link.externalLink.id : link.link.id;
+			        setLabelPosition(link,linkId,positionX,positionY);
+			    }
+			}
+            
+            // set label position
+            function setLabelPosition(link,id, positionX, positionY){
+            	$(".label-"+id).css({
+            	    'left': link.positionX + positionX - displaceLableOnX,
+            	    'top': link.positionY + positionY + displaceLableOnY,
+            	    'color': 'red'
+            	}); 
+            }
+            
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');
                 imageblock.find('img').attr('src', reader.result);

From 726ca207859f16ea858db75c7d7d297d2848a496 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 15 Sep 2023 13:54:43 -0700
Subject: [PATCH 20/64] [story/VSPC-242] Java script

---
 .../views/staff/modules/slides/slide.html     | 375 ++++++++----------
 1 file changed, 165 insertions(+), 210 deletions(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 7c6f1510f..864d760b0 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -107,7 +107,7 @@
 				var inactiveLinkTitle;
 				if(link.link.targetSpace==null) {
 				    inactiveLinkId = "deletedSpace-";
-				    inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
+				    inactiveLinkClasses = "deletedSlideClass deletedClass-";   
 				    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
 			    	} else {
 				    inactiveLinkId = "unpublished-";
@@ -154,7 +154,170 @@
             	    'color': 'red'
             	}); 
             }
+            //generate external links
+			function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
+				if(link != null){
+					var externalLink;
+					if(link.type=="IMAGE" && link.image != null){
+						var imageURL = [[@{/api/image/}]]+link.image.id;
+						externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
+					}else{
+						externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
+					}
+					setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
+					$(divId).append(externalLink);
+					if(spanId === "externallinkId-"){
+						$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
+						$('#'+spanId+link.externalLink.id).click(function(e) {
+							var linkData = $('#'+spanId+link.externalLink.id).data();
+							makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
+						});
+					}
+				}
+			}
+            
+            //drawlink method
+            
+			function drawLinks(){
+			    $(".Info_cz_Class").remove();
+			    $(".imageLink").remove();
+			    $(".alertLink").remove();
+			    $(".ellipse_class").remove();
+			    $(".unpublishedSpaceClass").remove();
+			    $(".textBlockClass").remove();
+			    $(".deletedSlideClass").remove();
+			    
+			    $.ajax({
+			        type: "GET",
+			        url: "[(@{'/staff/slide/'+${slide?.id}+'/links'})]",
+			        cache       : false,
+			        contentType : false,
+			        processData : false,
+			        beforeSend: function () {
+			            $("#loader").show();
+			            },
+			       	complete: function () {
+			            $("#loader").hide();
+			            },
+			        success: function(data) {
+			            var externalLinks = data['externalLinks'];
+			            
+			            var posXModal = $("#bgImage").position().left;
+			            var posYModal = $("#bgImage").position().top;
+			            var posX = $("#main-bgImage").position().left;
+			            var posY = $("#main-bgImage").position().top;
+			           
+			            externalLinks.forEach(function(link,index){
+			                var spanId= "externalModallinkId-";
+			                var divId = "#space";
+			                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+			            })
+			            
+			            externalLinks.forEach(function(link,index){
+			                var spanId= "externallinkId-";
+			                var divId = "#main-space";
+			                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+			            })
+			        }
+			    });
+			}
             
+			//--------- show links functions --------------
+			function showExternalLinkEdit(externalLink, show, posX, posY) {
+			    externalLink["x"]=storeX;
+			    externalLink["y"]=storeY;
+			    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
+			    var selectedLabelClass = '.label-'+selectedExternalLinkId;
+			    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
+			}			
+			
+			//update link 
+			function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
+			    var posX, posY;
+			    if(show) {
+			        posX = $("#main-bgImage").position().left;
+			        posY = $("#main-bgImage").position().top;
+			    }
+			    else{
+			        posX = $("#bgImage").position().left;
+			        posY = 0
+			    }
+			    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
+			    $(selectedLinkClass).css({ 'position': 'absolute'});
+			    $(selectedLinkClass).css({ 'left': x + posX});
+			    $(selectedLinkClass).css({ 'top': y + posY});
+			    $(selectedLabelClass+' span').remove();
+			    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
+			    feather.replace();    
+			}
+			//hide link info
+			function hideLinkInfoTabs(){
+			    $("#editExternalLinkInfo").hide();
+			    $("#createExternalLinkAlert").hide();
+			    $("#errorMsg").text("");
+			    $('#errorAlert').hide();
+			}
+			
+			// Show external link function
+			
+			function showExternalLinks(externalLink, show, x, y) {
+			    $("#ext_label").remove();
+			    $("#link").remove();
+			    $("#undefined").remove();
+			    var posX = $("#bgImage").position().left;
+			    var posY = $("#bgImage").position().top;
+			    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
+			    ext_label.text(externalLink["externalLinkLabel"]);
+			
+			    var link;
+			    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
+			        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
+			    } else {
+			        $(ext_label).css({
+			            'position': 'absolute',
+			            'font-size': "12px",
+			            'transform': 'rotate(0deg)',
+			            'color': 'blue'
+			        });
+			        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
+			    }
+			    
+			    if(show) {
+			        link.css('top', externalLink["y"] + posY);
+			    } else {
+			    	link.css('top', externalLink["y"]);
+			    }
+			
+			    link.css('position', 'absolute');
+			    link.css('left', externalLink["x"] + posX);
+			    link.css('color', 'blue');
+			    link.css('font-size', "12px");
+			
+			    if (externalLink["id"]) {
+					link.attr("data-link-id", externalLink["id"]);
+					link.css('cursor', 'pointer');
+					link.attr('href', externalLink["url"]);
+					link.click(function(e) {
+						makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+					});
+					
+					ext_label.attr("data-link-id", externalLink["id"]);
+					ext_label.css('cursor', 'pointer');
+					ext_label.attr("class", "label-"+externalLink["id"]);
+					ext_label.click(function(e) {
+						makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+					});
+			    }
+			
+			    $("#slide").append(link);
+			    $("#link").append(ext_label);
+			    $("#external-link").remove();
+			
+			}			
+			
+			//--------- Utility functions -------------
+			
+			
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');
                 imageblock.find('img').attr('src', reader.result);
@@ -504,53 +667,7 @@
 					}
 				});
 			}
-            function drawLinks(){
-        	    $(".Info_cz_Class").remove();
-        	    $(".imageLink").remove();
-        	    $(".alertLink").remove();
-        	    $(".ellipse_class").remove();
-        	    $(".unpublishedSpaceClass").remove();
-        	    $(".textBlockClass").remove();
-        	    $(".deletedSpaceClass").remove();
-        	    
-        	    $.ajax({
-        	        type: "GET",
-        	        url: "[(@{'/staff/slide/'+${slide?.id}+'/links'})]",
-        	        cache       : false,
-        	        contentType : false,
-        	        processData : false,
-        	        beforeSend: function () {
-        	            $("#loader").show();
-        	            },
-        	       	complete: function () {
-        	            $("#loader").hide();
-        	            },
-        	        success: function(data) {
-        	            var spaceLinks = data['spaceLinks'];
-        	            var externalLinks = data['externalLinks'];
-        	            var moduleLinks = data['moduleLinks'];
-        	            var textBlocks = data['textBlocks'];
-        	            
-        	            var posXModal = $("#bgImage").position().left;
-        	            var posYModal = $("#bgImage").position().top;
-        	            var posX = $("#main-bgImage").position().left;
-        	            var posY = $("#main-bgImage").position().top;
-        	            
-        	            externalLinks.forEach(function(link,index){
-        	                var spanId= "externalModallinkId-";
-        	                var divId = "#space";
-        	                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-        	            })
-        	            
-        	            externalLinks.forEach(function(link,index){
-        	                var spanId= "externallinkId-";
-        	                var divId = "#main-space";
-        	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-        	            })
-        	        }
-        	    });
-        	}
-        	
+            
         	function displayForms(formToShow){
         	    drawLinks();
         	    $("#space").css("display", "-webkit-box");
@@ -559,8 +676,6 @@
         	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
         	}
 
-
-
         	function updateContentOrder(jsonObj,token){
             		$.ajax({
             		 // ------------- adjusting content order of blocks if their position changed after dragging ----------
@@ -735,166 +850,6 @@
 	            	}
             	});
             	
-            	function showExternalLinkEdit(externalLink, show, posX, posY) {
-            	    externalLink["x"]=storeX;
-            	    externalLink["y"]=storeY;
-            	    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
-            	    var selectedLabelClass = '.label-'+selectedExternalLinkId;
-            	    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
-            	}
-
-            	function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
-            	    var posX, posY;
-            	    if(show) {
-            	        posX = $("#main-bgImage").position().left;
-            	        posY = $("#main-bgImage").position().top;
-            	    }
-            	    else{
-            	        posX = $("#bgImage").position().left;
-            	        posY = 0
-            	    }
-            	    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
-            	    $(selectedLinkClass).css({ 'position': 'absolute'});
-            	    $(selectedLinkClass).css({ 'left': x + posX});
-            	    $(selectedLinkClass).css({ 'top': y + posY});
-            	    $(selectedLabelClass+' span').remove();
-            	    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
-            	    feather.replace();    
-            	}
-
-            	function hideLinkInfoTabs(){
-            	    $("#editExternalLinkInfo").hide();
-            	    $("#editSpaceLinkInfo").hide();
-            	    $("#editModuleLinkInfo").hide();
-            	    $("#editTextBlockInfo").hide();
-            	    $("#createExternalLinkAlert").hide();
-            	    $("#createSpaceLinkAlert").hide();
-            	    $("#createModuleLinkAlert").hide();
-            	    $("#errorMsg").text("");
-            	    $('#errorAlert').hide();
-            	}
-
-            	function showExternalLinks(externalLink, show, x, y) {
-            	    $("#ext_label").remove();
-            	    $("#link").remove();
-            	    $("#undefined").remove();
-            	    var posX = $("#bgImage").position().left;
-            	    var posY = $("#bgImage").position().top;
-            	    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
-            	    ext_label.text(externalLink["externalLinkLabel"]);
-
-            	    var link;
-            	    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
-            	        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
-            	    } else {
-            	        $(ext_label).css({
-            	            'position': 'absolute',
-            	            'font-size': "12px",
-            	            'transform': 'rotate(0deg)',
-            	            'color': 'blue'
-            	        });
-            	        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
-            	    }
-            	    
-            	    if(show) {
-            	        link.css('top', externalLink["y"] + posY);
-            	    } else {
-            	    	link.css('top', externalLink["y"]);
-            	    }
-
-            	    link.css('position', 'absolute');
-            	    link.css('left', externalLink["x"] + posX);
-            	    link.css('color', 'blue');
-            	    link.css('font-size', "12px");
-
-            	    if (externalLink["id"]) {
-            			link.attr("data-link-id", externalLink["id"]);
-            			link.css('cursor', 'pointer');
-            			link.attr('href', externalLink["url"]);
-            			link.click(function(e) {
-            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-            			});
-            			
-            			ext_label.attr("data-link-id", externalLink["id"]);
-            			ext_label.css('cursor', 'pointer');
-            			ext_label.attr("class", "label-"+externalLink["id"]);
-            			ext_label.click(function(e) {
-            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-            			});
-            	    }
-
-            	    $("#space").append(link);
-            	    $("#link").append(ext_label);
-            	    $("#external-link").remove();
-
-            	}
-            	
-            	function editExternalLinkInfo() {
-            		var info = {};
-            		info["x"] = storeX;
-            		info["y"] = storeY;
-            		info["tabOpen"] = $("#extTabOpenEdit").val();
-            		info["type"] = $("#extTypeEdit").val();
-            		info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
-            		info["externalLinkURL"] = $("#externalLinkURLEdit").val();
-            		return info;
-            	}
-            	
-            	function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
-            	    selectedExternalLinkId=linkId;
-            	    storeX=posXEdit;
-            	    storeY=posYEdit;
-            	    $("#externalLinkInfoLabel").text(linkName);
-            	    $("#externalLinkId").val(linkId);
-            	    $("#externalLinkDisplayId").val(displayLinkId);
-            	    $("#externalLinkInfoLabelEdit").text(linkName);
-            	    $("#externalLinkLabelEdit").val(linkName);
-            	    $("#externalLinkIdValueEdit").val(linkId);
-            	    $("#externalLinkURLEdit").val(externalLinkURL);
-            	    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
-            	    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
-            	    
-            	    resetHighlighting();
-
-            	    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
-            	    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
-            	    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
-            	    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
-
-            	    $("#bgImage").on("click", function(e){
-            	        e.preventDefault();
-            	        var posX = $(this).position().left;
-            	        var posY = $(this).position().top;    
-            	        storeX = e.pageX - $(this).offset().left;
-            	        storeY = e.pageY - $(this).offset().top + 25;
-            	        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
-            	    });
-            	    hideLinkInfoTabs();
-            	    displayForms("#editExternalLinkInfo");
-            	}
-            	
-            	function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
-            		if(link != null){
-            			var externalLink;
-            			if(link.type=="IMAGE" && link.image != null){
-            				var imageURL = [[@{/api/image/}]]+link.image.id;
-            				externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
-            			}else{
-            				externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
-            			}
-            			setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
-            			$(divId).append(externalLink);
-            			if(spanId === "externallinkId-"){
-            				$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
-            				$('#'+spanId+link.externalLink.id).click(function(e) {
-            					var linkData = $('#'+spanId+link.externalLink.id).data();
-            					makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
-            				});
-            			}
-            		}
-            	}
-            	
-            
                 //-------- edit contentblock description --------
             
                 $("#submitDescription").hide()

From d49a3649258d23170207f35375b452e21309d99e Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 19 Sep 2023 15:17:53 -0700
Subject: [PATCH 21/64] [story/VSPC-242]Utility js functions

---
 .../views/staff/modules/slides/slide.html     | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 864d760b0..2e72b95ca 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -316,6 +316,38 @@
 			}			
 			
 			//--------- Utility functions -------------
+
+			function createExternalLinkInfo() {
+				var info = {};
+				info["x"] = storeX;
+				info["y"] = storeY;
+				info["tabOpen"] = $("#extTabOpen").val();
+				info["type"] = $("#extType").val();
+				info["externalLinkLabel"] = $("#externalLinkLabel").val();
+				info["externalLinkURL"] = $("#externalLink").val();
+				return info;
+			}
+			
+			function editExternalLinkInfo() {
+				var info = {};
+				info["x"] = storeX;
+				info["y"] = storeY;
+				info["tabOpen"] = $("#extTabOpenEdit").val();
+				info["type"] = $("#extTypeEdit").val();
+				info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
+				info["externalLinkURL"] = $("#externalLinkURLEdit").val();
+				return info;
+			}
+			
+			function displayForms(formToShow){
+			    drawLinks();
+			    $("#slide").css("display", "-webkit-box");
+			    $(formToShow).css("display", "flex");
+			    modalBgImageHeight = parseInt($("#bgImage").css("height"));
+			    modalBgImageWidth = parseInt($("#bgImage").css("width"));
+			}
+			
+			
 			
 			
             function createImageBlock(reader, width) {
@@ -668,14 +700,6 @@
 				});
 			}
             
-        	function displayForms(formToShow){
-        	    drawLinks();
-        	    $("#space").css("display", "-webkit-box");
-        	    $(formToShow).css("display", "flex");
-        	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
-        	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
-        	}
-
         	function updateContentOrder(jsonObj,token){
             		$.ajax({
             		 // ------------- adjusting content order of blocks if their position changed after dragging ----------
@@ -968,25 +992,6 @@
                     editVideoClk=0;
                 });
                 
-                $("#addExternalLinkButton").click(function(e) {
-                    $("#bgImage").off("click");
-                    $("#bgImage").on("click", function(e){
-                        e.preventDefault();
-                        $("#link").remove();
-                        $("#external-arrow").remove();
-                        $("#ext_label").remove();
-                        var icon;
-                        var posX = $(this).position().left
-                        var posY = $(this).position().top;
-                        storeX = e.pageX - $(this).offset().left;
-                        storeY = e.pageY - $(this).offset().top + 25;
-                        showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
-                    });
-                    hideLinkInfoTabs();
-                    displayForms("#createExternalLinkAlert");
-                });
-
-                
                 $("#uploadImage").click(function(e) {
                     e.preventDefault();
                     $("#addImgAlert").hide();

From 158ac5a460e962ed303a77e01ddf27f4a1eb6eba Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 20 Sep 2023 16:25:49 -0700
Subject: [PATCH 22/64] [story/VSPC-242]External link editable

---
 .../views/staff/modules/slides/slide.html     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 2e72b95ca..33afa2c46 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -347,7 +347,51 @@
 			    modalBgImageWidth = parseInt($("#bgImage").css("width"));
 			}
 			
+			function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
+			    selectedExternalLinkId=linkId;
+			    storeX=posXEdit;
+			    storeY=posYEdit;
+			    $("#externalLinkInfoLabel").text(linkName);
+			    $("#externalLinkId").val(linkId);
+			    $("#externalLinkDisplayId").val(displayLinkId);
+			    $("#externalLinkInfoLabelEdit").text(linkName);
+			    $("#externalLinkLabelEdit").val(linkName);
+			    $("#externalLinkIdValueEdit").val(linkId);
+			    $("#externalLinkURLEdit").val(externalLinkURL);
+			    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
+			    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
+			    
+			    resetHighlighting();
+
+			    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
+			    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
+			    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
+			    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
+
+			    $("#bgImage").on("click", function(e){
+			        e.preventDefault();
+			        var posX = $(this).position().left;
+			        var posY = $(this).position().top;    
+			        storeX = e.pageX - $(this).offset().left;
+			        storeY = e.pageY - $(this).offset().top + 25;
+			        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
+			    });
+			    hideLinkInfoTabs();
+			    displayForms("#editExternalLinkInfo");
+			}
 			
+			function resetHighlighting() {
+			    // reset icon links
+			    $('[data-link-id]').css("color", "red");
+
+			    // reset alert links
+			    $('div[data-link-id]').removeClass("alert-warning");
+			    $('div[data-link-id]').addClass("alert-primary");
+
+			    // reset image links
+			    $('img[data-link-id]').css("border-width", "0");
+			}
+
 			
 			
             function createImageBlock(reader, width) {

From 3713c45a298868a6b5bcbd728d1e52bace8b1287 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 22 Sep 2023 13:53:06 -0700
Subject: [PATCH 23/64] [story/VSPC-242] Text area function

---
 .../views/staff/modules/slides/slide.html     | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 33afa2c46..f5f1bc68b 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -392,7 +392,41 @@
 			    $('img[data-link-id]').css("border-width", "0");
 			}
 
-			
+			function getTextArea(x,y) {
+			    var posX = $("#bgImage").position().left;
+			    var posY = $("#bgImage").position().top;
+			    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
+			    text.css('position', 'absolute');
+			    text.css('left', x + posX);
+			    text.css('top', y);
+			    $("#slide").append(text);
+			    
+			    var textB = $('#textB')[0],
+			    tHeight = textB.clientHeight,
+			    tWidth = textB.clientWidth;
+			    
+			    var height = modalBgImageHeight;
+			    var width = modalBgImageWidth;
+			    
+			    $("#textBoxWidthID").val(tWidth);
+			    $("#textBoxHeightID").val(tHeight);
+			    textB.onmouseup = function (e) {
+			        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
+			            tHeight = textB.clientHeight;
+			            tWidth = textB.clientWidth;
+			            let percentileHeight = (tHeight*100)/height;
+			            let percentileWidth = (tWidth*100)/width;
+			            $("#textBoxWidthID").val(percentileWidth);
+			            $("#textBoxHeightID").val(percentileHeight);
+			            $("#textContentID").val(textB.value);
+			        }
+			    };
+			    var percentileHeight = (tHeight*100)/height;
+			    var percentileWidth = (tWidth*100)/width;
+			    $("#textBoxWidthID").val(percentileWidth);
+			    $("#textBoxHeightID").val(percentileHeight);
+			    $("#textContentID").val(textB.value);
+			}
 			
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');

From d14bdcbc0fa04745629638c3794ff2acaffd421b Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 26 Sep 2023 15:27:25 -0700
Subject: [PATCH 24/64] [story/VSPC-242]Buttons ajax call

---
 .../views/staff/modules/slides/slide.html     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index f5f1bc68b..c35559595 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -428,6 +428,35 @@
 			    $("#textContentID").val(textB.value);
 			}
 			
+			// -------- buttons that open modals (e.g. to create external links) ------
+			
+			$("#addExternalLinkButton").click(function(e) {
+	            $("#createSlideLinkAlert").hide();
+	            $("#changeBgImgAlert").hide();
+	            $("#bgImage").off("click");
+	            $("#bgImage").on("click", function(e){
+	                e.preventDefault();
+	                $("#link").remove();
+	                $("#external-arrow").remove();
+	                $("#ext_label").remove();
+	                var icon;
+	                var posX = $(this).position().left
+	                var posY = $(this).position().top;
+	                storeX = e.pageX - $(this).offset().left;
+	                storeY = e.pageY - $(this).offset().top + 25;
+	                showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
+	            });
+	            hideLinkInfoTabs();
+	            displayForms("#createExternalLinkAlert");
+	        });
+			
+			$('#changeBgImgButton').click(function(file) {
+	            $("#createSlideLinkAlert").hide();
+	            $("#createExternalLinkAlert").hide();
+	            drawLinks();
+	            $("#changeBgImgAlert").show();          
+	        });
+			
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');
                 imageblock.find('img').attr('src', reader.result);

From 89cae0dab37418d9eba109133a4b5cf8603fe65d Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 27 Sep 2023 17:54:13 -0700
Subject: [PATCH 25/64] [story/VSPC-242] Ajax method for create link

---
 .../views/staff/modules/slides/slide.html     | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index c35559595..61ca1921c 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -457,6 +457,85 @@
 	            $("#changeBgImgAlert").show();          
 	        });
 			
+			// ----------- submit buttons (e.g. to create external links) ------------------
+			
+			
+			$("#createExternalLinkBtn").click(function(e) {
+            e.preventDefault();
+            $("#slide").scrollTop(0);
+            var payload = {};
+
+            if (storeX == undefined || storeY == undefined) {
+                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+                $('#errorAlert').show();
+                return;
+            }
+
+            var externalLink = $("#externalLink").val();
+            var externalLinkLabel = $("#externalLinkLabel").val();
+            var type = $("#extType option:selected").text();
+
+            if (externalLink == undefined || externalLink == "") {
+                $("#errorMsg").text("Please provide the link to the external link.")
+                $('#errorAlert').show();
+                return;
+            }
+
+            if (externalLinkLabel == undefined || externalLinkLabel == "") {
+                $("#errorMsg").text("Please enter a label for this external link.")
+                $('#errorAlert').show();
+                return;
+            }
+            
+            if (type == undefined || type == "Choose...") {
+                $("#errorMsg").text("Please select a link type in Type dropdown.")
+                $('#errorAlert').show();
+                return;
+            }
+            $("#externalLinkX").val(storeX);
+            $("#externalLinkY").val(storeY - 25);
+
+            var form = $("#createExternalLinkForm");
+            var formData = new FormData(form[0]);
+            var externalLinkInfo = createExternalLinkInfo();
+
+            $.ajax({
+                type: "POST",
+                url: "[(@{'/staff/slide/'+${slide?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                cache       : false,
+                contentType : false,
+                processData : false,
+                enctype: 'multipart/form-data',
+                data: formData,
+                beforeSend: function () {
+                    $(".saveLoader").show();
+                    },
+               	complete: function () {
+                    $(".saveLoader").hide();
+                    },
+                success: function(data) {
+                    var linkData = JSON.parse(data);
+                    $("#bgImage").off("click");
+                    externalLinkInfo["id"] = linkData["id"];
+                    externalLinkInfo["displayId"]=linkData["displayId"];
+                    externalLinkInfo["x"]=linkData["x"];
+                    externalLinkInfo["y"]=linkData["y"];
+                    showExternalLinks(externalLinkInfo, true);
+                    $("#ext_label").attr("id","");
+                    $("#link").attr("id","");
+                    $("#createExternalLinkAlert").hide();
+                    $("#errorMsg").text("");
+                    $('#errorAlert').hide();
+                    $("."+linkData["id"]).remove();
+                    form[0].reset();
+                    $("#external-arrow").attr("id","");
+                    $("#space").css("display", "none");
+                    externalLinkIcon=null;
+                    drawLinks();
+                	}
+            	});
+        	});
+			
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');
                 imageblock.find('img').attr('src', reader.result);

From bc9c564899ecb34269dc4e522f830ddfacb18ace Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 29 Sep 2023 13:49:01 -0700
Subject: [PATCH 26/64] [story/VSPC-242]Ajax method for edit external link

---
 .../views/staff/modules/slides/slide.html     | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 61ca1921c..20389035f 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -529,13 +529,61 @@
                     $("."+linkData["id"]).remove();
                     form[0].reset();
                     $("#external-arrow").attr("id","");
-                    $("#space").css("display", "none");
+                    $("#slide").css("display", "none");
                     externalLinkIcon=null;
                     drawLinks();
                 	}
             	});
         	});
 			
+			$("#editExternalLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            $("#slide").scrollTop(0);
+	            var linkId = $("#externalLinkIdEdit").val();
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            var linkedSpace = $("#externalLinkIdEdit").val();
+	            $("#externalLinkXEdit").val(storeX);
+	            $("#externalLinkYEdit").val(storeY - 25);
+	            var form = $("#editExternalLinkForm");
+	            var formData = new FormData(form[0]);
+	            var externalLinkInfo = editExternalLinkInfo();
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/slide/link/external/'+${slide?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache: false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    externalLinkInfo["id"] = linkData["id"];
+	                    externalLinkInfo["displayId"]=linkData["displayId"];
+	                    externalLinkInfo["x"]=linkData["x"];
+	                    externalLinkInfo["y"]=linkData["y"];
+	                    $('#linkLabel-'+selectedExternalLinkId).val(linkData["label"]);
+	                    $('#linkType-'+selectedExternalLinkId).val(linkData["dislpayType"]);
+	                    $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]);
+	                    showExternalLinkEdit(editExternalLinkInfo, true);
+	                    hideLinkInfoTabs();
+	                    $("#slide").css("display", "none");
+	                    selectedExternalLinkId=undefined;
+	                    drawLinks();
+	                }
+	            });
+	        });
+			
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');
                 imageblock.find('img').attr('src', reader.result);

From 62906bfb6f0d33a29d1bd2a0dfa92fedb89db39d Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 3 Oct 2023 14:44:23 -0700
Subject: [PATCH 27/64] [story/VSPC-242] Delete button java script

---
 .../asu/diging/vspace/core/model/ILink.java   |   3 -
 .../staff/AddSlideExternalLinkController.java |   5 +-
 .../views/staff/modules/slides/slide.html     | 203 ++++++++++--------
 3 files changed, 115 insertions(+), 96 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
index 1fd5dffca..4422b5691 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
@@ -9,8 +9,5 @@ public interface ILink<T extends IVSpaceElement> extends IVSpaceElement{
     T getTarget();
 
     void setTarget(T target);
-    
-    ISlide getSlide();
 
-    void setSlide(ISlide slide);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 9d907132c..88cf6f8c9 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -32,8 +32,9 @@ public class AddSlideExternalLinkController {
     @Autowired
     private IExternalLinkSlideManager externalLinkSlideManager;
     
-    @RequestMapping(value = "/staff/slide/{id}/externallink", method = RequestMethod.POST)
-    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
+    @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
+    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, 
+            @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 20389035f..10c7907e9 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -185,11 +185,11 @@
 			    $(".ellipse_class").remove();
 			    $(".unpublishedSpaceClass").remove();
 			    $(".textBlockClass").remove();
-			    $(".deletedSlideClass").remove();
+			    $(".deletedSpaceClass").remove();
 			    
 			    $.ajax({
 			        type: "GET",
-			        url: "[(@{'/staff/slide/'+${slide?.id}+'/links'})]",
+			        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}})]",
 			        cache       : false,
 			        contentType : false,
 			        processData : false,
@@ -206,7 +206,7 @@
 			            var posYModal = $("#bgImage").position().top;
 			            var posX = $("#main-bgImage").position().left;
 			            var posY = $("#main-bgImage").position().top;
-			           
+			            
 			            externalLinks.forEach(function(link,index){
 			                var spanId= "externalModallinkId-";
 			                var divId = "#space";
@@ -218,9 +218,10 @@
 			                var divId = "#main-space";
 			                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
 			            })
+			            
 			        }
 			    });
-			}
+			}            
             
 			//--------- show links functions --------------
 			function showExternalLinkEdit(externalLink, show, posX, posY) {
@@ -259,7 +260,7 @@
 			}
 			
 			// Show external link function
-			
+
 			function showExternalLinks(externalLink, show, x, y) {
 			    $("#ext_label").remove();
 			    $("#link").remove();
@@ -313,7 +314,7 @@
 			    $("#link").append(ext_label);
 			    $("#external-link").remove();
 			
-			}			
+			}
 			
 			//--------- Utility functions -------------
 
@@ -325,6 +326,7 @@
 				info["type"] = $("#extType").val();
 				info["externalLinkLabel"] = $("#externalLinkLabel").val();
 				info["externalLinkURL"] = $("#externalLink").val();
+				console.log("info here");
 				return info;
 			}
 			
@@ -399,7 +401,7 @@
 			    text.css('position', 'absolute');
 			    text.css('left', x + posX);
 			    text.css('top', y);
-			    $("#slide").append(text);
+			    $("#space").append(text);
 			    
 			    var textB = $('#textB')[0],
 			    tHeight = textB.clientHeight,
@@ -430,8 +432,7 @@
 			
 			// -------- buttons that open modals (e.g. to create external links) ------
 			
-			$("#addExternalLinkButton").click(function(e) {
-	            $("#createSlideLinkAlert").hide();
+	        $("#addExternalLinkButton").click(function(e) {
 	            $("#changeBgImgAlert").hide();
 	            $("#bgImage").off("click");
 	            $("#bgImage").on("click", function(e){
@@ -449,9 +450,9 @@
 	            hideLinkInfoTabs();
 	            displayForms("#createExternalLinkAlert");
 	        });
-			
-			$('#changeBgImgButton').click(function(file) {
-	            $("#createSlideLinkAlert").hide();
+	
+	        $('#changeBgImgButton').click(function(file) {
+	            $("#createSpaceLinkAlert").hide();
 	            $("#createExternalLinkAlert").hide();
 	            drawLinks();
 	            $("#changeBgImgAlert").show();          
@@ -460,85 +461,85 @@
 			// ----------- submit buttons (e.g. to create external links) ------------------
 			
 			
-			$("#createExternalLinkBtn").click(function(e) {
-            e.preventDefault();
-            $("#slide").scrollTop(0);
-            var payload = {};
-
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            var externalLink = $("#externalLink").val();
-            var externalLinkLabel = $("#externalLinkLabel").val();
-            var type = $("#extType option:selected").text();
-
-            if (externalLink == undefined || externalLink == "") {
-                $("#errorMsg").text("Please provide the link to the external link.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            if (externalLinkLabel == undefined || externalLinkLabel == "") {
-                $("#errorMsg").text("Please enter a label for this external link.")
-                $('#errorAlert').show();
-                return;
-            }
-            
-            if (type == undefined || type == "Choose...") {
-                $("#errorMsg").text("Please select a link type in Type dropdown.")
-                $('#errorAlert').show();
-                return;
-            }
-            $("#externalLinkX").val(storeX);
-            $("#externalLinkY").val(storeY - 25);
-
-            var form = $("#createExternalLinkForm");
-            var formData = new FormData(form[0]);
-            var externalLinkInfo = createExternalLinkInfo();
-
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/slide/'+${slide?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache       : false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    externalLinkInfo["id"] = linkData["id"];
-                    externalLinkInfo["displayId"]=linkData["displayId"];
-                    externalLinkInfo["x"]=linkData["x"];
-                    externalLinkInfo["y"]=linkData["y"];
-                    showExternalLinks(externalLinkInfo, true);
-                    $("#ext_label").attr("id","");
-                    $("#link").attr("id","");
-                    $("#createExternalLinkAlert").hide();
-                    $("#errorMsg").text("");
-                    $('#errorAlert').hide();
-                    $("."+linkData["id"]).remove();
-                    form[0].reset();
-                    $("#external-arrow").attr("id","");
-                    $("#slide").css("display", "none");
-                    externalLinkIcon=null;
-                    drawLinks();
-                	}
-            	});
-        	});
+	        $("#createExternalLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            $("#space").scrollTop(0);
+	            var payload = {};
+	
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            var externalLink = $("#externalLink").val();
+	            var externalLinkLabel = $("#externalLinkLabel").val();
+	            var type = $("#extType option:selected").text();
+	
+	            if (externalLink == undefined || externalLink == "") {
+	                $("#errorMsg").text("Please provide the link to the external link.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            if (externalLinkLabel == undefined || externalLinkLabel == "") {
+	                $("#errorMsg").text("Please enter a label for this external link.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            
+	            if (type == undefined || type == "Choose...") {
+	                $("#errorMsg").text("Please select a link type in Type dropdown.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            $("#externalLinkX").val(storeX);
+	            $("#externalLinkY").val(storeY - 25);
+	
+	            var form = $("#createExternalLinkForm");
+	            var formData = new FormData(form[0]);
+	            var externalLinkInfo = createExternalLinkInfo();
+	
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/'+${space?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache       : false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    externalLinkInfo["id"] = linkData["id"];
+	                    externalLinkInfo["displayId"]=linkData["displayId"];
+	                    externalLinkInfo["x"]=linkData["x"];
+	                    externalLinkInfo["y"]=linkData["y"];
+	                    showExternalLinks(externalLinkInfo, true);
+	                    $("#ext_label").attr("id","");
+	                    $("#link").attr("id","");
+	                    $("#createExternalLinkAlert").hide();
+	                    $("#errorMsg").text("");
+	                    $('#errorAlert').hide();
+	                    $("."+linkData["id"]).remove();
+	                    form[0].reset();
+	                    $("#external-arrow").attr("id","");
+	                    $("#space").css("display", "none");
+	                    externalLinkIcon=null;
+	                    drawLinks();
+	                }
+	            });
+	        });
 			
-			$("#editExternalLinkBtn").click(function(e) {
+	        $("#editExternalLinkBtn").click(function(e) {
 	            e.preventDefault();
-	            $("#slide").scrollTop(0);
+	            $("#space").scrollTop(0);
 	            var linkId = $("#externalLinkIdEdit").val();
 	            if (storeX == undefined || storeY == undefined) {
 	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
@@ -553,7 +554,7 @@
 	            var externalLinkInfo = editExternalLinkInfo();
 	            $.ajax({
 	                type: "POST",
-	                url: "[(@{'/staff/slide/link/external/'+${slide?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                url: "[(@{'/staff/space/link/external/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
 	                cache: false,
 	                contentType : false,
 	                processData : false,
@@ -577,12 +578,32 @@
 	                    $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]);
 	                    showExternalLinkEdit(editExternalLinkInfo, true);
 	                    hideLinkInfoTabs();
-	                    $("#slide").css("display", "none");
+	                    $("#space").css("display", "none");
 	                    selectedExternalLinkId=undefined;
 	                    drawLinks();
 	                }
 	            });
 	        });
+	        
+	        $("#deleteExternalLinkButton").click(function() {
+	            var linkId = $("#externalLinkIdValueEdit").val();
+	            $.ajax({
+	                url: "[(@{'/staff/space/'+${space?.id}+'/externallink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+	                method: "DELETE",
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success:function(data) {
+	                    $('[data-link-id="' + linkId + '"]').remove();
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    drawLinks();
+	                }
+	            });
+	        });
 			
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');

From 04f9c0aae12626f250e479ae891d65af3ee256df Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 4 Oct 2023 16:18:22 -0700
Subject: [PATCH 28/64] [story/VSPC-242] Delete and cancel button

---
 .../staff/AddSlideExternalLinkController.java |    4 +-
 .../views/staff/modules/slides/slide.html     | 1118 +++++++++--------
 2 files changed, 591 insertions(+), 531 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 88cf6f8c9..f40c4997a 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -32,8 +32,8 @@ public class AddSlideExternalLinkController {
     @Autowired
     private IExternalLinkSlideManager externalLinkSlideManager;
     
-    @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
-    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, 
+    @RequestMapping(value = "/staff/slide/{id}/externallink", method = RequestMethod.POST)
+    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, 
             @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 10c7907e9..dfc44a952 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -36,38 +36,49 @@
 			background: transparent;
 			}
 			
+			.Info_cz_Class .tooltiptext {
+			    visibility: hidden;
+			    width: 120px;
+			    color: white;
+			    text-align: center;
+			    font-size: 12px;
+			    padding: 3px 0;
+			    border-radius: 6px;
+			    position: absolute;
+			    z-index: 1;
+			    left: -38px;
+			    top: 31px;
+			    background: rgba(0, 0, 0, 0.6);
+			}
+			
+			.Info_cz_Class:hover .tooltiptext {
+			    visibility: visible;
+			}
+			#space {
+			    max-width: 1800px;
+			}
 			
         </style>
         <script th:inline="javascript">
             //# sourceURL=click.js
-            
-            $(function () {
-            	  $('[data-toggle="tooltip"]').tooltip()
-            });
-            
+            var contentCount = [[${#lists.size(slideContents)}]];
+            var markDown = null;
+            var defaultValue;
+            var addVideoClk=0;
+            var editVideoClk=0;
             $(window).on("load", function() {
                 $( window ).resize(function() {
                     drawLinks();
                 });
                 drawLinks();
             });
-            
-            $(window).scroll(function(){
-          	  var sticky = $('.sticky'),
-          	      scroll = $(window).scrollTop();
-          	  if (scroll >= 100) sticky.addClass('fixed');
-          	  else sticky.removeClass('fixed');
-          	});
-            
-            var contentCount = [[${#lists.size(slideContents)}]];
-            var markDown = null;
-            var defaultValue;
-            var addVideoClk=0;
-            var editVideoClk=0;
             //store where a user clicked on an image
             var storeX;
             var storeY;
+            var selectedModuleLinkId;
+            var selectedSpaceLinkId;
             var selectedExternalLinkId;
+            var selectedTextBlockId;
             const displaceUnpublishedOnX = 25;
             const displaceUnpublishedOnY = 13;
             const displaceUnpublishedOnXModal = 50;
@@ -77,76 +88,74 @@
             var modalBgImageHeight;
             var modalBgImageWidth;
             
-          //link icons for exterenal links
             var externalLinkIconReader = new FileReader();
             var externalLinkIcon;
             externalLinkIconReader.onload = function(e) {
                 externalLinkIcon = e.target.result;
                 showExternalLinks(createExternalLinkInfo());
             }
-            
-            //Set link position 
+
             function setLinkPosition(modalLink, link, isSpaceLink, isModal, isExternalLink, posX, posY, posXModal, posYModal, isTextBlock, isModuleLink){
-				modalLink.css('position', 'absolute');
-			    if(isModal){
-			        modalLink.css('left',link.positionX + posXModal);
-			        modalLink.css('top', link.positionY + posYModal);
-			    }else{
-			        modalLink.css('left', link.positionX + posX);
-			        modalLink.css('top', link.positionY + posY);
-			    }
-			    modalLink.css('transform', 'rotate('+link.rotation+'deg)');
-			    modalLink.find("span").css('fill', 'grey');
-			    modalLink.css('color', 'rgba(128,128,128,1)');
-			    modalLink.css('font-size', "16px");
-			    var positionX = isModal ? posXModal : posX;
-			    var positionY = isModal ? posYModal : posY;
-			    if(isSpaceLink && (link.link.targetSpace==null || link.link.targetSpace.spaceStatus=="UNPUBLISHED")){
-				var inactiveLinkId;
-				var inactiveLinkClasses;
-				var inactiveLinkTitle;
-				if(link.link.targetSpace==null) {
-				    inactiveLinkId = "deletedSpace-";
-				    inactiveLinkClasses = "deletedSlideClass deletedClass-";   
-				    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
-			    	} else {
-				    inactiveLinkId = "unpublished-";
-				    inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
-				    inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
-			    	}
-				var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
-			    	inactiveSpaceElement.css('position', 'absolute');
-				inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-				inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-				inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
-				inactiveSpaceElement.css('font-size', "24px");
-				inactiveSpaceElement.attr('title', inactiveLinkTitle);
-				if(isModal){
-				    $("#space").append(inactiveSpaceElement);
-				} else{
-				    $("#main-space").append(inactiveSpaceElement);
-				}
-			    }
-			    if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
-			    	var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
-			        unpublishedModuleElement.css('position', 'absolute');
-			    	unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-			    	unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-			    	unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
-			    	unpublishedModuleElement.css('font-size', "24px");
-			        if(isModal){
-			            $("#space").append(unpublishedModuleElement);
-			        }else{
-			            $("#main-space").append(unpublishedModuleElement);
-			        }
-			    }
-			    if(!isTextBlock){
-			        var linkId = isExternalLink ? link.externalLink.id : link.link.id;
-			        setLabelPosition(link,linkId,positionX,positionY);
-			    }
-			}
+            	modalLink.css('position', 'absolute');
+                if(isModal){
+                    modalLink.css('left',link.positionX + posXModal);
+                    modalLink.css('top', link.positionY + posYModal);
+                }else{
+                    modalLink.css('left', link.positionX + posX);
+                    modalLink.css('top', link.positionY + posY);
+                }
+                modalLink.css('transform', 'rotate('+link.rotation+'deg)');
+                modalLink.find("span").css('fill', 'grey');
+                modalLink.css('color', 'rgba(128,128,128,1)');
+                modalLink.css('font-size', "16px");
+                var positionX = isModal ? posXModal : posX;
+                var positionY = isModal ? posYModal : posY;
+                if(isSpaceLink && (link.link.targetSpace==null || link.link.targetSpace.spaceStatus=="UNPUBLISHED")){
+            	var inactiveLinkId;
+            	var inactiveLinkClasses;
+            	var inactiveLinkTitle;
+            	if(link.link.targetSpace==null) {
+            	    inactiveLinkId = "deletedSpace-";
+            	    inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
+            	    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
+                	} else {
+            	    inactiveLinkId = "unpublished-";
+            	    inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
+            	    inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
+                	}
+            	var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
+                	inactiveSpaceElement.css('position', 'absolute');
+            	inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+            	inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+            	inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
+            	inactiveSpaceElement.css('font-size', "24px");
+            	inactiveSpaceElement.attr('title', inactiveLinkTitle);
+            	if(isModal){
+            	    $("#space").append(inactiveSpaceElement);
+            	} else{
+            	    $("#main-space").append(inactiveSpaceElement);
+            	}
+                }
+                if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
+                	var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
+                    unpublishedModuleElement.css('position', 'absolute');
+                	unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+                	unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+                	unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
+                	unpublishedModuleElement.css('font-size', "24px");
+                    if(isModal){
+                        $("#space").append(unpublishedModuleElement);
+                    }else{
+                        $("#main-space").append(unpublishedModuleElement);
+                    }
+                }
+                if(!isTextBlock){
+                    var linkId = isExternalLink ? link.externalLink.id : link.link.id;
+                    setLabelPosition(link,linkId,positionX,positionY);
+                }
+            }
+            
             
-            // set label position
             function setLabelPosition(link,id, positionX, positionY){
             	$(".label-"+id).css({
             	    'left': link.positionX + positionX - displaceLableOnX,
@@ -154,457 +163,21 @@
             	    'color': 'red'
             	}); 
             }
-            //generate external links
-			function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
-				if(link != null){
-					var externalLink;
-					if(link.type=="IMAGE" && link.image != null){
-						var imageURL = [[@{/api/image/}]]+link.image.id;
-						externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
-					}else{
-						externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
-					}
-					setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
-					$(divId).append(externalLink);
-					if(spanId === "externallinkId-"){
-						$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
-						$('#'+spanId+link.externalLink.id).click(function(e) {
-							var linkData = $('#'+spanId+link.externalLink.id).data();
-							makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
-						});
-					}
-				}
-			}
             
-            //drawlink method
             
-			function drawLinks(){
-			    $(".Info_cz_Class").remove();
-			    $(".imageLink").remove();
-			    $(".alertLink").remove();
-			    $(".ellipse_class").remove();
-			    $(".unpublishedSpaceClass").remove();
-			    $(".textBlockClass").remove();
-			    $(".deletedSpaceClass").remove();
-			    
-			    $.ajax({
-			        type: "GET",
-			        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}})]",
-			        cache       : false,
-			        contentType : false,
-			        processData : false,
-			        beforeSend: function () {
-			            $("#loader").show();
-			            },
-			       	complete: function () {
-			            $("#loader").hide();
-			            },
-			        success: function(data) {
-			            var externalLinks = data['externalLinks'];
-			            
-			            var posXModal = $("#bgImage").position().left;
-			            var posYModal = $("#bgImage").position().top;
-			            var posX = $("#main-bgImage").position().left;
-			            var posY = $("#main-bgImage").position().top;
-			            
-			            externalLinks.forEach(function(link,index){
-			                var spanId= "externalModallinkId-";
-			                var divId = "#space";
-			                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-			            })
-			            
-			            externalLinks.forEach(function(link,index){
-			                var spanId= "externallinkId-";
-			                var divId = "#main-space";
-			                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-			            })
-			            
-			        }
-			    });
-			}            
+            $(function () {
+            	  $('[data-toggle="tooltip"]').tooltip()
+            });
+            
+            $(window).scroll(function(){
+            	  var sticky = $('.sticky'),
+            	      scroll = $(window).scrollTop();
+            	  if (scroll >= 100) sticky.addClass('fixed');
+            	  else sticky.removeClass('fixed');
+            });
+            
+            
             
-			//--------- show links functions --------------
-			function showExternalLinkEdit(externalLink, show, posX, posY) {
-			    externalLink["x"]=storeX;
-			    externalLink["y"]=storeY;
-			    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
-			    var selectedLabelClass = '.label-'+selectedExternalLinkId;
-			    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
-			}			
-			
-			//update link 
-			function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
-			    var posX, posY;
-			    if(show) {
-			        posX = $("#main-bgImage").position().left;
-			        posY = $("#main-bgImage").position().top;
-			    }
-			    else{
-			        posX = $("#bgImage").position().left;
-			        posY = 0
-			    }
-			    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
-			    $(selectedLinkClass).css({ 'position': 'absolute'});
-			    $(selectedLinkClass).css({ 'left': x + posX});
-			    $(selectedLinkClass).css({ 'top': y + posY});
-			    $(selectedLabelClass+' span').remove();
-			    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
-			    feather.replace();    
-			}
-			//hide link info
-			function hideLinkInfoTabs(){
-			    $("#editExternalLinkInfo").hide();
-			    $("#createExternalLinkAlert").hide();
-			    $("#errorMsg").text("");
-			    $('#errorAlert').hide();
-			}
-			
-			// Show external link function
-
-			function showExternalLinks(externalLink, show, x, y) {
-			    $("#ext_label").remove();
-			    $("#link").remove();
-			    $("#undefined").remove();
-			    var posX = $("#bgImage").position().left;
-			    var posY = $("#bgImage").position().top;
-			    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
-			    ext_label.text(externalLink["externalLinkLabel"]);
-			
-			    var link;
-			    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
-			        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
-			    } else {
-			        $(ext_label).css({
-			            'position': 'absolute',
-			            'font-size': "12px",
-			            'transform': 'rotate(0deg)',
-			            'color': 'blue'
-			        });
-			        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
-			    }
-			    
-			    if(show) {
-			        link.css('top', externalLink["y"] + posY);
-			    } else {
-			    	link.css('top', externalLink["y"]);
-			    }
-			
-			    link.css('position', 'absolute');
-			    link.css('left', externalLink["x"] + posX);
-			    link.css('color', 'blue');
-			    link.css('font-size', "12px");
-			
-			    if (externalLink["id"]) {
-					link.attr("data-link-id", externalLink["id"]);
-					link.css('cursor', 'pointer');
-					link.attr('href', externalLink["url"]);
-					link.click(function(e) {
-						makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-					});
-					
-					ext_label.attr("data-link-id", externalLink["id"]);
-					ext_label.css('cursor', 'pointer');
-					ext_label.attr("class", "label-"+externalLink["id"]);
-					ext_label.click(function(e) {
-						makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-					});
-			    }
-			
-			    $("#slide").append(link);
-			    $("#link").append(ext_label);
-			    $("#external-link").remove();
-			
-			}
-			
-			//--------- Utility functions -------------
-
-			function createExternalLinkInfo() {
-				var info = {};
-				info["x"] = storeX;
-				info["y"] = storeY;
-				info["tabOpen"] = $("#extTabOpen").val();
-				info["type"] = $("#extType").val();
-				info["externalLinkLabel"] = $("#externalLinkLabel").val();
-				info["externalLinkURL"] = $("#externalLink").val();
-				console.log("info here");
-				return info;
-			}
-			
-			function editExternalLinkInfo() {
-				var info = {};
-				info["x"] = storeX;
-				info["y"] = storeY;
-				info["tabOpen"] = $("#extTabOpenEdit").val();
-				info["type"] = $("#extTypeEdit").val();
-				info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
-				info["externalLinkURL"] = $("#externalLinkURLEdit").val();
-				return info;
-			}
-			
-			function displayForms(formToShow){
-			    drawLinks();
-			    $("#slide").css("display", "-webkit-box");
-			    $(formToShow).css("display", "flex");
-			    modalBgImageHeight = parseInt($("#bgImage").css("height"));
-			    modalBgImageWidth = parseInt($("#bgImage").css("width"));
-			}
-			
-			function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
-			    selectedExternalLinkId=linkId;
-			    storeX=posXEdit;
-			    storeY=posYEdit;
-			    $("#externalLinkInfoLabel").text(linkName);
-			    $("#externalLinkId").val(linkId);
-			    $("#externalLinkDisplayId").val(displayLinkId);
-			    $("#externalLinkInfoLabelEdit").text(linkName);
-			    $("#externalLinkLabelEdit").val(linkName);
-			    $("#externalLinkIdValueEdit").val(linkId);
-			    $("#externalLinkURLEdit").val(externalLinkURL);
-			    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
-			    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
-			    
-			    resetHighlighting();
-
-			    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
-			    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
-			    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
-			    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
-
-			    $("#bgImage").on("click", function(e){
-			        e.preventDefault();
-			        var posX = $(this).position().left;
-			        var posY = $(this).position().top;    
-			        storeX = e.pageX - $(this).offset().left;
-			        storeY = e.pageY - $(this).offset().top + 25;
-			        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
-			    });
-			    hideLinkInfoTabs();
-			    displayForms("#editExternalLinkInfo");
-			}
-			
-			function resetHighlighting() {
-			    // reset icon links
-			    $('[data-link-id]').css("color", "red");
-
-			    // reset alert links
-			    $('div[data-link-id]').removeClass("alert-warning");
-			    $('div[data-link-id]').addClass("alert-primary");
-
-			    // reset image links
-			    $('img[data-link-id]').css("border-width", "0");
-			}
-
-			function getTextArea(x,y) {
-			    var posX = $("#bgImage").position().left;
-			    var posY = $("#bgImage").position().top;
-			    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
-			    text.css('position', 'absolute');
-			    text.css('left', x + posX);
-			    text.css('top', y);
-			    $("#space").append(text);
-			    
-			    var textB = $('#textB')[0],
-			    tHeight = textB.clientHeight,
-			    tWidth = textB.clientWidth;
-			    
-			    var height = modalBgImageHeight;
-			    var width = modalBgImageWidth;
-			    
-			    $("#textBoxWidthID").val(tWidth);
-			    $("#textBoxHeightID").val(tHeight);
-			    textB.onmouseup = function (e) {
-			        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
-			            tHeight = textB.clientHeight;
-			            tWidth = textB.clientWidth;
-			            let percentileHeight = (tHeight*100)/height;
-			            let percentileWidth = (tWidth*100)/width;
-			            $("#textBoxWidthID").val(percentileWidth);
-			            $("#textBoxHeightID").val(percentileHeight);
-			            $("#textContentID").val(textB.value);
-			        }
-			    };
-			    var percentileHeight = (tHeight*100)/height;
-			    var percentileWidth = (tWidth*100)/width;
-			    $("#textBoxWidthID").val(percentileWidth);
-			    $("#textBoxHeightID").val(percentileHeight);
-			    $("#textContentID").val(textB.value);
-			}
-			
-			// -------- buttons that open modals (e.g. to create external links) ------
-			
-	        $("#addExternalLinkButton").click(function(e) {
-	            $("#changeBgImgAlert").hide();
-	            $("#bgImage").off("click");
-	            $("#bgImage").on("click", function(e){
-	                e.preventDefault();
-	                $("#link").remove();
-	                $("#external-arrow").remove();
-	                $("#ext_label").remove();
-	                var icon;
-	                var posX = $(this).position().left
-	                var posY = $(this).position().top;
-	                storeX = e.pageX - $(this).offset().left;
-	                storeY = e.pageY - $(this).offset().top + 25;
-	                showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
-	            });
-	            hideLinkInfoTabs();
-	            displayForms("#createExternalLinkAlert");
-	        });
-	
-	        $('#changeBgImgButton').click(function(file) {
-	            $("#createSpaceLinkAlert").hide();
-	            $("#createExternalLinkAlert").hide();
-	            drawLinks();
-	            $("#changeBgImgAlert").show();          
-	        });
-			
-			// ----------- submit buttons (e.g. to create external links) ------------------
-			
-			
-	        $("#createExternalLinkBtn").click(function(e) {
-	            e.preventDefault();
-	            $("#space").scrollTop(0);
-	            var payload = {};
-	
-	            if (storeX == undefined || storeY == undefined) {
-	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-	                $('#errorAlert').show();
-	                return;
-	            }
-	
-	            var externalLink = $("#externalLink").val();
-	            var externalLinkLabel = $("#externalLinkLabel").val();
-	            var type = $("#extType option:selected").text();
-	
-	            if (externalLink == undefined || externalLink == "") {
-	                $("#errorMsg").text("Please provide the link to the external link.")
-	                $('#errorAlert').show();
-	                return;
-	            }
-	
-	            if (externalLinkLabel == undefined || externalLinkLabel == "") {
-	                $("#errorMsg").text("Please enter a label for this external link.")
-	                $('#errorAlert').show();
-	                return;
-	            }
-	            
-	            if (type == undefined || type == "Choose...") {
-	                $("#errorMsg").text("Please select a link type in Type dropdown.")
-	                $('#errorAlert').show();
-	                return;
-	            }
-	            $("#externalLinkX").val(storeX);
-	            $("#externalLinkY").val(storeY - 25);
-	
-	            var form = $("#createExternalLinkForm");
-	            var formData = new FormData(form[0]);
-	            var externalLinkInfo = createExternalLinkInfo();
-	
-	            $.ajax({
-	                type: "POST",
-	                url: "[(@{'/staff/space/'+${space?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-	                cache       : false,
-	                contentType : false,
-	                processData : false,
-	                enctype: 'multipart/form-data',
-	                data: formData,
-	                beforeSend: function () {
-	                    $(".saveLoader").show();
-	                    },
-	               	complete: function () {
-	                    $(".saveLoader").hide();
-	                    },
-	                success: function(data) {
-	                    var linkData = JSON.parse(data);
-	                    $("#bgImage").off("click");
-	                    externalLinkInfo["id"] = linkData["id"];
-	                    externalLinkInfo["displayId"]=linkData["displayId"];
-	                    externalLinkInfo["x"]=linkData["x"];
-	                    externalLinkInfo["y"]=linkData["y"];
-	                    showExternalLinks(externalLinkInfo, true);
-	                    $("#ext_label").attr("id","");
-	                    $("#link").attr("id","");
-	                    $("#createExternalLinkAlert").hide();
-	                    $("#errorMsg").text("");
-	                    $('#errorAlert').hide();
-	                    $("."+linkData["id"]).remove();
-	                    form[0].reset();
-	                    $("#external-arrow").attr("id","");
-	                    $("#space").css("display", "none");
-	                    externalLinkIcon=null;
-	                    drawLinks();
-	                }
-	            });
-	        });
-			
-	        $("#editExternalLinkBtn").click(function(e) {
-	            e.preventDefault();
-	            $("#space").scrollTop(0);
-	            var linkId = $("#externalLinkIdEdit").val();
-	            if (storeX == undefined || storeY == undefined) {
-	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-	                $('#errorAlert').show();
-	                return;
-	            }
-	            var linkedSpace = $("#externalLinkIdEdit").val();
-	            $("#externalLinkXEdit").val(storeX);
-	            $("#externalLinkYEdit").val(storeY - 25);
-	            var form = $("#editExternalLinkForm");
-	            var formData = new FormData(form[0]);
-	            var externalLinkInfo = editExternalLinkInfo();
-	            $.ajax({
-	                type: "POST",
-	                url: "[(@{'/staff/space/link/external/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-	                cache: false,
-	                contentType : false,
-	                processData : false,
-	                enctype: 'multipart/form-data',
-	                data: formData,
-	                beforeSend: function () {
-	                    $(".saveLoader").show();
-	                    },
-	               	complete: function () {
-	                    $(".saveLoader").hide();
-	                    },
-	                success: function(data) {
-	                    var linkData = JSON.parse(data);
-	                    $("#bgImage").off("click");
-	                    externalLinkInfo["id"] = linkData["id"];
-	                    externalLinkInfo["displayId"]=linkData["displayId"];
-	                    externalLinkInfo["x"]=linkData["x"];
-	                    externalLinkInfo["y"]=linkData["y"];
-	                    $('#linkLabel-'+selectedExternalLinkId).val(linkData["label"]);
-	                    $('#linkType-'+selectedExternalLinkId).val(linkData["dislpayType"]);
-	                    $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]);
-	                    showExternalLinkEdit(editExternalLinkInfo, true);
-	                    hideLinkInfoTabs();
-	                    $("#space").css("display", "none");
-	                    selectedExternalLinkId=undefined;
-	                    drawLinks();
-	                }
-	            });
-	        });
-	        
-	        $("#deleteExternalLinkButton").click(function() {
-	            var linkId = $("#externalLinkIdValueEdit").val();
-	            $.ajax({
-	                url: "[(@{'/staff/space/'+${space?.id}+'/externallink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
-	                method: "DELETE",
-	                beforeSend: function () {
-	                    $(".saveLoader").show();
-	                    },
-	               	complete: function () {
-	                    $(".saveLoader").hide();
-	                    },
-	                success:function(data) {
-	                    $('[data-link-id="' + linkId + '"]').remove();
-	                    hideLinkInfoTabs();
-	                    $("#space").css("display", "none");
-	                    drawLinks();
-	                }
-	            });
-	        });
-			
             function createImageBlock(reader, width) {
                 var imageblock = $('<div id="current" class="valueDiv tab row"><img src="#" style="imgDiv tab row"/><input type="hidden" id="deleteImageId" /><a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"><span class="icon-trash error"></span></a></div>');
                 imageblock.find('img').attr('src', reader.result);
@@ -954,7 +527,48 @@
 					}
 				});
 			}
-            
+            function drawLinks(){
+        	    $(".Info_cz_Class").remove();
+        	    $(".imageLink").remove();
+        	    $(".alertLink").remove();
+        	    $(".ellipse_class").remove();
+        	    $(".unpublishedSpaceClass").remove();
+        	    $(".textBlockClass").remove();
+        	    $(".deletedSpaceClass").remove();
+        	    
+        	    $.ajax({
+        	        type: "GET",
+        	        url: "[(@{'/staff/space/'+${space?.id}+'/links'})]",
+        	        cache       : false,
+        	        contentType : false,
+        	        processData : false,
+        	        beforeSend: function () {
+        	            $("#loader").show();
+        	            },
+        	       	complete: function () {
+        	            $("#loader").hide();
+        	            },
+        	        success: function(data) {
+        	            var externalLinks = data['externalLinks'];
+        	            var posXModal = $("#bgImage").position().left;
+        	            var posYModal = $("#bgImage").position().top;
+        	            var posX = $("#main-bgImage").position().left;
+        	            var posY = $("#main-bgImage").position().top;
+        	            externalLinks.forEach(function(link,index){
+        	                var spanId= "externalModallinkId-";
+        	                var divId = "#space";
+        	                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+        	            })
+        	            
+        	            externalLinks.forEach(function(link,index){
+        	                var spanId= "externallinkId-";
+        	                var divId = "#main-space";
+        	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+        	            })
+        	        }
+        	    });
+        	}
+        	
         	function updateContentOrder(jsonObj,token){
             		$.ajax({
             		 // ------------- adjusting content order of blocks if their position changed after dragging ----------
@@ -1129,6 +743,236 @@
 	            	}
             	});
             	
+            	function showExternalLinkEdit(externalLink, show, posX, posY) {
+            	    externalLink["x"]=storeX;
+            	    externalLink["y"]=storeY;
+            	    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
+            	    var selectedLabelClass = '.label-'+selectedExternalLinkId;
+            	    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
+            	}
+
+            	function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
+            	    var posX, posY;
+            	    if(show) {
+            	        posX = $("#main-bgImage").position().left;
+            	        posY = $("#main-bgImage").position().top;
+            	    }
+            	    else{
+            	        posX = $("#bgImage").position().left;
+            	        posY = 0
+            	    }
+            	    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
+            	    $(selectedLinkClass).css({ 'position': 'absolute'});
+            	    $(selectedLinkClass).css({ 'left': x + posX});
+            	    $(selectedLinkClass).css({ 'top': y + posY});
+            	    $(selectedLabelClass+' span').remove();
+            	    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
+            	    feather.replace();    
+            	}
+
+            	function hideLinkInfoTabs(){
+            	    $("#editExternalLinkInfo").hide();
+            	    $("#editSpaceLinkInfo").hide();
+            	    $("#editModuleLinkInfo").hide();
+            	    $("#editTextBlockInfo").hide();
+            	    $("#createExternalLinkAlert").hide();
+            	    $("#createSpaceLinkAlert").hide();
+            	    $("#createModuleLinkAlert").hide();
+            	    $("#errorMsg").text("");
+            	    $('#errorAlert').hide();
+            	}
+
+            	function showExternalLinks(externalLink, show, x, y) {
+            	    $("#ext_label").remove();
+            	    $("#link").remove();
+            	    $("#undefined").remove();
+            	    var posX = $("#bgImage").position().left;
+            	    var posY = $("#bgImage").position().top;
+            	    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
+            	    ext_label.text(externalLink["externalLinkLabel"]);
+
+            	    var link;
+            	    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
+            	        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
+            	    } else {
+            	        $(ext_label).css({
+            	            'position': 'absolute',
+            	            'font-size': "12px",
+            	            'transform': 'rotate(0deg)',
+            	            'color': 'blue'
+            	        });
+            	        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
+            	    }
+            	    
+            	    if(show) {
+            	        link.css('top', externalLink["y"] + posY);
+            	    } else {
+            	    	link.css('top', externalLink["y"]);
+            	    }
+
+            	    link.css('position', 'absolute');
+            	    link.css('left', externalLink["x"] + posX);
+            	    link.css('color', 'blue');
+            	    link.css('font-size', "12px");
+
+            	    if (externalLink["id"]) {
+            			link.attr("data-link-id", externalLink["id"]);
+            			link.css('cursor', 'pointer');
+            			link.attr('href', externalLink["url"]);
+            			link.click(function(e) {
+            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+            			});
+            			
+            			ext_label.attr("data-link-id", externalLink["id"]);
+            			ext_label.css('cursor', 'pointer');
+            			ext_label.attr("class", "label-"+externalLink["id"]);
+            			ext_label.click(function(e) {
+            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+            			});
+            	    }
+
+            	    $("#space").append(link);
+            	    $("#link").append(ext_label);
+            	    $("#external-link").remove();
+
+            	}
+            	
+            	function createExternalLinkInfo() {
+            		var info = {};
+            		info["x"] = storeX;
+            		info["y"] = storeY;
+            		info["tabOpen"] = $("#extTabOpen").val();
+            		info["type"] = $("#extType").val();
+            		info["externalLinkLabel"] = $("#externalLinkLabel").val();
+            		info["externalLinkURL"] = $("#externalLink").val();
+            		return info;
+            	}
+            	
+            	
+            	
+            	function editExternalLinkInfo() {
+            		var info = {};
+            		info["x"] = storeX;
+            		info["y"] = storeY;
+            		info["tabOpen"] = $("#extTabOpenEdit").val();
+            		info["type"] = $("#extTypeEdit").val();
+            		info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
+            		info["externalLinkURL"] = $("#externalLinkURLEdit").val();
+            		return info;
+            	}
+            	
+            	function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
+            	    selectedExternalLinkId=linkId;
+            	    storeX=posXEdit;
+            	    storeY=posYEdit;
+            	    $("#externalLinkInfoLabel").text(linkName);
+            	    $("#externalLinkId").val(linkId);
+            	    $("#externalLinkDisplayId").val(displayLinkId);
+            	    $("#externalLinkInfoLabelEdit").text(linkName);
+            	    $("#externalLinkLabelEdit").val(linkName);
+            	    $("#externalLinkIdValueEdit").val(linkId);
+            	    $("#externalLinkURLEdit").val(externalLinkURL);
+            	    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
+            	    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
+            	    
+            	    resetHighlighting();
+
+            	    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
+            	    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
+            	    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
+            	    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
+
+            	    $("#bgImage").on("click", function(e){
+            	        e.preventDefault();
+            	        var posX = $(this).position().left;
+            	        var posY = $(this).position().top;    
+            	        storeX = e.pageX - $(this).offset().left;
+            	        storeY = e.pageY - $(this).offset().top + 25;
+            	        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
+            	    });
+            	    hideLinkInfoTabs();
+            	    displayForms("#editExternalLinkInfo");
+            	}
+            	
+            	function displayForms(formToShow){
+            	    drawLinks();
+            	    $("#space").css("display", "-webkit-box");
+            	    $(formToShow).css("display", "flex");
+            	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
+            	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
+            	}
+            	
+            	function resetHighlighting() {
+            	    // reset icon links
+            	    $('[data-link-id]').css("color", "red");
+
+            	    // reset alert links
+            	    $('div[data-link-id]').removeClass("alert-warning");
+            	    $('div[data-link-id]').addClass("alert-primary");
+
+            	    // reset image links
+            	    $('img[data-link-id]').css("border-width", "0");
+            	}
+            	
+            	function getTextArea(x,y) {
+            	    var posX = $("#bgImage").position().left;
+            	    var posY = $("#bgImage").position().top;
+            	    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
+            	    text.css('position', 'absolute');
+            	    text.css('left', x + posX);
+            	    text.css('top', y);
+            	    $("#space").append(text);
+            	    
+            	    var textB = $('#textB')[0],
+            	    tHeight = textB.clientHeight,
+            	    tWidth = textB.clientWidth;
+            	    
+            	    var height = modalBgImageHeight;
+            	    var width = modalBgImageWidth;
+            	    
+            	    $("#textBoxWidthID").val(tWidth);
+            	    $("#textBoxHeightID").val(tHeight);
+            	    textB.onmouseup = function (e) {
+            	        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
+            	            tHeight = textB.clientHeight;
+            	            tWidth = textB.clientWidth;
+            	            let percentileHeight = (tHeight*100)/height;
+            	            let percentileWidth = (tWidth*100)/width;
+            	            $("#textBoxWidthID").val(percentileWidth);
+            	            $("#textBoxHeightID").val(percentileHeight);
+            	            $("#textContentID").val(textB.value);
+            	        }
+            	    };
+            	    var percentileHeight = (tHeight*100)/height;
+            	    var percentileWidth = (tWidth*100)/width;
+            	    $("#textBoxWidthID").val(percentileWidth);
+            	    $("#textBoxHeightID").val(percentileHeight);
+            	    $("#textContentID").val(textB.value);
+            	}
+            	
+            	
+            	function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
+            		if(link != null){
+            			var externalLink;
+            			if(link.type=="IMAGE" && link.image != null){
+            				var imageURL = [[@{/api/image/}]]+link.image.id;
+            				externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
+            			}else{
+            				externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
+            			}
+            			setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
+            			$(divId).append(externalLink);
+            			if(spanId === "externallinkId-"){
+            				$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
+            				$('#'+spanId+link.externalLink.id).click(function(e) {
+            					var linkData = $('#'+spanId+link.externalLink.id).data();
+            					makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
+            				});
+            			}
+            		}
+            	}
+            	
+            
                 //-------- edit contentblock description --------
             
                 $("#submitDescription").hide()
@@ -1247,6 +1091,222 @@
                     editVideoClk=0;
                 });
                 
+                $("#addExternalLinkButton").click(function(e) {
+                    $("#bgImage").off("click");
+                    $("#bgImage").on("click", function(e){
+                        e.preventDefault();
+                        $("#link").remove();
+                        $("#external-arrow").remove();
+                        $("#ext_label").remove();
+                        var icon;
+                        var posX = $(this).position().left
+                        var posY = $(this).position().top;
+                        storeX = e.pageX - $(this).offset().left;
+                        storeY = e.pageY - $(this).offset().top + 25;
+                        showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
+                    });
+                    hideLinkInfoTabs();
+                    displayForms("#createExternalLinkAlert");
+                });
+                
+                $("#editExternalLinkBtn").click(function(e) {
+                    e.preventDefault();
+                    $("#space").scrollTop(0);
+                    var linkId = $("#externalLinkIdEdit").val();
+                    if (storeX == undefined || storeY == undefined) {
+                        $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+                        $('#errorAlert').show();
+                        return;
+                    }
+                    var linkedSpace = $("#externalLinkIdEdit").val();
+                    $("#externalLinkXEdit").val(storeX);
+                    $("#externalLinkYEdit").val(storeY - 25);
+                    var form = $("#editExternalLinkForm");
+                    var formData = new FormData(form[0]);
+                    var externalLinkInfo = editExternalLinkInfo();
+                    $.ajax({
+                        type: "POST",
+                        url: "[(@{'/staff/space/link/external/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                        cache: false,
+                        contentType : false,
+                        processData : false,
+                        enctype: 'multipart/form-data',
+                        data: formData,
+                        beforeSend: function () {
+                            $(".saveLoader").show();
+                            },
+                       	complete: function () {
+                            $(".saveLoader").hide();
+                            },
+                        success: function(data) {
+                            var linkData = JSON.parse(data);
+                            $("#bgImage").off("click");
+                            externalLinkInfo["id"] = linkData["id"];
+                            externalLinkInfo["displayId"]=linkData["displayId"];
+                            externalLinkInfo["x"]=linkData["x"];
+                            externalLinkInfo["y"]=linkData["y"];
+                            $('#linkLabel-'+selectedExternalLinkId).val(linkData["label"]);
+                            $('#linkType-'+selectedExternalLinkId).val(linkData["dislpayType"]);
+                            $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]);
+                            showExternalLinkEdit(editExternalLinkInfo, true);
+                            hideLinkInfoTabs();
+                            $("#space").css("display", "none");
+                            selectedExternalLinkId=undefined;
+                            drawLinks();
+                        }
+                    });
+                });
+
+                $("#createExternalLinkBtn").click(function(e) {
+                    e.preventDefault();
+                    $("#space").scrollTop(0);
+                    var payload = {};
+
+                    if (storeX == undefined || storeY == undefined) {
+                        $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+                        $('#errorAlert').show();
+                        return;
+                    }
+
+                    var externalLink = $("#externalLink").val();
+                    var externalLinkLabel = $("#externalLinkLabel").val();
+                    var type = $("#extType option:selected").text();
+
+                    if (externalLink == undefined || externalLink == "") {
+                        $("#errorMsg").text("Please provide the link to the external link.")
+                        $('#errorAlert').show();
+                        return;
+                    }
+
+                    if (externalLinkLabel == undefined || externalLinkLabel == "") {
+                        $("#errorMsg").text("Please enter a label for this external link.")
+                        $('#errorAlert').show();
+                        return;
+                    }
+                    
+                    if (type == undefined || type == "Choose...") {
+                        $("#errorMsg").text("Please select a link type in Type dropdown.")
+                        $('#errorAlert').show();
+                        return;
+                    }
+                    $("#externalLinkX").val(storeX);
+                    $("#externalLinkY").val(storeY - 25);
+
+                    var form = $("#createExternalLinkForm");
+                    var formData = new FormData(form[0]);
+                    var externalLinkInfo = createExternalLinkInfo();
+
+                    $.ajax({
+                        type: "POST",
+                        url: "[(@{'/staff/space/'+${space?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                        cache       : false,
+                        contentType : false,
+                        processData : false,
+                        enctype: 'multipart/form-data',
+                        data: formData,
+                        beforeSend: function () {
+                            $(".saveLoader").show();
+                            },
+                       	complete: function () {
+                            $(".saveLoader").hide();
+                            },
+                        success: function(data) {
+                            var linkData = JSON.parse(data);
+                            $("#bgImage").off("click");
+                            externalLinkInfo["id"] = linkData["id"];
+                            externalLinkInfo["displayId"]=linkData["displayId"];
+                            externalLinkInfo["x"]=linkData["x"];
+                            externalLinkInfo["y"]=linkData["y"];
+                            showExternalLinks(externalLinkInfo, true);
+                            $("#ext_label").attr("id","");
+                            $("#link").attr("id","");
+                            $("#createExternalLinkAlert").hide();
+                            $("#errorMsg").text("");
+                            $('#errorAlert').hide();
+                            $("."+linkData["id"]).remove();
+                            form[0].reset();
+                            $("#external-arrow").attr("id","");
+                            $("#space").css("display", "none");
+                            externalLinkIcon=null;
+                            drawLinks();
+                        }
+                    });
+                });
+                
+                $("#deleteExternalLinkButton").click(function() {
+                    var linkId = $("#externalLinkIdValueEdit").val();
+                    $.ajax({
+                        url: "[(@{'/staff/space/'+${space?.id}+'/externallink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+                        method: "DELETE",
+                        beforeSend: function () {
+                            $(".saveLoader").show();
+                            },
+                       	complete: function () {
+                            $(".saveLoader").hide();
+                            },
+                        success:function(data) {
+                            $('[data-link-id="' + linkId + '"]').remove();
+                            hideLinkInfoTabs();
+                            $("#space").css("display", "none");
+                            drawLinks();
+                        }
+                    });
+                });
+                
+                $("#closeAlert").click(function() {
+                    $('#errorAlert').hide();
+                });
+
+                // ------------- adjust links on background image (e.g. when inputs are changed) ------------
+                // external links
+                $(".extlink-target").change(function() {
+                    var externalLink = {};
+                    externalLink["x"] = storeX;
+                    externalLink["y"] = storeY;
+                    externalLink["externalLinkLabel"] = $("#externalLinkLabel").val();
+                    externalLink["url"] = $("#externalLink").val();
+                    externalLink["type"] = $("#extType").val();
+                    showExternalLinks(externalLink);
+                });     
+                
+                $(".externallink-targetEdit").change(function() {
+                    showExternalLinkEdit(editExternalLinkInfo());
+                });
+                
+                $("#externalLinkImage").change(function() {
+                    if (this.files && this.files[0]) {
+                        externalLinkIconReader.readAsDataURL(this.files[0]);
+                    }
+                });
+                
+                $(".cancelExternalLinkBtn").click(function() {
+                    storeX = null;
+                    storeY = null;
+                    $("#space").scrollTop(0);
+                    externalLinkIcon=null;
+                    $("#external-link").remove();
+                    $("#undefined").remove();
+                    $("div#link").remove();
+                    $("#external-arrow").remove();
+                    $("#ext_label").remove();
+                    $("#space").hide();
+                    $("#createExternalLinkAlert").hide();
+                    $("#bgImage").off("click");
+                    $('#errorAlert').hide();
+                    drawLinks();
+                });
+                
+                $("#closeEditExternalLinkInfo").click(function(e) {
+                    e.preventDefault();
+                    selectedExternalLinkId=undefined;
+                    $("#externalLinkInfoLabel").text("");
+                    $("#externalLinkId").val("");
+                    resetHighlighting();
+                    $("#space").hide();
+                    $("#editExternalLinkInfo").hide();
+                    drawLinks();
+                });
+                
                 $("#uploadImage").click(function(e) {
                     e.preventDefault();
                     $("#addImgAlert").hide();

From 598e51a86376393422af304d8eac283311c01947 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 6 Oct 2023 14:02:26 -0700
Subject: [PATCH 29/64] [story/VSPC-242] Fixing front end issue

---
 .../WEB-INF/views/staff/modules/slides/slide.html  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index dfc44a952..58bafaf27 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -1198,7 +1198,7 @@
 
                     $.ajax({
                         type: "POST",
-                        url: "[(@{'/staff/space/'+${space?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                        url: "[(@{'/staff/slide/'+${slide?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
                         cache       : false,
                         contentType : false,
                         processData : false,
@@ -1971,6 +1971,18 @@ <h2 class="heading"><span style="color: var(--dark-grey);">Slide:</span> [[${sli
             </div>
             <p style="margin-top: 0.5rem;">Double click on a block to edit it. Drag and drop blocks to change their order.</p>
             <div class="sticky" id="contOrdUpdStatus"></div>
+			<div id="slide" th:style="|max-width: ${display.width+400}px;|" th:if="${slide.image != null}" class="link-modal flex-spacing">
+        	<img id="bgImage" th:style="|max-width: ${display.width}px;|" th:src="@{'/api/image/'+${slide.image?.id}}" />
+        	<div id="errorAlert"
+            	class="alert alert-danger alert-dismissible fade show"
+            	role="alert"
+            	style="display: none; position: fixed; top: 10%; right: 50px; z-index: 10">
+            	<strong>Error!</strong> <span id="errorMsg"></span>
+            	<button type="button" class="close" id="closeAlert"
+                	aria-label="Close">
+                	<span aria-hidden="true">&times;</span>
+            	</button>
+        	</div>                        
             <!-- Delete Text Modal -->
             <div id="confirmDeleteTextAlert" class="modal" tabindex="-1"
                 role="dialog" th:draggable="true">

From d5efaa7969d911e6b00769d9bdcf41f8134882c0 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 10 Oct 2023 15:18:48 -0700
Subject: [PATCH 30/64] [story/VSPC-242] Alert issue fixed

---
 .../views/staff/modules/slides/slide.html     | 388 +++++++++---------
 1 file changed, 198 insertions(+), 190 deletions(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 58bafaf27..5c11118ea 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -1970,19 +1970,7 @@ <h2 class="heading"><span style="color: var(--dark-grey);">Slide:</span> [[${sli
                 +&nbsp;<span class="icon-checkmark"></span></button>
             </div>
             <p style="margin-top: 0.5rem;">Double click on a block to edit it. Drag and drop blocks to change their order.</p>
-            <div class="sticky" id="contOrdUpdStatus"></div>
-			<div id="slide" th:style="|max-width: ${display.width+400}px;|" th:if="${slide.image != null}" class="link-modal flex-spacing">
-        	<img id="bgImage" th:style="|max-width: ${display.width}px;|" th:src="@{'/api/image/'+${slide.image?.id}}" />
-        	<div id="errorAlert"
-            	class="alert alert-danger alert-dismissible fade show"
-            	role="alert"
-            	style="display: none; position: fixed; top: 10%; right: 50px; z-index: 10">
-            	<strong>Error!</strong> <span id="errorMsg"></span>
-            	<button type="button" class="close" id="closeAlert"
-                	aria-label="Close">
-                	<span aria-hidden="true">&times;</span>
-            	</button>
-        	</div>                        
+            <div class="sticky" id="contOrdUpdStatus"></div>             
             <!-- Delete Text Modal -->
             <div id="confirmDeleteTextAlert" class="modal" tabindex="-1"
                 role="dialog" th:draggable="true">
@@ -2192,183 +2180,7 @@ <h6>
                 </div>
             </div>
             
-            <div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;">
-	        <div class="divider"></div>
-	        <form id="createExternalLinkForm" style="z-index: 1;">
-	            <div role="alert" style="margin-top: 30px;">
-                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
-                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-                    </div>
-	            	<div class="row">	
-	            		<div class="col">
-	            			<h5 class="alert-heading">Create new External Link</h5>
-			                <p>Please click on the image where you
-			                   want to place the new external link. Then click
-			                   "Create External Link".</p>
-	            		</div>
-	                </div>
-	
-	                <input type="hidden" name="x" id="externalLinkX" /> 
-	                <input type="hidden" name="y" id="externalLinkY" /> 
-	                
-	                <div class="row">
-	                	<div class="col-sm-4">
-	                		<label>Label</label>
-	                	</div>
-	                	<div class="col-sm-8">
-	                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
-	                			 name="externalLinkLabel" id="externalLinkLabel">	
-	                	</div>
-	                </div>
-	                 
-	                <div class="row">
-	                	<div class="col-sm-4">
-	                		<label>External Link</label>
-	                	</div>
-	                	<div class="col-sm-8">
-	                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
-	                    		size="15" name="url" id="externalLink">	
-	                	</div>
-	                </div>               
-					<div class="row">
-	                    <div class="col-sm-4">
-	                        <label>How To Open:</label>
-	                    </div>
-	                    <div class="col-sm-8">
-	                        <select id="extTabOpen" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
-	                            <option th:selected>Choose...</option>
-	                            <option th:value="NEWWINDOW">New Window</option>
-	                            <option th:value="SAMEWINDOW">Same Window</option>
-	                        </select>
-	                    </div>
-	                </div>
-	                <div class="row">
-	                    <div class="col-sm-4">
-	                        <label>Type</label>
-	                    </div>
-	                    <div class="col-sm-8">
-	                        <select id="extType" name="type" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
-	                            <option th:selected>Choose...</option>
-	                            <option th:value="IMAGE">Image</option>
-	                            <option th:value="ARROW">Link</option>
-	                        </select>
-	                    </div>
-	                </div>
-	
-	                <div class="row">
-	                    <div class="col-sm-4">
-	                        <label>Image</label>
-	                    </div>
-	                    <div class="col-sm-8">
-	                        <input type="file" class="form-control-sm" name="externalLinkImage" id="externalLinkImage" style="width: inherit">
-	                    </div>
-	                </div>
-	                <p class="mt-5 text-center">
-	                    <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
-	                    <button id="createExternalLinkBtn" type="submit" class="btn primary-btn btn-sm">Create External Link</button>
-	                </p>
-	            </div>
-	        </form>
-		</div>
-        
-        <div id="editExternalLinkInfo" class="custom_form_style" style="z-index: 1;">
-            <div class="divider"></div>
-            <form id="editExternalLinkForm" style="z-index: 1;">
-                <p class="float-right">
-                    <a href="#" id="closeEditExternalLinkInfo" class="icon-circle-close"></a>
-                </p>
-                <div role="alert" style="margin-top: 30px;">
-                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
-                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-                    </div>
-                    <div class="row">
-                        <div class="col">
-                            <h6 class="alert-heading">
-                                <span style="color: var(--dark-grey)">Modify External
-                                    Link: </span><span
-                                    id="externalLinkInfoLabelEdit"></span>
-                            </h6>
-                            <p>Please click on the image where you
-                                want to place the existing external
-                                link. Then click "Edit External Link".</p>
-                        </div>
-                    </div>
-                    <input type="hidden" name="externalLinkIdValueEdit"
-                        id="externalLinkIdValueEdit" />
-                    <input type="hidden" name="x" id="externalLinkXEdit" />
-                    <input type="hidden" name="y" id="externalLinkYEdit" />
-                    <input type="hidden" name="externalLinkDisplayId"
-                        id="externalLinkDisplayId" />
-
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <label>Label:</label>
-                        </div>
-                        <div class="col-sm-8">
-                            <input
-                                class="form-control-sm externallink-targetEdit"
-                                type="text" name="externalLinkLabel"
-                                id="externalLinkLabelEdit"
-                                style="width: inherit; background: var(--base-grey)"><br>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-sm-4" style="padding-right: 0;">
-                            <label>External Link
-                            </label>
-                        </div>
-                        <div class="col-sm-8">
-                            <input
-                                class="form-control-sm externallink-targetEdit"
-                                type="text" name="url"
-                                id="externalLinkURLEdit"
-                                style="width: inherit; background: var(--base-grey)">
-                        </div>
-                    </div>
-					<div class="row">
-	                    <div class="col-sm-4">
-	                        <label>How To Open:</label>
-	                    </div>
-	                    <div class="col-sm-8">
-	                        <select id="extTabOpenEdit" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
-	                            <option th:value="NEWWINDOW">New Window</option>
-	                            <option th:value="SAMEWINDOW">Same Window</option>
-	                        </select>
-	                    </div>
-	                </div>
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <label>Type:</label>
-                        </div>
-                        <div class="col-sm-8">
-                            <select id="extTypeEdit" name="type"
-                                class="form-control-sm externallink-targetEdit">
-                                <option th:value="IMAGE">Image</option>
-                                <option th:value="ARROW">Link</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-sm-3" style="padding-right: 0;">
-                            <label>Image:</label>
-                        </div>
-                        <div class="col-sm-9">
-                            <input type="file" class="form-control-sm"
-                                name="externalLinkImage"
-                                id="externalLinkImageEdit" style="width: inherit" />
-                        </div>
-                    </div>
-                    
-                    <p class="mt-5 text-center">
-                        <button id="deleteExternalLinkButton" type="reset" class="btn delete-btn btn-sm"><i class="fa fa-trash"></i>Delete</button>
-                        <button id="editExternalLinkBtn" type="reset" class="btn primary-btn btn-sm">Save External Link</button>
-                    </p>
-                    
-                </div>
-            </form>
-        </div>
+            
         
             <div id="addVideoAlert" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
 				<div class="modal-dialog" role="document" draggable="true">
@@ -2474,6 +2286,202 @@ <h5 class="modal-title">Select from the
                     </div>
                 </div>
             </div>
+            
+            
+            <div th:each="contents: ${slideContents}">
+            <div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
+        	<img id="bgImage" style="max-width: 461px;" th:src="@{'/api/image/'+${contents.image.id}}" />
+        	<div id="errorAlert"
+            	class="alert alert-danger alert-dismissible fade show"
+            	role="alert"
+            	style="display: none; position: fixed; top: 10%; right: 50px; z-index: 10">
+            	<strong>Error!</strong> <span id="errorMsg"></span>
+            	<button type="button" class="close" id="closeAlert"
+                	aria-label="Close">
+                	<span aria-hidden="true">&times;</span>
+            	</button>
+        	</div> 
+        	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
+			        <div class="divider"></div>
+			        <form id="createExternalLinkForm" style="z-index: 1;">
+			            <div role="alert" style="margin-top: 30px;">
+		                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+		                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+		                    </div>
+			            	<div class="row">	
+			            		<div class="col">
+			            			<h5 class="alert-heading">Create new External Link</h5>
+					                <p>Please click on the image where you
+					                   want to place the new external link. Then click
+					                   "Create External Link".</p>
+			            		</div>
+			                </div>
+			
+			                <input type="hidden" name="x" id="externalLinkX" /> 
+			                <input type="hidden" name="y" id="externalLinkY" /> 
+			                
+			                <div class="row">
+			                	<div class="col-sm-4">
+			                		<label>Label</label>
+			                	</div>
+			                	<div class="col-sm-8">
+			                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
+			                			 name="externalLinkLabel" id="externalLinkLabel">	
+			                	</div>
+			                </div>
+			                 
+			                <div class="row">
+			                	<div class="col-sm-4">
+			                		<label>External Link</label>
+			                	</div>
+			                	<div class="col-sm-8">
+			                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
+			                    		size="15" name="url" id="externalLink">	
+			                	</div>
+			                </div>               
+							<div class="row">
+			                    <div class="col-sm-4">
+			                        <label>How To Open:</label>
+			                    </div>
+			                    <div class="col-sm-8">
+			                        <select id="extTabOpen" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
+			                            <option th:selected>Choose...</option>
+			                            <option th:value="NEWWINDOW">New Window</option>
+			                            <option th:value="SAMEWINDOW">Same Window</option>
+			                        </select>
+			                    </div>
+			                </div>
+			                <div class="row">
+			                    <div class="col-sm-4">
+			                        <label>Type</label>
+			                    </div>
+			                    <div class="col-sm-8">
+			                        <select id="extType" name="type" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
+			                            <option th:selected>Choose...</option>
+			                            <option th:value="IMAGE">Image</option>
+			                            <option th:value="ARROW">Link</option>
+			                        </select>
+			                    </div>
+			                </div>
+			
+			                <div class="row">
+			                    <div class="col-sm-4">
+			                        <label>Image</label>
+			                    </div>
+			                    <div class="col-sm-8">
+			                        <input type="file" class="form-control-sm" name="externalLinkImage" id="externalLinkImage" style="width: inherit">
+			                    </div>
+			                </div>
+			                <p class="mt-5 text-center">
+			                    <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
+			                    <button id="createExternalLinkBtn" type="submit" class="btn primary-btn btn-sm">Create External Link</button>
+			                </p>
+			            </div>
+			        </form>
+				</div>
+		        
+		        <div id="editExternalLinkInfo" class="custom_form_style" style="z-index: 1;">
+		            <div class="divider"></div>
+		            <form id="editExternalLinkForm" style="z-index: 1;">
+		                <p class="float-right">
+		                    <a href="#" id="closeEditExternalLinkInfo" class="icon-circle-close"></a>
+		                </p>
+		                <div role="alert" style="margin-top: 30px;">
+		                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+		                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+		                    </div>
+		                    <div class="row">
+		                        <div class="col">
+		                            <h6 class="alert-heading">
+		                                <span style="color: var(--dark-grey)">Modify External
+		                                    Link: </span><span
+		                                    id="externalLinkInfoLabelEdit"></span>
+		                            </h6>
+		                            <p>Please click on the image where you
+		                                want to place the existing external
+		                                link. Then click "Edit External Link".</p>
+		                        </div>
+		                    </div>
+		                    <input type="hidden" name="externalLinkIdValueEdit"
+		                        id="externalLinkIdValueEdit" />
+		                    <input type="hidden" name="x" id="externalLinkXEdit" />
+		                    <input type="hidden" name="y" id="externalLinkYEdit" />
+		                    <input type="hidden" name="externalLinkDisplayId"
+		                        id="externalLinkDisplayId" />
+		
+		                    <div class="row">
+		                        <div class="col-sm-4">
+		                            <label>Label:</label>
+		                        </div>
+		                        <div class="col-sm-8">
+		                            <input
+		                                class="form-control-sm externallink-targetEdit"
+		                                type="text" name="externalLinkLabel"
+		                                id="externalLinkLabelEdit"
+		                                style="width: inherit; background: var(--base-grey)"><br>
+		                        </div>
+		                    </div>
+		
+		                    <div class="row">
+		                        <div class="col-sm-4" style="padding-right: 0;">
+		                            <label>External Link
+		                            </label>
+		                        </div>
+		                        <div class="col-sm-8">
+		                            <input
+		                                class="form-control-sm externallink-targetEdit"
+		                                type="text" name="url"
+		                                id="externalLinkURLEdit"
+		                                style="width: inherit; background: var(--base-grey)">
+		                        </div>
+		                    </div>
+							<div class="row">
+			                    <div class="col-sm-4">
+			                        <label>How To Open:</label>
+			                    </div>
+			                    <div class="col-sm-8">
+			                        <select id="extTabOpenEdit" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
+			                            <option th:value="NEWWINDOW">New Window</option>
+			                            <option th:value="SAMEWINDOW">Same Window</option>
+			                        </select>
+			                    </div>
+			                </div>
+		                    <div class="row">
+		                        <div class="col-sm-4">
+		                            <label>Type:</label>
+		                        </div>
+		                        <div class="col-sm-8">
+		                            <select id="extTypeEdit" name="type"
+		                                class="form-control-sm externallink-targetEdit">
+		                                <option th:value="IMAGE">Image</option>
+		                                <option th:value="ARROW">Link</option>
+		                            </select>
+		                        </div>
+		                    </div>
+		
+		                    <div class="row">
+		                        <div class="col-sm-3" style="padding-right: 0;">
+		                            <label>Image:</label>
+		                        </div>
+		                        <div class="col-sm-9">
+		                            <input type="file" class="form-control-sm"
+		                                name="externalLinkImage"
+		                                id="externalLinkImageEdit" style="width: inherit" />
+		                        </div>
+		                    </div>
+		                    
+		                    <p class="mt-5 text-center">
+		                        <button id="deleteExternalLinkButton" type="reset" class="btn delete-btn btn-sm"><i class="fa fa-trash"></i>Delete</button>
+		                        <button id="editExternalLinkBtn" type="reset" class="btn primary-btn btn-sm">Save External Link</button>
+		                    </p>
+		                    
+		                </div>
+		            </form>
+		        </div>
+		        </div>
+		        </div>
+            
+            
             <div id="slideSpace">
                 <div th:each="contents: ${slideContents}">
                     <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="valueDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}">

From 4198951de337d3daf47fc88a2130dbf7aa19159d Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 11 Oct 2023 17:08:46 -0700
Subject: [PATCH 31/64] [story/VSPC-242] Area for link working

---
 .../data/ExternalLinkDisplayRepository.java   |  3 --
 .../core/factory/IExternalLinkFactory.java    |  2 --
 .../factory/impl/ExternalLinkFactory.java     | 14 --------
 .../vspace/core/model/IExternalLink.java      |  6 +---
 .../asu/diging/vspace/core/model/ISlide.java  |  3 --
 .../vspace/core/model/impl/ExternalLink.java  | 22 +-----------
 .../diging/vspace/core/model/impl/Slide.java  | 20 -----------
 .../services/IExternalLinkSlideManager.java   | 24 -------------
 .../core/services/impl/LinkManager.java       | 36 -------------------
 .../web/staff/AddExternalLinkController.java  |  2 +-
 .../staff/AddSlideExternalLinkController.java | 24 ++++++++-----
 .../views/staff/modules/slides/slide.html     | 25 +++++--------
 12 files changed, 27 insertions(+), 154 deletions(-)
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
index 80454fd6e..c91fbac33 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
@@ -19,7 +19,4 @@ public interface ExternalLinkDisplayRepository extends PagingAndSortingRepositor
     public List<IExternalLinkDisplay> findExternalLinkDisplaysForSpace(String spaceId);
 
     public void deleteByExternalLink(IExternalLink link);
-    
-    @Query("SELECT d FROM ExternalLinkDisplay d WHERE d.externalLink.slide.id = ?1")
-    public List<IExternalLinkDisplay> findExternalLinkDisplaysForSlide(String slideId);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
index 434bf95c1..f80632485 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
@@ -8,6 +8,4 @@ public interface IExternalLinkFactory {
 
     IExternalLink createExternalLink(String title, ISpace space);
     
-    IExternalLink createExternalLink(String title, ISlide slide);
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
index 284ab8aca..6a39292b3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
@@ -24,18 +24,4 @@ public IExternalLink createExternalLink(String title, ISpace space) {
         link.setSpace(space);
         return link;
     }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.factory.impl.IExternalLinkFactory#
-     * createExternalLink(java.lang.String, edu.asu.diging.vspace.core.model.ISlide)
-     */
-    @Override
-    public IExternalLink createExternalLink(String title, ISlide slide) {
-        IExternalLink link = new ExternalLink();
-        link.setName(title);
-        link.setSlide(slide);
-        return link;
-    }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
index 72abc3000..6a27edf92 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
@@ -11,9 +11,5 @@ public interface IExternalLink extends ILink<ExternalLinkValue> {
     String getExternalLink();
 
     void setExternalLink(String externalLink);
-    
-    ISlide getSlide();
-
-    void setSlide(ISlide slide);
-
+  
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index 0d2b68470..f3f7fdde4 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -16,7 +16,4 @@ public interface ISlide extends IVSpaceElement {
     
     ITextBlock getFirstMatchedTextBlock(String searchTerm);
     
-    List<IExternalLink> getExternalLinks();
-
-    void setExternalLinks(List<IExternalLink> externalLinks);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
index f5ddc9ca8..2b3513116 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
@@ -26,11 +26,7 @@ public class ExternalLink extends VSpaceElement implements IExternalLink {
     @ManyToOne(targetEntity=Space.class)
     @JoinColumn(name="space_id", nullable=false)
     private ISpace space;
-    
-    @ManyToOne(targetEntity=Slide.class)
-    @JoinColumn(name="slide_id", nullable=false)
-    private ISlide slide;
-
+  
     private String externalLink;
 
     /* (non-Javadoc)
@@ -48,22 +44,6 @@ public String getId() {
     public void setId(String id) {
         this.id = id;
     }
-
-    /* (non-Javadoc)
-     * @see edu.asu.diging.vspace.core.model.impl.IExternalLink#getSlide()
-     */
-    @Override
-    public ISlide getSlide() {
-        return slide;
-    }
-
-    /* (non-Javadoc)
-     * @see edu.asu.diging.vspace.core.model.impl.IExternalLink#setSlide(edu.asu.diging.vspace.core.model.ISlide)
-     */
-    @Override
-    public void setSlide(ISlide slide) {
-        this.slide = slide;
-    }
     
     @Override
     public ISpace getSpace() {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 3e38ba88f..a10980368 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -37,9 +37,6 @@ public class Slide extends VSpaceElement implements ISlide {
     @ManyToOne(targetEntity = Module.class)
     private IModule module;
     
-    @OneToMany(mappedBy = "slide", targetEntity=ExternalLink.class)
-    private List<IExternalLink> externalLinks;
-
     // -------- @JsonIgnore used as this entity will be returned in a controller
     @JsonIgnore
     @OneToMany(targetEntity = ContentBlock.class, mappedBy = "slide", cascade = CascadeType.ALL)
@@ -90,23 +87,6 @@ public void setModule(IModule module) {
         this.module = module;
     }
     
-    /* (non-Javadoc)
-     * @see edu.asu.diging.vspace.core.model.impl.ISlide#getExternalLinks()
-     */
-    @Override
-    public List<IExternalLink> getExternalLinks() {
-        return externalLinks;
-    }
-
-    /* (non-Javadoc)
-     * @see edu.asu.diging.vspace.core.model.impl.ISplide#setExternalLinks(java.util.List)
-     */
-    @Override
-    public void setExternalLinks(List<IExternalLink> externalLinks) {
-        this.externalLinks = externalLinks;
-    }
-    
-
     /*
      * (non-Javadoc)
      * 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
deleted file mode 100644
index 32fcb7b26..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkSlideManager.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package edu.asu.diging.vspace.core.services;
-
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
-import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
-
-public interface IExternalLinkSlideManager extends ILinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay>{
-   
-    IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
-
-    IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
index 329fedb1a..5adae7546 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
@@ -73,23 +73,6 @@ protected U createLinkForSlide(String title, String id, float positionX, float p
 
     }
     
-    
-    protected U updateLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
-
-        validateSlide(id);
-
-        L link = getLink(linkId);
-        T target = getTarget(linkedId);
-        link.setName(title);
-        link.setTarget(target);
-        U displayLink = getDisplayLink(linkDisplayId);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
-        return updateLinkAndDisplay(link, displayLink);
-    }
-   
     @Override
     public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
@@ -114,18 +97,6 @@ public void deleteLink(String linkId) {
         deleteLinkDisplayRepo(link);
         deleteLinkRepo(link);
     }
-    
-    protected void deleteLinkForSlide(String linkId) {
-        L link = getLink(linkId);
-        removeFromLinkListForSlide(link.getSlide(), link);
-        deleteLinkDisplayRepo(link);
-        deleteLinkRepo(link);
-    }
-    
-    
-    protected void removeFromLinkListForSlide(ISlide slide, L link) {
-        slide.getExternalLinks().remove(link);
-    }
 
     protected abstract void deleteLinkRepo(L link);
 
@@ -152,13 +123,6 @@ protected void validateSpace(String id) throws SpaceDoesNotExistException {
         }
     }
     
-    protected void validateSlide(String id) throws SlideDoesNotExistException {
-        ISlide source = slideManager.getSlide(id);
-        if (source == null) {
-            throw new SlideDoesNotExistException();
-        }
-    }
-
     protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float positionX, float positionY,
             int rotation, DisplayType displayType, byte[] linkImage, String imageFilename)
             throws ImageCouldNotBeStoredException {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
index 2cb91e2f6..a04a78a46 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
@@ -40,7 +40,7 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
+            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
 
         ISpace space = spaceManager.getSpace(id);
         if (space == null) {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index f40c4997a..7d62446c6 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,29 +17,34 @@
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.services.IExternalLinkSlideManager;
+import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
+import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 
+
+
+@Controller
 public class AddSlideExternalLinkController {
     
     @Autowired
     private ISlideManager slideManager;
-    
+
     @Autowired
-    private IExternalLinkSlideManager externalLinkSlideManager;
+    private IExternalLinkManager externalLinkManager;
     
-    @RequestMapping(value = "/staff/slide/{id}/externallink", method = RequestMethod.POST)
-    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, 
-            @RequestParam("x") String x,
-            @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
+    @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
+    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, 
+            @RequestParam("x") String x, @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SlideDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
 
         ISlide slide = slideManager.getSlide(id);
         if (slide == null) {
@@ -54,7 +60,7 @@ public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
                 : ExternalLinkDisplayMode.valueOf(howToOpen);
-        IExternalLinkDisplay display = externalLinkSlideManager.createLink(title, id, new Float(x), new Float(y), 0,
+        IExternalLinkDisplay display = externalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
                 externalLink, title, type, linkImage, filename, externalLinkOpenMode);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 5c11118ea..7268bdb65 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -538,7 +538,7 @@
         	    
         	    $.ajax({
         	        type: "GET",
-        	        url: "[(@{'/staff/space/'+${space?.id}+'/links'})]",
+        	        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/links'})]",
         	        cache       : false,
         	        contentType : false,
         	        processData : false,
@@ -1198,7 +1198,7 @@
 
                     $.ajax({
                         type: "POST",
-                        url: "[(@{'/staff/slide/'+${slide?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
                         cache       : false,
                         contentType : false,
                         processData : false,
@@ -1913,6 +1913,7 @@
     </head>
     <body>
         <div class="main-content" layout:fragment="content">
+        
             <ol class="breadcrumb">
                 <li class="breadcrumb-item">
                     <a th:href="@{/staff/dashboard}">Dashboard</a>
@@ -2291,16 +2292,7 @@ <h5 class="modal-title">Select from the
             <div th:each="contents: ${slideContents}">
             <div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
         	<img id="bgImage" style="max-width: 461px;" th:src="@{'/api/image/'+${contents.image.id}}" />
-        	<div id="errorAlert"
-            	class="alert alert-danger alert-dismissible fade show"
-            	role="alert"
-            	style="display: none; position: fixed; top: 10%; right: 50px; z-index: 10">
-            	<strong>Error!</strong> <span id="errorMsg"></span>
-            	<button type="button" class="close" id="closeAlert"
-                	aria-label="Close">
-                	<span aria-hidden="true">&times;</span>
-            	</button>
-        	</div> 
+        	
         	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
 			        <div class="divider"></div>
 			        <form id="createExternalLinkForm" style="z-index: 1;">
@@ -2480,9 +2472,9 @@ <h6 class="alert-heading">
 		        </div>
 		        </div>
 		        </div>
-            
-            
-            <div id="slideSpace">
+		        
+		        
+		        <div id="slideSpace">
                 <div th:each="contents: ${slideContents}">
                     <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="valueDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}">
                         <img th:id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}" />
@@ -2529,6 +2521,7 @@ <h3><strong>[[${contents.video.title}]]</strong></h3>
                     </div>
                 </div>
             </div>
-        </div>
+		        
+		</div>
     </body>
 </html>
\ No newline at end of file

From 73e38f6250f096738ac8da059cc19a8a95c54f75 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 13 Oct 2023 13:57:18 -0700
Subject: [PATCH 32/64] [story/VSPC-242] model

---
 .../vspace/core/model/IExternalLinkSlide.java | 15 ++++
 .../diging/vspace/core/model/ILinkSlide.java  | 12 ++++
 .../core/model/impl/ExternalLinkSlide.java    | 70 +++++++++++++++++++
 3 files changed, 97 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
new file mode 100644
index 000000000..31a18ea9c
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
@@ -0,0 +1,15 @@
+package edu.asu.diging.vspace.core.model;
+
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+
+public interface IExternalLinkSlide extends ILinkSlide<ExternalLinkValue>{
+    
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
+
+    String getExternalLink();
+
+    void setExternalLink(String externalLink);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java
new file mode 100644
index 000000000..ff00281ee
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java
@@ -0,0 +1,12 @@
+package edu.asu.diging.vspace.core.model;
+
+public interface ILinkSlide<T extends IVSpaceElement> extends IVSpaceElement {
+    
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
+
+    T getTarget();
+
+    void setTarget(T target);
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
new file mode 100644
index 000000000..bcfbe19a5
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
@@ -0,0 +1,70 @@
+package edu.asu.diging.vspace.core.model.impl;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+
+public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSlide {
+    
+    @Id 
+    @GeneratedValue(generator = "extlink_id_generator")
+    @GenericGenerator(name = "extlink_id_generator", 
+        parameters = @Parameter(name = "prefix", value = "EXL"), 
+        strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+    private String id;
+
+    @ManyToOne(targetEntity=Slide.class)
+    @JoinColumn(name="slide_id", nullable=false)
+    private ISlide slide;
+  
+    private String externalLink;
+    
+    @Override
+    public String getId() {
+        return id;
+    }
+    
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+    
+    @Override
+    public ISlide getSlide() {
+        return slide;
+    }
+
+    @Override
+    public void setSlide(ISlide slide) {
+        this.slide = slide;
+    }
+
+    @Override
+    public String getExternalLink() {
+        return externalLink;
+    }
+
+    @Override
+    public void setExternalLink(String externalLink) {
+        this.externalLink = externalLink;
+    }
+
+    @Override
+    public ExternalLinkValue getTarget() {
+        return new ExternalLinkValue(this.externalLink);
+    }
+
+    @Override
+    public void setTarget(ExternalLinkValue target) {
+        this.externalLink = target.getValue();
+    }
+    
+}

From bd001e0896aac349096489063605d863074a7fa7 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 17 Oct 2023 15:29:37 -0700
Subject: [PATCH 33/64] [story/VSPC-242] External link storing

---
 .../vspace/core/model/impl/ExternalLink.java  |   1 -
 .../impl/ExternalLinkSlideManager.java        | 155 ------------------
 .../core/services/impl/LinkManager.java       |  19 +--
 .../staff/AddSlideExternalLinkController.java |  10 +-
 4 files changed, 5 insertions(+), 180 deletions(-)
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
index 2b3513116..2d740cea0 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
@@ -10,7 +10,6 @@
 import org.hibernate.annotations.Parameter;
 
 import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 
 @Entity
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
deleted file mode 100644
index fdc2ad95c..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkSlideManager.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package edu.asu.diging.vspace.core.services.impl;
-
-import java.util.List;
-import java.util.Optional;
-
-import javax.transaction.Transactional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
-import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
-import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
-import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
-import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.impl.ExternalLink;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
-import edu.asu.diging.vspace.core.services.IExternalLinkSlideManager;
-import edu.asu.diging.vspace.core.services.ISlideManager;
-
-@Transactional
-@Service
-public class ExternalLinkSlideManager extends LinkManager<IExternalLink, ExternalLinkValue, IExternalLinkDisplay> 
-        implements IExternalLinkSlideManager {
-    
-    @Autowired
-    private ISlideManager slideManager;
-    
-    @Autowired
-    private IExternalLinkFactory externalLinkFactory;
-    
-    @Autowired
-    private ExternalLinkRepository externalLinkRepo;
-    
-    @Autowired
-    private ExternalLinkDisplayRepository externalLinkDisplayRepo;
-    
-    @Autowired
-    private IExternalLinkDisplayFactory externalLinkDisplayFactory;
-
-    @Override
-    public List<IExternalLinkDisplay> getLinkDisplays(String slideId) {
-        return externalLinkDisplayRepo.findExternalLinkDisplaysForSlide(slideId);
-    }
-    
-    @Override
-    protected ExternalLinkValue getTarget(String externalLink) {
-        return new ExternalLinkValue(externalLink);
-    }
-
-    @Override
-    protected IExternalLinkDisplay updateLinkAndDisplay(IExternalLink link, IExternalLinkDisplay displayLink) {
-        externalLinkRepo.save((ExternalLink) link);
-        return externalLinkDisplayRepo.save((ExternalLinkDisplay) displayLink);
-    }
-
-    @Override
-    protected IExternalLinkDisplay getDisplayLink(String externalLinkDisplayId) {
-        Optional<ExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo.findById(externalLinkDisplayId);
-        if (externalLinkDisplay.isPresent()) {
-            return externalLinkDisplay.get();
-        }
-        return null;
-    }
-    
-    @Override
-    protected IExternalLink createLinkObject(String title, String id) {
-        ISlide source = slideManager.getSlide(id);
-        IExternalLink link = externalLinkFactory.createExternalLink(title, source);
-        return externalLinkRepo.save((ExternalLink) link);
-    }
-    
-    @Override
-    protected void deleteLinkDisplayRepo(IExternalLink link) {
-        externalLinkDisplayRepo.deleteByExternalLink(link);
-    }
-  
-
-    @Override
-    protected void deleteLinkRepo(IExternalLink link) {
-        externalLinkRepo.delete((ExternalLink) link);
-    }
-    
-    @Override
-    public IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,
-            ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
-
-        /*
-         * When createLink is called then inside updateLinkAndDisplay(link, displayLink)
-         * is called to save Link and Display link in the database and return an object
-         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
-         * ExternalLinkDisplay object to set howToOpen field then Hibernate
-         * automatically persist howToOpen in database.
-         */
-        IExternalLinkDisplay externalLinkDisplay = createLinkForSlide(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, displayType, linkImage, imageFilename);
-        externalLinkDisplay.setHowToOpen(howToOpen);
-        return externalLinkDisplay;
-
-    }
-
-    @Override
-    public IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, String linkId, String linkDisplayId, DisplayType displayType,
-            byte[] linkImage, String imageFilename, ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
-
-        /*
-         * When updateLink is called then inside updateLinkAndDisplay(link, displayLink)
-         * is called to save Link and Display link in the database and return an object
-         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
-         * ExternalLinkDisplay object to set howToOpen field then Hibernate
-         * automatically persist howToOpen in database.
-         */
-        IExternalLinkDisplay externalLinkDisplay = updateLinkForSlide(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, linkId, linkDisplayId, displayType, linkImage, imageFilename);
-        externalLinkDisplay.setHowToOpen(howToOpen);
-        return externalLinkDisplay;
-    }
-
-    @Override
-    protected void removeFromLinkList(ISpace space, IExternalLink link) {
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    protected IExternalLink getLink(String externalLinkID) {
-        Optional<ExternalLink> externalLink = externalLinkRepo.findById(externalLinkID);
-        if (externalLink.isPresent()) {
-            return externalLink.get();
-        }
-        return null;
-    }
-
-    @Override
-    protected IExternalLinkDisplay createDisplayLink(IExternalLink link) {
-        return externalLinkDisplayFactory.createExternalLinkDisplay(link);
-
-    }
-    
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
index 5adae7546..eaae78ac2 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
@@ -31,10 +31,7 @@ public abstract class LinkManager<L extends ILink<T>, T extends IVSpaceElement,
 
     @Autowired
     private ISpaceManager spaceManager;
-    
-    @Autowired
-    private ISlideManager slideManager;
-
+  
     @Autowired
     private IImageFactory imageFactory;
 
@@ -59,20 +56,6 @@ public U createLink(String title, String id, float positionX, float positionY, i
 
     }
     
-    protected U createLinkForSlide(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
-
-        L link = createLinkObject(title, id);
-        T target = getTarget(linkedId);
-        link.setName(linkLabel);
-        link.setTarget(target);
-        U displayLink = createDisplayLink(link);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
-        return updateLinkAndDisplay(link, displayLink);
-
-    }
-    
     @Override
     public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 7d62446c6..8dcc8f2d6 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -24,12 +24,10 @@
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
-
-
-
 @Controller
 public class AddSlideExternalLinkController {
     
@@ -37,14 +35,14 @@ public class AddSlideExternalLinkController {
     private ISlideManager slideManager;
 
     @Autowired
-    private IExternalLinkManager externalLinkManager;
+    private ISlideExternalLinkManager slideExternalLinkManager;
     
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
     public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, 
             @RequestParam("x") String x, @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
             @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SpaceDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+            throws NumberFormatException, SlideDoesNotExistException, IOException, ImageCouldNotBeStoredException {
 
         ISlide slide = slideManager.getSlide(id);
         if (slide == null) {
@@ -60,7 +58,7 @@ public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
                 : ExternalLinkDisplayMode.valueOf(howToOpen);
-        IExternalLinkDisplay display = externalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
+        IExternalLinkDisplay display = slideExternalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
                 externalLink, title, type, linkImage, filename, externalLinkOpenMode);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();

From 3c7e35207dad0155e8af51775062dc3c9f75759e Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 18 Oct 2023 16:28:44 -0700
Subject: [PATCH 34/64] [story/VSPC-242] Manager methods

---
 .../services/ISlideExternalLinkManager.java   |  24 ++++
 .../core/services/ISlideLinkManager.java      |  29 ++++
 .../core/services/impl/SlideLinkManager.java  | 133 ++++++++++++++++++
 3 files changed, 186 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
new file mode 100644
index 000000000..9e24e8f2a
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -0,0 +1,24 @@
+package edu.asu.diging.vspace.core.services;
+
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+
+public interface ISlideExternalLinkManager extends ISlideLinkManager<IExternalLinkSlide, ExternalLinkValue, IExternalLinkDisplay>{
+    
+    IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
+
+    IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename,ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
new file mode 100644
index 000000000..6b203a074
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
@@ -0,0 +1,29 @@
+package edu.asu.diging.vspace.core.services;
+
+import java.util.List;
+
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.model.ILink;
+import edu.asu.diging.vspace.core.model.ILinkSlide;
+import edu.asu.diging.vspace.core.model.IVSpaceElement;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
+
+public interface ISlideLinkManager<L extends ILinkSlide<T>, T extends IVSpaceElement, U extends ILinkDisplay> {
+    
+    U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
+
+    U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+
+    List<U> getLinkDisplays(String slideId);
+
+    void deleteLink(String linkId);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
new file mode 100644
index 000000000..c0faffa1b
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
@@ -0,0 +1,133 @@
+package edu.asu.diging.vspace.core.services.impl;
+
+import org.apache.tika.Tika;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import edu.asu.diging.vspace.core.data.ImageRepository;
+import edu.asu.diging.vspace.core.exception.FileStorageException;
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IImageFactory;
+import edu.asu.diging.vspace.core.file.IStorageEngine;
+import edu.asu.diging.vspace.core.model.ILink;
+import edu.asu.diging.vspace.core.model.ILinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.IVSImage;
+import edu.asu.diging.vspace.core.model.IVSpaceElement;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
+import edu.asu.diging.vspace.core.model.impl.VSImage;
+import edu.asu.diging.vspace.core.services.ISlideLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
+
+@Transactional
+public abstract class SlideLinkManager<L extends ILinkSlide<T>, T extends IVSpaceElement, U extends ILinkDisplay>
+implements ISlideLinkManager<L, T, U> {
+    
+    @Autowired
+    private ISlideManager slideManager;
+
+    @Autowired
+    private IImageFactory imageFactory;
+
+    @Autowired
+    private ImageRepository imageRepo;
+
+    @Autowired
+    private IStorageEngine storage;
+    
+    @Override
+    public U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
+
+        L link = createLinkObject(title, id);
+        T target = getTarget(linkedId);
+        link.setName(linkLabel);
+        link.setTarget(target);
+        U displayLink = createDisplayLink(link);
+        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        return updateLinkAndDisplay(link, displayLink);
+
+    }
+    
+    @Override
+    public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
+            String imageFilename)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+
+        validateSlide(id);
+
+        L link = getLink(linkId);
+        T target = getTarget(linkedId);
+        link.setName(title);
+        link.setTarget(target);
+        U displayLink = getDisplayLink(linkDisplayId);
+        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        return updateLinkAndDisplay(link, displayLink);
+    }
+    
+    @Override
+    public void deleteLink(String linkId) {
+        L link = getLink(linkId);
+        removeFromLinkList(link.getSlide(), link);
+        deleteLinkDisplayRepo(link);
+        deleteLinkRepo(link);
+    }
+
+    protected abstract void deleteLinkRepo(L link);
+
+    protected abstract void deleteLinkDisplayRepo(L link);
+
+    protected abstract void removeFromLinkList(ISlide slide, L link);
+
+    protected abstract U updateLinkAndDisplay(L link, U displayLink);
+
+    protected abstract U getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException;
+
+    protected abstract L getLink(String linkId);
+
+    protected abstract L createLinkObject(String title, String id);
+   
+    protected abstract T getTarget(String linkedId);
+
+    protected abstract U createDisplayLink(L link);
+
+    protected void validateSlide(String id) throws SlideDoesNotExistException {
+        ISlide source = slideManager.getSlide(id);
+        if (source == null) {
+            throw new SlideDoesNotExistException();
+        }
+    }
+    
+    protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float positionX, float positionY,
+            int rotation, DisplayType displayType, byte[] linkImage, String imageFilename)
+            throws ImageCouldNotBeStoredException {
+        linkDisplay.setPositionX(positionX);
+        linkDisplay.setPositionY(positionY);
+        linkDisplay.setRotation(rotation);
+        linkDisplay.setType(displayType != null ? displayType : DisplayType.ARROW);
+        if (linkImage != null && linkImage.length > 0) {
+            Tika tika = new Tika();
+            String contentType = tika.detect(linkImage);
+            IVSImage image = imageFactory.createImage(imageFilename, contentType);
+            image = imageRepo.save((VSImage) image);
+            String relativePath = null;
+            try {
+                relativePath = storage.storeFile(linkImage, imageFilename, image.getId());
+            } catch (FileStorageException e) {
+                throw new ImageCouldNotBeStoredException(e);
+            }
+            image.setParentPath(relativePath);
+            imageRepo.save((VSImage) image);
+            linkDisplay.setImage(image);
+        }
+
+    }
+
+}

From 49628c7034bf784c922ece28a2006e73bf98567c Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 20 Oct 2023 13:58:09 -0700
Subject: [PATCH 35/64] [story/VSPC-242] modified entinty

---
 .../asu/diging/vspace/core/model/ISlide.java  |  4 +++
 .../core/model/impl/ExternalLinkSlide.java    |  5 ++--
 .../diging/vspace/core/model/impl/Slide.java  | 27 +++++++++++++++++++
 .../services/ISlideExternalLinkManager.java   |  9 ++++---
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index f3f7fdde4..713853f06 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -16,4 +16,8 @@ public interface ISlide extends IVSpaceElement {
     
     ITextBlock getFirstMatchedTextBlock(String searchTerm);
     
+    List<IExternalLinkSlide> getExternalLinks();
+
+    void setExternalLinks(List<IExternalLinkSlide> externalLinks);
+    
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
index bcfbe19a5..ece22de81 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
@@ -1,5 +1,6 @@
 package edu.asu.diging.vspace.core.model.impl;
 
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
@@ -11,13 +12,13 @@
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
-
+@Entity
 public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSlide {
     
     @Id 
     @GeneratedValue(generator = "extlink_id_generator")
     @GenericGenerator(name = "extlink_id_generator", 
-        parameters = @Parameter(name = "prefix", value = "EXL"), 
+        parameters = @Parameter(name = "prefix", value = "SEXL"), 
         strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
     private String id;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index a10980368..761144cbe 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -20,6 +20,7 @@
 
 import edu.asu.diging.vspace.core.model.IContentBlock;
 import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISequence;
@@ -45,6 +46,10 @@ public class Slide extends VSpaceElement implements ISlide {
     @JsonIgnore
     @ManyToMany(mappedBy = "slides", targetEntity = Sequence.class)
     private List<ISequence> sequence;
+    
+    @JsonIgnore
+    @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class)
+    private List<IExternalLinkSlide> externalLinks;
 
     /*
      * (non-Javadoc)
@@ -87,6 +92,28 @@ public void setModule(IModule module) {
         this.module = module;
     }
     
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.impl.ISlide#getExternalLinks()
+     */
+    @Override
+    public List<IExternalLinkSlide> getExternalLinks() {
+        return externalLinks;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * edu.asu.diging.vspace.core.model.impl.ISlide#setExternalLinks(java.util.
+     * List)
+     */
+    @Override
+    public void setExternalLinks(List<IExternalLinkSlide> externalLinks) {
+        this.externalLinks = externalLinks;
+    }
+    
     /*
      * (non-Javadoc)
      * 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
index 9e24e8f2a..8d016c91a 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -8,17 +8,20 @@
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 
-public interface ISlideExternalLinkManager extends ISlideLinkManager<IExternalLinkSlide, ExternalLinkValue, IExternalLinkDisplay>{
+public interface ISlideExternalLinkManager extends ISlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>{
     
-    IExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+    ISlideExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
             throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
 
-    IExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+    ISlideExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
             String imageFilename,ExternalLinkDisplayMode howToOpen)
             throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+    
+    
 
 }

From 2a74b830eef4dc2c375c9963af4007194c95528f Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 24 Oct 2023 15:27:14 -0700
Subject: [PATCH 36/64] [story/VSPC-242] Repository

---
 .../data/ExternalLinkDisplayRepository.java   |  2 +-
 .../SlideExternalLinkDisplayRepository.java   | 23 +++++++++++++++++++
 .../data/SlideExternalLinkRepository.java     | 12 ++++++++++
 .../factory/IExternalLinkDisplayFactory.java  |  1 +
 .../impl/ExternalLinkDisplayFactory.java      |  1 +
 .../display/ISlideExternalLinkDisplay.java    | 15 ++++++++++++
 6 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
index c91fbac33..322e89a6c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
@@ -17,6 +17,6 @@ public interface ExternalLinkDisplayRepository extends PagingAndSortingRepositor
 
     @Query("SELECT d FROM ExternalLinkDisplay d WHERE d.externalLink.space.id = ?1")
     public List<IExternalLinkDisplay> findExternalLinkDisplaysForSpace(String spaceId);
-
+  
     public void deleteByExternalLink(IExternalLink link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java
new file mode 100644
index 000000000..ad507c87e
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java
@@ -0,0 +1,23 @@
+package edu.asu.diging.vspace.core.data;
+
+import java.util.List;
+
+import org.javers.spring.annotation.JaversSpringDataAuditable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
+
+@Repository
+@JaversSpringDataAuditable
+public interface SlideExternalLinkDisplayRepository extends PagingAndSortingRepository<SlideExternalLinkDisplay, String> {
+    
+    @Query("SELECT d FROM SlideExternalLinkDisplay d WHERE d.externalLink.slide.id = ?1")
+    public List<ISlideExternalLinkDisplay> findSlideExternalLinkDisplaysForSlide(String slideId);
+
+    public void deleteByExternalLink(IExternalLinkSlide link);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
new file mode 100644
index 000000000..eda918758
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
@@ -0,0 +1,12 @@
+package edu.asu.diging.vspace.core.data;
+
+import org.javers.spring.annotation.JaversSpringDataAuditable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+
+@Repository
+@JaversSpringDataAuditable
+public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String>{
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java
index a9c2c24bc..18c262195 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java
@@ -1,6 +1,7 @@
 package edu.asu.diging.vspace.core.factory;
 
 import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 
 /*
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java
index 89a972ed8..cd04dd0f6 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java
@@ -4,6 +4,7 @@
 
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java
new file mode 100644
index 000000000..c10898d2f
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java
@@ -0,0 +1,15 @@
+package edu.asu.diging.vspace.core.model.display;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+
+public interface ISlideExternalLinkDisplay extends ILinkDisplay {
+    
+    String getId();
+
+    void setId(String id);
+
+    void setExternalLink(IExternalLinkSlide link);
+
+    IExternalLinkSlide getExternalLink();
+
+}

From 9b5d03015bde11654a255e414788f5486d8f45ec Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 25 Oct 2023 16:15:46 -0700
Subject: [PATCH 37/64] [story/VSPC-242]Display factors

---
 .../ISlideExternalLinkDisplayFactory.java     | 22 +++++
 .../factory/ISlideExternalLinkFactory.java    | 10 ++
 .../impl/SlideExternalLinkDisplayFactory.java | 26 +++++
 .../impl/SlideExternalLinkDisplay.java        | 98 +++++++++++++++++++
 4 files changed, 156 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java
new file mode 100644
index 000000000..af20331d3
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java
@@ -0,0 +1,22 @@
+package edu.asu.diging.vspace.core.factory;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+
+/*
+*(non-javadoc)
+*This interface represents a factory for creating external link displays.
+*/
+public interface ISlideExternalLinkDisplayFactory {
+    
+    /*
+     *(non-javadoc)
+     *Creates an external link display based on the provided external link.
+     *@param link the external link to create a display for
+     *@return  edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay that 
+     *represents the provided external link
+     *
+     */
+    ISlideExternalLinkDisplay createExternalLinkDisplay(IExternalLinkSlide link);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java
new file mode 100644
index 000000000..d1952666c
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java
@@ -0,0 +1,10 @@
+package edu.asu.diging.vspace.core.factory;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+
+public interface ISlideExternalLinkFactory {
+    
+    IExternalLinkSlide createExternalLink(String title, ISlide slide);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java
new file mode 100644
index 000000000..b3866733a
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java
@@ -0,0 +1,26 @@
+package edu.asu.diging.vspace.core.factory.impl;
+
+import org.springframework.stereotype.Service;
+
+import edu.asu.diging.vspace.core.factory.ISlideExternalLinkDisplayFactory;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
+
+@Service
+public class SlideExternalLinkDisplayFactory implements ISlideExternalLinkDisplayFactory {
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.factory.impl.ISlideExternalLinkDisplayFactory#
+     * createExternalLinkDisplay(edu.asu.diging.vspace.core.model.IExternalLinkSlide)
+     */
+    @Override
+    public ISlideExternalLinkDisplay createExternalLinkDisplay(IExternalLinkSlide link) {
+        ISlideExternalLinkDisplay display = new SlideExternalLinkDisplay();
+        display.setExternalLink(link);
+        return display;
+    }
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
new file mode 100644
index 000000000..943d7d441
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
@@ -0,0 +1,98 @@
+package edu.asu.diging.vspace.core.model.display.impl;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+
+@Entity
+public class SlideExternalLinkDisplay extends LinkDisplay implements ISlideExternalLinkDisplay {
+    
+    @Id
+    @GeneratedValue(generator = "externallink_display_id_generator")
+    @GenericGenerator(name = "externallink_display_id_generator", 
+      parameters = @Parameter(name = "prefix", value = "SEXLD"),
+      strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+    private String id;
+
+    @OneToOne(targetEntity = ExternalLinkSlide.class)
+    private IExternalLinkSlide externalLink;
+    
+    private DisplayType type;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.ISpaceLinkDisplay#getId()
+     */
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * edu.asu.diging.vspace.core.model.display.impl.ISpaceLinkDisplay#setId(java.
+     * lang.String)
+     */
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * getExternalLinkSlide()
+     */
+    @Override
+    public IExternalLinkSlide getExternalLink() {
+        return externalLink;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * setExternalLink(IExternalLinkSlide)
+     */
+    @Override
+    public void setExternalLink(IExternalLinkSlide externalLink) {
+        this.externalLink = externalLink;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * getType()
+     */
+    @Override
+    public DisplayType getType() {
+        return type;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
+     * setType(DisplayType)
+     */
+    @Override
+    public void setType(DisplayType type) {
+        this.type = type;
+    }
+    
+
+}

From 41a805ab274a57564dc74de301de9c7a4df73a56 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 27 Oct 2023 13:59:44 -0700
Subject: [PATCH 38/64] [story/VSPC-242]Manager methods

---
 .../impl/SlideExternalLinkFactory.java        |  27 +++
 .../impl/SlideExternalLinkManager.java        | 174 ++++++++++++++++++
 .../staff/AddSlideExternalLinkController.java |   3 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
new file mode 100644
index 000000000..04bd8f3bc
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
@@ -0,0 +1,27 @@
+package edu.asu.diging.vspace.core.factory.impl;
+
+import org.springframework.stereotype.Service;
+
+import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+
+@Service
+public class SlideExternalLinkFactory implements ISlideExternalLinkFactory{
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.factory.impl.ISlideExternalLinkFactory#
+     * createExternalLink(java.lang.String, edu.asu.diging.vspace.core.model.ISlide)
+     */
+    @Override
+    public IExternalLinkSlide createExternalLink(String title, ISlide slide) {
+        IExternalLinkSlide link = new ExternalLinkSlide();
+        link.setName(title);
+        link.setSlide(slide);
+        return link;
+    }
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
new file mode 100644
index 000000000..c508c6477
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -0,0 +1,174 @@
+package edu.asu.diging.vspace.core.services.impl;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
+import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
+import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
+import edu.asu.diging.vspace.core.data.ImageRepository;
+import edu.asu.diging.vspace.core.data.SlideExternalLinkDisplayRepository;
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
+import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
+import edu.asu.diging.vspace.core.factory.IImageFactory;
+import edu.asu.diging.vspace.core.factory.ISlideExternalLinkDisplayFactory;
+import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
+import edu.asu.diging.vspace.core.file.IStorageEngine;
+import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.impl.ExternalLink;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+import edu.asu.diging.vspace.core.services.IExternalLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
+import edu.asu.diging.vspace.core.services.ISpaceManager;
+
+@Transactional
+@Service
+public class SlideExternalLinkManager extends SlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>
+implements ISlideExternalLinkManager{
+    
+    @Autowired
+    private ISlideManager slideManager;
+    
+    @Autowired
+    private SlideExternalLinkRepository externalLinkRepo;
+
+    @Autowired
+    private SlideExternalLinkDisplayRepository externalLinkDisplayRepo;
+
+    @Autowired
+    private ISlideExternalLinkFactory externalLinkFactory;
+
+    @Autowired
+    private ISlideExternalLinkDisplayFactory externalLinkDisplayFactory;
+
+    @Autowired
+    private IImageFactory imageFactory;
+
+    @Autowired
+    private ImageRepository imageRepo;
+
+    @Autowired
+    private IStorageEngine storage;
+    
+    @Override
+    public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
+        return externalLinkDisplayRepo.findSlideExternalLinkDisplaysForSlide(slideId);
+    }
+
+    @Override
+    protected IExternalLinkSlide createLinkObject(String title, String id) {
+        ISlide source = slideManager.getSlide(id);
+        IExternalLinkSlide link = externalLinkFactory.createExternalLink(title, source);
+        return externalLinkRepo.save((ExternalLinkSlide) link);
+    }
+    
+    @Override
+    protected ExternalLinkValue getTarget(String externalLink) {
+        return new ExternalLinkValue(externalLink);
+    }
+
+    @Override
+    protected ISlideExternalLinkDisplay updateLinkAndDisplay(IExternalLinkSlide link, ISlideExternalLinkDisplay displayLink) {
+        externalLinkRepo.save((ExternalLinkSlide) link);
+        return externalLinkDisplayRepo.save((SlideExternalLinkDisplay) displayLink);
+    }
+
+    @Override
+    protected ISlideExternalLinkDisplay getDisplayLink(String externalLinkDisplayId) {
+        Optional<SlideExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo.findById(externalLinkDisplayId);
+        if (externalLinkDisplay.isPresent()) {
+            return externalLinkDisplay.get();
+        }
+        return null;
+    }
+
+    @Override
+    protected IExternalLinkSlide getLink(String externalLinkID) {
+        Optional<ExternalLinkSlide> externalLink = externalLinkRepo.findById(externalLinkID);
+        if (externalLink.isPresent()) {
+            return externalLink.get();
+        }
+        return null;
+    }
+
+    @Override
+    protected ISlideExternalLinkDisplay createDisplayLink(IExternalLinkSlide link) {
+        return externalLinkDisplayFactory.createExternalLinkDisplay(link);
+    }
+
+    @Override
+    protected void deleteLinkDisplayRepo(IExternalLinkSlide link) {
+        externalLinkDisplayRepo.deleteByExternalLink(link);
+    }
+
+    @Override
+    protected void removeFromLinkList(ISlide slide, IExternalLinkSlide link) {
+        slide.getExternalLinks().remove(link);
+    }
+
+    @Override
+    protected void deleteLinkRepo(IExternalLinkSlide link) {
+        externalLinkRepo.delete((ExternalLinkSlide) link);
+    }
+
+    
+    @Override
+    public ISlideExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation,
+            String linkedId, String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,
+            ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
+
+        /*
+         * When createLink is called then inside updateLinkAndDisplay(link, displayLink)
+         * is called to save Link and Display link in the database and return an object
+         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
+         * ExternalLinkDisplay object to set howToOpen field then Hibernate
+         * automatically persist howToOpen in database.
+         */
+        ISlideExternalLinkDisplay externalLinkDisplay = createLink(title, id, positionX, positionY, rotation, linkedId,
+                linkLabel, displayType, linkImage, imageFilename);
+        externalLinkDisplay.setHowToOpen(howToOpen);
+        return externalLinkDisplay;
+
+    }
+
+    @Override
+    public ISlideExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation,
+            String linkedId, String linkLabel, String linkId, String linkDisplayId, DisplayType displayType,
+            byte[] linkImage, String imageFilename, ExternalLinkDisplayMode howToOpen)
+            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+
+        /*
+         * When updateLink is called then inside updateLinkAndDisplay(link, displayLink)
+         * is called to save Link and Display link in the database and return an object
+         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
+         * ExternalLinkDisplay object to set howToOpen field then Hibernate
+         * automatically persist howToOpen in database.
+         */
+        ISlideExternalLinkDisplay externalLinkDisplay = updateLink(title, id, positionX, positionY, rotation, linkedId,
+                linkLabel, linkId, linkDisplayId, displayType, linkImage, imageFilename);
+        externalLinkDisplay.setHowToOpen(howToOpen);
+        return externalLinkDisplay;
+    }
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 8dcc8f2d6..ddde14e44 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -23,6 +23,7 @@
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
@@ -58,7 +59,7 @@ public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String
         DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
         ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
                 : ExternalLinkDisplayMode.valueOf(howToOpen);
-        IExternalLinkDisplay display = slideExternalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
+        ISlideExternalLinkDisplay display = slideExternalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
                 externalLink, title, type, linkImage, filename, externalLinkOpenMode);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();

From c29fc77cb91dfd6ff78dd3c1cc1d460bb09da951 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 31 Oct 2023 15:15:37 -0700
Subject: [PATCH 39/64] [story/VSPC-242]Display id

---
 .../views/staff/modules/slides/slide.html     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 7268bdb65..aa0cd3143 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -133,7 +133,7 @@
             	if(isModal){
             	    $("#space").append(inactiveSpaceElement);
             	} else{
-            	    $("#main-space").append(inactiveSpaceElement);
+            	    $("#slideSpace").append(inactiveSpaceElement);
             	}
                 }
                 if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
@@ -146,7 +146,7 @@
                     if(isModal){
                         $("#space").append(unpublishedModuleElement);
                     }else{
-                        $("#main-space").append(unpublishedModuleElement);
+                        $("#slideSpace").append(unpublishedModuleElement);
                     }
                 }
                 if(!isTextBlock){
@@ -562,7 +562,7 @@
         	            
         	            externalLinks.forEach(function(link,index){
         	                var spanId= "externallinkId-";
-        	                var divId = "#main-space";
+        	                var divId = "#slideSpace";
         	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
         	            })
         	        }
@@ -2288,10 +2288,22 @@ <h5 class="modal-title">Select from the
                 </div>
             </div>
             
-            
+            <div id="space" >
             <div th:each="contents: ${slideContents}">
-            <div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
+            <div style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
         	<img id="bgImage" style="max-width: 461px;" th:src="@{'/api/image/'+${contents.image.id}}" />
+       	
+			<div id="errorAlert"
+            	class="alert alert-danger alert-dismissible fade show"
+            	role="alert"
+            	style="display: none; position: fixed; top: 10%; right: 50px; z-index: 10">
+            	<strong>Error!</strong> <span id="errorMsg"></span>
+            	<button type="button" class="close" id="closeAlert"
+                	aria-label="Close">
+                	<span aria-hidden="true">&times;</span>
+            	</button>
+        	</div>        	
+        	
         	
         	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
 			        <div class="divider"></div>
@@ -2469,10 +2481,11 @@ <h6 class="alert-heading">
 		                    
 		                </div>
 		            </form>
+		            </div>
 		        </div>
 		        </div>
 		        </div>
-		        
+		       
 		        
 		        <div id="slideSpace">
                 <div th:each="contents: ${slideContents}">

From d7b3078893031ecf337ab4756e2ba62e5edeca6d Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 1 Nov 2023 16:26:33 -0700
Subject: [PATCH 40/64] [story/VSPC-242] Edit link

---
 .../web/staff/EditSlideLinksController.java   | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java
new file mode 100644
index 000000000..1ccbda855
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java
@@ -0,0 +1,50 @@
+package edu.asu.diging.vspace.web.staff;
+
+import java.io.IOException;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.services.ISlideManager;
+
+public class EditSlideLinksController {
+    
+    protected ResponseEntity<String> checkIfSlideExists(ISlideManager slideManager, String id, String x, String y) throws IOException{
+        ISlide source = slideManager.getSlide(id);
+        if (source == null) {
+            return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
+        }
+        if (x == null || x.trim().isEmpty() || y == null || y.trim().isEmpty()) {
+            ObjectMapper mapper = new ObjectMapper();
+            ObjectNode node = mapper.createObjectNode();
+            node.put("errorMessage", "No link coordinates specified.");
+            return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
+        }
+        return null;
+    }
+    
+    protected ResponseEntity<String> success(String id, String  displayId, float posX, float posY, int rotation, String url, String label, String displayType, String linkedId, String linkedSlideStatus) throws IOException{
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode linkNode = mapper.createObjectNode();
+        linkNode.put("id", id);
+        linkNode.put("displayId", displayId);
+        linkNode.put("x", posX);
+        linkNode.put("y", posY);
+        linkNode.put("rotation", rotation);
+        linkNode.put("label", label);
+        linkNode.put("displayType", displayType);
+        linkNode.put("linkedId", linkedId);
+        if(linkedSlideStatus!=null) {
+            linkNode.put("linkedSlideStatus", linkedSlideStatus);
+        }
+        if(url!=null) {
+            linkNode.put("url", url);
+        }
+        return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
+    }
+
+}

From 6a720f145320db04062512d50d67a691a1a05f2d Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 3 Nov 2023 14:18:10 -0700
Subject: [PATCH 41/64] [story/VSPC-242] success

---
 .../EditSlideExternalLinkController.java      | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
new file mode 100644
index 000000000..1b391b7b7
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
@@ -0,0 +1,69 @@
+package edu.asu.diging.vspace.web.staff;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
+
+@Controller
+public class EditSlideExternalLinkController extends EditSlideLinksController{
+    
+    @Autowired
+    private ISlideManager slideManager;
+
+    @Autowired
+    private ISlideExternalLinkManager externalLinkManager;
+    
+    
+    
+    @RequestMapping(value = "/staff/module/{moduleId}/slide/link/external/{id}", method = RequestMethod.POST)
+    public ResponseEntity<String> editExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
+            @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
+            @RequestParam("url") String externalLink,
+            @RequestParam("externalLinkIdValueEdit") String externalLinkIdValueEdit,
+            @RequestParam("externalLinkDisplayId") String externalLinkDisplayId,
+            @RequestParam("tabOpen") String howToOpen, @RequestParam("type") String displayType,
+            @RequestParam("externalLinkImage") MultipartFile file) throws SlideDoesNotExistException, IOException,
+            LinkDoesNotExistsException, NumberFormatException, ImageCouldNotBeStoredException {
+
+        ResponseEntity<String> validation = checkIfSlideExists(slideManager, id, x, y);
+        if (validation != null) {
+            return validation;
+        }
+        byte[] linkImage = null;
+        String filename = null;
+        if (file != null) {
+            linkImage = file.getBytes();
+            filename = file.getOriginalFilename();
+        }
+        DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
+        ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
+                : ExternalLinkDisplayMode.valueOf(howToOpen);
+        ISlideExternalLinkDisplay display = (ISlideExternalLinkDisplay) externalLinkManager.updateLink(title, id, new Float(x),
+                new Float(y), 0, externalLink, title, externalLinkIdValueEdit, externalLinkDisplayId, type, linkImage,
+                filename, externalLinkOpenMode);
+        return success(display.getExternalLink().getId(), display.getId(), display.getPositionX(),
+                display.getPositionY(), display.getRotation(), display.getExternalLink().getExternalLink(), title,
+                displayType, null, null);
+
+    }
+
+
+}

From 4b68cbc579e80cc830d4b1a0126d116c206dcf08 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 7 Nov 2023 15:15:32 -0700
Subject: [PATCH 42/64] [story/VSPC-242] Edit issue

---
 .../views/staff/modules/slides/slide.html     | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index aa0cd3143..76b430928 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -133,7 +133,7 @@
             	if(isModal){
             	    $("#space").append(inactiveSpaceElement);
             	} else{
-            	    $("#slideSpace").append(inactiveSpaceElement);
+            	    $("#main-space").append(inactiveSpaceElement);
             	}
                 }
                 if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
@@ -146,7 +146,7 @@
                     if(isModal){
                         $("#space").append(unpublishedModuleElement);
                     }else{
-                        $("#slideSpace").append(unpublishedModuleElement);
+                        $("#main-space").append(unpublishedModuleElement);
                     }
                 }
                 if(!isTextBlock){
@@ -562,7 +562,7 @@
         	            
         	            externalLinks.forEach(function(link,index){
         	                var spanId= "externallinkId-";
-        	                var divId = "#slideSpace";
+        	                var divId = "#main-space";
         	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
         	            })
         	        }
@@ -1126,7 +1126,7 @@
                     var externalLinkInfo = editExternalLinkInfo();
                     $.ajax({
                         type: "POST",
-                        url: "[(@{'/staff/space/link/external/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+'link/external/'+${slidee?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
                         cache: false,
                         contentType : false,
                         processData : false,
@@ -2288,22 +2288,10 @@ <h5 class="modal-title">Select from the
                 </div>
             </div>
             
-            <div id="space" >
+            
             <div th:each="contents: ${slideContents}">
-            <div style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
+            <div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
         	<img id="bgImage" style="max-width: 461px;" th:src="@{'/api/image/'+${contents.image.id}}" />
-       	
-			<div id="errorAlert"
-            	class="alert alert-danger alert-dismissible fade show"
-            	role="alert"
-            	style="display: none; position: fixed; top: 10%; right: 50px; z-index: 10">
-            	<strong>Error!</strong> <span id="errorMsg"></span>
-            	<button type="button" class="close" id="closeAlert"
-                	aria-label="Close">
-                	<span aria-hidden="true">&times;</span>
-            	</button>
-        	</div>        	
-        	
         	
         	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
 			        <div class="divider"></div>
@@ -2481,11 +2469,10 @@ <h6 class="alert-heading">
 		                    
 		                </div>
 		            </form>
-		            </div>
 		        </div>
 		        </div>
 		        </div>
-		       
+		        
 		        
 		        <div id="slideSpace">
                 <div th:each="contents: ${slideContents}">

From c1df0adc05f5cb694dfbfd86f256b6038909c08c Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 8 Nov 2023 16:18:12 -0700
Subject: [PATCH 43/64] [story/VSPC-242]Unit test

---
 .../impl/SlideExternalLinkManagerTest.java    | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java

diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
new file mode 100644
index 000000000..45851b438
--- /dev/null
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
@@ -0,0 +1,122 @@
+package edu.asu.diging.vspace.core.services.impl;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
+import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
+import edu.asu.diging.vspace.core.data.SlideExternalLinkDisplayRepository;
+import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
+import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
+import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
+import edu.asu.diging.vspace.core.factory.ISlideExternalLinkDisplayFactory;
+import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
+import edu.asu.diging.vspace.core.model.IExternalLink;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.IVSImage;
+import edu.asu.diging.vspace.core.model.display.DisplayType;
+import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
+import edu.asu.diging.vspace.core.model.impl.ExternalLink;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+import edu.asu.diging.vspace.core.model.impl.Slide;
+import edu.asu.diging.vspace.core.model.impl.Space;
+import edu.asu.diging.vspace.core.model.impl.VSImage;
+
+public class SlideExternalLinkManagerTest {
+    
+    @Mock
+    private SlideExternalLinkRepository externalLinkRepo;
+
+    @Mock
+    private SlideExternalLinkDisplayRepository externalLinkDisplayRepo;
+
+    @Mock
+    private SlideManager slideManager;
+
+    @Mock
+    private SlideDisplayManager slideDisplayManager;
+
+    @Mock
+    private ISlideExternalLinkFactory externalLinkFactory;
+
+    @Mock
+    private ISlideExternalLinkDisplayFactory externalLinkDisplayFactory;
+
+    @InjectMocks
+    private SlideExternalLinkManager managerToTest = new SlideExternalLinkManager();
+
+    private String slideId1;
+    private String externalLinkURL;
+
+    @Before
+    public void init() {
+        MockitoAnnotations.initMocks(this);
+        slideId1 = "SLA000000014";
+        externalLinkURL = "www.google.com";
+    }
+
+    @Test
+    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException {
+
+        Slide slide = new Slide();
+        slide.setId(slideId1);
+        IVSImage slideImage = new VSImage();
+        slideImage.setHeight(700);
+        slideImage.setWidth(1300);
+        slide.setImage(slideImage);
+
+        ISpaceDisplay displayAttributes = new SpaceDisplay();
+        displayAttributes.setHeight(700);
+        displayAttributes.setWidth(1300);
+
+        Mockito.when(slideDisplayManager.getBySpace(slide)).thenReturn(displayAttributes);
+        Mockito.when(slideManager.getSlide(slide.getId())).thenReturn(slide);
+
+        IExternalLinkSlide externalLink = new ExternalLink();
+        ExternalLinkValue externalLinkValue = new ExternalLinkValue(externalLinkURL);
+        externalLink.setId("SEXL001");
+        externalLink.setTarget(externalLinkValue);
+        Mockito.when(slideManager.getSlide(slideId1)).thenReturn(slide);
+        Mockito.when(externalLinkFactory.createExternalLink("New External Link", slide)).thenReturn(externalLink);
+
+        Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
+
+        ISlideExternalLinkDisplay externalDisplayLink = new SlideExternalLinkDisplay();
+        externalDisplayLink.setId("SEXLD001");
+
+        externalDisplayLink.setPositionX(10);
+        externalDisplayLink.setPositionY(30);
+        externalDisplayLink.setRotation(40);
+        externalDisplayLink.setType(DisplayType.ARROW);
+        externalDisplayLink.setExternalLink(externalLink);
+        Mockito.when(externalLinkDisplayFactory.createExternalLinkDisplay(externalLink)).thenReturn(externalDisplayLink);
+
+        Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
+        Mockito.when(externalLinkDisplayRepo.save((SlideExternalLinkDisplay)externalDisplayLink)).thenReturn((SlideExternalLinkDisplay)externalDisplayLink);
+
+        ISlideExternalLinkDisplay savedExternalLinkDisplay1 = managerToTest.createLink("New External Link", slideId1, 10, 30, 40, "SEXL001", "New External Link", DisplayType.ARROW, null, null,null);
+        Assert.assertEquals(externalDisplayLink.getId(), savedExternalLinkDisplay1.getId());
+        Assert.assertEquals(externalDisplayLink.getName(), savedExternalLinkDisplay1.getName());
+        Assert.assertEquals(new Double(externalDisplayLink.getPositionX()), new Double(savedExternalLinkDisplay1.getPositionX()));
+        Assert.assertEquals(new Double(externalDisplayLink.getPositionY()), new Double(savedExternalLinkDisplay1.getPositionY()));
+        Assert.assertEquals(externalDisplayLink.getRotation(), savedExternalLinkDisplay1.getRotation());
+        Assert.assertEquals(externalDisplayLink.getType(), savedExternalLinkDisplay1.getType());
+        Assert.assertEquals(externalDisplayLink.getExternalLink(), savedExternalLinkDisplay1.getExternalLink());
+        Assert.assertEquals(externalDisplayLink.getExternalLink().getTarget().getValue(), savedExternalLinkDisplay1.getExternalLink().getTarget().getValue());
+        Mockito.verify(externalLinkDisplayRepo).save((SlideExternalLinkDisplay)externalDisplayLink);
+    }
+
+}

From 9f6ac3925b68c0ef27c6115360c8977813c5af29 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Thu, 9 Nov 2023 12:48:12 -0700
Subject: [PATCH 44/64] [story/VSPC-242]Created slide display manager

---
 .../core/services/ISlideDisplayManager.java   |  9 ++
 .../services/impl/SlideDisplayManager.java    | 87 +++++++++++++++++++
 .../staff/AddSlideExternalLinkController.java |  9 ++
 3 files changed, 105 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
new file mode 100644
index 000000000..7111ac09e
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
@@ -0,0 +1,9 @@
+package edu.asu.diging.vspace.core.services;
+
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
+
+public interface ISlideDisplayManager {
+    ISlideDisplay getBySlide(ISlide slide);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
new file mode 100644
index 000000000..a0cbef2a3
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
@@ -0,0 +1,87 @@
+package edu.asu.diging.vspace.core.services.impl;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Service;
+
+import edu.asu.diging.vspace.core.data.display.SpaceDisplayRepository;
+import edu.asu.diging.vspace.core.factory.ISpaceDisplayFactory;
+import edu.asu.diging.vspace.core.file.IStorageEngine;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.IVSImage;
+import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
+import edu.asu.diging.vspace.core.services.IImageService;
+import edu.asu.diging.vspace.core.services.ISpaceDisplayManager;
+import edu.asu.diging.vspace.core.services.impl.model.ImageData;
+
+@Service
+@PropertySource("classpath:config.properties")
+public class SlideDisplayManager implements ISlideDisplayManager{
+    
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Value("${bg_image_max_width}")
+    private int maxBgImageWidth;
+
+    @Value("${bg_image_max_height}")
+    private int maxBgImageHeight;
+
+    @Autowired
+    private SlideDisplayRepository slideDisplayRepo;
+
+    @Autowired
+    private ISpaceDisplayFactory displayFactory;
+
+    @Autowired
+    private IImageService imageService;
+
+    @Autowired
+    private IStorageEngine storage;
+    
+    @Override
+    public ISlideDisplay getBySlide(ISpace slide) {
+        IVSImage image = slide!=null ? slide.getImage():null;
+        List<SpaceDisplay> displays = spaceDisplayRepo.getBySlide(slide);
+        ISpaceDisplay display = displays.isEmpty() ? null:displays.get(0);
+        if(display==null) {
+            display = displayFactory.createSpaceDisplay();
+        }
+     
+        if(image!=null) {
+            if(image.getWidth()<=0 || image.getHeight()<=0) {
+                try {
+                    ImageData data = imageService.getImageData(storage.getMediaContent(image.getId(), image.getFilename()));
+                    if (data != null) {
+                        image.setWidth(data.getWidth());
+                        image.setHeight(data.getHeight());
+                    }
+                    
+                } catch (IOException e) {
+                    logger.error("Could not get image.", e);
+                    return display;
+                }
+            }
+
+            if(image.getWidth()<=maxBgImageWidth && image.getHeight()<=maxBgImageHeight) {
+                display.setWidth(image.getWidth());
+                display.setHeight(image.getHeight());
+                return display;
+            }
+
+            ImageData data = imageService.getImageDimensions(image, maxBgImageWidth, maxBgImageHeight);
+            display.setHeight(data.getHeight());
+            display.setWidth(data.getWidth());
+            spaceDisplayRepo.save((SpaceDisplay) display);
+        }
+
+        return display;
+    }
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index ddde14e44..643efed21 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -1,11 +1,13 @@
 package edu.asu.diging.vspace.web.staff;
 
 import java.io.IOException;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -18,12 +20,14 @@
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.model.IContentBlock;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.services.IContentBlockManager;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
@@ -38,6 +42,9 @@ public class AddSlideExternalLinkController {
     @Autowired
     private ISlideExternalLinkManager slideExternalLinkManager;
     
+    @Autowired
+    private IContentBlockManager contentBlockManager;
+    
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
     public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, 
             @RequestParam("x") String x, @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
@@ -68,6 +75,8 @@ public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String
         linkNode.put("x", display.getPositionX());
         linkNode.put("y", display.getPositionY());
         linkNode.put("url", display.getExternalLink().getId());
+       
+        
 
         return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
     }

From 7d1817d7b4d829e4a8a046a8bdfc92b158977e60 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 14 Nov 2023 15:31:31 -0700
Subject: [PATCH 45/64] [VSPC-242]Test and Template issue

---
 .../web/staff/AddSlideExternalLinkController.java    |  4 +---
 .../WEB-INF/views/staff/modules/slides/slide.html    | 12 +++++++++---
 .../services/impl/SlideExternalLinkManagerTest.java  | 11 +++++++----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 643efed21..9a1df366b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -75,9 +75,7 @@ public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String
         linkNode.put("x", display.getPositionX());
         linkNode.put("y", display.getPositionY());
         linkNode.put("url", display.getExternalLink().getId());
-       
-        
-
+ 
         return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
     }
 
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 76b430928..968f5c553 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -2293,6 +2293,8 @@ <h5 class="modal-title">Select from the
             <div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
         	<img id="bgImage" style="max-width: 461px;" th:src="@{'/api/image/'+${contents.image.id}}" />
         	
+        	
+        	
         	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
 			        <div class="divider"></div>
 			        <form id="createExternalLinkForm" style="z-index: 1;">
@@ -2473,16 +2475,20 @@ <h6 class="alert-heading">
 		        </div>
 		        </div>
 		        
-		        
-		        <div id="slideSpace">
+		        <div id="main-space">
                 <div th:each="contents: ${slideContents}">
                     <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="valueDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}">
-                        <img th:id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}" />
+                        <img id="main-bgImage" th:id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}" />
                         <input type="hidden" id="deleteImageId" th:value="${contents.id}"> 
                         <a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"> 
                         <span class="icon-trash error"></span>
                         </a>
                     </div>
+                  </div>
+                  </div>
+		        
+		        <div id="slideSpace">
+                <div th:each="contents: ${slideContents}">
                      <div th:attr="data-position=${contents.contentOrder}" class="tab vidDiv row" th:id="${contents.id}" th:if="${#strings.equals(contents['class'].simpleName,'VideoBlock')}">
 	                    <div>
 	                    	<h3><strong>[[${contents.video.title}]]</strong></h3>
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
index 45851b438..85d142d6a 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
@@ -13,6 +13,7 @@
 import edu.asu.diging.vspace.core.data.SlideExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
@@ -23,9 +24,11 @@
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
@@ -69,7 +72,7 @@ public void init() {
     }
 
     @Test
-    public void test_createLink_success() throws SpaceDoesNotExistException, ImageCouldNotBeStoredException {
+    public void test_createLink_success() throws SlideDoesNotExistException, ImageCouldNotBeStoredException {
 
         Slide slide = new Slide();
         slide.setId(slideId1);
@@ -78,14 +81,14 @@ public void test_createLink_success() throws SpaceDoesNotExistException, ImageCo
         slideImage.setWidth(1300);
         slide.setImage(slideImage);
 
-        ISpaceDisplay displayAttributes = new SpaceDisplay();
+        ISlideDisplay displayAttributes = new SlideDisplay();
         displayAttributes.setHeight(700);
         displayAttributes.setWidth(1300);
 
-        Mockito.when(slideDisplayManager.getBySpace(slide)).thenReturn(displayAttributes);
+        Mockito.when(slideDisplayManager.getBySlide(slide)).thenReturn(displayAttributes);
         Mockito.when(slideManager.getSlide(slide.getId())).thenReturn(slide);
 
-        IExternalLinkSlide externalLink = new ExternalLink();
+        IExternalLinkSlide externalLink = new ExternalLinkSlide();
         ExternalLinkValue externalLinkValue = new ExternalLinkValue(externalLinkURL);
         externalLink.setId("SEXL001");
         externalLink.setTarget(externalLinkValue);

From b580b60102746dbc1e0ed10c13bc901d4f7045cb Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 15 Nov 2023 16:29:09 -0700
Subject: [PATCH 46/64] [story/VSPC-242] Updated the entity

---
 .../asu/diging/vspace/core/model/ISlide.java   |  4 ++++
 .../diging/vspace/core/model/impl/Slide.java   | 16 ++++++++++++++++
 .../core/services/ISlideDisplayManager.java    |  2 ++
 .../services/impl/SlideDisplayManager.java     | 18 ++++++++++++------
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index 713853f06..f54cc8574 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -20,4 +20,8 @@ public interface ISlide extends IVSpaceElement {
 
     void setExternalLinks(List<IExternalLinkSlide> externalLinks);
     
+    IVSImage getImage();
+
+    void setImage(IVSImage image);
+    
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 761144cbe..99aa36d8b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -12,8 +12,11 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.annotations.Parameter;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -26,6 +29,7 @@
 import edu.asu.diging.vspace.core.model.ISequence;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ITextBlock;
+import edu.asu.diging.vspace.core.model.IVSImage;
 
 @Entity
 public class Slide extends VSpaceElement implements ISlide {
@@ -50,6 +54,10 @@ public class Slide extends VSpaceElement implements ISlide {
     @JsonIgnore
     @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class)
     private List<IExternalLinkSlide> externalLinks;
+    
+    @OneToOne(targetEntity = VSImage.class)
+    @NotFound(action = NotFoundAction.IGNORE)
+    private IVSImage image;
 
     /*
      * (non-Javadoc)
@@ -159,6 +167,14 @@ public List<ISequence> getSequence() {
     public void setSequence(List<ISequence> sequence) {
         this.sequence = sequence;
     }
+    
+    public IVSImage getImage() {
+        return image;
+    }
+
+    public void setImage(IVSImage image) {
+        this.image = image;
+    }
 
     /**
      * This Method will retrieve the first ImageBlock of a slide if the ImageBlock
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
index 7111ac09e..acd9e75f9 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
@@ -1,6 +1,8 @@
 package edu.asu.diging.vspace.core.services;
 
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
 import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 
 public interface ISlideDisplayManager {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
index a0cbef2a3..4dfc06870 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
@@ -10,14 +10,20 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
 
+import edu.asu.diging.vspace.core.data.display.SlideDisplayRepository;
 import edu.asu.diging.vspace.core.data.display.SpaceDisplayRepository;
+import edu.asu.diging.vspace.core.factory.ISlideDisplayFactory;
 import edu.asu.diging.vspace.core.factory.ISpaceDisplayFactory;
 import edu.asu.diging.vspace.core.file.IStorageEngine;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
+import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
 import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
 import edu.asu.diging.vspace.core.services.IImageService;
+import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
 import edu.asu.diging.vspace.core.services.ISpaceDisplayManager;
 import edu.asu.diging.vspace.core.services.impl.model.ImageData;
 
@@ -37,7 +43,7 @@ public class SlideDisplayManager implements ISlideDisplayManager{
     private SlideDisplayRepository slideDisplayRepo;
 
     @Autowired
-    private ISpaceDisplayFactory displayFactory;
+    private ISlideDisplayFactory displayFactory;
 
     @Autowired
     private IImageService imageService;
@@ -46,12 +52,12 @@ public class SlideDisplayManager implements ISlideDisplayManager{
     private IStorageEngine storage;
     
     @Override
-    public ISlideDisplay getBySlide(ISpace slide) {
+    public ISlideDisplay getBySlide(ISlide slide) {
         IVSImage image = slide!=null ? slide.getImage():null;
-        List<SpaceDisplay> displays = spaceDisplayRepo.getBySlide(slide);
-        ISpaceDisplay display = displays.isEmpty() ? null:displays.get(0);
+        List<SlideDisplay> displays = slideDisplayRepo.getBySlide(slide);
+        ISlideDisplay display = displays.isEmpty() ? null:displays.get(0);
         if(display==null) {
-            display = displayFactory.createSpaceDisplay();
+            display = displayFactory.createSlideDisplay();
         }
      
         if(image!=null) {
@@ -78,7 +84,7 @@ public ISlideDisplay getBySlide(ISpace slide) {
             ImageData data = imageService.getImageDimensions(image, maxBgImageWidth, maxBgImageHeight);
             display.setHeight(data.getHeight());
             display.setWidth(data.getWidth());
-            spaceDisplayRepo.save((SpaceDisplay) display);
+            slideDisplayRepo.save((SlideDisplay) display);
         }
 
         return display;

From 0d0fcfefc1a1f66686c0f731e4db7ed551f5fa0e Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 17 Nov 2023 13:49:59 -0700
Subject: [PATCH 47/64] [story/VSPC-242] slide display

---
 .../java/edu/asu/diging/vspace/core/model/ISlide.java |  5 +----
 .../edu/asu/diging/vspace/core/model/impl/Slide.java  | 11 -----------
 .../asu/diging/vspace/web/staff/SlideController.java  | 11 +++++++++++
 .../services/impl/SlideExternalLinkManagerTest.java   |  3 +--
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index f54cc8574..ef11de3f7 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -19,9 +19,6 @@ public interface ISlide extends IVSpaceElement {
     List<IExternalLinkSlide> getExternalLinks();
 
     void setExternalLinks(List<IExternalLinkSlide> externalLinks);
-    
-    IVSImage getImage();
-
-    void setImage(IVSImage image);
+   
     
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 99aa36d8b..224e27bbf 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -55,9 +55,6 @@ public class Slide extends VSpaceElement implements ISlide {
     @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class)
     private List<IExternalLinkSlide> externalLinks;
     
-    @OneToOne(targetEntity = VSImage.class)
-    @NotFound(action = NotFoundAction.IGNORE)
-    private IVSImage image;
 
     /*
      * (non-Javadoc)
@@ -168,14 +165,6 @@ public void setSequence(List<ISequence> sequence) {
         this.sequence = sequence;
     }
     
-    public IVSImage getImage() {
-        return image;
-    }
-
-    public void setImage(IVSImage image) {
-        this.image = image;
-    }
-
     /**
      * This Method will retrieve the first ImageBlock of a slide if the ImageBlock
      * is present
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index f5610886d..c9f52b084 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -17,12 +17,16 @@
 
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
 import edu.asu.diging.vspace.core.model.IContentBlock;
+import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
+import edu.asu.diging.vspace.core.model.impl.ImageBlock;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
+import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
+import edu.asu.diging.vspace.core.services.ISpaceDisplayManager;
 import edu.asu.diging.vspace.web.staff.forms.SequenceForm;
 
 @Transactional
@@ -40,6 +44,10 @@ public class SlideController {
     
     @Autowired
     private IExternalLinkManager externalLinkManager;
+    
+    @Autowired
+    private ISlideDisplayManager slideDisplayManager;
+   
 
     @RequestMapping("/staff/module/{moduleId}/slide/{id}")
     public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) {
@@ -50,7 +58,10 @@ public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId"
         model.addAttribute("externalLinks", externalLinkManager.getLinkDisplays(id));
         model.addAttribute("slideSequences", slideManager.getSlideSequences(id, moduleId));
         List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(id);
+        IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
+        slideManager.storeSlideDisplay(slide, imageblock.getImage());
         model.addAttribute("slideContents", slideContents);
+        model.addAttribute("display", slideDisplayManager.getBySlide(slide,imageblock.getImage()));
         model.addAttribute("contentCount",slideContents.size()>0 ? slideContents.get(slideContents.size()-1).getContentOrder() : 0);
         if(slideManager.getSlide(id) instanceof BranchingPoint) {
             model.addAttribute("choices", ((IBranchingPoint)slide).getChoices());
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
index 85d142d6a..da6949455 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
@@ -79,13 +79,12 @@ public void test_createLink_success() throws SlideDoesNotExistException, ImageCo
         IVSImage slideImage = new VSImage();
         slideImage.setHeight(700);
         slideImage.setWidth(1300);
-        slide.setImage(slideImage);
 
         ISlideDisplay displayAttributes = new SlideDisplay();
         displayAttributes.setHeight(700);
         displayAttributes.setWidth(1300);
 
-        Mockito.when(slideDisplayManager.getBySlide(slide)).thenReturn(displayAttributes);
+        Mockito.when(slideDisplayManager.getBySlide(slide, slideImage)).thenReturn(displayAttributes);
         Mockito.when(slideManager.getSlide(slide.getId())).thenReturn(slide);
 
         IExternalLinkSlide externalLink = new ExternalLinkSlide();

From 20c23d9454d70c5168a629403b8b30c2e1f2b1cf Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Mon, 20 Nov 2023 12:58:53 -0700
Subject: [PATCH 48/64] [story/VSPC-242]Slide Display entity

---
 .../data/display/SlideDisplayRepository.java  |  22 ++++
 .../core/model/display/ISlideDisplay.java     |  23 ++++
 .../core/model/display/impl/SlideDisplay.java | 118 ++++++++++++++++++
 3 files changed, 163 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java
new file mode 100644
index 000000000..db4a7ccf7
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java
@@ -0,0 +1,22 @@
+package edu.asu.diging.vspace.core.data.display;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
+
+public interface SlideDisplayRepository extends PagingAndSortingRepository<SlideDisplay, String>{
+    
+    @Modifying
+    @Query("delete from SlideDisplay where slide_id = ?1")
+    void deleteBySlideId(String id);
+
+    public List<SlideDisplay> getBySlide(ISlide slide);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java
new file mode 100644
index 000000000..316b99c31
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java
@@ -0,0 +1,23 @@
+package edu.asu.diging.vspace.core.model.display;
+
+import edu.asu.diging.vspace.core.model.ISlide;
+
+public interface ISlideDisplay {
+    
+    String getId();
+
+    void setId(String id);
+
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
+
+    int getWidth();
+
+    void setWidth(int width);
+
+    int getHeight();
+
+    void setHeight(int height);
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java
new file mode 100644
index 000000000..51544ffe7
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java
@@ -0,0 +1,118 @@
+package edu.asu.diging.vspace.core.model.display.impl;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
+import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
+import edu.asu.diging.vspace.core.model.impl.Slide;
+import edu.asu.diging.vspace.core.model.impl.Space;
+
+@Entity
+public class SlideDisplay implements ISlideDisplay{
+    
+    @Id
+    @GeneratedValue(generator = "slide_display_id_generator")
+    @GenericGenerator(name = "slide_display_id_generator", parameters = @Parameter(name = "prefix", value = "SLD"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+    private String id;
+
+    @OneToOne(targetEntity = Slide.class)
+    private ISlide slide;
+
+    private int width;
+    private int height;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideeDisplay#getId()
+     */
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setId(java.lang.
+     * String)
+     */
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#getSlide()
+     */
+    @Override
+    public ISlide getSlide() {
+        return slide;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setSlide(edu.asu.
+     * diging.vspace.core.model.ISlide)
+     */
+    @Override
+    public void setSlide(ISlide slide) {
+        this.slide = slide;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#getWidth()
+     */
+    @Override
+    public int getWidth() {
+        return width;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setWidth(int)
+     */
+    @Override
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#getHeight()
+     */
+    @Override
+    public int getHeight() {
+        return height;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setHeight(int)
+     */
+    @Override
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+}

From 2592d8182d4cb5b74937fad8910308a2d70d44a9 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 21 Nov 2023 15:24:05 -0700
Subject: [PATCH 49/64] [story/VSPC-242] factory

---
 .../core/factory/ISlideDisplayFactory.java       |  8 ++++++++
 .../core/factory/impl/SlideDisplayFactory.java   | 16 ++++++++++++++++
 .../diging/vspace/web/staff/SlideController.java |  1 -
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java
new file mode 100644
index 000000000..b669aa786
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java
@@ -0,0 +1,8 @@
+package edu.asu.diging.vspace.core.factory;
+
+import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
+
+public interface ISlideDisplayFactory {
+    ISlideDisplay createSlideDisplay();
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java
new file mode 100644
index 000000000..6dc0b21ac
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java
@@ -0,0 +1,16 @@
+package edu.asu.diging.vspace.core.factory.impl;
+
+import org.springframework.stereotype.Component;
+
+import edu.asu.diging.vspace.core.factory.ISlideDisplayFactory;
+import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
+
+@Component
+public class SlideDisplayFactory implements ISlideDisplayFactory{
+    
+    public ISlideDisplay createSlideDisplay() {
+        return new SlideDisplay();
+    }
+
+}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index c9f52b084..12a8b8da5 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -26,7 +26,6 @@
 import edu.asu.diging.vspace.core.services.IModuleManager;
 import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
-import edu.asu.diging.vspace.core.services.ISpaceDisplayManager;
 import edu.asu.diging.vspace.web.staff.forms.SequenceForm;
 
 @Transactional

From 95d5b40a0b9a798e0a2f769022870bcb8061bd75 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 22 Nov 2023 16:25:43 -0700
Subject: [PATCH 50/64] [story/VSPC-242]validation and store

---
 .../core/services/ISlideDisplayManager.java   |  3 +-
 .../vspace/core/services/ISlideManager.java   |  3 ++
 .../services/impl/SlideDisplayManager.java    | 11 ++---
 .../core/services/impl/SlideManager.java      | 42 +++++++++++++++++++
 4 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
index acd9e75f9..066290f91 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
@@ -2,10 +2,11 @@
 
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
 import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 
 public interface ISlideDisplayManager {
-    ISlideDisplay getBySlide(ISlide slide);
+    ISlideDisplay getBySlide(ISlide slide, IVSImage img);
 
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
index 3cb86052e..d4bf72444 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
@@ -10,6 +10,7 @@
 import edu.asu.diging.vspace.core.model.IChoice;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
@@ -35,5 +36,7 @@ public interface ISlideManager {
     List<Sequence> getSlideSequences(String slideId, String moduleId);
     
     Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);
+
+    void storeSlideDisplay(ISlide slide, IVSImage image);
     
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
index 4dfc06870..37b2861ea 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
@@ -11,20 +11,14 @@
 import org.springframework.stereotype.Service;
 
 import edu.asu.diging.vspace.core.data.display.SlideDisplayRepository;
-import edu.asu.diging.vspace.core.data.display.SpaceDisplayRepository;
 import edu.asu.diging.vspace.core.factory.ISlideDisplayFactory;
-import edu.asu.diging.vspace.core.factory.ISpaceDisplayFactory;
 import edu.asu.diging.vspace.core.file.IStorageEngine;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
 import edu.asu.diging.vspace.core.services.IImageService;
 import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
-import edu.asu.diging.vspace.core.services.ISpaceDisplayManager;
 import edu.asu.diging.vspace.core.services.impl.model.ImageData;
 
 @Service
@@ -52,8 +46,9 @@ public class SlideDisplayManager implements ISlideDisplayManager{
     private IStorageEngine storage;
     
     @Override
-    public ISlideDisplay getBySlide(ISlide slide) {
-        IVSImage image = slide!=null ? slide.getImage():null;
+    public ISlideDisplay getBySlide(ISlide slide, IVSImage img) {
+        
+        IVSImage image = slide!=null ? img:null;
         List<SlideDisplay> displays = slideDisplayRepo.getBySlide(slide);
         ISlideDisplay display = displays.isEmpty() ? null:displays.get(0);
         if(display==null) {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
index 515fa1b4c..51755e6c8 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
@@ -20,9 +20,13 @@
 import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
 import edu.asu.diging.vspace.core.data.SequenceRepository;
 import edu.asu.diging.vspace.core.data.SlideRepository;
+import edu.asu.diging.vspace.core.data.display.SlideDisplayRepository;
+import edu.asu.diging.vspace.core.data.display.SpaceDisplayRepository;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
+import edu.asu.diging.vspace.core.factory.ISlideDisplayFactory;
+import edu.asu.diging.vspace.core.factory.ISpaceDisplayFactory;
 import edu.asu.diging.vspace.core.factory.impl.ChoiceFactory;
 import edu.asu.diging.vspace.core.factory.impl.SlideFactory;
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
@@ -30,14 +34,21 @@
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
+import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
+import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.model.impl.Choice;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
 import edu.asu.diging.vspace.core.model.impl.Slide;
+import edu.asu.diging.vspace.core.model.impl.Space;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.web.staff.forms.SlideForm;
 
@@ -50,6 +61,12 @@ public class SlideManager implements ISlideManager {
     @Autowired
     private SlideRepository slideRepo;
     
+    @Autowired
+    private ISlideDisplayFactory slideDisplayFactory;
+    
+    @Autowired
+    private SlideDisplayRepository slideDisplayRepo;
+    
     @Autowired
     private IExternalLinkFactory externalLinkFactory;
 
@@ -82,6 +99,31 @@ public ISlide createSlide(IModule module, SlideForm slideForm, SlideType type) {
         ISlide slide = slideFactory.createSlide(module, slideForm, type);
         return slideRepo.save((Slide) slide);
     }
+    
+    @Override
+    public void storeSlideDisplay(ISlide slide, IVSImage image) {
+        
+        List<SlideDisplay> displays = null;
+        if (slide.getId() != null) {
+            displays = slideDisplayRepo.getBySlide(slide);
+        }
+        ISlideDisplay slideDisplay;
+        if (displays == null || displays.isEmpty()) {
+            slideDisplay = slideDisplayFactory.createSlideDisplay();
+        } else {
+            slideDisplay = displays.get(0);
+        }
+
+        if (image != null) {
+            //space.setImage(image);
+            slideDisplay.setHeight(image.getHeight());
+            slideDisplay.setWidth(image.getWidth());
+        }
+
+        slideDisplay.setSlide(slide);
+        slideDisplayRepo.save((SlideDisplay) slideDisplay);
+        
+    }
 
     @Override
     public IBranchingPoint createBranchingPoint(IModule module, SlideForm slideForm, SlideType type) {

From 64df79540c4272a27d2bb4361a6e869dcfe217ab Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Tue, 28 Nov 2023 16:04:37 -0700
Subject: [PATCH 51/64] [story/VSPC-242]test for factory and update

---
 .../asu/diging/vspace/core/model/ISlide.java  |  4 ++
 .../impl/SlideExternalLinkDisplay.java        |  2 +-
 .../core/model/impl/ExternalLinkSlide.java    |  2 +-
 .../diging/vspace/core/model/impl/Slide.java  | 13 +++++++
 .../staff/AddSlideExternalLinkController.java |  6 ---
 .../SlideExternalLinkDisplayFactoryTest.java  | 38 +++++++++++++++++++
 .../impl/SlideExternalLinkManagerTest.java    | 35 +++++++++++++++--
 7 files changed, 89 insertions(+), 11 deletions(-)
 create mode 100644 vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index ef11de3f7..3a05d5559 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -19,6 +19,10 @@ public interface ISlide extends IVSpaceElement {
     List<IExternalLinkSlide> getExternalLinks();
 
     void setExternalLinks(List<IExternalLinkSlide> externalLinks);
+    
+    IVSImage getImage();
+
+    void setImage(IVSImage image);
    
     
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
index 943d7d441..69711b0e0 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
@@ -19,7 +19,7 @@ public class SlideExternalLinkDisplay extends LinkDisplay implements ISlideExter
     @Id
     @GeneratedValue(generator = "externallink_display_id_generator")
     @GenericGenerator(name = "externallink_display_id_generator", 
-      parameters = @Parameter(name = "prefix", value = "SEXLD"),
+      parameters = @Parameter(name = "prefix", value = "EXLDS"),
       strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
     private String id;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
index ece22de81..a4c705ab3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
@@ -18,7 +18,7 @@ public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSli
     @Id 
     @GeneratedValue(generator = "extlink_id_generator")
     @GenericGenerator(name = "extlink_id_generator", 
-        parameters = @Parameter(name = "prefix", value = "SEXL"), 
+        parameters = @Parameter(name = "prefix", value = "EXLS"), 
         strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
     private String id;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 224e27bbf..edd1e8aff 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -55,6 +55,11 @@ public class Slide extends VSpaceElement implements ISlide {
     @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class)
     private List<IExternalLinkSlide> externalLinks;
     
+    @OneToOne(targetEntity = VSImage.class)
+    @NotFound(action = NotFoundAction.IGNORE)
+    private IVSImage image;
+
+    
 
     /*
      * (non-Javadoc)
@@ -119,6 +124,14 @@ public void setExternalLinks(List<IExternalLinkSlide> externalLinks) {
         this.externalLinks = externalLinks;
     }
     
+    public IVSImage getImage() {
+        return image;
+    }
+
+    public void setImage(IVSImage image) {
+        this.image = image;
+    }
+    
     /*
      * (non-Javadoc)
      * 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 9a1df366b..ec570f49f 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -19,19 +19,13 @@
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
-import edu.asu.diging.vspace.core.model.IContentBlock;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
-import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
-import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Controller
 public class AddSlideExternalLinkController {
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java
new file mode 100644
index 000000000..7f6a7b1e0
--- /dev/null
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java
@@ -0,0 +1,38 @@
+package edu.asu.diging.vspace.core.factory.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+
+@RunWith(MockitoJUnitRunner.class)
+public class SlideExternalLinkDisplayFactoryTest {
+    
+    @Mock
+    private IExternalLinkSlide mockExternalLink;
+
+    @InjectMocks
+    private SlideExternalLinkDisplayFactory externalLinkDisplayFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void test_createExternalLinkDisplay_success() {
+        ISlideExternalLinkDisplay externalLinkDisplay = externalLinkDisplayFactory.createExternalLinkDisplay(mockExternalLink);
+        assertNotNull(externalLinkDisplay);
+        assertEquals(mockExternalLink, externalLinkDisplay.getExternalLink());
+    }
+
+}
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
index da6949455..824bbeaa1 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
@@ -13,6 +13,7 @@
 import edu.asu.diging.vspace.core.data.SlideExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
@@ -21,6 +22,8 @@
 import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
@@ -89,7 +92,7 @@ public void test_createLink_success() throws SlideDoesNotExistException, ImageCo
 
         IExternalLinkSlide externalLink = new ExternalLinkSlide();
         ExternalLinkValue externalLinkValue = new ExternalLinkValue(externalLinkURL);
-        externalLink.setId("SEXL001");
+        externalLink.setId("EXLS001");
         externalLink.setTarget(externalLinkValue);
         Mockito.when(slideManager.getSlide(slideId1)).thenReturn(slide);
         Mockito.when(externalLinkFactory.createExternalLink("New External Link", slide)).thenReturn(externalLink);
@@ -97,7 +100,7 @@ public void test_createLink_success() throws SlideDoesNotExistException, ImageCo
         Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
 
         ISlideExternalLinkDisplay externalDisplayLink = new SlideExternalLinkDisplay();
-        externalDisplayLink.setId("SEXLD001");
+        externalDisplayLink.setId("EXLDS001");
 
         externalDisplayLink.setPositionX(10);
         externalDisplayLink.setPositionY(30);
@@ -109,7 +112,7 @@ public void test_createLink_success() throws SlideDoesNotExistException, ImageCo
         Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
         Mockito.when(externalLinkDisplayRepo.save((SlideExternalLinkDisplay)externalDisplayLink)).thenReturn((SlideExternalLinkDisplay)externalDisplayLink);
 
-        ISlideExternalLinkDisplay savedExternalLinkDisplay1 = managerToTest.createLink("New External Link", slideId1, 10, 30, 40, "SEXL001", "New External Link", DisplayType.ARROW, null, null,null);
+        ISlideExternalLinkDisplay savedExternalLinkDisplay1 = managerToTest.createLink("New External Link", slideId1, 10, 30, 40, "EXLS001", "New External Link", DisplayType.ARROW, null, null,null);
         Assert.assertEquals(externalDisplayLink.getId(), savedExternalLinkDisplay1.getId());
         Assert.assertEquals(externalDisplayLink.getName(), savedExternalLinkDisplay1.getName());
         Assert.assertEquals(new Double(externalDisplayLink.getPositionX()), new Double(savedExternalLinkDisplay1.getPositionX()));
@@ -120,5 +123,31 @@ public void test_createLink_success() throws SlideDoesNotExistException, ImageCo
         Assert.assertEquals(externalDisplayLink.getExternalLink().getTarget().getValue(), savedExternalLinkDisplay1.getExternalLink().getTarget().getValue());
         Mockito.verify(externalLinkDisplayRepo).save((SlideExternalLinkDisplay)externalDisplayLink);
     }
+    
+    @Test
+    public void test_updateLink_success() throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
+        ISlide slide = new Slide();
+        slide.setId(slideId1);
+        IVSImage slideImage = new VSImage();
+        slideImage.setHeight(700);
+        slideImage.setWidth(1300);
+        slide.setImage(slideImage);
+
+        ISlideDisplay displayAttributes = new SlideDisplay();
+        displayAttributes.setHeight(700);
+        displayAttributes.setWidth(1300);
+
+        Mockito.when(slideDisplayManager.getBySlide(slide,slideImage)).thenReturn(displayAttributes);
+        SlideExternalLinkDisplay externalLinkDisplay = new SlideExternalLinkDisplay();
+        IExternalLinkSlide externalLink = new ExternalLinkSlide();
+        externalLink.setId("EXLS001");
+        externalLink.setSlide(slide);
+        externalLink.setTarget(new ExternalLinkValue("stackOverflow.com"));
+        externalLinkDisplay.setId("EXLDS001");
+
+        externalLinkDisplay.setExternalLink(externalLink);
+    }
+    
+    
 
 }

From a2e534ea26a42be787563cb217df0e51ff95c4dd Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Wed, 29 Nov 2023 17:13:56 -0700
Subject: [PATCH 52/64] [story/VSPC-242]Update link test cases

---
 .../core/services/impl/SlideManager.java      |  2 +-
 .../impl/SlideExternalLinkManagerTest.java    | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
index 51755e6c8..26ec74ac1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
@@ -115,7 +115,7 @@ public void storeSlideDisplay(ISlide slide, IVSImage image) {
         }
 
         if (image != null) {
-            //space.setImage(image);
+            slide.setImage(image);
             slideDisplay.setHeight(image.getHeight());
             slideDisplay.setWidth(image.getWidth());
         }
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
index 824bbeaa1..19428ffac 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
@@ -1,5 +1,7 @@
 package edu.asu.diging.vspace.core.services.impl;
 
+import java.util.Optional;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -146,6 +148,32 @@ public void test_updateLink_success() throws SlideDoesNotExistException, LinkDoe
         externalLinkDisplay.setId("EXLDS001");
 
         externalLinkDisplay.setExternalLink(externalLink);
+        
+        externalLinkDisplay.setName("TestExternalEdited");
+        externalLinkDisplay.setPositionX(100);
+        externalLinkDisplay.setPositionY(300);
+        externalLinkDisplay.setType(DisplayType.ALERT);
+
+        Mockito.when(slideManager.getSpace(slideId1)).thenReturn(slide);
+        ExternalLink newExternalLink = new ExternalLink(); 
+        newExternalLink.setId("externalLink1");
+        Optional<ExternalLinkSlide> mockExternalLink = Optional.of((ExternalLinkSlide)externalLink);
+        Mockito.when(externalLinkRepo.findById(externalLink.getId())).thenReturn(mockExternalLink);
+
+        Optional<SlideExternalLinkDisplay> mockExternalLinkDisplay = Optional.of((SlideExternalLinkDisplay)externalLinkDisplay);
+        Mockito.when(externalLinkDisplayRepo.findById(externalLinkDisplay.getId())).thenReturn(mockExternalLinkDisplay);
+
+        Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
+        Mockito.when(externalLinkDisplayRepo.save((SlideExternalLinkDisplay)externalLinkDisplay)).thenReturn((SlideExternalLinkDisplay)externalLinkDisplay);
+
+        ISlideExternalLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestExternalNew", slideId1, 20, 40, 0, "www.google.com", "TestExternalNew", "EXLS001", "EXLDS001", DisplayType.ARROW, null, null,null);
+        Assert.assertEquals(externalLinkDisplay.getId(), actualUpdatedLink.getId());
+        Assert.assertEquals(externalLinkDisplay.getName(), actualUpdatedLink.getName());
+        Assert.assertEquals(new Double(externalLinkDisplay.getPositionX()), new Double(actualUpdatedLink.getPositionX()));
+        Assert.assertEquals(new Double(externalLinkDisplay.getPositionY()), new Double(actualUpdatedLink.getPositionY()));
+        Assert.assertEquals(externalLinkDisplay.getExternalLink().getId(), actualUpdatedLink.getExternalLink().getId());
+        Assert.assertEquals(externalLinkDisplay.getExternalLink().getTarget().getValue(), actualUpdatedLink.getExternalLink().getTarget().getValue());
+        Assert.assertEquals(externalLinkDisplay.getType(), actualUpdatedLink.getType());
     }
     
     

From 180eae71a59baf758da64ea37baadbe6aa90ee20 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Fri, 1 Dec 2023 14:08:01 -0700
Subject: [PATCH 53/64] [story/VSPC-242]Delete testcase

---
 .../impl/SlideExternalLinkManagerTest.java    | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
index 19428ffac..0253f45a0 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
@@ -1,5 +1,7 @@
 package edu.asu.diging.vspace.core.services.impl;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import org.junit.Assert;
@@ -154,7 +156,7 @@ public void test_updateLink_success() throws SlideDoesNotExistException, LinkDoe
         externalLinkDisplay.setPositionY(300);
         externalLinkDisplay.setType(DisplayType.ALERT);
 
-        Mockito.when(slideManager.getSpace(slideId1)).thenReturn(slide);
+        Mockito.when(slideManager.getSlide(slideId1)).thenReturn(slide);
         ExternalLink newExternalLink = new ExternalLink(); 
         newExternalLink.setId("externalLink1");
         Optional<ExternalLinkSlide> mockExternalLink = Optional.of((ExternalLinkSlide)externalLink);
@@ -176,6 +178,44 @@ public void test_updateLink_success() throws SlideDoesNotExistException, LinkDoe
         Assert.assertEquals(externalLinkDisplay.getType(), actualUpdatedLink.getType());
     }
     
+    @Test
+    public void test_deleteLink_linkPresent() {
+        ISlide slide = new Slide();
+        slide.setId(slideId1);
+        SlideExternalLinkDisplay externalLinkDisplay = new SlideExternalLinkDisplay();
+        IExternalLinkSlide externalLink = new ExternalLinkSlide();
+        externalLink.setId("EXLS001");
+        externalLink.setSlide(slide);
+
+        List<IExternalLinkSlide> externalLinks = new ArrayList<IExternalLinkSlide>();
+        externalLinks.add(externalLink);
+
+        slide.setExternalLinks(externalLinks);
+        ExternalLinkValue target = new ExternalLinkValue("www.google.com");
+        target.setId("EXTS001");
+        externalLink.setTarget(target);
+
+        externalLinkDisplay.setId("SPLD001");
+        externalLinkDisplay.setExternalLink(externalLink);
+
+        externalLinkDisplay.setName("TestExternal");
+        externalLinkDisplay.setPositionX(10);
+        externalLinkDisplay.setPositionY(30);
+        externalLinkDisplay.setPositionY(20);
+        externalLinkDisplay.setType(DisplayType.ARROW);
+
+        Optional<ExternalLinkSlide> mockExternalLink = Optional.of((ExternalLinkSlide)externalLink);
+        Mockito.when(externalLinkRepo.findById(externalLink.getId())).thenReturn(mockExternalLink);
+
+        Optional<SlideExternalLinkDisplay> mockExternalLinkDisplay = Optional.of((SlideExternalLinkDisplay)externalLinkDisplay);
+        Mockito.when(externalLinkDisplayRepo.findById(externalLinkDisplay.getId())).thenReturn(mockExternalLinkDisplay);
+
+        managerToTest.deleteLink("EXLS001");
+
+        Mockito.verify(externalLinkDisplayRepo).deleteByExternalLink(externalLink);
+        Mockito.verify(externalLinkRepo).delete((ExternalLinkSlide)externalLink);
+    }
+    
     
 
 }

From 79259ede18112155c6fca7fc09c93d6b744cf616 Mon Sep 17 00:00:00 2001
From: swetalina-prusty25 <sprusty1@asu.edu>
Date: Mon, 4 Dec 2023 16:36:35 -0700
Subject: [PATCH 54/64] [story/VSPC-242]display api

---
 .../diging/vspace/web/staff/SlideController.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index 12a8b8da5..47ab3a6b4 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -1,12 +1,15 @@
 package edu.asu.diging.vspace.web.staff;
 
 import java.security.Principal;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.transaction.Transactional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -25,6 +28,7 @@
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
 import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
+import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.web.staff.forms.SequenceForm;
 
@@ -42,7 +46,7 @@ public class SlideController {
     private IContentBlockManager contentBlockManager;
     
     @Autowired
-    private IExternalLinkManager externalLinkManager;
+    private ISlideExternalLinkManager externalLinkManager;
     
     @Autowired
     private ISlideDisplayManager slideDisplayManager;
@@ -75,4 +79,11 @@ public ResponseEntity<List<IContentBlock>> getAllContentBlocks(Model model, @Pat
         List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(slideId);
         return new ResponseEntity<List<IContentBlock>>(slideContents, HttpStatus.OK);
     }
+    
+    @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/links", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<Map<String,Object>> showSlideLinks(@PathVariable String id, Model model) {
+        Map<String,Object> responseData = new HashMap<String,Object>();
+        responseData.put("externalLinks", externalLinkManager.getLinkDisplays(id));
+        return new ResponseEntity<>(responseData, HttpStatus.OK);
+    }
 }

From 99d41ec0e1d76c31183906c2fca9ed34e645c312 Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Thu, 6 Jun 2024 17:20:19 -0700
Subject: [PATCH 55/64] [fixed creation, editing, and deletion of slide
 external links; cleaned up unneccessary code, fixed external links in UI]

---
 .../data/SlideExternalLinkRepository.java     |    9 +
 .../impl/SlideExternalLinkFactory.java        |    3 +
 .../vspace/core/model/IExternalLinkSlide.java |    1 -
 .../asu/diging/vspace/core/model/ISlide.java  |    2 +-
 .../core/model/impl/ExternalLinkSlide.java    |    7 +-
 .../diging/vspace/core/model/impl/Slide.java  |   12 +-
 .../services/ISlideExternalLinkManager.java   |   20 +-
 .../core/services/ISlideLinkManager.java      |    4 +-
 .../vspace/core/services/ISlideManager.java   |    2 +-
 .../core/services/impl/ModuleManager.java     |    5 +-
 .../impl/SlideExternalLinkManager.java        |   97 +-
 .../core/services/impl/SlideLinkManager.java  |   20 +-
 .../core/services/impl/SlideManager.java      |    7 +-
 .../view/ExhibitionSlideController.java       |   14 +-
 .../staff/AddSlideExternalLinkController.java |   43 +-
 .../web/staff/DeleteLinkController.java       |   11 +
 .../EditSlideExternalLinkController.java      |   44 +-
 .../web/staff/EditSlideLinksController.java   |   10 +-
 .../vspace/web/staff/SlideController.java     |   19 +-
 .../WEB-INF/views/exhibition/module.html      |  115 +-
 .../WEB-INF/views/exhibition/space.html       |   40 +-
 .../views/staff/modules/slides/slide.html     | 2653 ++++++-------
 .../WEB-INF/views/staff/spaces/space.html     | 3519 +++++++++--------
 .../main/webapp/resources/extra/Module_1.css  |    7 +-
 .../resources/extra/Module_1_slideshow_1.css  |    4 +-
 25 files changed, 3150 insertions(+), 3518 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
index eda918758..17d15d78b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
@@ -1,12 +1,21 @@
 package edu.asu.diging.vspace.core.data;
 
+import java.util.List;
+
 import org.javers.spring.annotation.JaversSpringDataAuditable;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
 
 @Repository
 @JaversSpringDataAuditable
 public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String>{
 
+	@Query("SELECT d FROM ExternalLinkSlide d WHERE d.slide.id = ?1")
+    public List<IExternalLinkSlide> findExternalLinkSlides(String slideId);
+
+    public void deleteByExternalLink(IExternalLinkSlide link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
index 04bd8f3bc..6ad454893 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
@@ -19,8 +19,11 @@ public class SlideExternalLinkFactory implements ISlideExternalLinkFactory{
     @Override
     public IExternalLinkSlide createExternalLink(String title, ISlide slide) {
         IExternalLinkSlide link = new ExternalLinkSlide();
+        System.out.println("LINK FACTORY: " + link);
+        System.out.println("LINK ID: " + link.getId());
         link.setName(title);
         link.setSlide(slide);
+        System.out.println("LINK ID 2: " + link.getId());
         return link;
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
index 31a18ea9c..976ea09b4 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
@@ -11,5 +11,4 @@ public interface IExternalLinkSlide extends ILinkSlide<ExternalLinkValue>{
     String getExternalLink();
 
     void setExternalLink(String externalLink);
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index 3a05d5559..83287a8ee 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -19,7 +19,7 @@ public interface ISlide extends IVSpaceElement {
     List<IExternalLinkSlide> getExternalLinks();
 
     void setExternalLinks(List<IExternalLinkSlide> externalLinks);
-    
+        
     IVSImage getImage();
 
     void setImage(IVSImage image);
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
index a4c705ab3..b2d4a481d 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
@@ -9,15 +9,14 @@
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
 
-import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
 @Entity
 public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSlide {
     
     @Id 
-    @GeneratedValue(generator = "extlink_id_generator")
-    @GenericGenerator(name = "extlink_id_generator", 
+    @GeneratedValue(generator = "extlinkslide_id_generator")
+    @GenericGenerator(name = "extlinkslide_id_generator", 
         parameters = @Parameter(name = "prefix", value = "EXLS"), 
         strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
     private String id;
@@ -27,7 +26,7 @@ public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSli
     private ISlide slide;
   
     private String externalLink;
-    
+        
     @Override
     public String getId() {
         return id;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index edd1e8aff..2731bb4f7 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -1,5 +1,7 @@
 package edu.asu.diging.vspace.core.model.impl;
 
+
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -22,7 +24,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import edu.asu.diging.vspace.core.model.IContentBlock;
-import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.IModule;
@@ -33,7 +34,7 @@
 
 @Entity
 public class Slide extends VSpaceElement implements ISlide {
-
+	
     @Id
     @GeneratedValue(generator = "slide_id_generator")
     @GenericGenerator(name = "slide_id_generator", parameters = @Parameter(name = "prefix", value = "SLI"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
@@ -52,15 +53,13 @@ public class Slide extends VSpaceElement implements ISlide {
     private List<ISequence> sequence;
     
     @JsonIgnore
-    @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class)
+    @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class, cascade = CascadeType.ALL)
     private List<IExternalLinkSlide> externalLinks;
     
     @OneToOne(targetEntity = VSImage.class)
     @NotFound(action = NotFoundAction.IGNORE)
     private IVSImage image;
 
-    
-
     /*
      * (non-Javadoc)
      * 
@@ -109,6 +108,9 @@ public void setModule(IModule module) {
      */
     @Override
     public List<IExternalLinkSlide> getExternalLinks() {
+    	if (externalLinks == null) {
+    		externalLinks = new ArrayList<IExternalLinkSlide>();
+    	}
         return externalLinks;
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
index 8d016c91a..507f4afc1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -1,27 +1,21 @@
 package edu.asu.diging.vspace.core.services;
 
+import java.util.List;
+
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 
 public interface ISlideExternalLinkManager extends ISlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>{
     
-    ISlideExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
-
-    ISlideExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename,ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
-    
-    
-
+	List<IExternalLinkSlide> getLinks(String slideId);
+	
+	IExternalLinkSlide createExternalLink(String title, String url, String slideId);
+	
+	IExternalLinkSlide updateExternalLink(String title, String url, String id);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
index 6b203a074..def6a7ac3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
@@ -13,11 +13,11 @@
 
 public interface ISlideLinkManager<L extends ILinkSlide<T>, T extends IVSpaceElement, U extends ILinkDisplay> {
     
-    U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+    U createLink(String title, String id, String linkedId,
             String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
             throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
 
-    U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+    U updateLink(String title, String id, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
             String imageFilename)
             throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
index d4bf72444..7834c72b1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
@@ -23,7 +23,7 @@ public interface ISlideManager {
 
     ISlide createSlide(IModule module, SlideForm slideForm, SlideType type);
 
-    void updateSlide(Slide slide);
+    ISlide updateSlide(ISlide slide);
 
     IBranchingPoint createBranchingPoint(IModule module, SlideForm slideForm, SlideType type);
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java
index f7bb2510d..48f19d5a3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Optional;
 
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -22,8 +21,8 @@
 import edu.asu.diging.vspace.core.model.ISequence;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.impl.Module;
-import edu.asu.diging.vspace.core.model.impl.ModuleLink;
 import edu.asu.diging.vspace.core.services.IModuleManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
 
 @Transactional
 @Service
@@ -43,7 +42,7 @@ public class ModuleManager implements IModuleManager {
     private SequenceRepository sequenceRepo;
     
     @Autowired
-    private SlideManager slideManager;
+    private ISlideManager slideManager;
     
     @Autowired
     private ModuleLinkDisplayRepository moduleLinkDisplayRepo;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index c508c6477..2def7aa56 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -8,38 +8,18 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
-import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
-import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
-import edu.asu.diging.vspace.core.data.ImageRepository;
 import edu.asu.diging.vspace.core.data.SlideExternalLinkDisplayRepository;
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
-import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
-import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
-import edu.asu.diging.vspace.core.factory.IImageFactory;
+import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
 import edu.asu.diging.vspace.core.factory.ISlideExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
-import edu.asu.diging.vspace.core.file.IStorageEngine;
-import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
-import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
-import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Transactional
 @Service
@@ -60,20 +40,16 @@ public class SlideExternalLinkManager extends SlideLinkManager<IExternalLinkSlid
 
     @Autowired
     private ISlideExternalLinkDisplayFactory externalLinkDisplayFactory;
-
-    @Autowired
-    private IImageFactory imageFactory;
-
-    @Autowired
-    private ImageRepository imageRepo;
-
-    @Autowired
-    private IStorageEngine storage;
     
-    @Override
-    public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
-        return externalLinkDisplayRepo.findSlideExternalLinkDisplaysForSlide(slideId);
+    public List<IExternalLinkSlide> getLinks(String slideId) {
+        return externalLinkRepo.findExternalLinkSlides(slideId);
     }
+    
+	@Override
+	public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 
     @Override
     protected IExternalLinkSlide createLinkObject(String title, String id) {
@@ -131,44 +107,27 @@ protected void deleteLinkRepo(IExternalLinkSlide link) {
         externalLinkRepo.delete((ExternalLinkSlide) link);
     }
 
-    
     @Override
-    public ISlideExternalLinkDisplay createLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename,
-            ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
-
-        /*
-         * When createLink is called then inside updateLinkAndDisplay(link, displayLink)
-         * is called to save Link and Display link in the database and return an object
-         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
-         * ExternalLinkDisplay object to set howToOpen field then Hibernate
-         * automatically persist howToOpen in database.
-         */
-        ISlideExternalLinkDisplay externalLinkDisplay = createLink(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, displayType, linkImage, imageFilename);
-        externalLinkDisplay.setHowToOpen(howToOpen);
-        return externalLinkDisplay;
-
+    public IExternalLinkSlide createExternalLink(String title, String url, String slideId) {
+    	ISlide slide = slideManager.getSlide(slideId);
+    	IExternalLinkSlide externalLink = new ExternalLinkSlide();
+    	externalLink.setExternalLink(url);
+    	externalLink.setName(title);
+    	externalLink.setSlide(slide);
+    	externalLinkRepo.save((ExternalLinkSlide) externalLink);
+    	return externalLink;
     }
-
+    
     @Override
-    public ISlideExternalLinkDisplay updateLink(String title, String id, float positionX, float positionY, int rotation,
-            String linkedId, String linkLabel, String linkId, String linkDisplayId, DisplayType displayType,
-            byte[] linkImage, String imageFilename, ExternalLinkDisplayMode howToOpen)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
-
-        /*
-         * When updateLink is called then inside updateLinkAndDisplay(link, displayLink)
-         * is called to save Link and Display link in the database and return an object
-         * of ExternalLinkDisplay. When setHowToOpen method is being called on the same
-         * ExternalLinkDisplay object to set howToOpen field then Hibernate
-         * automatically persist howToOpen in database.
-         */
-        ISlideExternalLinkDisplay externalLinkDisplay = updateLink(title, id, positionX, positionY, rotation, linkedId,
-                linkLabel, linkId, linkDisplayId, displayType, linkImage, imageFilename);
-        externalLinkDisplay.setHowToOpen(howToOpen);
-        return externalLinkDisplay;
+    public IExternalLinkSlide updateExternalLink(String title, String url, String id) {
+    	IExternalLinkSlide externalLink = getLink(id);
+    	if (externalLink != null) {
+			externalLink.setExternalLink(url);
+	    	externalLink.setName(title);
+	    	externalLinkRepo.save((ExternalLinkSlide) externalLink);
+    	} else {
+    		externalLink = new ExternalLinkSlide();
+    	}
+    	return externalLink;
     }
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
index c0faffa1b..421c79aa1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
@@ -9,13 +9,10 @@
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IImageFactory;
 import edu.asu.diging.vspace.core.file.IStorageEngine;
-import edu.asu.diging.vspace.core.model.ILink;
 import edu.asu.diging.vspace.core.model.ILinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -41,22 +38,25 @@ public abstract class SlideLinkManager<L extends ILinkSlide<T>, T extends IVSpac
     private IStorageEngine storage;
     
     @Override
-    public U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+    public U createLink(String title, String id, String linkedId,
             String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
             throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
 
         L link = createLinkObject(title, id);
+        System.out.println("LINK ID 3: " + id);
+        System.out.println("LINK ID 4: " + link.getId());
         T target = getTarget(linkedId);
         link.setName(linkLabel);
         link.setTarget(target);
+        System.out.println("LINK TARGET: " + link.getTarget());
         U displayLink = createDisplayLink(link);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        setDisplayProperties(displayLink, id, displayType, linkImage, imageFilename);
         return updateLinkAndDisplay(link, displayLink);
 
     }
     
     @Override
-    public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
+    public U updateLink(String title, String id, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
             String imageFilename)
             throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
@@ -68,7 +68,7 @@ public U updateLink(String title, String id, float positionX, float positionY, i
         link.setName(title);
         link.setTarget(target);
         U displayLink = getDisplayLink(linkDisplayId);
-        setDisplayProperties(displayLink, id, positionX, positionY, rotation, displayType, linkImage, imageFilename);
+        setDisplayProperties(displayLink, id, displayType, linkImage, imageFilename);
         return updateLinkAndDisplay(link, displayLink);
     }
     
@@ -105,12 +105,8 @@ protected void validateSlide(String id) throws SlideDoesNotExistException {
         }
     }
     
-    protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float positionX, float positionY,
-            int rotation, DisplayType displayType, byte[] linkImage, String imageFilename)
+    protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, DisplayType displayType, byte[] linkImage, String imageFilename)
             throws ImageCouldNotBeStoredException {
-        linkDisplay.setPositionX(positionX);
-        linkDisplay.setPositionY(positionY);
-        linkDisplay.setRotation(rotation);
         linkDisplay.setType(displayType != null ? displayType : DisplayType.ARROW);
         if (linkImage != null && linkImage.length > 0) {
             Tika tika = new Tika();
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
index 26ec74ac1..340331759 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
@@ -6,6 +6,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javax.transaction.Transactional;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,6 +54,7 @@
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.web.staff.forms.SlideForm;
 
+@Transactional
 @Service
 public class SlideManager implements ISlideManager {
 
@@ -177,8 +180,8 @@ public IChoice getChoice(String choiceId) {
     }
 
     @Override
-    public void updateSlide(Slide slide) {
-        slideRepo.save((Slide) slide);
+    public ISlide updateSlide(ISlide slide) {
+        return slideRepo.save((Slide) slide);
     }
 
     @Override
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
index 1f0e6fb30..67904e5f8 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
@@ -22,14 +22,13 @@
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
-import edu.asu.diging.vspace.core.model.impl.ExhibitionAboutPage;
 import edu.asu.diging.vspace.core.model.impl.SequenceHistory;
-import edu.asu.diging.vspace.core.services.IExhibitionAboutPageManager;
 import edu.asu.diging.vspace.core.services.IExhibitionManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
 import edu.asu.diging.vspace.core.services.ISequenceManager;
+import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-import edu.asu.diging.vspace.core.services.impl.SlideManager;
 
 @Controller
 public class ExhibitionSlideController {
@@ -38,7 +37,7 @@ public class ExhibitionSlideController {
     private IModuleManager moduleManager;
 
     @Autowired
-    private SlideManager slideManager;
+    private ISlideManager slideManager;
 
     @Autowired
     private ISequenceManager sequenceManager;
@@ -49,9 +48,11 @@ public class ExhibitionSlideController {
     @Autowired
     private SequenceHistory sequenceHistory;
     
-    
     @Autowired
     private IExhibitionManager exhibitManager;
+    
+    @Autowired
+    private ISlideExternalLinkManager slideExternalLinkManager;
 
     @RequestMapping(value = {
         "/exhibit/{spaceId}/module/{moduleId}/sequence/{sequenceId}/slide/{slideId}",
@@ -135,6 +136,9 @@ public String slide(Model model, @PathVariable("slideId") String slideId, @PathV
         model.addAttribute("currentNumOfSlide", slideIndex + 1);
         model.addAttribute("spaceId", spaceId);
         model.addAttribute("spaceName", spaceManager.getSpace(spaceId).getName());
+        System.out.println("SLIDE ID: " + slideId);
+        model.addAttribute("slideExternalLinkList", slideExternalLinkManager.getLinkDisplays(slideId));
+        System.out.println("SLIDE LIST: " + slideExternalLinkManager.getLinkDisplays(slideId));
         return "exhibition/module";
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index ec570f49f..34a447e40 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -1,29 +1,22 @@
 package edu.asu.diging.vspace.web.staff;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.services.IContentBlockManager;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 
@@ -35,40 +28,26 @@ public class AddSlideExternalLinkController {
 
     @Autowired
     private ISlideExternalLinkManager slideExternalLinkManager;
-    
-    @Autowired
-    private IContentBlockManager contentBlockManager;
-    
+        
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
     public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, 
-            @RequestParam("x") String x, @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
-            @RequestParam("url") String externalLink, @RequestParam("tabOpen") String howToOpen,
-            @RequestParam("type") String displayType, @RequestParam("externalLinkImage") MultipartFile file)
-            throws NumberFormatException, SlideDoesNotExistException, IOException, ImageCouldNotBeStoredException {
+            @RequestParam("externalLinkLabel") String label, @RequestParam("url") String externalLink)
+            throws NumberFormatException, SlideDoesNotExistException, IOException {
 
         ISlide slide = slideManager.getSlide(id);
+        
         if (slide == null) {
             return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
         }
 
-        byte[] linkImage = null;
-        String filename = null;
-        if (file != null) {
-            linkImage = file.getBytes();
-            filename = file.getOriginalFilename();
-        }
-        DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
-        ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
-                : ExternalLinkDisplayMode.valueOf(howToOpen);
-        ISlideExternalLinkDisplay display = slideExternalLinkManager.createLink(title, id, new Float(x), new Float(y), 0,
-                externalLink, title, type, linkImage, filename, externalLinkOpenMode);
+        IExternalLinkSlide externalLinkSlide = slideExternalLinkManager.createExternalLink(label, externalLink, id);
+        slide.getExternalLinks().add(externalLinkSlide);
+    	slideManager.updateSlide(slide);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
-        linkNode.put("id", display.getExternalLink().getId());
-        linkNode.put("displayId", display.getId());
-        linkNode.put("x", display.getPositionX());
-        linkNode.put("y", display.getPositionY());
-        linkNode.put("url", display.getExternalLink().getId());
+        linkNode.put("label", externalLinkSlide.getName());
+        linkNode.put("id", externalLinkSlide.getId());
+        linkNode.put("url", externalLinkSlide.getExternalLink());
  
         return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
     }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
index 9f2b35d07..c70df4d24 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
@@ -10,6 +10,7 @@
 
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.IModuleLinkManager;
+import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceLinkManager;
 
 @Controller
@@ -23,6 +24,9 @@ public class DeleteLinkController {
 
     @Autowired
     private IExternalLinkManager externalLinkManager;
+    
+    @Autowired
+    private ISlideExternalLinkManager slideExternalLinkManager;
 
     @RequestMapping(value = "/staff/space/{id}/modulelink/{linkId}", method = RequestMethod.DELETE)
     public ResponseEntity<String> deleteModuleLink(@PathVariable("id") String spaceId, @PathVariable("linkId") String linkId) {
@@ -41,4 +45,11 @@ public ResponseEntity<String> deleteExternalLink(@PathVariable("id") String spac
         externalLinkManager.deleteLink(linkId);
         return new ResponseEntity<String>(HttpStatus.OK);
     }
+    
+    @RequestMapping(value = "/staff/module/{id}/slide/{slideId}/externallink/{linkId}", method = RequestMethod.DELETE)
+    public ResponseEntity<String> deleteSlideExternalLink(@PathVariable("id") String moduleId, @PathVariable("slideId") String slideId, @PathVariable("linkId") String linkId) {
+    	System.out.println("IDs: " + moduleId + " " + slideId + " " + linkId);
+        slideExternalLinkManager.deleteLink(linkId);
+        return new ResponseEntity<String>(HttpStatus.OK);
+    }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
index 1b391b7b7..f515db19e 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
@@ -9,16 +9,10 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 
@@ -32,36 +26,20 @@ public class EditSlideExternalLinkController extends EditSlideLinksController{
     private ISlideExternalLinkManager externalLinkManager;
     
     
-    
-    @RequestMapping(value = "/staff/module/{moduleId}/slide/link/external/{id}", method = RequestMethod.POST)
-    public ResponseEntity<String> editExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
-            @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
-            @RequestParam("url") String externalLink,
-            @RequestParam("externalLinkIdValueEdit") String externalLinkIdValueEdit,
-            @RequestParam("externalLinkDisplayId") String externalLinkDisplayId,
-            @RequestParam("tabOpen") String howToOpen, @RequestParam("type") String displayType,
-            @RequestParam("externalLinkImage") MultipartFile file) throws SlideDoesNotExistException, IOException,
-            LinkDoesNotExistsException, NumberFormatException, ImageCouldNotBeStoredException {
+    @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/link/external/{id}", method = RequestMethod.POST)
+    public ResponseEntity<String> editExternalLink(@PathVariable("id") String id, @PathVariable("slideId") String slideId,
+    		@RequestParam("externalLinkLabel") String title,
+            @RequestParam("url") String externalLink
+            ) throws SlideDoesNotExistException, IOException, LinkDoesNotExistsException, NumberFormatException {
 
-        ResponseEntity<String> validation = checkIfSlideExists(slideManager, id, x, y);
+        ResponseEntity<String> validation = checkIfSlideExists(slideManager, slideId);
         if (validation != null) {
             return validation;
         }
-        byte[] linkImage = null;
-        String filename = null;
-        if (file != null) {
-            linkImage = file.getBytes();
-            filename = file.getOriginalFilename();
-        }
-        DisplayType type = displayType.isEmpty() ? null : DisplayType.valueOf(displayType);
-        ExternalLinkDisplayMode externalLinkOpenMode = howToOpen.isEmpty() ? null
-                : ExternalLinkDisplayMode.valueOf(howToOpen);
-        ISlideExternalLinkDisplay display = (ISlideExternalLinkDisplay) externalLinkManager.updateLink(title, id, new Float(x),
-                new Float(y), 0, externalLink, title, externalLinkIdValueEdit, externalLinkDisplayId, type, linkImage,
-                filename, externalLinkOpenMode);
-        return success(display.getExternalLink().getId(), display.getId(), display.getPositionX(),
-                display.getPositionY(), display.getRotation(), display.getExternalLink().getExternalLink(), title,
-                displayType, null, null);
+
+        IExternalLinkSlide link = externalLinkManager.updateExternalLink(title, externalLink, id);
+        return success(link.getId(), link.getExternalLink(), title, null, 0, 0, 0,
+        		null, null, null);
 
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java
index 1ccbda855..91f947cf2 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java
@@ -13,21 +13,15 @@
 
 public class EditSlideLinksController {
     
-    protected ResponseEntity<String> checkIfSlideExists(ISlideManager slideManager, String id, String x, String y) throws IOException{
+    protected ResponseEntity<String> checkIfSlideExists(ISlideManager slideManager, String id) throws IOException{
         ISlide source = slideManager.getSlide(id);
         if (source == null) {
             return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
         }
-        if (x == null || x.trim().isEmpty() || y == null || y.trim().isEmpty()) {
-            ObjectMapper mapper = new ObjectMapper();
-            ObjectNode node = mapper.createObjectNode();
-            node.put("errorMessage", "No link coordinates specified.");
-            return new ResponseEntity<String>(mapper.writeValueAsString(node), HttpStatus.BAD_REQUEST);
-        }
         return null;
     }
     
-    protected ResponseEntity<String> success(String id, String  displayId, float posX, float posY, int rotation, String url, String label, String displayType, String linkedId, String linkedSlideStatus) throws IOException{
+    protected ResponseEntity<String> success(String id, String url, String label, String  displayId, float posX, float posY, int rotation, String displayType, String linkedId, String linkedSlideStatus) throws IOException{
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
         linkNode.put("id", id);
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index 47ab3a6b4..d6d72416e 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -23,9 +23,7 @@
 import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
-import edu.asu.diging.vspace.core.model.impl.ImageBlock;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
-import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
 import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
@@ -54,21 +52,22 @@ public class SlideController {
 
     @RequestMapping("/staff/module/{moduleId}/slide/{id}")
     public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) {
-
         ISlide slide = slideManager.getSlide(id);
         model.addAttribute("module", moduleManager.getModule(moduleId));
         model.addAttribute("slide", slide);
-        model.addAttribute("externalLinks", externalLinkManager.getLinkDisplays(id));
+        model.addAttribute("externalLinks", externalLinkManager.getLinks(id));
         model.addAttribute("slideSequences", slideManager.getSlideSequences(id, moduleId));
         List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(id);
-        IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
-        slideManager.storeSlideDisplay(slide, imageblock.getImage());
+        if (slideContents.size()>0) {
+    		IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
+            slideManager.storeSlideDisplay(slide, imageblock.getImage());
+            model.addAttribute("display", slideDisplayManager.getBySlide(slide,imageblock.getImage()));
+        }
         model.addAttribute("slideContents", slideContents);
-        model.addAttribute("display", slideDisplayManager.getBySlide(slide,imageblock.getImage()));
         model.addAttribute("contentCount",slideContents.size()>0 ? slideContents.get(slideContents.size()-1).getContentOrder() : 0);
         if(slideManager.getSlide(id) instanceof BranchingPoint) {
-            model.addAttribute("choices", ((IBranchingPoint)slide).getChoices());
-        }           
+        model.addAttribute("choices", ((IBranchingPoint)slide).getChoices());
+        }
         return "staff/modules/slides/slide";
     }
 
@@ -83,7 +82,7 @@ public ResponseEntity<List<IContentBlock>> getAllContentBlocks(Model model, @Pat
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/links", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<Map<String,Object>> showSlideLinks(@PathVariable String id, Model model) {
         Map<String,Object> responseData = new HashMap<String,Object>();
-        responseData.put("externalLinks", externalLinkManager.getLinkDisplays(id));
+        responseData.put("externalLinks", externalLinkManager.getLinks(id));
         return new ResponseEntity<>(responseData, HttpStatus.OK);
     }
 }
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html
index f2153bf87..c09092d8b 100644
--- a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html
+++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html
@@ -1,6 +1,6 @@
 <html layout:decorate="~{layouts/main}">
-   <head>
-      <style type="text/css">
+<head>
+<style type="text/css">
       
 .imgFullScreen:hover .tooltiptext {
     visibility: visible;
@@ -24,27 +24,43 @@
     top: -15px;
     background: rgba(0, 0, 0, 0.6);
 }
-      
-      </style>
+
+.Group_8_Class {
+    display: block;
+}
+
+.External_Links_Class {
+	position: absolute;
+	text-align: left;
+	margin-left: 15px;
+}
+
+.slide_container {
+	display: grid;
+	align-items:center;
+}
+  
+</style>
       <script th:inline="javascript">
-         $( document ).ready(function() {
-            $("#blocks a").css('color','rgb(150, 45, 62)').css('font-weight','bold');
-            $(".nav-bar").css('position','fixed').css('width','100%').css('z-index','125');
-         });
-         
-         function imageFullScreen(){
-			   var elem = document.getElementById("Module_1");
-			   $(".imgFullScreen").hide();
-			   $("#Module_1").css('overflow-y','scroll');
-			   $("#Module_1").css('background-color','white');
-			   if (elem.requestFullscreen) {
-				    elem.requestFullscreen();
-				    } else if (elem.webkitRequestFullscreen) { 
-				    elem.webkitRequestFullscreen();
-				  } else if (elem.msRequestFullscreen) { 
-				    elem.msRequestFullscreen();
-				  }
-			   $("#Module_1").append('<div class = "exitfullscreen"><button class="btn circle-btn" style="padding: 3px;width: 35px;height: 35px;position: fixed;right: 0;bottom: 0;margin: 0 2rem 2rem 0;" onclick="exitFullScreen()"><span class="icon-collapse secondary"></span><span class="tooltiptextForExitFullscreen">Exit Full screen</span></button></div>')
+        $( window ).on('load', function() {
+           $("#blocks a").css('color','rgb(150, 45, 62)').css('font-weight','bold');
+           $(".nav-bar").css('position','fixed').css('width','100%').css('z-index','125');
+           drawLinks();
+        });
+        
+        function imageFullScreen(){
+			var elem = document.getElementById("Module_1");
+			$(".imgFullScreen").hide();
+			$("#Module_1").css('overflow-y','scroll');
+			$("#Module_1").css('background-color','white');
+			if (elem.requestFullscreen) {
+				elem.requestFullscreen();
+			} else if (elem.webkitRequestFullscreen) { 
+				elem.webkitRequestFullscreen();
+			} else if (elem.msRequestFullscreen) {
+				elem.msRequestFullscreen();
+			}
+			$("#Module_1").append('<div class = "exitfullscreen"><button class="btn circle-btn" style="padding: 3px;width: 35px;height: 35px;position: fixed;right: 0;bottom: 0;margin: 0 2rem 2rem 0;" onclick="exitFullScreen()"><span class="icon-collapse secondary"></span><span class="tooltiptextForExitFullscreen">Exit Full screen</span></button></div>');
 		}
 
 		function exitFullScreen()
@@ -89,7 +105,7 @@ <h3 class="textDiv">[[${module.name}]]</h3>
                </div>
            </a>
             <a th:if="${!#strings.isEmpty(nextSlide)}" th:href= "${isExhPreview == null OR isExhPreview == false}?@{'/exhibit/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${currentSequenceId}+'/slide/'+${nextSlide}}:@{'/preview/'+${previewId}+'/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${currentSequenceId}+'/slide/'+${nextSlide}}">
-               <div class="slideshow_next slideshow_next_Class" style="position: fixed; z-index:110; right: 11%; top: 40.3%;">
+               <div class="slideshow_next slideshow_next_Class" style="position: fixed; z-index:110; right: 11%; top: 40.3%;"> 
                     <button class="btn circle-btn-slide-nav">
                          <span class="icon-chevron-right slide-nav"></span>
                          <span class="tooltiptext">Next slide</span>
@@ -131,30 +147,37 @@ <h3 class="textDiv">[[${module.name}]]</h3>
          
          <div style="position: relative;top: 6.5%;">
             <h3 style="text-align:center;">[[${currentSlideCon.name}]]</h3>
-            <div id="blocks" class="Group_8_Class" th:each="contents: ${currentSlideCon.contents}">
-                <img th:if="${contents['class'].simpleName ==  'ImageBlock'}" id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}" style="max-width:57%">
-                <div th:if="${contents['class'].simpleName ==  'TextBlock'}" id="${contents.id}" class="textDiv">[(${contents.htmlRenderedText()})]</div>
-                <div th:if="${contents['class'].simpleName == 'ChoiceBlock'}" id="${contents.id}" class="textDiv" style="margin: 1%;">
-                    <div th:if="${contents.showsAll eq true}" th:each="choice: ${choices}" class="list-group">
-                        <a th:href="${isExhPreview == null OR isExhPreview == false}?@{'/exhibit/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}:@{'/preview/'+${previewId}+'/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}"
-                            class="list-group-item list-group-item-action">[[${choice.sequence.name}]]</a>
-                    </div>
-                    <div class="list-group" th:if="${contents.showsAll eq false}" th:each="choice: ${contents.choices}">
-                        <a th:href="${isExhPreview == null OR isExhPreview == false}?@{'/exhibit/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}:@{'/preview/'+${previewId}+'/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}"
-                            class="list-group-item list-group-item-action">[[${choice.sequence.name}]]</a>
-                    </div>
-                </div>
-                <div style="align-items: center" class="list-group" th:id="${contents.id}" th:if="${#strings.equals(contents['class'].simpleName,'VideoBlock')}">
-                  <br/>[[${contents.video.title}]]
-                    <iframe th:id="${contents.id}" width="800" height="530" th:src="${contents.video.url}" th:if="${contents.video.url}" frameborder="0"
-                        allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-                        allowfullscreen ></iframe>
-                     <video width="800" height="530" th:if="${contents.video.url == null}" controls>
-						  <source th:src="@{'/api/video/'+${contents.video.id}}" />
-						</video>
-						 <br>
-               </div>
+            <div class="slide_container"> 
+	            <div id="blocks" class="Group_8_Class" th:each="contents: ${currentSlideCon.contents}">
+	                <img th:if="${contents['class'].simpleName == 'ImageBlock'}" th:id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}" style="max-width:57%;"/>
+	                <div th:if="${contents['class'].simpleName == 'TextBlock'}" th:id="${contents.id}" class="textDiv">[(${contents.htmlRenderedText()})]</div>
+	                <div th:if="${contents['class'].simpleName == 'ChoiceBlock'}" th:id="${contents.id}" class="textDiv" style="margin: 1%;">
+	                    <div th:if="${contents.showsAll eq true}" th:each="choice: ${choices}" class="list-group">
+	                        <a th:href="${isExhPreview == null OR isExhPreview == false}?@{'/exhibit/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}:@{'/preview/'+${previewId}+'/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}"
+	                            class="list-group-item list-group-item-action">[[${choice.sequence.name}]]</a>
+	                    </div>
+	                    <div class="list-group" th:if="${contents.showsAll eq false}" th:each="choice: ${contents.choices}">
+	                        <a th:href="${isExhPreview == null OR isExhPreview == false}?@{'/exhibit/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}:@{'/preview/'+${previewId}+'/'+${spaceId}+'/module/'+${module.id}+'/sequence/'+${choice.sequence.id}+'?branchingPoint='+${slideId}+'&previousSequenceId='+${currentSequenceId}}"
+	                            class="list-group-item list-group-item-action">[[${choice.sequence.name}]]</a>
+	                    </div>
+	                </div>
+	                <div style="align-items: center" class="list-group" th:id="${contents.id}" th:if="${#strings.equals(contents['class'].simpleName,'VideoBlock')}">
+	                  <br/>[[${contents.video.title}]]
+	                    <iframe th:id="${contents.id}" width="800" height="530" th:src="${contents.video.url}" th:if="${contents.video.url}" frameborder="0"
+	                        allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+	                        allowfullscreen ></iframe>
+	                     <video width="800" height="530" th:if="${contents.video.url == null}" controls>
+							  <source th:src="@{'/api/video/'+${contents.video.id}}" />
+							</video>
+							 <br>
+	               </div>
+	            </div>
             </div>
+            <div class="External_Links_Class"> External Resources:
+	     		<div th:if="${slideExternalLinkList}" th:each="link: ${slideExternalLinkList}"> -
+	      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.externalLink.externalLink}}">[[${link.externalLink.name}]]</a>
+	     		</div>
+     		</div>
         </div>
       </div>
       </div>
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
index 65d89f5a7..01648db2c 100644
--- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
+++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
@@ -208,14 +208,18 @@
 
 <script th:inline="javascript">
 $(document).ready(function() {
-	const textBlock = document.getElementByClassName("textBlock");
-	const color = textBlock.style.borderColor;
-	console.log("color" + color);
-	textBlock.addEventListener('focus-visible', function(e) {
-		e.target.style.outline = "2px solid blue";
-	});
+	const textBlockElements = document.getElementsByClassName("textBlock");
+	Array.from(textBlockElements).forEach(function(textBlock, index){
+    	if(textBlock != null) {
+    		const color = textBlock.style.borderColor;
+    		console.log("color 1: ", color);
+    	}
+		textBlock.addEventListener('focus-visible', function(e) {
+			e.target.style.outline = "2px solid blue";
+		});
 
-}
+	});
+});
 
 </script>
 </head>
@@ -247,7 +251,7 @@
 					$("#Module_1").css("min-height", "0");
 					$("#Module_1").css("margin-bottom", "0px");
 				}
-        		}
+       		}
 			else {
 				$("#toggleImgClass").attr('class', "icon-expand secondary");
 				if(maxImgWidthOrig > maxImgWidth) {
@@ -360,15 +364,15 @@
 			if(isResizeImgBtnClicked == null || isResizeImgBtnClicked == "") {
 				setCookie('isResizeImgBtnClicked', -1, null);
 			} 
-		    	let spaceHeight = $("#bgImage").css("height");
-		    	$("#Module_1").css("height",spaceHeight);
+	    	let spaceHeight = $("#bgImage").css("height");
+	    	$("#Module_1").css("height",spaceHeight);
 			$( window ).resize(function() {
-					$("#space a").remove();
-					$(".Info_cz_Class").remove();
-			    	drawLinks();
-		    	});
+				$("#space a").remove();
+				$(".Info_cz_Class").remove();
 		    	drawLinks();
-		    	toggleImgSize(false);
+	    	});
+	    	drawLinks();
+	    	toggleImgSize(false);
 		});
 		
 		function drawLinks() {
@@ -463,7 +467,8 @@
             })
             externalLinks.forEach(function(link,index){
                 if(link!=null){
-                    var posX = parseInt($("#space").css('margin-left')) + $("#space").position().left; 
+                    var posX = parseInt($("#space").css('margin-left')) + $("#space").position().left;
+                    console.log('posX: ', parseInt($("#space").css('margin-left')), $("#space").position());
                     var posY = $("#space").position().top;
                     var externalLink = $('<a></a>');
                     externalLink.attr('href', link.externalLink.externalLink);
@@ -486,6 +491,7 @@
                     linkDisplay.css('transform', 'rotate('+link.rotation+'deg)');
                     linkDisplay.css('fill', 'grey'); 
                     linkDisplay.css('color', 'rgba(128,128,128,1)');
+                    console.log('LINK DISPLAY: ', linkDisplay);
                     var linkPosX=(width*link.positionX)/[(${display?.width})];
                     var linkPosY=(height*link.positionY)/relativeHeight;
                     linkDisplay.css('left',linkPosX + posX);
@@ -527,7 +533,7 @@
             Array.from(textBlockElements).forEach(function(textBlock, index){
             	if(textBlock != null) {
             	   	const color = textBlock.style.borderColor;
-                 	console.log("color" + color);
+                 	console.log("color 2:", color);
                  	textBlock.addEventListener('focus', function(e) {
                		e.target.style.outline = "2px solid "+ color;
                  	});
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 968f5c553..12fac7919 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -54,10 +54,59 @@
 			.Info_cz_Class:hover .tooltiptext {
 			    visibility: visible;
 			}
+			
 			#space {
 			    max-width: 1800px;
 			}
 			
+			.alert {
+				padding: 20px;
+		  		background-color: #f44336;
+		  		color: white;
+		  		width: 100%;
+			  	left: 0;
+			  	position: absolute;
+			  	display:none;
+			}
+			
+			.closebtn {
+				margin-left: 15px;
+				color: white;
+				font-weight: bold;
+				float: right;
+				font-size: 22px;
+				line-height: 20px;
+				cursor: pointer;
+				transition: 0.3s;
+				padding: 0;
+				border: none;
+				background: none;
+			}
+			
+			.closebtn:hover {
+				color: black;
+			}
+			
+			#Ext_Links_Module_Slide1 {
+				text-align: left;
+				display: inline-block;
+				margin: auto 20px;
+			}
+			
+			#Ext_Links_Module_Slide2 {
+				text-align: left;
+				display: inline-block;
+				margin: 15px 15px 15px 15px;
+			}
+			
+			.imgDiv {
+				display: inline-block;
+			}
+			
+			.deleteExternalLink {
+				width: auto;
+			}
+			
         </style>
         <script th:inline="javascript">
             //# sourceURL=click.js
@@ -66,104 +115,9 @@
             var defaultValue;
             var addVideoClk=0;
             var editVideoClk=0;
-            $(window).on("load", function() {
-                $( window ).resize(function() {
-                    drawLinks();
-                });
-                drawLinks();
-            });
-            //store where a user clicked on an image
-            var storeX;
-            var storeY;
             var selectedModuleLinkId;
             var selectedSpaceLinkId;
-            var selectedExternalLinkId;
             var selectedTextBlockId;
-            const displaceUnpublishedOnX = 25;
-            const displaceUnpublishedOnY = 13;
-            const displaceUnpublishedOnXModal = 50;
-            const displaceUnpublishedOnYModal = 13;
-            const displaceLableOnX = 10;
-            const displaceLableOnY = 35;
-            var modalBgImageHeight;
-            var modalBgImageWidth;
-            
-            var externalLinkIconReader = new FileReader();
-            var externalLinkIcon;
-            externalLinkIconReader.onload = function(e) {
-                externalLinkIcon = e.target.result;
-                showExternalLinks(createExternalLinkInfo());
-            }
-
-            function setLinkPosition(modalLink, link, isSpaceLink, isModal, isExternalLink, posX, posY, posXModal, posYModal, isTextBlock, isModuleLink){
-            	modalLink.css('position', 'absolute');
-                if(isModal){
-                    modalLink.css('left',link.positionX + posXModal);
-                    modalLink.css('top', link.positionY + posYModal);
-                }else{
-                    modalLink.css('left', link.positionX + posX);
-                    modalLink.css('top', link.positionY + posY);
-                }
-                modalLink.css('transform', 'rotate('+link.rotation+'deg)');
-                modalLink.find("span").css('fill', 'grey');
-                modalLink.css('color', 'rgba(128,128,128,1)');
-                modalLink.css('font-size', "16px");
-                var positionX = isModal ? posXModal : posX;
-                var positionY = isModal ? posYModal : posY;
-                if(isSpaceLink && (link.link.targetSpace==null || link.link.targetSpace.spaceStatus=="UNPUBLISHED")){
-            	var inactiveLinkId;
-            	var inactiveLinkClasses;
-            	var inactiveLinkTitle;
-            	if(link.link.targetSpace==null) {
-            	    inactiveLinkId = "deletedSpace-";
-            	    inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
-            	    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
-                	} else {
-            	    inactiveLinkId = "unpublished-";
-            	    inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
-            	    inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
-                	}
-            	var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
-                	inactiveSpaceElement.css('position', 'absolute');
-            	inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-            	inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-            	inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
-            	inactiveSpaceElement.css('font-size', "24px");
-            	inactiveSpaceElement.attr('title', inactiveLinkTitle);
-            	if(isModal){
-            	    $("#space").append(inactiveSpaceElement);
-            	} else{
-            	    $("#main-space").append(inactiveSpaceElement);
-            	}
-                }
-                if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
-                	var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
-                    unpublishedModuleElement.css('position', 'absolute');
-                	unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-                	unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-                	unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
-                	unpublishedModuleElement.css('font-size', "24px");
-                    if(isModal){
-                        $("#space").append(unpublishedModuleElement);
-                    }else{
-                        $("#main-space").append(unpublishedModuleElement);
-                    }
-                }
-                if(!isTextBlock){
-                    var linkId = isExternalLink ? link.externalLink.id : link.link.id;
-                    setLabelPosition(link,linkId,positionX,positionY);
-                }
-            }
-            
-            
-            function setLabelPosition(link,id, positionX, positionY){
-            	$(".label-"+id).css({
-            	    'left': link.positionX + positionX - displaceLableOnX,
-            	    'top': link.positionY + positionY + displaceLableOnY,
-            	    'color': 'red'
-            	}); 
-            }
-            
             
             $(function () {
             	  $('[data-toggle="tooltip"]').tooltip()
@@ -284,12 +238,11 @@
                     $(".open").css('height', '400px');
                 } else {
                 	// store image ID selected by the user to replace, onDoubleClick
-                	var imgBlockID = $(e.target).attr('id'); 
+                	var imgBlockID = $(e.target).attr('id');
                 	if(imgBlockID != ''){
                     	$("#uploadImage").data('value', imgBlockID); // sets image ID value
                     	$("#addImgAlert").show();
                 	}
-            	
                 }
             }
                 
@@ -315,33 +268,33 @@
             			    
             	// checks if image ID is present to replace
             	if (imgBlockID != '') {
-            			oldImageBlock = $("#" + imgBlockID);
-            			var imageBlockId = imgBlockID;
-            			formData.append('imageBlockId',imageBlockId);
-            			var url = "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/image/'})]" + imageBlockId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]';
-            			if(!chooseFromExisting){
-            				reader.onload = function (theFile)
-            				{
-            					var image = new Image();
-            					image.src = theFile.target.result;
-            					image.onload = function ()
-            					{
-            						imageblock = createImageBlock(reader, this.width);
-            						$("#" + imageBlockId).replaceWith(imageblock);	
-            						$(imageblock[0]).mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
-            					};
-            				}
-            			}
-            			else{
-            				var image = new Image();
-            				image.src = $('#selectedImage').find('img').attr('src');
-            				formData.append('imageId',imageId);
-            				imageblock = createImageBlockWithExistingImage($('#selectedImage').find('img').attr('src'),image.width);
-            				$("#" + imageBlockId).replaceWith(imageblock);	
-            				$(imageblock[0]).mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
-            			}
-            			// Reset data-attribute to get current selected image ID
-            			$("#uploadImage").data('value', '');
+           			oldImageBlock = $("#" + imgBlockID);
+           			var imageBlockId = imgBlockID;
+           			formData.append('imageBlockId',imageBlockId);
+           			var url = "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/image/'})]" + imageBlockId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]';
+           			if(!chooseFromExisting){
+           				reader.onload = function (theFile)
+           				{
+           					var image = new Image();
+           					image.src = theFile.target.result;
+           					image.onload = function ()
+           					{
+           						imageblock = createImageBlock(reader, this.width);
+           						$("#" + imageBlockId).replaceWith(imageblock);	
+           						$(imageblock[0]).mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
+           					};
+           				}
+           			}
+           			else{
+           				var image = new Image();
+           				image.src = $('#selectedImage').find('img').attr('src');
+           				formData.append('imageId',imageId);
+           				imageblock = createImageBlockWithExistingImage($('#selectedImage').find('img').attr('src'),image.width);
+           				$("#" + imageBlockId).replaceWith(imageblock);	
+           				$(imageblock[0]).mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
+           			}
+           			// Reset data-attribute to get current selected image ID
+           			$("#uploadImage").data('value', '');
             	}
             	else {
             		var url = "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/image/?'+${_csrf.parameterName}+'='+${_csrf.token}})]";
@@ -527,47 +480,6 @@
 					}
 				});
 			}
-            function drawLinks(){
-        	    $(".Info_cz_Class").remove();
-        	    $(".imageLink").remove();
-        	    $(".alertLink").remove();
-        	    $(".ellipse_class").remove();
-        	    $(".unpublishedSpaceClass").remove();
-        	    $(".textBlockClass").remove();
-        	    $(".deletedSpaceClass").remove();
-        	    
-        	    $.ajax({
-        	        type: "GET",
-        	        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/links'})]",
-        	        cache       : false,
-        	        contentType : false,
-        	        processData : false,
-        	        beforeSend: function () {
-        	            $("#loader").show();
-        	            },
-        	       	complete: function () {
-        	            $("#loader").hide();
-        	            },
-        	        success: function(data) {
-        	            var externalLinks = data['externalLinks'];
-        	            var posXModal = $("#bgImage").position().left;
-        	            var posYModal = $("#bgImage").position().top;
-        	            var posX = $("#main-bgImage").position().left;
-        	            var posY = $("#main-bgImage").position().top;
-        	            externalLinks.forEach(function(link,index){
-        	                var spanId= "externalModallinkId-";
-        	                var divId = "#space";
-        	                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-        	            })
-        	            
-        	            externalLinks.forEach(function(link,index){
-        	                var spanId= "externallinkId-";
-        	                var divId = "#main-space";
-        	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-        	            })
-        	        }
-        	    });
-        	}
         	
         	function updateContentOrder(jsonObj,token){
             		$.ajax({
@@ -614,6 +526,73 @@
 	            		}
             		});
         		}
+        	
+           	function hideLinkInfoTabs(){
+           	    $("#editExternalLinkInfo").hide();
+           	    $("#editSpaceLinkInfo").hide();
+           	    $("#editModuleLinkInfo").hide();
+           	    $("#editTextBlockInfo").hide();
+           	    $("#createExternalLinkAlert").hide();
+           	    $("#createSpaceLinkAlert").hide();
+           	    $("#createModuleLinkAlert").hide();
+           	    $("#errorMsg").text("");
+           	}
+           	
+           	function displayForms(formToShow){
+           	    $("#space").css("display", "-webkit-box");
+           	    $(formToShow).css("display", "flex");
+           	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
+           	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
+           	}
+           	
+           	function resetHighlighting() {
+           	    // reset icon links
+           	    $('[data-link-id]').css("color", "red");
+
+           	    // reset alert links
+           	    $('div[data-link-id]').removeClass("alert-warning");
+           	    $('div[data-link-id]').addClass("alert-primary");
+
+           	    // reset image links
+           	    $('img[data-link-id]').css("border-width", "0");
+           	}
+           	
+           	function getTextArea(x,y) {
+           	    var posX = $("#bgImage").position().left;
+           	    var posY = $("#bgImage").position().top;
+           	    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
+           	    text.css('position', 'absolute');
+           	    text.css('left', x + posX);
+           	    text.css('top', y);
+           	    $("#space").append(text);
+           	    
+           	    var textB = $('#textB')[0],
+           	    tHeight = textB.clientHeight,
+           	    tWidth = textB.clientWidth;
+           	    
+           	    var height = modalBgImageHeight;
+           	    var width = modalBgImageWidth;
+           	    
+           	    $("#textBoxWidthID").val(tWidth);
+           	    $("#textBoxHeightID").val(tHeight);
+           	    textB.onmouseup = function (e) {
+           	        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
+           	            tHeight = textB.clientHeight;
+           	            tWidth = textB.clientWidth;
+           	            let percentileHeight = (tHeight*100)/height;
+           	            let percentileWidth = (tWidth*100)/width;
+           	            $("#textBoxWidthID").val(percentileWidth);
+           	            $("#textBoxHeightID").val(percentileHeight);
+           	            $("#textContentID").val(textB.value);
+           	        }
+           	    };
+           	    var percentileHeight = (tHeight*100)/height;
+           	    var percentileWidth = (tWidth*100)/width;
+           	    $("#textBoxWidthID").val(percentileWidth);
+           	    $("#textBoxHeightID").val(percentileHeight);
+           	    $("#textContentID").val(textB.value);
+           	}
+           	
             [# th:if="${#strings.equals(slide['class'].simpleName,'BranchingPoint')}"]
         		$('#addChoice').show();
         		$('#choiceSpace').show();
@@ -709,13 +688,13 @@
             		$('#imageId').prop("disabled",true);
             		$('#file').prop("disabled",false);
             		
-            	  });
+            	});
             	
             	$('#chooseFromExisting').click(function() {
             		$('#file').val('');
             		$('#file').prop("disabled",true);
             		$('#imageId').prop("disabled",false);
-            	  });
+            	});
             	var timeout=null;
             	$('#slideSpace').sortable({
 	            	update: function(event,ui) {
@@ -742,1121 +721,847 @@
 		            	}
 	            	}
             	});
-            	
-            	function showExternalLinkEdit(externalLink, show, posX, posY) {
-            	    externalLink["x"]=storeX;
-            	    externalLink["y"]=storeY;
-            	    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
-            	    var selectedLabelClass = '.label-'+selectedExternalLinkId;
-            	    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
-            	}
-
-            	function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
-            	    var posX, posY;
-            	    if(show) {
-            	        posX = $("#main-bgImage").position().left;
-            	        posY = $("#main-bgImage").position().top;
-            	    }
-            	    else{
-            	        posX = $("#bgImage").position().left;
-            	        posY = 0
-            	    }
-            	    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
-            	    $(selectedLinkClass).css({ 'position': 'absolute'});
-            	    $(selectedLinkClass).css({ 'left': x + posX});
-            	    $(selectedLinkClass).css({ 'top': y + posY});
-            	    $(selectedLabelClass+' span').remove();
-            	    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
-            	    feather.replace();    
-            	}
-
-            	function hideLinkInfoTabs(){
-            	    $("#editExternalLinkInfo").hide();
-            	    $("#editSpaceLinkInfo").hide();
-            	    $("#editModuleLinkInfo").hide();
-            	    $("#editTextBlockInfo").hide();
-            	    $("#createExternalLinkAlert").hide();
-            	    $("#createSpaceLinkAlert").hide();
-            	    $("#createModuleLinkAlert").hide();
-            	    $("#errorMsg").text("");
-            	    $('#errorAlert').hide();
-            	}
-
-            	function showExternalLinks(externalLink, show, x, y) {
-            	    $("#ext_label").remove();
-            	    $("#link").remove();
-            	    $("#undefined").remove();
-            	    var posX = $("#bgImage").position().left;
-            	    var posY = $("#bgImage").position().top;
-            	    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
-            	    ext_label.text(externalLink["externalLinkLabel"]);
-
-            	    var link;
-            	    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
-            	        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
-            	    } else {
-            	        $(ext_label).css({
-            	            'position': 'absolute',
-            	            'font-size': "12px",
-            	            'transform': 'rotate(0deg)',
-            	            'color': 'blue'
-            	        });
-            	        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
-            	    }
-            	    
-            	    if(show) {
-            	        link.css('top', externalLink["y"] + posY);
-            	    } else {
-            	    	link.css('top', externalLink["y"]);
-            	    }
-
-            	    link.css('position', 'absolute');
-            	    link.css('left', externalLink["x"] + posX);
-            	    link.css('color', 'blue');
-            	    link.css('font-size', "12px");
-
-            	    if (externalLink["id"]) {
-            			link.attr("data-link-id", externalLink["id"]);
-            			link.css('cursor', 'pointer');
-            			link.attr('href', externalLink["url"]);
-            			link.click(function(e) {
-            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-            			});
-            			
-            			ext_label.attr("data-link-id", externalLink["id"]);
-            			ext_label.css('cursor', 'pointer');
-            			ext_label.attr("class", "label-"+externalLink["id"]);
-            			ext_label.click(function(e) {
-            				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-            			});
-            	    }
-
-            	    $("#space").append(link);
-            	    $("#link").append(ext_label);
-            	    $("#external-link").remove();
-
-            	}
-            	
-            	function createExternalLinkInfo() {
-            		var info = {};
-            		info["x"] = storeX;
-            		info["y"] = storeY;
-            		info["tabOpen"] = $("#extTabOpen").val();
-            		info["type"] = $("#extType").val();
-            		info["externalLinkLabel"] = $("#externalLinkLabel").val();
-            		info["externalLinkURL"] = $("#externalLink").val();
-            		return info;
-            	}
-            	
-            	
-            	
-            	function editExternalLinkInfo() {
-            		var info = {};
-            		info["x"] = storeX;
-            		info["y"] = storeY;
-            		info["tabOpen"] = $("#extTabOpenEdit").val();
-            		info["type"] = $("#extTypeEdit").val();
-            		info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
-            		info["externalLinkURL"] = $("#externalLinkURLEdit").val();
-            		return info;
-            	}
-            	
-            	function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
-            	    selectedExternalLinkId=linkId;
-            	    storeX=posXEdit;
-            	    storeY=posYEdit;
-            	    $("#externalLinkInfoLabel").text(linkName);
-            	    $("#externalLinkId").val(linkId);
-            	    $("#externalLinkDisplayId").val(displayLinkId);
-            	    $("#externalLinkInfoLabelEdit").text(linkName);
-            	    $("#externalLinkLabelEdit").val(linkName);
-            	    $("#externalLinkIdValueEdit").val(linkId);
-            	    $("#externalLinkURLEdit").val(externalLinkURL);
-            	    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
-            	    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
-            	    
-            	    resetHighlighting();
-
-            	    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
-            	    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
-            	    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
-            	    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
-
-            	    $("#bgImage").on("click", function(e){
-            	        e.preventDefault();
-            	        var posX = $(this).position().left;
-            	        var posY = $(this).position().top;    
-            	        storeX = e.pageX - $(this).offset().left;
-            	        storeY = e.pageY - $(this).offset().top + 25;
-            	        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
-            	    });
-            	    hideLinkInfoTabs();
-            	    displayForms("#editExternalLinkInfo");
-            	}
-            	
-            	function displayForms(formToShow){
-            	    drawLinks();
-            	    $("#space").css("display", "-webkit-box");
-            	    $(formToShow).css("display", "flex");
-            	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
-            	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
-            	}
-            	
-            	function resetHighlighting() {
-            	    // reset icon links
-            	    $('[data-link-id]').css("color", "red");
-
-            	    // reset alert links
-            	    $('div[data-link-id]').removeClass("alert-warning");
-            	    $('div[data-link-id]').addClass("alert-primary");
-
-            	    // reset image links
-            	    $('img[data-link-id]').css("border-width", "0");
-            	}
-            	
-            	function getTextArea(x,y) {
-            	    var posX = $("#bgImage").position().left;
-            	    var posY = $("#bgImage").position().top;
-            	    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
-            	    text.css('position', 'absolute');
-            	    text.css('left', x + posX);
-            	    text.css('top', y);
-            	    $("#space").append(text);
-            	    
-            	    var textB = $('#textB')[0],
-            	    tHeight = textB.clientHeight,
-            	    tWidth = textB.clientWidth;
-            	    
-            	    var height = modalBgImageHeight;
-            	    var width = modalBgImageWidth;
-            	    
-            	    $("#textBoxWidthID").val(tWidth);
-            	    $("#textBoxHeightID").val(tHeight);
-            	    textB.onmouseup = function (e) {
-            	        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
-            	            tHeight = textB.clientHeight;
-            	            tWidth = textB.clientWidth;
-            	            let percentileHeight = (tHeight*100)/height;
-            	            let percentileWidth = (tWidth*100)/width;
-            	            $("#textBoxWidthID").val(percentileWidth);
-            	            $("#textBoxHeightID").val(percentileHeight);
-            	            $("#textContentID").val(textB.value);
-            	        }
-            	    };
-            	    var percentileHeight = (tHeight*100)/height;
-            	    var percentileWidth = (tWidth*100)/width;
-            	    $("#textBoxWidthID").val(percentileWidth);
-            	    $("#textBoxHeightID").val(percentileHeight);
-            	    $("#textContentID").val(textB.value);
-            	}
-            	
-            	
-            	function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
-            		if(link != null){
-            			var externalLink;
-            			if(link.type=="IMAGE" && link.image != null){
-            				var imageURL = [[@{/api/image/}]]+link.image.id;
-            				externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
-            			}else{
-            				externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
-            			}
-            			setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
-            			$(divId).append(externalLink);
-            			if(spanId === "externallinkId-"){
-            				$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
-            				$('#'+spanId+link.externalLink.id).click(function(e) {
-            					var linkData = $('#'+spanId+link.externalLink.id).data();
-            					makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
-            				});
-            			}
-            		}
-            	}
-            	
-            
-                //-------- edit contentblock description --------
-            
-                $("#submitDescription").hide()
-                $("#cancelEditDescription").hide()
-                var description = $("#description").text()
-                $("#editDescription").click(function() {
-                    $('<textarea id="newDescription" style="margin-top: 1%;" class="form-control" type="text">'+description+'</textarea>').insertBefore( "#description" );
-                    $("#description").remove()
-                    $("#editDescription").hide()
-                    $("#submitDescription").show()
-                    $("#cancelEditDescription").show()
-                    
-                });
-            
-                $("#submitDescription").click(function() {
-                    var formData = new FormData();
-                    formData.append('description', $("#newDescription").val());
-                    $.ajax({ 
-            	        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/edit/description?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-            	        type: 'POST',
-            	        cache       : false,
-            	        contentType : false,
-            	        processData : false,
-            	        data: formData,
-            	        enctype: 'multipart/form-data',
-            	        success: function(data) {
-            	            // replace text box with new description
-            	            $("#submitDescription").hide()
-            	            $("#cancelEditDescription").hide()
-            	            $("#editDescription").show()
-            	            var val = $("#newDescription").val();
-            	            $('<p id="description"style="margin-top: .5rem; margin-bottom: .5rem;"></p>').insertBefore( "#newDescription" );
-            	            $("#newDescription").remove();
-            	            $("#description").text(val)
-            	        },
-            	        error: function(data) {
-            	            $(".open").removeClass("open");
-            	                var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            	                $('.error').append(alert);
-            	        }
-                     });       
-                  });
-                
-                $("#cancelEditDescription").click(function(){
-                    $("#submitDescription").hide()
-                    $("#editDescription").show()
-                    $("#cancelEditDescription").hide()
-                    $('<p id="description" style="margin-top: .5rem; margin-bottom: .5rem;"></p>').insertBefore( "#newDescription" );
-                    $("#newDescription").remove()
-                    $("#description").text(description)
-                    
-                });
-                
-                //------- edit title --------
-                $("#submitTitle").hide();
-                $("#cancelEditTitle").hide();
-                var getTitleText = $("#title").text().split(": ")[1]
-                $("#editTitle").click(function() {
-                    $('<div class="col-4"><input id="newTitle" class="form-control" type="text"></div>').insertAfter( "#title" );
-                    $('#title').text('Slide: ')
-                    $("#newTitle").val(getTitleText)
-                    $("#editTitle").hide()
-                    $("#submitTitle").show()
-                    $("#cancelEditTitle").show()       
-                });
-                
-                $("#submitTitle").click(function() {
-                    var formData = new FormData();
-                    formData.append('title', $("#newTitle").val());
-                    $.ajax({
-                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/edit/title?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                        type: 'POST',
-                        cache       : false,
-                        contentType : false,
-                        processData : false,
-                        data: formData,
-                        enctype: 'multipart/form-data',
-                        success: function(data) {
-                            // replace text box with new description
-                            $("#submitTitle").hide()
-                            $("#cancelEditTitle").hide();
-                            $("#editTitle").show()
-                            var val = $("#newTitle").val();
-                            $("#newTitle").closest('div').remove();
-                            $("#title").text("Silde: " + val)
-                            
-                        },
-                        error: function(data) {
-                            var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-                            $('.error').append(alert);
-                        }
-                    });
-                  });
-               $("#cancelEditTitle").click(function(){
-                    $("#submitTitle").hide()
-                    $("#editTitle").show()
-                    $("#cancelEditTitle").hide()
-                    $("#newTitle").closest('div').remove();
-                    $("#title").text("Silde: " + getTitleText);
+           
+               //-------- edit contentblock description --------
+           
+               $("#submitDescription").hide()
+               $("#cancelEditDescription").hide()
+               var description = $("#description").text()
+               $("#editDescription").click(function() {
+                   $('<textarea id="newDescription" style="margin-top: 1%;" class="form-control" type="text">'+description+'</textarea>').insertBefore( "#description" );
+                   $("#description").remove()
+                   $("#editDescription").hide()
+                   $("#submitDescription").show()
+                   $("#cancelEditDescription").show()
+                   
                });
+           
+               $("#submitDescription").click(function() {
+                   var formData = new FormData();
+                   formData.append('description', $("#newDescription").val());
+                   $.ajax({ 
+           	        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/edit/description?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+           	        type: 'POST',
+           	        cache       : false,
+           	        contentType : false,
+           	        processData : false,
+           	        data: formData,
+           	        enctype: 'multipart/form-data',
+           	        success: function(data) {
+           	            // replace text box with new description
+           	            $("#submitDescription").hide()
+           	            $("#cancelEditDescription").hide()
+           	            $("#editDescription").show()
+           	            var val = $("#newDescription").val();
+           	            $('<p id="description"style="margin-top: .5rem; margin-bottom: .5rem;"></p>').insertBefore( "#newDescription" );
+           	            $("#newDescription").remove();
+           	            $("#description").text(val)
+           	        },
+           	        error: function(data) {
+           	            $(".open").removeClass("open");
+           	                var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           	                $('.error').append(alert);
+           	        }
+                    });       
+                 });
                
-                $("#addText").click(function() {
-                    $(".EasyMDEContainer").remove();
-                	markDown = new EasyMDE({element: $('#textBlockText')[0]});
-                    $("#addTextAlert").show();
-                });
-                
-                $("#addImage").click(function() {
-                    $("#addImgAlert").show();
-                });
-                
-                $("#addVideo").click(function() {
-                    $("#videoTitle").value = "";
-                    $("#addVideoAlert").show();
-                    addVideoClk =1;
-                    editVideoClk=0;
-                });
-                
-                $("#addExternalLinkButton").click(function(e) {
-                    $("#bgImage").off("click");
-                    $("#bgImage").on("click", function(e){
-                        e.preventDefault();
-                        $("#link").remove();
-                        $("#external-arrow").remove();
-                        $("#ext_label").remove();
-                        var icon;
-                        var posX = $(this).position().left
-                        var posY = $(this).position().top;
-                        storeX = e.pageX - $(this).offset().left;
-                        storeY = e.pageY - $(this).offset().top + 25;
-                        showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
-                    });
-                    hideLinkInfoTabs();
-                    displayForms("#createExternalLinkAlert");
-                });
-                
-                $("#editExternalLinkBtn").click(function(e) {
-                    e.preventDefault();
-                    $("#space").scrollTop(0);
-                    var linkId = $("#externalLinkIdEdit").val();
-                    if (storeX == undefined || storeY == undefined) {
-                        $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                        $('#errorAlert').show();
-                        return;
-                    }
-                    var linkedSpace = $("#externalLinkIdEdit").val();
-                    $("#externalLinkXEdit").val(storeX);
-                    $("#externalLinkYEdit").val(storeY - 25);
-                    var form = $("#editExternalLinkForm");
-                    var formData = new FormData(form[0]);
-                    var externalLinkInfo = editExternalLinkInfo();
-                    $.ajax({
-                        type: "POST",
-                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+'link/external/'+${slidee?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                        cache: false,
-                        contentType : false,
-                        processData : false,
-                        enctype: 'multipart/form-data',
-                        data: formData,
-                        beforeSend: function () {
-                            $(".saveLoader").show();
-                            },
-                       	complete: function () {
-                            $(".saveLoader").hide();
-                            },
-                        success: function(data) {
-                            var linkData = JSON.parse(data);
-                            $("#bgImage").off("click");
-                            externalLinkInfo["id"] = linkData["id"];
-                            externalLinkInfo["displayId"]=linkData["displayId"];
-                            externalLinkInfo["x"]=linkData["x"];
-                            externalLinkInfo["y"]=linkData["y"];
-                            $('#linkLabel-'+selectedExternalLinkId).val(linkData["label"]);
-                            $('#linkType-'+selectedExternalLinkId).val(linkData["dislpayType"]);
-                            $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]);
-                            showExternalLinkEdit(editExternalLinkInfo, true);
-                            hideLinkInfoTabs();
-                            $("#space").css("display", "none");
-                            selectedExternalLinkId=undefined;
-                            drawLinks();
-                        }
-                    });
-                });
-
-                $("#createExternalLinkBtn").click(function(e) {
-                    e.preventDefault();
-                    $("#space").scrollTop(0);
-                    var payload = {};
-
-                    if (storeX == undefined || storeY == undefined) {
-                        $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                        $('#errorAlert').show();
-                        return;
-                    }
-
-                    var externalLink = $("#externalLink").val();
-                    var externalLinkLabel = $("#externalLinkLabel").val();
-                    var type = $("#extType option:selected").text();
-
-                    if (externalLink == undefined || externalLink == "") {
-                        $("#errorMsg").text("Please provide the link to the external link.")
-                        $('#errorAlert').show();
-                        return;
-                    }
-
-                    if (externalLinkLabel == undefined || externalLinkLabel == "") {
-                        $("#errorMsg").text("Please enter a label for this external link.")
-                        $('#errorAlert').show();
-                        return;
-                    }
-                    
-                    if (type == undefined || type == "Choose...") {
-                        $("#errorMsg").text("Please select a link type in Type dropdown.")
-                        $('#errorAlert').show();
-                        return;
-                    }
-                    $("#externalLinkX").val(storeX);
-                    $("#externalLinkY").val(storeY - 25);
+               $("#cancelEditDescription").click(function(){
+                   $("#submitDescription").hide()
+                   $("#editDescription").show()
+                   $("#cancelEditDescription").hide()
+                   $('<p id="description" style="margin-top: .5rem; margin-bottom: .5rem;"></p>').insertBefore( "#newDescription" );
+                   $("#newDescription").remove()
+                   $("#description").text(description)
+                   
+               });
+               
+               //------- edit title --------
+               $("#submitTitle").hide();
+               $("#cancelEditTitle").hide();
+               var getTitleText = $("#title").text().split(": ")[1]
+               $("#editTitle").click(function() {
+                   $('<div class="col-4"><input id="newTitle" class="form-control" type="text"></div>').insertAfter( "#title" );
+                   $('#title').text('Slide: ')
+                   $("#newTitle").val(getTitleText)
+                   $("#editTitle").hide()
+                   $("#submitTitle").show()
+                   $("#cancelEditTitle").show()       
+               });
+               
+               $("#submitTitle").click(function() {
+                   var formData = new FormData();
+                   formData.append('title', $("#newTitle").val());
+                   $.ajax({
+                       url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/edit/title?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                       type: 'POST',
+                       cache       : false,
+                       contentType : false,
+                       processData : false,
+                       data: formData,
+                       enctype: 'multipart/form-data',
+                       success: function(data) {
+                           // replace text box with new description
+                           $("#submitTitle").hide()
+                           $("#cancelEditTitle").hide();
+                           $("#editTitle").show()
+                           var val = $("#newTitle").val();
+                           $("#newTitle").closest('div').remove();
+                           $("#title").text("Silde: " + val)
+                           
+                       },
+                       error: function(data) {
+                           var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+                           $('.error').append(alert);
+                       }
+                   });
+                 });
+              $("#cancelEditTitle").click(function(){
+                   $("#submitTitle").hide()
+                   $("#editTitle").show()
+                   $("#cancelEditTitle").hide()
+                   $("#newTitle").closest('div').remove();
+                   $("#title").text("Silde: " + getTitleText);
+              });
+              
+              $("#addText").click(function() {
+                  $(".EasyMDEContainer").remove();
+              	markDown = new EasyMDE({element: $('#textBlockText')[0]});
+                  $("#addTextAlert").show();
+              });
+              
+              $("#addImage").click(function() {
+                  $("#addImgAlert").show();
+              });
+              
+              $("#addVideo").click(function() {
+                  $("#videoTitle").value = "";
+                  $("#addVideoAlert").show();
+                  addVideoClk =1;
+                  editVideoClk=0;
+              });
 
-                    var form = $("#createExternalLinkForm");
-                    var formData = new FormData(form[0]);
-                    var externalLinkInfo = createExternalLinkInfo();
+              $(document).on("click", ".editExternalLink", function(e) {
+       			  externalLink = {};
+       			  externalLink["id"] = $(this).attr("data-link-id");
+                  externalLink["label"] = $(this).attr("data-label");
+                  externalLink["url"] = $(this).attr("data-url");
+                  makeExternalLinksEditable(externalLink);
+       		      displayForms("#editExternalLinkInfo");
+         	  });
+	
+	          function makeExternalLinksEditable(externalLink) {
+	        	  $(".externalLinkIdEdit").attr('data-link-id', externalLink['id']);
+	        	  $(".externalLinkLabelEdit").val(externalLink['label']);
+	        	  $(".externalLinkURLEdit").val(externalLink['url']);
+	        	    
+	        	  hideLinkInfoTabs();
+	          }
+               
+              $("#editExternalLinkBtn").click(function(e) {
+            	  e.preventDefault();
+                  $("#space").scrollTop(0);
+                  var linkId = $(".externalLinkIdEdit").attr('data-link-id');
+                  var form = $("#editExternalLinkForm");
+                  var formData = new FormData(form[0]);
+                  $.ajax({
+                      type: "POST",
+                      url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide?.id}+'/link/external/'})]"+linkId+'?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+                      cache: false,
+                      contentType : false,
+                      processData : false,
+                      enctype: 'multipart/form-data',
+                      data: formData,
+                      beforeSend: function () {
+                          $(".saveLoader").show();
+                      },
+                      complete: function () {
+                          $(".saveLoader").hide();
+                      },
+                      success: function(data) {
+                    	  var linkData = JSON.parse(data);
+                    	  console.log('LINK DATA: ', linkData);
+                          hideLinkInfoTabs();
+                          $("#space").css("display", "none");
+                   	      $('#'+ externalLink["id"]).remove();
+                	      $('#'+ externalLink["id"] +'form').remove();
+                          showExternalLinks(linkData);;
+                      }
+                  });
+              });
+               
+               $("#addExternalLinkButton").click(function(e) {
+            	   $('#errorAlert')[0].style.display = "none";
+                   hideLinkInfoTabs();
+                   displayForms("#createExternalLinkAlert");
+               });
+				
+               const closeButton = document.createElement('button');
+               closeButton.textContent = 'x';
+               closeButton.classList.add('closebtn');
+               $("#createExternalLinkBtn").click(function(e) {
+                   e.preventDefault();
+                   $("#space").scrollTop(0);
+                   var externalLink = $(".externalLink").val();
+                   var externalLinkLabel = $(".externalLinkLabel").val();
+                   if (externalLinkLabel == undefined || externalLinkLabel == "") {
+                	   $("#errorAlert")[0].style.display = "block";
+                	   $("#errorAlert")[0].textContent = "Please enter a label for this external link.";
+                	   $("#errorAlert")[0].appendChild(closeButton);
+                       $("#space").scrollTop($('#space')[0].scrollHeight);
+                       return;
+                   }
+                   if (externalLink == undefined || externalLink == "") {
+                	   $("#errorAlert")[0].style.display = "block";
+                	   $("#errorAlert")[0].textContent = "Please provide the link to the external link.";
+                	   $("#errorAlert")[0].appendChild(closeButton);
+                       $("#space").scrollTop($('#space')[0].scrollHeight);
+                       return;
+                   }
+                   var form = $("#createExternalLinkForm");
+                   var formData = new FormData(form[0]);
+                   $.ajax({
+                       type: "POST",
+                       url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                       cache       : false,
+                       contentType : false,
+                       processData : false,
+                       enctype: 'multipart/form-data',
+                       data: formData,
+                       beforeSend: function () {
+                           $(".saveLoader").show();
+                           },
+                      	complete: function () {
+                           $(".saveLoader").hide();
+                           },
+                       success: function(data) {
+                           var linkData = JSON.parse(data);
+                           $("#createExternalLinkAlert").hide();
+                           form[0].reset();
+                           $("#space").css("display", "none");
+                           showExternalLinks(linkData);
+                       }
+                   });
+               });
+         	   
+          	  function showExternalLinks(externalLink) {
+          		   var externalLinkMainDiv = $('<div id="'+ externalLink["id"] +'" style="margin-top: 15px;"><div class="link_headers">Name:'+ externalLink["label"] +'</div><div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" href="'+ externalLink["url"] +'">'+ externalLink["url"]+ '</a></div><a class="btn deleteExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-trash error" style="text-align: left;"></span></a><a class="btn editExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-edit" style="text-align: left;"></span></a></div>');
+               	   var externalLinkFormDiv = $('<div id="'+ externalLink["id"] +'form"> - <a style="text-decoration: underline; color:blue;" href="'+ externalLink["url"] +'">'+ externalLink["label"] +'</a></div>');
+                   externalLinkMainDiv.find('.deleteExternalLink').attr("data-link-id", externalLink["id"]);
+                   externalLinkMainDiv.find('.editExternalLink').attr("data-link-id", externalLink["id"]);
+                   externalLinkMainDiv.find('.editExternalLink').attr("data-label", externalLink["label"]);
+                   externalLinkMainDiv.find('.editExternalLink').attr("data-url", externalLink["url"]);
 
+                   $('#Ext_Links_Module_Slide2').append(externalLinkMainDiv);
+                   $('#Ext_Links_Module_Slide1').append(externalLinkFormDiv);
+               }
+               
+               $(document).on("click", ".deleteExternalLink", function(e) {
+            	   $("#confirmDeleteLinkAlert").show();
+               	   $(".deleteExternalLinkAlert").attr('data-link-id', $(this).attr("data-link-id"));
+               });
+               
+           	   $(".deleteExternalLinkAlert").on("click", function(e) {
+            	    e.preventDefault();
+              	    $("#confirmDeleteImageAlert").find('input').remove();
+              		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
+              		$("#confirmDeleteTextAlert").find('input').remove();
+              		$("#confirmDeleteLinkAlert").hide();
+               		var linkId = $(this).attr("data-link-id");
                     $.ajax({
-                        type: "POST",
-                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                        cache       : false,
-                        contentType : false,
-                        processData : false,
-                        enctype: 'multipart/form-data',
-                        data: formData,
-                        beforeSend: function () {
-                            $(".saveLoader").show();
-                            },
-                       	complete: function () {
-                            $(".saveLoader").hide();
-                            },
-                        success: function(data) {
-                            var linkData = JSON.parse(data);
-                            $("#bgImage").off("click");
-                            externalLinkInfo["id"] = linkData["id"];
-                            externalLinkInfo["displayId"]=linkData["displayId"];
-                            externalLinkInfo["x"]=linkData["x"];
-                            externalLinkInfo["y"]=linkData["y"];
-                            showExternalLinks(externalLinkInfo, true);
-                            $("#ext_label").attr("id","");
-                            $("#link").attr("id","");
-                            $("#createExternalLinkAlert").hide();
-                            $("#errorMsg").text("");
-                            $('#errorAlert').hide();
-                            $("."+linkData["id"]).remove();
-                            form[0].reset();
-                            $("#external-arrow").attr("id","");
-                            $("#space").css("display", "none");
-                            externalLinkIcon=null;
-                            drawLinks();
-                        }
-                    });
-                });
-                
-                $("#deleteExternalLinkButton").click(function() {
-                    var linkId = $("#externalLinkIdValueEdit").val();
-                    $.ajax({
-                        url: "[(@{'/staff/space/'+${space?.id}+'/externallink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+                    	url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/externallink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
                         method: "DELETE",
                         beforeSend: function () {
-                            $(".saveLoader").show();
-                            },
-                       	complete: function () {
-                            $(".saveLoader").hide();
-                            },
-                        success:function(data) {
-                            $('[data-link-id="' + linkId + '"]').remove();
-                            hideLinkInfoTabs();
-                            $("#space").css("display", "none");
-                            drawLinks();
-                        }
-                    });
-                });
-                
-                $("#closeAlert").click(function() {
-                    $('#errorAlert').hide();
-                });
-
-                // ------------- adjust links on background image (e.g. when inputs are changed) ------------
-                // external links
-                $(".extlink-target").change(function() {
-                    var externalLink = {};
-                    externalLink["x"] = storeX;
-                    externalLink["y"] = storeY;
-                    externalLink["externalLinkLabel"] = $("#externalLinkLabel").val();
-                    externalLink["url"] = $("#externalLink").val();
-                    externalLink["type"] = $("#extType").val();
-                    showExternalLinks(externalLink);
-                });     
-                
-                $(".externallink-targetEdit").change(function() {
-                    showExternalLinkEdit(editExternalLinkInfo());
-                });
-                
-                $("#externalLinkImage").change(function() {
-                    if (this.files && this.files[0]) {
-                        externalLinkIconReader.readAsDataURL(this.files[0]);
-                    }
-                });
-                
-                $(".cancelExternalLinkBtn").click(function() {
-                    storeX = null;
-                    storeY = null;
-                    $("#space").scrollTop(0);
-                    externalLinkIcon=null;
-                    $("#external-link").remove();
-                    $("#undefined").remove();
-                    $("div#link").remove();
-                    $("#external-arrow").remove();
-                    $("#ext_label").remove();
-                    $("#space").hide();
-                    $("#createExternalLinkAlert").hide();
-                    $("#bgImage").off("click");
-                    $('#errorAlert').hide();
-                    drawLinks();
-                });
-                
-                $("#closeEditExternalLinkInfo").click(function(e) {
-                    e.preventDefault();
-                    selectedExternalLinkId=undefined;
-                    $("#externalLinkInfoLabel").text("");
-                    $("#externalLinkId").val("");
-                    resetHighlighting();
-                    $("#space").hide();
-                    $("#editExternalLinkInfo").hide();
-                    drawLinks();
-                });
-                
-                $("#uploadImage").click(function(e) {
-                    e.preventDefault();
-                    $("#addImgAlert").hide();
-                    uploadImage();
-                    $('#chooseFromLocal').trigger( "click" );
-                });
-                
-                $("#saveVideo").click(function(e) {
-                    e.preventDefault();
-                    $("#addVideoAlert").hide();
-                    embedVideo();
-                    $("#saveVideo").data('value', '');
-                    $("#saveVideo").data('url', '');
-                    $("#uploadTab").addClass("active");
-                    $("#urlTab").removeClass("active");
-                    $("#urlLink").removeClass("active show");
-                    $("#urlLink>a").removeClass("active show");
-                    $("#uploadLink").addClass("active show");
-                    $("#uploadLink>a").addClass("active show");
-                });
-                
-                $("#addChoice").click(function() {
-                    $("#addChoiceAlert").show();
-                });
-                
-                $(document).on("click", ".deleteText", function(e) {
-            		$("#confirmDeleteTextAlert").show();
-            		var alert = $('<input type="hidden" id="deleteTextId">');
-            		$(alert).attr( 'value', $(this).siblings('input').val());
-            		$('.modal-footer').append(alert); 
-              	});
-            	
-            	$(document).on("click", ".deleteImage", function(e) {
-            		$("#confirmDeleteImageAlert").show();
-            		var alert = $('<input type="hidden" id="deleteImageId">');
-            		$(alert).attr( 'value', $(this).siblings('input').val());
-            		$('.modal-footer').append(alert); 
-              	});
-            	
-            	$(document).on("click", ".deleteVideo", function(e) {
-            		$("#videoIdToDelete").attr( 'value', $(this).attr('data-video-id'));
-            		$(".load").remove();
-            		$("#"+$(this).attr('data-video-id')).append($('<div class="load" style="font-size: 30px;display: none; text-align: center;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i></div>'));
-            		$(".load").show();
-            		setTimeout(function() {
-            		    //code to be executed after 3 second
-            		    $(".load").hide();
-            		    $("#confirmDeleteVideoAlert").show();
-            		  }, 3000);
-              	});
-            	
-            	$(document).on("click", ".deleteChoiceBlock", function(e) {
-            		$("#confirmDeleteChoiceBlockAlert").show();
-            		var alert = $('<input type="hidden" id="deleteChoiceBlockId">');
-            		$(alert).attr( 'value', $(this).siblings('input').val());
-            		$('.modal-footer').append(alert); 
-              	});
-                
-                $("#cancelSubmitText").click(function() {
-            		$("#addTextAlert").hide();	
-            	});
-            	
-            	$("#cancelDeleteText").click(function() {
-            		$("#confirmDeleteTextAlert").find('input').remove();
-            		$("#confirmDeleteImageAlert").find('input').remove();
-            		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
-            		$("#confirmDeleteTextAlert").hide();
-            	});
-            	
-            	$("#cancelDeleteImage").click(function() {
-            		$("#confirmDeleteImageAlert").hide();
-            	});
-            	
-            	$("#cancelDeleteVideo").click(function() {
-            		$("#confirmDeleteVideoAlert").find('input').remove();
-            		$("#confirmDeleteVideoAlert").hide();	
-            	});
-            	
-            	$("#cancelDeleteChoiceBlock").click(function() {
-            	    $("#confirmDeleteChoiceBlockAlert").find('input').remove();
-            	    $("#confirmDeleteTextAlert").find('input').remove();
-            		$("#confirmDeleteImageAlert").find('input').remove();
-            		$("#confirmDeleteChoiceBlockAlert").hide();
-            	});
-            	
-            	$("#cancelDelete").click(function() {
-            		$("#confirmDeleteTextAlert").find('input').remove();
-            		$("#confirmDeleteImageAlert").find('input').remove();
-            		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
-            		$("#confirmDeleteImageAlert").hide();	
-            	});
-            	
-                	// ---------- Delete Text Block -------------
-            	
-            		$("#deleteText").on("click", function(e) {
-            		e.preventDefault();
-            		$("#confirmDeleteImageAlert").find('input').remove();
-            		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
-            		$("#confirmDeleteTextAlert").hide();
-            		var blockId = $('#deleteTextId').attr('value');
-            		$('#deleteTextId').remove()
-            		
-            		// ------------- delete text content blocks ------------
-            		$.ajax({
-            		    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/text/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
-            		    type: 'DELETE',
-            		    success: function(result) {
-            		        $('#' + blockId).remove();
-            		        
-            		    },
-            			error: function(data) {
-            				var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            				$('.error').append(alert); 
-            				$(".error").delay(4000).slideUp(500, function(){
-            				    $(".error").empty();
-            				});
-            			}
-            		});
-            	});
-            	
-            	// ---------- Delete Image Block -----------
-            	
-            	$("#deleteImage").on("click", function(e) {
-            		e.preventDefault();
-            		$("#confirmDeleteTextAlert").find('input').remove();
-            		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
-            		$("#confirmDeleteImageAlert").hide();
-            		var blockId = $('#deleteImageId').attr('value');
-            		if(blockId == null || blockId == ''){
-            			var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            			$('.error').append(alert); 
-            			$(".error").delay(4000).slideUp(500, function(){
-            			    $(".error").empty();
-            			});
-            		} else{
-            			$('#deleteImageId').remove()
-            			// ------------- delete image content blocks ------------
-            			$.ajax({
-            			    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/image/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
-            			    type: 'DELETE',
-            			    success: function(result) {
-            			    	$('#' + blockId).remove();
-            			    },
-            				error: function(data) {
-            					var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            					$('.error').append(alert); 
-            					$(".error").delay(4000).slideUp(500, function(){
-            					    $(".error").empty();
-            					});
-            				}
-            			});
-            		}
-            	});
-            	
-            	// ---------- Delete Video Block -----------
-            	
-				$("#deleteVideo").on("click", function(e) {
-            		e.preventDefault();
-            		$("#confirmDeleteTextAlert").find('input').remove();
-            		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
-            		$("#confirmDeleteVideoAlert").hide();
-            		var blockId = $('#videoIdToDelete').attr('value');
-            		$('#videoIdToDelete').val("");
-            		if(blockId == null || blockId == ''){
-            			var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            			$('.error').append(alert); 
-            			$(".error").delay(4000).slideUp(500, function(){
-            			    $(".error").empty();
-            			});
-            		} else{
-            		    // ------------- delete video content blocks ------------
-            			$.ajax({
-            			    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/video/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
-            			    type: 'DELETE',
-            			    success: function(result) {
-            			    	$('#' + blockId).remove();
-            			    },
-            				error: function(data) {
-            					var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            					$('.error').append(alert); 
-            					$(".error").delay(4000).slideUp(500, function(){
-            					    $(".error").empty();
-            					});
-            				}
-            			});
-            		}
-            	});
-            	
-            	$("#deleteChoiceBlock").on("click", function(e) {
-            	    e.preventDefault();
-            	    $("#confirmDeleteTextAlert").find('input').remove();
-            	    $("#confirmDeleteImageAlert").find('input').remove();
-            		$("#confirmDeleteChoiceBlockAlert").hide();
-            		var blockId = $('#deleteChoiceBlockId').attr('value');
-            		if(blockId == null || blockId == ''){
-            			var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            			$('.error').append(alert); 
-            			$(".error").delay(4000).slideUp(500, function(){
-            			    $(".error").empty();
-            			});
-            		} else{
-            			$('#deleteChoiceBlockId').remove()
-            			// ------------- delete choices content blocks ------------
-            			$.ajax({
-            			    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/choiceBlock/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
-            			    type: 'DELETE',
-            			    success: function(result) {
-            			    	$('#' + blockId).remove();
-            			    },
-            				error: function(data) {
-            					var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-            					$('.error').append(alert); 
-            					$(".error").delay(4000).slideUp(500, function(){
-            					    $(".error").empty();
-            					});
-            				}
-            			});
-            		}
-            	});
-            	$("#cancelSubmitChoice").click(function() {
-                    $("#addChoiceAlert").hide();	
-                });
-            	
-                $("#cancelImageBtn").click(function() {
-                    $('#chooseFromLocal').trigger( "click" );
-                    // Initialize selected image ID to blank, on clicking cancel button
-                    $("#uploadImage").data('value', '');
-                    $("#addImgAlert").hide();
-                    $(".open").removeClass("open");
-                });
-                
-                $("#cancelVideoBtn").click(function() {
-                    // Initialize selected video ID to blank, on clicking cancel button
-                    $("#videoTitle").val('');
-                    $("#saveVideo").data('value', '');
-                    $("#saveVideo").data('url', '');
-                    $("#saveVideo").prop('disabled', true);
-                    $("#videoFile").val('');
-                    $("#videoLink").val('');
-                    $("#addVideoAlert").hide();
-                    $(".open").removeClass("open");
-                    $("#uploadTab").addClass("active");
-                    $("#urlTab").removeClass("active");
-                    $("#urlLink").removeClass("active show");
-                    $("#urlLink>a").removeClass("active show");
-                    $("#uploadLink").addClass("active show");
-                    $("#uploadLink>a").addClass("active show");
-                    $("#saveVideo").html("Update Video"); 
-                    $('#videoIdToDelete').val("");
-                });
-                
-                $("#file").click(function() {
-                    $("#selectedImage").empty();
-                    $('#imageId').prop('selectedIndex',0).trigger( "change" );
-                });
-                
-                $("#submitText").on("click", function(e) {
-                    $("#addTextAlert").hide();
-                    e.preventDefault();
-                    // ------------- creating text content blocks ------------
-                    
-                    var formData = new FormData();
-                    var text = markDown.value();
-                    formData.append('content', text);
-                    markDown.value('');
-                    $.ajax({
-                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/textcontent?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                        type: 'POST',
-                        cache       : false,
-                        contentType : false,
-                        processData : false,
-                        data: formData,
-                        enctype: 'multipart/form-data',
-                        success: function(data) {
-            
-                            var textblock = $('<div style="word-break:break-word;" id="'+ data +'" class="textDivStaff tab row"><p class="col-md-10">'+text+'</p>'+'<input type="hidden" id="deleteTextId" value="'+data+'" /><a class="btn deleteText col-md-1" href="javascript:;" style="position: absolute; right: 0px;"><span class="icon-trash error"></span></a></div>');
-                            $(textblock[0]).mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
-                            $('#slideSpace').append(textblock);             
+                        	$(".saveLoader").show();
                         },
-                        error: function(data) {
-                        	if (data.status == 403){
-                        		$("#loginAlert").show();
-                        	}
-                        	else {
-                            	var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-                            	$('.error').append(alert);
-                        	}
-                        }
-                    });
-                });
-                
-                $('input:checkbox').click(function() {
-                    if ($(this).is(':checked')) {
-                    	$('#submitChoices').prop("disabled", false);
-                    } else {
-                    if ($('.choiceOptions').filter(':checked').length < 1){
-                    	$('#submitChoices').attr('disabled',true);}
-                    }
-                });
-                
-                $("#submitChoices").on("click", function(e) {
-                    e.preventDefault();
-                    $("#addChoiceAlert").hide();
-                    var selectedChoice = [];
-                    var showsAll = false;
-                    $('#selectChoices :checked').each(function() {
-                    	selectedChoice.push($(this).attr("id"));
-                      });
-                    // ------------- creating choice content blocks ------------
-                    if ($('#showAllChoices').is(':checked')) {
-                        showsAll = true;
-                    }
-                    var formData = new FormData();
-                    formData.append('selectedChoices', selectedChoice);
-                    formData.append('showsAll', showsAll);
-                    $.ajax({
-                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/choice/content?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                        type: 'POST',
-                        cache       : false,
-                        contentType : false,
-                        processData : false,
-                        data: formData,
-                        enctype: 'multipart/form-data',
-                        success: function(data) {
-                            var choiceblock = $('<div id="'+ data['choiceBlock'].id +'" class="choiceDiv tab row" style="display:block;">');
-                            if (data['choiceBlock'].showsAll == false){
-                                $.each(data['selectedSequences'], function(index, sequence) {
-                                    choiceblock.append('<a style="color:var(--primary);  display:block;" href="/vspace/staff/module/[(${module.id})]/sequence/'+sequence.id+'">'+sequence.name+'</a>');
-                        	});
-                            }else{
-                            	$(function() {
-                                    var links = $("#choiceSpaceData a").map(function(e) {
-                                        text = '<a style="color:var(--primary); display:block;" href='+this.href+'>'+this.name+'</a>';
-                                        return text;
-                                    }).get();
-                                    $(links).each(function(index, choice) {
-                                        choiceblock.append(choice);
-                                    });
-                               });
-                            }
-                            choiceblock.append('<input type="hidden" class="col-md-8" id="deleteChoiceBlockId" value="'+ data['choiceBlock'].id +'"><a class="btn deleteChoiceBlock col-md-1" href="javascript:;" style="position: absolute; right: 0; top: 0;"><span class="icon-trash error"></span></a></div>')
-                        	$(choiceblock).css({
-                                'display': "block"
-                            });
-                            $('#slideSpace').append(choiceblock);
+                      	complete: function () {
+                        	$(".saveLoader").hide();
                         },
-                        error: function(data) {
-                            var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-                            $('.error').append(alert);
+                        success:function(data) {
+               		        $('#' + linkId).remove();
+               		    	$('#' + linkId + "form").remove();
+                            hideLinkInfoTabs();
                         }
                     });
-                    $('#choiceForm')[0].reset();
-                });
-            
-                $("#urlLink").on("click", function (e) {
- 				    if ($("#videoFile").val()) {
- 						$("#videoTitle").prop('disabled', true);
- 						$("#videoLink").prop('disabled', true);
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					if (!$("#videoFile").val()) {
- 						$("#videoTitle").prop('disabled', false);
- 						$("#videoLink").prop('disabled', false);
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 					if (!$("#videoTitle").val() && !$("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					if (!$("#videoTitle").val() && $("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					$("#urlLink").addClass("active show");
- 					$("#uploadLink").removeClass("active show");
-                    if(addVideoClk==1 && editVideoClk==0){
-                        $("#saveVideo").html("Embed Video"); 
-                        if (!$("#videoTitle").val() || !$("#videoLink").val()) {
-     						$("#saveVideo").prop('disabled', true);
-     					}
-                    }
-                    if(addVideoClk==0 && editVideoClk==1){
-                        $("#saveVideo").html("Update Video");  
-                        if ($("#videoTitle").val() && !$("#videoLink").val()) {
-     						$("#saveVideo").prop('disabled', false);
-     					}
-                        if (!$("#videoTitle").val() && $("#videoLink").val()) {
-     						$("#saveVideo").prop('disabled', true);
-     					}
-                    }
-                    
- 				});
+               });
 
- 				$("#uploadLink").on("click", function (e) {
- 				    if ($("#videoLink").val()) {
- 						$("#videoTitle").prop('disabled', true);
- 						$("#videoFile").prop('disabled', true);
- 						$("#saveVideo").prop('disabled', true);
- 					}else {
- 						$("#videoTitle").prop('disabled', false);
- 						$("#videoFile").prop('disabled', false);
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 					
- 					if (!$("#videoTitle").val() && !$("#videoFile").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}
- 					$("#urlLink").removeClass("active show");
- 					$("#uploadLink").addClass("active show");
- 				   if(addVideoClk==1 && editVideoClk==0){
-                       $("#saveVideo").html("Upload Video");   
-                       if (!$("#videoTitle").val() || !$("#videoFile").val()) {
+               // ------------- adjust links on background image (e.g. when inputs are changed) ------------
+               // external links
+//                $(".extlink-target").change(function() {
+//                    var externalLink = {};
+//                    externalLink["label"] = $("#externalLinkLabel").val();
+//                    externalLink["url"] = $("#externalLink").val();
+//                });
+               
+               $("#externalLinkImage").change(function() {
+                   if (this.files && this.files[0]) {
+                       externalLinkIconReader.readAsDataURL(this.files[0]);
+                   }
+               });
+               
+               $(".cancelExternalLinkBtn").click(function() {
+                   $("#space").scrollTop(0);
+                   $("#undefined").remove();
+                   $("#space").hide();
+                   $("#createExternalLinkAlert").hide();
+                   $("#editExternalLinkInfo").hide();
+               });
+               
+               $("#uploadImage").click(function(e) {
+                   e.preventDefault();
+                   $("#addImgAlert").hide();
+                   uploadImage();
+                   $('#chooseFromLocal').trigger( "click" );
+               });
+               
+               $("#saveVideo").click(function(e) {
+                   e.preventDefault();
+                   $("#addVideoAlert").hide();
+                   embedVideo();
+                   $("#saveVideo").data('value', '');
+                   $("#saveVideo").data('url', '');
+                   $("#uploadTab").addClass("active");
+                   $("#urlTab").removeClass("active");
+                   $("#urlLink").removeClass("active show");
+                   $("#urlLink>a").removeClass("active show");
+                   $("#uploadLink").addClass("active show");
+                   $("#uploadLink>a").addClass("active show");
+               });
+               
+               $("#addChoice").click(function() {
+                   $("#addChoiceAlert").show();
+               });
+               
+            $(document).on("click", ".deleteText", function(e) {
+           		$("#confirmDeleteTextAlert").show();
+           		var alert = $('<input type="hidden" id="deleteTextId">');
+           		$(alert).attr( 'value', $(this).siblings('input').val());
+           		$('.modal-footer').append(alert); 
+             	});
+           	
+           	$(document).on("click", ".deleteImage", function(e) {
+           		$("#confirmDeleteImageAlert").show();
+           		var alert = $('<input type="hidden" id="deleteImageId">');
+           		$(alert).attr( 'value', $(this).siblings('input').val());
+           		$('.modal-footer').append(alert); 
+             	});
+           	
+           	$(document).on("click", ".deleteVideo", function(e) {
+           		$("#videoIdToDelete").attr( 'value', $(this).attr('data-video-id'));
+           		$(".load").remove();
+           		$("#"+$(this).attr('data-video-id')).append($('<div class="load" style="font-size: 30px;display: none; text-align: center;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i></div>'));
+           		$(".load").show();
+           		setTimeout(function() {
+           		    //code to be executed after 3 second
+           		    $(".load").hide();
+           		    $("#confirmDeleteVideoAlert").show();
+           		  }, 3000);
+             	});
+           	
+           	$(document).on("click", ".deleteChoiceBlock", function(e) {
+           		$("#confirmDeleteChoiceBlockAlert").show();
+           		var alert = $('<input type="hidden" id="deleteChoiceBlockId">');
+           		$(alert).attr( 'value', $(this).siblings('input').val());
+           		$('.modal-footer').append(alert); 
+          	});
+               
+            $("#cancelSubmitText").click(function() {
+           		$("#addTextAlert").hide();	
+           	});
+           	
+           	$("#cancelDeleteText").click(function() {
+           		$("#confirmDeleteTextAlert").find('input').remove();
+           		$("#confirmDeleteImageAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
+           		$("#confirmDeleteTextAlert").hide();
+           	});
+           	
+           	$("#cancelDeleteLink").click(function() {
+           		$("#confirmDeleteTextAlert").find('input').remove();
+           		$("#confirmDeleteImageAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
+           		$("#confirmDeleteLinkAlert").hide();
+           	});
+           	
+           	$("#cancelDeleteImage").click(function() {
+           		$("#confirmDeleteImageAlert").hide();
+           	});
+           	
+           	$("#cancelDeleteVideo").click(function() {
+           		$("#confirmDeleteVideoAlert").find('input').remove();
+           		$("#confirmDeleteVideoAlert").hide();	
+           	});
+           	
+           	$("#cancelDeleteChoiceBlock").click(function() {
+           	    $("#confirmDeleteChoiceBlockAlert").find('input').remove();
+           	    $("#confirmDeleteTextAlert").find('input').remove();
+           		$("#confirmDeleteImageAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").hide();
+           	});
+           	
+           	$("#cancelDelete").click(function() {
+           		$("#confirmDeleteTextAlert").find('input').remove();
+           		$("#confirmDeleteImageAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
+           		$("#confirmDeleteImageAlert").hide();	
+           	});
+           	
+               	// ---------- Delete Text Block -------------
+           	
+       		$("#deleteText").on("click", function(e) {
+           		e.preventDefault();
+           		$("#confirmDeleteImageAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
+           		$("#confirmDeleteTextAlert").hide();
+           		var blockId = $('#deleteTextId').attr('value');
+           		$('#deleteTextId').remove()
+           		
+           		// ------------- delete text content blocks ------------
+           		$.ajax({
+           		    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/text/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
+           		    type: 'DELETE',
+           		    success: function(result) {
+           		        $('#' + blockId).remove();
+           		        
+           		    },
+           			error: function(data) {
+           				var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           				$('.error').append(alert); 
+           				$(".error").delay(4000).slideUp(500, function(){
+           				    $(".error").empty();
+           				});
+           			}
+           		});
+           	});
+           	
+           	// ---------- Delete Image Block -----------
+           	
+           	$("#deleteImage").on("click", function(e) {
+           		e.preventDefault();
+           		$("#confirmDeleteTextAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
+           		$("#confirmDeleteImageAlert").hide();
+           		var blockId = $('#deleteImageId').attr('value');
+           		if(blockId == null || blockId == ''){
+           			var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           			$('.error').append(alert); 
+           			$(".error").delay(4000).slideUp(500, function(){
+           			    $(".error").empty();
+           			});
+           		} else{
+           			$('#deleteImageId').remove()
+           			// ------------- delete image content blocks ------------
+           			$.ajax({
+           			    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/image/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
+           			    type: 'DELETE',
+           			    success: function(result) {
+           			    	$('#' + blockId).remove();
+           			    },
+           				error: function(data) {
+           					var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           					$('.error').append(alert); 
+           					$(".error").delay(4000).slideUp(500, function(){
+           					    $(".error").empty();
+           					});
+           				}
+           			});
+           		}
+           	});
+           	
+           	// ---------- Delete Video Block -----------
+           	
+			$("#deleteVideo").on("click", function(e) {
+           		e.preventDefault();
+           		$("#confirmDeleteTextAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").find('input').remove();
+           		$("#confirmDeleteVideoAlert").hide();
+           		var blockId = $('#videoIdToDelete').attr('value');
+           		$('#videoIdToDelete').val("");
+           		if(blockId == null || blockId == ''){
+           			var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           			$('.error').append(alert); 
+           			$(".error").delay(4000).slideUp(500, function(){
+           			    $(".error").empty();
+           			});
+           		} else{
+           		    // ------------- delete video content blocks ------------
+           			$.ajax({
+           			    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/video/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
+           			    type: 'DELETE',
+           			    success: function(result) {
+           			    	$('#' + blockId).remove();
+           			    },
+           				error: function(data) {
+           					var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           					$('.error').append(alert); 
+           					$(".error").delay(4000).slideUp(500, function(){
+           					    $(".error").empty();
+           					});
+           				}
+           			});
+           		}
+           	});
+           	
+           	$("#deleteChoiceBlock").on("click", function(e) {
+           	    e.preventDefault();
+           	    $("#confirmDeleteTextAlert").find('input').remove();
+           	    $("#confirmDeleteImageAlert").find('input').remove();
+           		$("#confirmDeleteChoiceBlockAlert").hide();
+           		var blockId = $('#deleteChoiceBlockId').attr('value');
+           		if(blockId == null || blockId == ''){
+           			var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           			$('.error').append(alert); 
+           			$(".error").delay(4000).slideUp(500, function(){
+           			    $(".error").empty();
+           			});
+           		} else{
+           			$('#deleteChoiceBlockId').remove()
+           			// ------------- delete choices content blocks ------------
+           			$.ajax({
+           			    url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/choiceBlock/'})]"+blockId+'?'+[[${_csrf.parameterName}]]+'='+[[${_csrf.token}]],
+           			    type: 'DELETE',
+           			    success: function(result) {
+           			    	$('#' + blockId).remove();
+           			    },
+           				error: function(data) {
+           					var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try to delete again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+           					$('.error').append(alert); 
+           					$(".error").delay(4000).slideUp(500, function(){
+           					    $(".error").empty();
+           					});
+           				}
+           			});
+           		}
+           	});
+           	$("#cancelSubmitChoice").click(function() {
+                   $("#addChoiceAlert").hide();	
+               });
+           	
+               $("#cancelImageBtn").click(function() {
+                   $('#chooseFromLocal').trigger( "click" );
+                   // Initialize selected image ID to blank, on clicking cancel button
+                   $("#uploadImage").data('value', '');
+                   $("#addImgAlert").hide();
+                   $(".open").removeClass("open");
+               });
+               
+               $("#cancelVideoBtn").click(function() {
+                   // Initialize selected video ID to blank, on clicking cancel button
+                   $("#videoTitle").val('');
+                   $("#saveVideo").data('value', '');
+                   $("#saveVideo").data('url', '');
+                   $("#saveVideo").prop('disabled', true);
+                   $("#videoFile").val('');
+                   $("#videoLink").val('');
+                   $("#addVideoAlert").hide();
+                   $(".open").removeClass("open");
+                   $("#uploadTab").addClass("active");
+                   $("#urlTab").removeClass("active");
+                   $("#urlLink").removeClass("active show");
+                   $("#urlLink>a").removeClass("active show");
+                   $("#uploadLink").addClass("active show");
+                   $("#uploadLink>a").addClass("active show");
+                   $("#saveVideo").html("Update Video"); 
+                   $('#videoIdToDelete').val("");
+               });
+               
+               $("#file").click(function() {
+                   $("#selectedImage").empty();
+                   $('#imageId').prop('selectedIndex',0).trigger( "change" );
+               });
+               
+               $("#submitText").on("click", function(e) {
+                   $("#addTextAlert").hide();
+                   e.preventDefault();
+                   // ------------- creating text content blocks ------------
+                   
+                   var formData = new FormData();
+                   var text = markDown.value();
+                   formData.append('content', text);
+                   markDown.value('');
+                   $.ajax({
+                       url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/textcontent?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                       type: 'POST',
+                       cache       : false,
+                       contentType : false,
+                       processData : false,
+                       data: formData,
+                       enctype: 'multipart/form-data',
+                       success: function(data) {
+           
+                           var textblock = $('<div style="word-break:break-word;" id="'+ data +'" class="textDivStaff tab row"><p class="col-md-10">'+text+'</p>'+'<input type="hidden" id="deleteTextId" value="'+data+'" /><a class="btn deleteText col-md-1" href="javascript:;" style="position: absolute; right: 0px;"><span class="icon-trash error"></span></a></div>');
+                           $(textblock[0]).mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
+                           $('#slideSpace').append(textblock);             
+                       },
+                       error: function(data) {
+                       	if (data.status == 403){
+                       		$("#loginAlert").show();
+                       	}
+                       	else {
+                           	var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+                           	$('.error').append(alert);
+                       	}
+                       }
+                   });
+               });
+               
+               $('input:checkbox').click(function() {
+                   if ($(this).is(':checked')) {
+                   	$('#submitChoices').prop("disabled", false);
+                   } else {
+                   if ($('.choiceOptions').filter(':checked').length < 1){
+                   	$('#submitChoices').attr('disabled',true);}
+                   }
+               });
+               
+               $("#submitChoices").on("click", function(e) {
+                   e.preventDefault();
+                   $("#addChoiceAlert").hide();
+                   var selectedChoice = [];
+                   var showsAll = false;
+                   $('#selectChoices :checked').each(function() {
+                   	selectedChoice.push($(this).attr("id"));
+                     });
+                   // ------------- creating choice content blocks ------------
+                   if ($('#showAllChoices').is(':checked')) {
+                       showsAll = true;
+                   }
+                   var formData = new FormData();
+                   formData.append('selectedChoices', selectedChoice);
+                   formData.append('showsAll', showsAll);
+                   $.ajax({
+                       url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/choice/content?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                       type: 'POST',
+                       cache       : false,
+                       contentType : false,
+                       processData : false,
+                       data: formData,
+                       enctype: 'multipart/form-data',
+                       success: function(data) {
+                           var choiceblock = $('<div id="'+ data['choiceBlock'].id +'" class="choiceDiv tab row" style="display:block;">');
+                           if (data['choiceBlock'].showsAll == false){
+                               $.each(data['selectedSequences'], function(index, sequence) {
+                                   choiceblock.append('<a style="color:var(--primary);  display:block;" href="/vspace/staff/module/[(${module.id})]/sequence/'+sequence.id+'">'+sequence.name+'</a>');
+                       	});
+                           }else{
+                           	$(function() {
+                                   var links = $("#choiceSpaceData a").map(function(e) {
+                                       text = '<a style="color:var(--primary); display:block;" href='+this.href+'>'+this.name+'</a>';
+                                       return text;
+                                   }).get();
+                                   $(links).each(function(index, choice) {
+                                       choiceblock.append(choice);
+                                   });
+                              });
+                           }
+                           choiceblock.append('<input type="hidden" class="col-md-8" id="deleteChoiceBlockId" value="'+ data['choiceBlock'].id +'"><a class="btn deleteChoiceBlock col-md-1" href="javascript:;" style="position: absolute; right: 0; top: 0;"><span class="icon-trash error"></span></a></div>')
+                       	$(choiceblock).css({
+                               'display': "block"
+                           });
+                           $('#slideSpace').append(choiceblock);
+                       },
+                       error: function(data) {
+                           var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+                           $('.error').append(alert);
+                       }
+                   });
+                   $('#choiceForm')[0].reset();
+               });
+           
+               $("#urlLink").on("click", function (e) {
+				    if ($("#videoFile").val()) {
+						$("#videoTitle").prop('disabled', true);
+						$("#videoLink").prop('disabled', true);
+						$("#saveVideo").prop('disabled', true);
+					}
+					if (!$("#videoFile").val()) {
+						$("#videoTitle").prop('disabled', false);
+						$("#videoLink").prop('disabled', false);
+						$("#saveVideo").prop('disabled', false);
+					}
+					if (!$("#videoTitle").val() && !$("#videoLink").val()) {
+						$("#saveVideo").prop('disabled', true);
+					}
+					if (!$("#videoTitle").val() && $("#videoLink").val()) {
+						$("#saveVideo").prop('disabled', true);
+					}
+					$("#urlLink").addClass("active show");
+					$("#uploadLink").removeClass("active show");
+                   if(addVideoClk==1 && editVideoClk==0){
+                       $("#saveVideo").html("Embed Video"); 
+                       if (!$("#videoTitle").val() || !$("#videoLink").val()) {
     						$("#saveVideo").prop('disabled', true);
     					}
                    }
                    if(addVideoClk==0 && editVideoClk==1){
                        $("#saveVideo").html("Update Video");  
-                       if ($("#videoTitle").val() && !$("#videoFile").val()) {
+                       if ($("#videoTitle").val() && !$("#videoLink").val()) {
     						$("#saveVideo").prop('disabled', false);
     					}
-                       if (!$("#videoTitle").val() && $("#videoFile").val()) {
+                       if (!$("#videoTitle").val() && $("#videoLink").val()) {
     						$("#saveVideo").prop('disabled', true);
     					}
                    }
- 				});
- 				
- 				$("#videoLink").on("input", function (e) {
- 				    if (!$("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}else {
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 				});
- 				
- 				$("#videoFile").on("input", function (e) {
- 				    if (!$("#videoFile").val()) {
- 						$("#saveVideo").prop('disabled', true);
- 					}else {
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 				});
- 				
- 				$("#videoTitle").on("input", function (e) {
- 				    if ($("#videoFile").val() || $("#videoLink").val()) {
- 						$("#saveVideo").prop('disabled', false);
- 					}
- 				}); 
-                
-                function updateTextBox(blockId, text) {
-                    // clear text box and buttons
-                    $(".open").empty();
-                    $(".open").append('<p class="col-md-10">'+text+'</p><input type="hidden" id="deleteTextId" value="'+blockId+'" /><a class="btn deleteText col-md-1" href="javascript:;" style="position: absolute; right:0;"><span class="icon-trash error"></span></a>');
-                    // reset border of the card
-                    //rebind event handlers
-                    $('.textDivStaff').mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
-                    //resetting the height and overflow-y so that the TextBlock doesn't expand
-                    $('.textDivStaff').css('height', 'auto');
-                    $('.textDivStaff').css('overflow-y', 'visible');
-                    $(".open").css('display', 'flex');
-                    // remove id from storage so its not there on refresh
-                    $(".open").removeClass("open");
-                }
-                
-                // must add the event to the document since the buttons are added dynamically
-                $('#cancelTextBlock').on('click',function(){
-                	$("#editTextAlert").hide();
-                	var blockId = $(this).closest(".open").attr("id");
-                	updateTextBox(blockId, defaultValue);
-                });
-            
-                $('.valueDiv').mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
-                $('.textDivStaff').mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
-                $('.vidDiv').mouseenter(onMouseEnter).mouseleave(onMouseLeave);//.dblclick(onDoubleClick);
-            
-                $("#submitTextBlock").on("click", function(e){
-                	e.preventDefault();
-                    // ------------- editting text content blocks ------------
-                    
-                    var formData = new FormData();
-                    var text = markDown.value();
-                    markDown.value('');
-                    var formData = new FormData();
-                    var blockId = $(".open").attr("id");
-                    formData.append('textBlockDesc', text);
-                    formData.append('textBlockId', blockId);
-                	$("#editTextAlert").hide();
-                    $.ajax({
-                        url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/text/edit?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                        type: 'POST',
-                        cache       : false,
-                        contentType : false,
-                        processData : false,
-                        data: formData,
-                        enctype: 'multipart/form-data',
-                        success: function(data) {
-                            // replace text box with new description
-                           updateTextBox(blockId, text)
-                           $(".open").removeClass("open");
-                       },
-                       error: function(data) {
-                    		if (data.status == 403) {
-                       			$("#loginAlert").show();
-                       		}
-                       		else {
-                           		var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
-                           		$('.error').append(alert);
-                       		}
-                       }
-                   });
-                });    
-                $("#imageId").select2({
-            		ajax: {
-            		    url: function (params) {
-            		  		var imageURL = [[@{|/staff/images/search|}]];
-            		  		return imageURL;
-            		    },
-            		    dataType: 'json',
-            		    processResults: function (data) {
-            		        return {
-            		          results: data,
-            		        };
-            		      },
-            		},
-            		templateResult: formatImage,
-            		templateSelection: formatSelection
-                });
-                
-                function formatImage (image) {
-                	if (!image.id) {
-                		return image.text;
-                	}
-                	var tbaseUrl = [[@{|/api/image/|}]];
-                	var $image = $(
-                			'<span><img src="' + tbaseUrl + image.id + '" class="img-thumbnail" /> ' + image.text + '</span>'
-                	);
-                	return $image;
-                };
-                
-                function formatSelection(image) {
-                	if (!image.id) {
-                        return image.text;
-                    }
-                	var tbaseUrl = [[@{|/api/image/|}]];
-                    var $image = $(
-                            '<span>' + image.text + '</span>'
-                    );
-                    $("#selectedImage").empty();
-                    $("#selectedImage").append('<img width="200px" src="' + tbaseUrl + image.id + '" class="img-thumbnail" />');
-                    return $image;
-                }
-            });
-            
+                   
+				});
+
+				$("#uploadLink").on("click", function (e) {
+				    if ($("#videoLink").val()) {
+						$("#videoTitle").prop('disabled', true);
+						$("#videoFile").prop('disabled', true);
+						$("#saveVideo").prop('disabled', true);
+					}else {
+						$("#videoTitle").prop('disabled', false);
+						$("#videoFile").prop('disabled', false);
+						$("#saveVideo").prop('disabled', false);
+					}
+					
+					if (!$("#videoTitle").val() && !$("#videoFile").val()) {
+						$("#saveVideo").prop('disabled', true);
+					}
+					$("#urlLink").removeClass("active show");
+					$("#uploadLink").addClass("active show");
+				   if(addVideoClk==1 && editVideoClk==0){
+                      $("#saveVideo").html("Upload Video");   
+                      if (!$("#videoTitle").val() || !$("#videoFile").val()) {
+   						$("#saveVideo").prop('disabled', true);
+   					}
+                  }
+                  if(addVideoClk==0 && editVideoClk==1){
+                      $("#saveVideo").html("Update Video");  
+                      if ($("#videoTitle").val() && !$("#videoFile").val()) {
+   						$("#saveVideo").prop('disabled', false);
+   					}
+                      if (!$("#videoTitle").val() && $("#videoFile").val()) {
+   						$("#saveVideo").prop('disabled', true);
+   					}
+                  }
+				});
+				
+				$("#videoLink").on("input", function (e) {
+				    if (!$("#videoLink").val()) {
+						$("#saveVideo").prop('disabled', true);
+					}else {
+						$("#saveVideo").prop('disabled', false);
+					}
+				});
+				
+				$("#videoFile").on("input", function (e) {
+				    if (!$("#videoFile").val()) {
+						$("#saveVideo").prop('disabled', true);
+					}else {
+						$("#saveVideo").prop('disabled', false);
+					}
+				});
+				
+				$("#videoTitle").on("input", function (e) {
+				    if ($("#videoFile").val() || $("#videoLink").val()) {
+						$("#saveVideo").prop('disabled', false);
+					}
+				});
+               
+               function updateTextBox(blockId, text) {
+                   // clear text box and buttons
+                   $(".open").empty();
+                   $(".open").append('<p class="col-md-10">'+text+'</p><input type="hidden" id="deleteTextId" value="'+blockId+'" /><a class="btn deleteText col-md-1" href="javascript:;" style="position: absolute; right:0;"><span class="icon-trash error"></span></a>');
+                   // reset border of the card
+                   //rebind event handlers
+                   $('.textDivStaff').mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
+                   //resetting the height and overflow-y so that the TextBlock doesn't expand
+                   $('.textDivStaff').css('height', 'auto');
+                   $('.textDivStaff').css('overflow-y', 'visible');
+                   $(".open").css('display', 'flex');
+                   // remove id from storage so its not there on refresh
+                   $(".open").removeClass("open");
+               }
+               
+               // must add the event to the document since the buttons are added dynamically
+               $('#cancelTextBlock').on('click',function(){
+               	$("#editTextAlert").hide();
+               	var blockId = $(this).closest(".open").attr("id");
+               	updateTextBox(blockId, defaultValue);
+               });
+           
+               $('.valueDiv').mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
+               $('.textDivStaff').mouseenter(onMouseEnter).mouseleave(onMouseLeave).dblclick(onDoubleClick);
+               $('.vidDiv').mouseenter(onMouseEnter).mouseleave(onMouseLeave);//.dblclick(onDoubleClick);
+           
+               $("#submitTextBlock").on("click", function(e){
+               	e.preventDefault();
+                   // ------------- editting text content blocks ------------
+                   
+                   var formData = new FormData();
+                   var text = markDown.value();
+                   markDown.value('');
+                   var formData = new FormData();
+                   var blockId = $(".open").attr("id");
+                   formData.append('textBlockDesc', text);
+                   formData.append('textBlockId', blockId);
+               	$("#editTextAlert").hide();
+                   $.ajax({
+                       url: "[(@{'/staff/module/'+${module.id}+'/slide/'+${slide.id}+'/text/edit?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+                       type: 'POST',
+                       cache       : false,
+                       contentType : false,
+                       processData : false,
+                       data: formData,
+                       enctype: 'multipart/form-data',
+                       success: function(data) {
+                           // replace text box with new description
+                          updateTextBox(blockId, text)
+                          $(".open").removeClass("open");
+                      },
+                      error: function(data) {
+                   		if (data.status == 403) {
+                      			$("#loginAlert").show();
+                      		}
+                      		else {
+                          		var alert = $('<div class="alert alert-danger alert-dismissible fade show" role="alert"><p>We are sorry but something went wrong. Please try again later.</p><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>');
+                          		$('.error').append(alert);
+                      		}
+                      }
+                  });
+               });    
+               $("#imageId").select2({
+           		ajax: {
+           		    url: function (params) {
+           		  		var imageURL = [[@{|/staff/images/search|}]];
+           		  		return imageURL;
+           		    },
+           		    dataType: 'json',
+           		    processResults: function (data) {
+           		        return {
+           		          results: data,
+           		        };
+           		      },
+           		},
+           		templateResult: formatImage,
+           		templateSelection: formatSelection
+               });
+               
+               function formatImage (image) {
+               	if (!image.id) {
+               		return image.text;
+               	}
+               	var tbaseUrl = [[@{|/api/image/|}]];
+               	var $image = $(
+               			'<span><img src="' + tbaseUrl + image.id + '" class="img-thumbnail" /> ' + image.text + '</span>'
+               	);
+               	return $image;
+               };
+               
+               function formatSelection(image) {
+               	if (!image.id) {
+                       return image.text;
+                   }
+               	var tbaseUrl = [[@{|/api/image/|}]];
+                   var $image = $(
+                           '<span>' + image.text + '</span>'
+                   );
+                   $("#selectedImage").empty();
+                   $("#selectedImage").append('<img width="200px" src="' + tbaseUrl + image.id + '" class="img-thumbnail" />');
+                   return $image;
+               }
+           
             $(window).on('load', function () {	
             	var divWindow = $(".valueDiv");
             	$(".deleteText").css('position', 'absolute');
@@ -1909,11 +1614,15 @@
                     $("#addVideoAlert").show();
             	}
             });
+        });
         </script>
     </head>
     <body>
         <div class="main-content" layout:fragment="content">
-        
+	        <div id="errorMsg" class="alert customWindow">
+    	        <span class="closebtn" onclick="this.parentElement.style.display='none';">&times;</span>
+    	        Error Message
+    	    </div>
             <ol class="breadcrumb">
                 <li class="breadcrumb-item">
                     <a th:href="@{/staff/dashboard}">Dashboard</a>
@@ -2024,6 +1733,31 @@ <h6>Are you sure you want to delete this
                     </div>
                 </div>
             </div>
+            <div id="confirmDeleteLinkAlert" class="modal" tabindex="-1"
+                role="dialog" th:draggable="true">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title">Confirm Delete</h5>
+                            <button type="button" class="close"
+                                data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <h6>Are you sure you want to delete this
+                                external link?
+                            </h6>
+                        </div>
+                        <div class="modal-footer">
+                            <button id="cancelDeleteLink" type="reset"
+                                class="btn light">Cancel</button>
+                            <button type="submit"
+                                class="btn btn-primary deleteExternalLinkAlert">Delete</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <!-- Delete Video Modal -->
             <div id="confirmDeleteVideoAlert" class="modal"
                 tabindex="-1" role="dialog" th:draggable="true">
@@ -2290,244 +2024,183 @@ <h5 class="modal-title">Select from the
             
             
             <div th:each="contents: ${slideContents}">
-            <div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
-        	<img id="bgImage" style="max-width: 461px;" th:src="@{'/api/image/'+${contents.image.id}}" />
-        	
-        	
-        	
-        	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
-			        <div class="divider"></div>
-			        <form id="createExternalLinkForm" style="z-index: 1;">
-			            <div role="alert" style="margin-top: 30px;">
-		                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
-		                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-		                    </div>
-			            	<div class="row">	
-			            		<div class="col">
-			            			<h5 class="alert-heading">Create new External Link</h5>
-					                <p>Please click on the image where you
-					                   want to place the new external link. Then click
-					                   "Create External Link".</p>
-			            		</div>
-			                </div>
-			
-			                <input type="hidden" name="x" id="externalLinkX" /> 
-			                <input type="hidden" name="y" id="externalLinkY" /> 
-			                
-			                <div class="row">
-			                	<div class="col-sm-4">
-			                		<label>Label</label>
-			                	</div>
-			                	<div class="col-sm-8">
-			                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
-			                			 name="externalLinkLabel" id="externalLinkLabel">	
-			                	</div>
-			                </div>
-			                 
-			                <div class="row">
-			                	<div class="col-sm-4">
-			                		<label>External Link</label>
-			                	</div>
-			                	<div class="col-sm-8">
-			                		<input class="form-control-sm extlink-target" type="text" style="width: inherit; background: var(--base-grey)"
-			                    		size="15" name="url" id="externalLink">	
-			                	</div>
-			                </div>               
-							<div class="row">
-			                    <div class="col-sm-4">
-			                        <label>How To Open:</label>
-			                    </div>
-			                    <div class="col-sm-8">
-			                        <select id="extTabOpen" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
-			                            <option th:selected>Choose...</option>
-			                            <option th:value="NEWWINDOW">New Window</option>
-			                            <option th:value="SAMEWINDOW">Same Window</option>
-			                        </select>
-			                    </div>
-			                </div>
-			                <div class="row">
-			                    <div class="col-sm-4">
-			                        <label>Type</label>
-			                    </div>
-			                    <div class="col-sm-8">
-			                        <select id="extType" name="type" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
-			                            <option th:selected>Choose...</option>
-			                            <option th:value="IMAGE">Image</option>
-			                            <option th:value="ARROW">Link</option>
-			                        </select>
-			                    </div>
-			                </div>
-			
-			                <div class="row">
-			                    <div class="col-sm-4">
-			                        <label>Image</label>
-			                    </div>
-			                    <div class="col-sm-8">
-			                        <input type="file" class="form-control-sm" name="externalLinkImage" id="externalLinkImage" style="width: inherit">
-			                    </div>
-			                </div>
-			                <p class="mt-5 text-center">
-			                    <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
-			                    <button id="createExternalLinkBtn" type="submit" class="btn primary-btn btn-sm">Create External Link</button>
-			                </p>
-			            </div>
-			        </form>
-				</div>
-		        
-		        <div id="editExternalLinkInfo" class="custom_form_style" style="z-index: 1;">
-		            <div class="divider"></div>
-		            <form id="editExternalLinkForm" style="z-index: 1;">
-		                <p class="float-right">
-		                    <a href="#" id="closeEditExternalLinkInfo" class="icon-circle-close"></a>
-		                </p>
-		                <div role="alert" style="margin-top: 30px;">
-		                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
-		                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-		                    </div>
-		                    <div class="row">
-		                        <div class="col">
-		                            <h6 class="alert-heading">
-		                                <span style="color: var(--dark-grey)">Modify External
-		                                    Link: </span><span
-		                                    id="externalLinkInfoLabelEdit"></span>
-		                            </h6>
-		                            <p>Please click on the image where you
-		                                want to place the existing external
-		                                link. Then click "Edit External Link".</p>
-		                        </div>
-		                    </div>
-		                    <input type="hidden" name="externalLinkIdValueEdit"
-		                        id="externalLinkIdValueEdit" />
-		                    <input type="hidden" name="x" id="externalLinkXEdit" />
-		                    <input type="hidden" name="y" id="externalLinkYEdit" />
-		                    <input type="hidden" name="externalLinkDisplayId"
-		                        id="externalLinkDisplayId" />
-		
-		                    <div class="row">
-		                        <div class="col-sm-4">
-		                            <label>Label:</label>
-		                        </div>
-		                        <div class="col-sm-8">
-		                            <input
-		                                class="form-control-sm externallink-targetEdit"
-		                                type="text" name="externalLinkLabel"
-		                                id="externalLinkLabelEdit"
-		                                style="width: inherit; background: var(--base-grey)"><br>
-		                        </div>
-		                    </div>
-		
-		                    <div class="row">
-		                        <div class="col-sm-4" style="padding-right: 0;">
-		                            <label>External Link
-		                            </label>
-		                        </div>
-		                        <div class="col-sm-8">
-		                            <input
-		                                class="form-control-sm externallink-targetEdit"
-		                                type="text" name="url"
-		                                id="externalLinkURLEdit"
-		                                style="width: inherit; background: var(--base-grey)">
-		                        </div>
-		                    </div>
-							<div class="row">
-			                    <div class="col-sm-4">
-			                        <label>How To Open:</label>
-			                    </div>
-			                    <div class="col-sm-8">
-			                        <select id="extTabOpenEdit" name="tabOpen" class="form-control-sm extlink-target" style="width: inherit; background: var(--base-grey)">
-			                            <option th:value="NEWWINDOW">New Window</option>
-			                            <option th:value="SAMEWINDOW">Same Window</option>
-			                        </select>
-			                    </div>
-			                </div>
-		                    <div class="row">
-		                        <div class="col-sm-4">
-		                            <label>Type:</label>
-		                        </div>
-		                        <div class="col-sm-8">
-		                            <select id="extTypeEdit" name="type"
-		                                class="form-control-sm externallink-targetEdit">
-		                                <option th:value="IMAGE">Image</option>
-		                                <option th:value="ARROW">Link</option>
-		                            </select>
-		                        </div>
-		                    </div>
-		
-		                    <div class="row">
-		                        <div class="col-sm-3" style="padding-right: 0;">
-		                            <label>Image:</label>
-		                        </div>
-		                        <div class="col-sm-9">
-		                            <input type="file" class="form-control-sm"
-		                                name="externalLinkImage"
-		                                id="externalLinkImageEdit" style="width: inherit" />
-		                        </div>
-		                    </div>
-		                    
-		                    <p class="mt-5 text-center">
-		                        <button id="deleteExternalLinkButton" type="reset" class="btn delete-btn btn-sm"><i class="fa fa-trash"></i>Delete</button>
-		                        <button id="editExternalLinkBtn" type="reset" class="btn primary-btn btn-sm">Save External Link</button>
-		                    </p>
-		                    
-		                </div>
-		            </form>
-		        </div>
-		        </div>
+	           	<div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
+		           	<div id="Ext_Links_Module_Slide1"> External Resources:
+			     		<div th:if="${externalLinks}" th:each="link: ${externalLinks}" th:id="${link.id}+'form'"> -
+			      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.externalLink}}">[[${link.name}]]</a>
+			     		</div>
+		     		</div>     	
+		        	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
+				        	<div class="divider"></div>
+					        <form id="createExternalLinkForm" style="z-index: 1;">
+					            <div role="alert" style="margin-top: 30px;">
+				                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+				                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+				                    </div>
+					            	<div class="row">	
+					            		<div class="col">
+					            			<h5 class="alert-heading">Create new External Link</h5>
+							                <p>Please fill out each field and then click
+							                   "Create External Link".</p>
+					            		</div>
+					                </div>
+					                <div class="row">
+					                	<div class="col-sm-4">
+					                		<label>Label</label>
+					                	</div>
+					                	<div class="col-sm-8">
+					                		<input class="form-control-sm extlink-target externalLinkLabel" type="text" style="width: inherit; background: var(--base-grey)"
+					                			 name="externalLinkLabel">
+					                	</div>
+					                </div>
+					                 
+					                <div class="row">
+					                	<div class="col-sm-4">
+					                		<label>External Link</label>
+					                	</div>
+					                	<div class="col-sm-8">
+					                		<input class="form-control-sm extlink-target externalLink" type="text" style="width: inherit; background: var(--base-grey)"
+					                    		size="15" name="url">	
+					                	</div>
+					                </div>               
+					                <p class="mt-5 text-center">
+					                    <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
+					                    <button id="createExternalLinkBtn" type="submit" class="btn primary-btn btn-sm">Create External Link</button>
+					                </p>
+					                <div id="errorAlert" class="alert customWindow"></div>
+					            </div>
+					        </form>
+						</div>
+			        
+				        <div id="editExternalLinkInfo" class="custom_form_style" style="z-index: 1;">
+				            <div class="divider"></div>
+				            <form id="editExternalLinkForm" style="z-index: 1;">
+				                <div role="alert" style="margin-top: 30px;">
+				                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+				                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+				                    </div>
+				                    <div class="row">
+				                        <div class="col">
+				                            <h6 class="alert-heading">
+				                                <span style="color: var(--dark-grey)">Modify External
+				                                    Link: </span><span
+				                                    id="externalLinkInfoLabelEdit"></span>
+				                            </h6>
+				                            <p>Please fill out each field and then click "Save External Link".</p>
+				                        </div>
+				                    </div>
+				                    <input hidden name="externalLinkIdEdit"
+				                        class="externalLinkIdEdit"/>
+				
+				                    <div class="row">
+				                        <div class="col-sm-4">
+				                            <label>Label:</label>
+				                        </div>
+				                        <div class="col-sm-8">
+				                            <input
+				                                class="form-control-sm externalLinkLabelEdit"
+				                                type="text" name="externalLinkLabel"
+				                                style="width: inherit; background: var(--base-grey)"><br>
+				                        </div>
+				                    </div>
+				
+				                    <div class="row">
+				                        <div class="col-sm-4" style="padding-right: 0;">
+				                            <label>External Link
+				                            </label>
+				                        </div>
+				                        <div class="col-sm-8">
+				                            <input
+				                                class="form-control-sm externalLinkURLEdit"
+				                                type="text" name="url"
+				                                style="width: inherit; background: var(--base-grey)">
+				                        </div>
+				                    </div>
+				                    <p class="mt-5 text-center">
+				                        <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
+				                        <button id="editExternalLinkBtn" type="reset" class="btn primary-btn btn-sm">Save External Link</button>
+				                    </p>
+				                    
+				                </div>
+				            </form>
+				        </div>
+			        </div>
 		        </div>
 		        
 		        <div id="main-space">
-                <div th:each="contents: ${slideContents}">
-                    <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="valueDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}">
-                        <img id="main-bgImage" th:id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}" />
-                        <input type="hidden" id="deleteImageId" th:value="${contents.id}"> 
-                        <a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;"> 
-                        <span class="icon-trash error"></span>
-                        </a>
-                    </div>
-                  </div>
-                  </div>
+	                <div th:each="contents: ${slideContents}">
+	                    <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="valueDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}">
+	                        <img id="main-bgImage" th:id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}"/>
+	                        <input type="hidden" id="deleteImageId" th:value="${contents.id}">
+	                        <a class="btn deleteImage col-md-1" href="javascript:;" style="position:absolute; right:25px;">
+	                        <span class="icon-trash error"></span>
+	                        </a>
+	                    </div>
+	                </div>
+                </div>
 		        
 		        <div id="slideSpace">
-                <div th:each="contents: ${slideContents}">
-                     <div th:attr="data-position=${contents.contentOrder}" class="tab vidDiv row" th:id="${contents.id}" th:if="${#strings.equals(contents['class'].simpleName,'VideoBlock')}">
-	                    <div>
-	                    	<h3><strong>[[${contents.video.title}]]</strong></h3>
-	                    	<br/>
-	                    	<iframe th:id="${contents.id}" width="800" height="530" th:src="${contents.video.url}" th:if="${contents.video.url}" frameborder="0"
-								allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-								allowfullscreen ></iframe>
-							<video th:id="${contents.id}" width="800" height="530" th:if="${contents.video.url == null}" controls >
-							  <source th:src="@{'/api/video/'+${contents.video.id}}" type="video/mp4"/>
-							</video>
+	                <div th:each="contents: ${slideContents}">
+	                     <div th:attr="data-position=${contents.contentOrder}" class="tab vidDiv row" th:id="${contents.id}" th:if="${#strings.equals(contents['class'].simpleName,'VideoBlock')}">
+		                    <div>
+		                    	<h3><strong>[[${contents.video.title}]]</strong></h3>
+		                    	<br/>
+		                    	<iframe th:id="${contents.id}" width="800" height="530" th:src="${contents.video.url}" th:if="${contents.video.url}" frameborder="0"
+									allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+									allowfullscreen ></iframe>
+								<video th:id="${contents.id}" width="800" height="530" th:if="${contents.video.url == null}" controls >
+								  <source th:src="@{'/api/video/'+${contents.video.id}}" type="video/mp4"/>
+								</video>
+		                    </div>
+		                    <div>
+		                    	<h3><strong>[[${contents.video.title}]]</strong></h3>
+		                    	<br/>
+		                    	<iframe th:id="${contents.id}" width="800" height="530" th:src="${contents.video.url}" th:if="${contents.video.url}" frameborder="0"
+									allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+									allowfullscreen ></iframe>
+								<video th:id="${contents.id}" width="800" height="530" th:if="${contents.video.url == null}" controls >
+								  <source th:src="@{'/api/video/'+${contents.video.id}}" type="video/mp4"/>
+								</video>
+		                    </div>
+		                    
+		                    <a class="btn deleteVideo col-md-1" href="javascript:;" th:attr="data-video-id=${contents.id}" style="position:absolute; right:25px;"> 
+		                        <span class="icon-trash error"></span>
+		                    </a>
+		                    <a class="btn editVideo col-md-1" href="javascript:;" th:attr="data-editvideo-id=${contents.id}" style="position:absolute; top:60px;right:25px;"> 
+		                        <span class="icon-edit"></span>
+		                    </a>
+	                	</div>
+	                    <div th:attr="data-position=${contents.contentOrder}" style="word-break:break-word;" th:id="${contents.id}" class="textDivStaff tab row" th:if="${#strings.equals(contents['class'].simpleName,'TextBlock')}">
+	                        <p class="col-md-10"> [[${contents.text}]]</p>
+	                        <input type="hidden" id="deleteTextId" th:value="${contents.id}" />
+	                        <a class="btn deleteText col-md-1" href="javascript:;"> 
+	                        <span class="icon-trash error"></span>
+	                        </a>
 	                    </div>
-	                    
-	                    <a class="btn deleteVideo col-md-1" href="javascript:;" th:attr="data-video-id=${contents.id}" style="position:absolute; right:25px;"> 
+	                    <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="choiceDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ChoiceBlock')}" style="display:block;">
+	                        <a th:if="${contents.showsAll}" th:each="choice: ${choices}" style="display:block; color: var(--primary);"
+	                            th:href="@{'/staff/module/'+${module.id}+'/sequence/'+${choice.sequence.id}}">[[${choice.sequence.name}]]</a>
+	                        <a th:if="!${contents.showsAll}" th:each="choice: ${contents.choices}" style="display:block; color: var(--primary);"
+	                            th:href="@{'/staff/module/'+${module.id}+'/sequence/'+${choice.sequence.id}}">[[${choice.sequence.name}]]</a>
+	                        <input type="hidden" class="col-md-8" id="deleteChoiceBlockId" th:value="${contents.id}"> 
+	                        <a class="btn deleteChoiceBlock col-md-1" href="javascript:;" style="position:absolute; right:0; top: 0;">
 	                        <span class="icon-trash error"></span>
-	                    </a>
-	                    <a class="btn editVideo col-md-1" href="javascript:;" th:attr="data-editvideo-id=${contents.id}" style="position:absolute; top:60px;right:25px;"> 
-	                        <span class="icon-edit"></span>
-	                    </a>
-                	</div>
-                    <div th:attr="data-position=${contents.contentOrder}" style="word-break:break-word;" th:id="${contents.id}" class="textDivStaff tab row" th:if="${#strings.equals(contents['class'].simpleName,'TextBlock')}">
-                        <p class="col-md-10"> [[${contents.text}]]</p>
-                        <input type="hidden" id="deleteTextId" th:value="${contents.id}" />
-                        <a class="btn deleteText col-md-1" href="javascript:;"> 
-                        <span class="icon-trash error"></span>
+	                        </a>
+	                    </div>
+	                </div>
+            	</div>
+            	<div th:if="${externalLinks}" id="Ext_Links_Module_Slide2">External Resources:
+		     		<div th:each="link: ${externalLinks}" th:id="${link.id}" style="margin-top: 15px;">
+		      			<div class="link_headers">Name: [[${link.name}]]</div>
+		      			<div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" th:href="@{${link.externalLink}}">[[${link.externalLink}]]</a></div>
+                        <a class="btn deleteExternalLink col-md-1" th:attr="data-link-id=${link.id}" style="text-align: left; padding-left: 0;" href="javascript:;"> 
+                        <span class="icon-trash error" style="text-align: left;"></span>
                         </a>
-                    </div>
-                    <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="choiceDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ChoiceBlock')}" style="display:block;">
-                        <a th:if="${contents.showsAll}" th:each="choice: ${choices}" style="display:block; color: var(--primary);"
-                            th:href="@{'/staff/module/'+${module.id}+'/sequence/'+${choice.sequence.id}}">[[${choice.sequence.name}]]</a>
-                        <a th:if="!${contents.showsAll}" th:each="choice: ${contents.choices}" style="display:block; color: var(--primary);"
-                            th:href="@{'/staff/module/'+${module.id}+'/sequence/'+${choice.sequence.id}}">[[${choice.sequence.name}]]</a>
-                        <input type="hidden" class="col-md-8" id="deleteChoiceBlockId" th:value="${contents.id}"> 
-                        <a class="btn deleteChoiceBlock col-md-1" href="javascript:;" style="position:absolute; right:0; top: 0;">
-                        <span class="icon-trash error"></span>
+                        <a class="btn editExternalLink col-md-1" th:attr="data-link-id=${link.id}, data-label=${link.name}, data-url=${link.externalLink}" style="text-align: left; padding-left: 0;" href="javascript:;"> 
+                        <span class="icon-edit" style="text-align: left;"></span>
                         </a>
-                    </div>
-                </div>
-            </div>
-		        
+		     		</div>
+	     		</div>    
 		</div>
     </body>
 </html>
\ No newline at end of file
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html
index e84a8bf61..439d6d7a5 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html
@@ -3,14 +3,15 @@
 <head>
 <link rel="stylesheet" type="text/css" id="applicationStylesheet"
     th:href="@{/resources/extra/Home.css}" />
+<link th:href="@{/resources/boostrap-colorpicker/dist/css/bootstrap-colorpicker.css}" rel="stylesheet">
 
 <script src="//use.fontawesome.com/releases/v5.8.1/js/all.js"
     data-auto-replace-svg="nest"></script>
 <script th:src="@{'/resources/extra/space.js'}"></script>
-<script th:src="@{/webjars/jquery/jquery.min.js}"></script>
-<script th:src="@{/webjars/popper.js/umd/popper.min.js}"></script>
-<script th:src="@{/webjars/bootstrap/js/bootstrap.min.js}"></script>
-<script th:src="@{/assets/bootstrap-colorpicker/js/bootstrap-colorpicker.js}"></script>
+<script th:src="@{/resources/jquery/jquery-ui.min.js}"></script>
+<script th:src="@{/resources/bootstrap-4.1.2/assets/js/popper.min.js}"></script>
+<script th:src="@{/resources/bootstrap-4.1.2/js/bootstrap.min.js}"></script>
+<script th:src="@{/resources/boostrap-colorpicker/dist/js/bootstrap-colorpicker.js}"></script>
 <style type="text/css">
 
 .right-aligned {
@@ -26,1765 +27,1767 @@
 </style>
 <script th:inline="javascript">
 //# sourceURL=script.js
-$(function () {
-    $('[data-toggle="tooltip"]').tooltip()
-});
-
-$(function () {
-    $('#textColor').colorpicker();
-});
-
-$(window).on("load", function() {
-    $( window ).resize(function() {
-        drawLinks();
-    });
-    drawLinks();
-    
-    var textBlockElements = document.getElementsByClassName("textBlock");
-    Array.from(textBlockElements).forEach(function(textBlock, index){
-    	if(textBlock != null) {
-    	   	const color = textBlock.style.borderColor;
-         	textBlock.addEventListener('focus', function(e) {
-       		e.target.style.outline = "2px solid "+ color;
-         	});
-         	textBlock.addEventListener('blur', function(e) {
-         		e.target.style.outline = "none";
-        	});
-    	}
- 
-    })
-});
-//store where a user clicked on an image
-var storeX;
-var storeY;
-var selectedModuleLinkId;
-var selectedSpaceLinkId;
-var selectedExternalLinkId;
-var selectedTextBlockId;
-const displaceUnpublishedOnX = 25;
-const displaceUnpublishedOnY = 13;
-const displaceUnpublishedOnXModal = 50;
-const displaceUnpublishedOnYModal = 13;
-const displaceLableOnX = 10;
-const displaceLableOnY = 35;
-var modalBgImageHeight;
-var modalBgImageWidth;
-
-//link icons for space links
-var linkIconReader = new FileReader();
-var linkIcon;
-linkIconReader.onload = function(e) {
-    linkIcon = e.target.result;
-    showSpaceLink(createSpaceLinkInfo());
-}
-
-var moduleLinkIconReader = new FileReader();
-var moduleLinkIcon;
-moduleLinkIconReader.onload = function(e) {
-	moduleLinkIcon = e.target.result;
-    showModuleLink(createModuleLinkInfo());
-}
-
-var externalLinkIconReader = new FileReader();
-var externalLinkIcon;
-externalLinkIconReader.onload = function(e) {
-    externalLinkIcon = e.target.result;
-    showExternalLinks(createExternalLinkInfo());
-}
-
-function setLinkPosition(modalLink, link, isSpaceLink, isModal, isExternalLink, posX, posY, posXModal, posYModal, isTextBlock, isModuleLink){
-	modalLink.css('position', 'absolute');
-    if(isModal){
-        modalLink.css('left',link.positionX + posXModal);
-        modalLink.css('top', link.positionY + posYModal);
-    }else{
-        modalLink.css('left', link.positionX + posX);
-        modalLink.css('top', link.positionY + posY);
-    }
-    modalLink.css('transform', 'rotate('+link.rotation+'deg)');
-    modalLink.find("span").css('fill', 'grey');
-    modalLink.css('color', 'rgba(128,128,128,1)');
-    modalLink.css('font-size', "16px");
-    var positionX = isModal ? posXModal : posX;
-    var positionY = isModal ? posYModal : posY;
-    if(isSpaceLink && (link.link.targetSpace==null || link.link.targetSpace.spaceStatus=="UNPUBLISHED")){
-	var inactiveLinkId;
-	var inactiveLinkClasses;
-	var inactiveLinkTitle;
-	if(link.link.targetSpace==null) {
-	    inactiveLinkId = "deletedSpace-";
-	    inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
-	    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
-    	} else {
-	    inactiveLinkId = "unpublished-";
-	    inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
-	    inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
-    	}
-	var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
-    	inactiveSpaceElement.css('position', 'absolute');
-	inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-	inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-	inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
-	inactiveSpaceElement.css('font-size', "24px");
-	inactiveSpaceElement.attr('title', inactiveLinkTitle);
-	if(isModal){
-	    $("#space").append(inactiveSpaceElement);
-	} else{
-	    $("#main-space").append(inactiveSpaceElement);
+	$(function () {
+	    $('[data-toggle="tooltip"]').tooltip()
+	});
+	
+	/* $(function () {
+	    $('[name="textColor"]').colorpicker();
+	}); */
+	
+	$(window).on("load", function() {
+	    $( window ).resize(function() {
+	        drawLinks();
+	    });
+	    drawLinks();
+	    
+	    var textBlockElements = document.getElementsByClassName("textBlock");
+	    Array.from(textBlockElements).forEach(function(textBlock, index){
+	    	if(textBlock != null) {
+	    	   	const color = textBlock.style.borderColor;
+	         	textBlock.addEventListener('focus', function(e) {
+	       		e.target.style.outline = "2px solid "+ color;
+	         	});
+	         	textBlock.addEventListener('blur', function(e) {
+	         		e.target.style.outline = "none";
+	        	});
+	    	}
+	 
+	    })
+	});
+	//store where a user clicked on an image
+	var storeX;
+	var storeY;
+	var selectedModuleLinkId;
+	var selectedSpaceLinkId;
+	var selectedExternalLinkId;
+	var selectedTextBlockId;
+	const displaceUnpublishedOnX = 25;
+	const displaceUnpublishedOnY = 13;
+	const displaceUnpublishedOnXModal = 50;
+	const displaceUnpublishedOnYModal = 13;
+	const displaceLableOnX = 10;
+	const displaceLableOnY = 35;
+	var modalBgImageHeight;
+	var modalBgImageWidth;
+	
+	//link icons for space links
+	var linkIconReader = new FileReader();
+	var linkIcon;
+	linkIconReader.onload = function(e) {
+	    linkIcon = e.target.result;
+	    showSpaceLink(createSpaceLinkInfo());
 	}
-    }
-    if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
-    	var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
-        unpublishedModuleElement.css('position', 'absolute');
-    	unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
-    	unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
-    	unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
-    	unpublishedModuleElement.css('font-size', "24px");
-        if(isModal){
-            $("#space").append(unpublishedModuleElement);
-        }else{
-            $("#main-space").append(unpublishedModuleElement);
-        }
-    }
-    if(!isTextBlock){
-        var linkId = isExternalLink ? link.externalLink.id : link.link.id;
-        setLabelPosition(link,linkId,positionX,positionY);
-    }
-}
-function setLabelPosition(link,id, positionX, positionY){
-	$(".label-"+id).css({
-	    'left': link.positionX + positionX - displaceLableOnX,
-	    'top': link.positionY + positionY + displaceLableOnY,
-	    'color': 'red'
-	}); 
-}
-
-function generateSpaceLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
-    if(link != null){
-        var spaceLink;
-        if(link.type == "ALERT"){
-            spaceLink = $('<span id="'+spanId+link.link.id+'" class="alert alertLink alert-primary spaceLink-'+link.link.id+'" role="alert" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.targetSpace?.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'"><p class="label-'+link.link.id+'">'+link.link.name+'</p></span>');
-        }
-        else if(link.type == "IMAGE" && link.image != null){
-            var spaceImageURL = [[@{/api/image/}]]+link.image.id;
-            spaceLink = $('<img id="'+spanId+link.link.id+'" class="spaceLink-'+link.link.id+' imageLink" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.targetSpace?.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" src="'+spaceImageURL+'" />');
-        }
-        else{
-            spaceLink = $('<span id="'+spanId+link.link.id+'" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.targetSpace?.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" class="spaceLink-'+link.link.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-move Icon_awesome_info_staff_c"></span><p class="label-'+link.link.id+'" data-link-id="'+link.link.id+'"><span class="tooltiptext">'+link.link.name+'</span></p></span>');
-        }
-        setLinkPosition(spaceLink,link,true,isModal,false, posX, posY, posXModal, posYModal, false);
-        $(divId).append(spaceLink);
-        
-        if(spanId === "spacelinkId-"){
-            $('#'+spanId+link.link.id).css('cursor', 'pointer');
-            $('#'+spanId+link.link.id).click(function(e) {
-                var linkData = $('#'+spanId+link.link.id).data();
-                makeSpaceLinksEditable(linkData["linklabel"], link.link.id, linkData["linkrotation"] ,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"]);
-            });
-        }
-    }
-}
-
-function generateModuleLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
-    if(link != null){
-        var moduleLink;
-        if(link.type=="ALERT"){
-            moduleLink = $('<div class="alert alert-primary alertLink moduleLink-'+link.link.id+'" id="'+spanId+link.link.id+'" role="alert" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.module.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'"><p class="label-'+link.link.id+'">'+link.link.name+'</p></div>');
-        }
-        else if(link.type=="IMAGE" && link.image != null){
-            var moduleImageURL = [[@{/api/image/}]]+link.image.id;
-            moduleLink = $('<img id="'+spanId+link.link.id+'" class="moduleLink-'+link.link.id+' imageLink" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.module.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" src="' + moduleImageURL+'" />');
-        }
-        else{
-            moduleLink = $('<span id="'+spanId+link.link.id+'" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.module.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" class="moduleLink-'+link.link.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-info Icon_awesome_info_staff_m"></span><p class="label-'+link.link.id+'" data-link-id="'+link.link.id+'"><span class="tooltiptext">'+link.link.name+'</span></p></span>');
-        }
-        setLinkPosition(moduleLink,link,false,isModal,false, posX, posY, posXModal, posYModal,true);
-        $(divId).append(moduleLink);
-        if(spanId === "modulelinkId-"){
-            $('#'+spanId+link.link.id).css('cursor', 'pointer');
-            $('#'+spanId+link.link.id).click(function(e) {
-                var linkData = $('#'+spanId+link.link.id).data();
-                makeModuleLinksEditable(linkData["linklabel"], link.link.id,linkData["linkrotation"],linkData["linktarget"],link.positionX,link.positionY,link.id, linkData["linktype"]);
-            });
-        }
-    }
-}
-
-function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
-	if(link != null){
-		var externalLink;
-		if(link.type=="IMAGE" && link.image != null){
-			var imageURL = [[@{/api/image/}]]+link.image.id;
-			externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
-		}else{
-			externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
+	
+	var moduleLinkIconReader = new FileReader();
+	var moduleLinkIcon;
+	moduleLinkIconReader.onload = function(e) {
+		moduleLinkIcon = e.target.result;
+	    showModuleLink(createModuleLinkInfo());
+	}
+	
+	var externalLinkIconReader = new FileReader();
+	var externalLinkIcon;
+	externalLinkIconReader.onload = function(e) {
+	    externalLinkIcon = e.target.result;
+	    showExternalLinks(createExternalLinkInfo());
+	}
+	
+	function setLinkPosition(modalLink, link, isSpaceLink, isModal, isExternalLink, posX, posY, posXModal, posYModal, isTextBlock, isModuleLink){
+		modalLink.css('position', 'absolute');
+	    if(isModal){
+	        modalLink.css('left',link.positionX + posXModal);
+	        modalLink.css('top', link.positionY + posYModal);
+	    }else{
+	        modalLink.css('left', link.positionX + posX);
+	        modalLink.css('top', link.positionY + posY);
+	    }
+	    modalLink.css('transform', 'rotate('+link.rotation+'deg)');
+	    modalLink.find("span").css('fill', 'grey');
+	    modalLink.css('color', 'rgba(128,128,128,1)');
+	    modalLink.css('font-size', "16px");
+	    var positionX = isModal ? posXModal : posX;
+	    var positionY = isModal ? posYModal : posY;
+	    if(isSpaceLink && (link.link.targetSpace==null || link.link.targetSpace.spaceStatus=="UNPUBLISHED")){
+		var inactiveLinkId;
+		var inactiveLinkClasses;
+		var inactiveLinkTitle;
+		if(link.link.targetSpace==null) {
+		    inactiveLinkId = "deletedSpace-";
+		    inactiveLinkClasses = "deletedSpaceClass deletedClass-";   
+		    inactiveLinkTitle = "The target space for this link has been deleted. This link won't be shown on the public site."
+	    	} else {
+		    inactiveLinkId = "unpublished-";
+		    inactiveLinkClasses = "unpublishedSpaceClass unpublishedClass-";
+		    inactiveLinkTitle = "The target space for this link is unpublished. This link won't be shown on the public site."
+	    	}
+		var inactiveSpaceElement  = $('<span data-link-id="'+inactiveLinkId +link.link.id+'" class="icon-warning secondary '+inactiveLinkClasses+link.link.id+'"></span>')
+	    	inactiveSpaceElement.css('position', 'absolute');
+		inactiveSpaceElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+		inactiveSpaceElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+		inactiveSpaceElement.css('transform', 'rotate('+link.rotation+'deg)');
+		inactiveSpaceElement.css('font-size', "24px");
+		inactiveSpaceElement.attr('title', inactiveLinkTitle);
+		if(isModal){
+		    $("#space").append(inactiveSpaceElement);
+		} else{
+		    $("#main-space").append(inactiveSpaceElement);
 		}
-		setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
-		$(divId).append(externalLink);
-		if(spanId === "externallinkId-"){
-			$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
-			$('#'+spanId+link.externalLink.id).click(function(e) {
-				var linkData = $('#'+spanId+link.externalLink.id).data();
-				makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
-			});
+	    }
+	    if(isModuleLink && link.link.module.moduleStatus!=null && link.link.module.moduleStatus=="UNPUBLISHED"){
+	    	var unpublishedModuleElement = $('<span data-link-id="unpublished-'+link.link.id+'" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-'+link.link.id+'"></span>')
+	        unpublishedModuleElement.css('position', 'absolute');
+	    	unpublishedModuleElement.css('left', link.positionX + positionX + displaceUnpublishedOnX);
+	    	unpublishedModuleElement.css('top', link.positionY + positionY - displaceUnpublishedOnY);
+	    	unpublishedModuleElement.css('transform', 'rotate('+link.rotation+'deg)');
+	    	unpublishedModuleElement.css('font-size', "24px");
+	        if(isModal){
+	            $("#space").append(unpublishedModuleElement);
+	        }else{
+	            $("#main-space").append(unpublishedModuleElement);
+	        }
+	    }
+	    if(!isTextBlock){
+	        var linkId = isExternalLink ? link.externalLink.id : link.link.id;
+	        setLabelPosition(link,linkId,positionX,positionY);
+	    }
+	}
+	function setLabelPosition(link,id, positionX, positionY){
+		$(".label-"+id).css({
+		    'left': link.positionX + positionX - displaceLableOnX,
+		    'top': link.positionY + positionY + displaceLableOnY,
+		    'color': 'red'
+		}); 
+	}
+	
+	function generateSpaceLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
+	    if(link != null){
+	        var spaceLink;
+	        if(link.type == "ALERT"){
+	            spaceLink = $('<span id="'+spanId+link.link.id+'" class="alert alertLink alert-primary spaceLink-'+link.link.id+'" role="alert" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.targetSpace?.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'"><p class="label-'+link.link.id+'">'+link.link.name+'</p></span>');
+	        }
+	        else if(link.type == "IMAGE" && link.image != null){
+	            var spaceImageURL = [[@{/api/image/}]]+link.image.id;
+	            spaceLink = $('<img id="'+spanId+link.link.id+'" class="spaceLink-'+link.link.id+' imageLink" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.targetSpace?.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" src="'+spaceImageURL+'" />');
+	        }
+	        else{
+	            spaceLink = $('<span id="'+spanId+link.link.id+'" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.targetSpace?.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" class="spaceLink-'+link.link.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-move Icon_awesome_info_staff_c"></span><p class="label-'+link.link.id+'" data-link-id="'+link.link.id+'"><span class="tooltiptext">'+link.link.name+'</span></p></span>');
+	        }
+	        setLinkPosition(spaceLink,link,true,isModal,false, posX, posY, posXModal, posYModal, false);
+	        $(divId).append(spaceLink);
+	        
+	        if(spanId === "spacelinkId-"){
+	            $('#'+spanId+link.link.id).css('cursor', 'pointer');
+	            $('#'+spanId+link.link.id).click(function(e) {
+	                var linkData = $('#'+spanId+link.link.id).data();
+	                makeSpaceLinksEditable(linkData["linklabel"], link.link.id, linkData["linkrotation"] ,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"]);
+	            });
+	        }
+	    }
+	}
+	
+	function generateModuleLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
+	    if(link != null){
+	    	console.log('LINK: ', link);
+	        var moduleLink;
+	        if(link.type=="ALERT"){
+	            moduleLink = $('<div class="alert alert-primary alertLink moduleLink-'+link.link.id+'" id="'+spanId+link.link.id+'" role="alert" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.module.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'"><p class="label-'+link.link.id+'">'+link.link.name+'</p></div>');
+	        }
+	        else if(link.type=="IMAGE" && link.image != null){
+	            var moduleImageURL = [[@{/api/image/}]]+link.image.id;
+	            moduleLink = $('<img id="'+spanId+link.link.id+'" class="moduleLink-'+link.link.id+' imageLink" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.module.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" src="' + moduleImageURL+'" />');
+	        }
+	        else{
+	            moduleLink = $('<span id="'+spanId+link.link.id+'" data-link-id="'+link.link.id+'" data-linkTarget="'+link.link.module.id+'" data-linkRotation="'+link.rotation+'" data-linkType="'+link.type+'" data-linkLabel="'+link.link.name+'" class="moduleLink-'+link.link.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-info Icon_awesome_info_staff_m"></span><p class="label-'+link.link.id+'" data-link-id="'+link.link.id+'"><span class="tooltiptext">'+link.link.name+'</span></p></span>');
+	        }
+	        setLinkPosition(moduleLink,link,false,isModal,false, posX, posY, posXModal, posYModal,true);
+	        $(divId).append(moduleLink);
+			console.log('DIV ID: ', $(divId));
+	        if(spanId === "modulelinkId-"){
+	            $('#'+spanId+link.link.id).css('cursor', 'pointer');
+	            $('#'+spanId+link.link.id).click(function(e) {
+	                var linkData = $('#'+spanId+link.link.id).data();
+	                makeModuleLinksEditable(linkData["linklabel"], link.link.id,linkData["linkrotation"],linkData["linktarget"],link.positionX,link.positionY,link.id, linkData["linktype"]);
+	            });
+	        }
+	    }
+	}
+	
+	function generateExternalLinks(link,spanId,divId,isModal, posX, posY, posXModal, posYModal){
+		if(link != null){
+			var externalLink;
+			if(link.type=="IMAGE" && link.image != null){
+				var imageURL = [[@{/api/image/}]]+link.image.id;
+				externalLink = $('<img id="'+spanId+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' imageLink" data-link-id="'+link.externalLink.id+'" src="'+imageURL+'" />');
+			}else{
+				externalLink = $('<span id="'+spanId+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'" data-linkTarget="'+link.externalLink.externalLink+'" data-linkType="'+link.type+'"  data-howToOpen="'+ link.howToOpen+'" data-linkLabel="'+link.externalLink.name+'" class="externalLink-'+link.externalLink.id+' Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span><p class="label-'+link.externalLink.id+'" data-link-id="'+link.externalLink.id+'"><span class="tooltiptext">'+link.externalLink.name+'</span></p></span>');
+			}
+			setLinkPosition(externalLink,link,false,isModal,true, posX, posY, posXModal, posYModal);
+			$(divId).append(externalLink);
+			if(spanId === "externallinkId-"){
+				$('#'+spanId+link.externalLink.id).css('cursor', 'pointer');
+				$('#'+spanId+link.externalLink.id).click(function(e) {
+					var linkData = $('#'+spanId+link.externalLink.id).data();
+					makeExternalLinksEditable(linkData["linklabel"],link.externalLink.id,linkData["linktarget"],link.positionX,link.positionY,link.id,linkData["linktype"],linkData["howtoopen"]);
+				});
+			}
 		}
 	}
-}
-
-function generateTextBlock(block,spanId,divId,isModal, posX, posY, posXModal, posYModal, imageHeight, imageWidth){
-    if(block != null){
-        var height = (block.height*imageHeight)/100;
-        var width = (block.width*imageWidth)/100;
-        var textBlock = $('<span id="'+spanId+block.spaceTextBlock.id+'" data-link-id="'+block.spaceTextBlock.id+'" data-blockId="'+block.id+'" data-text="'+block.spaceTextBlock.text+'" data-width="'+block.width+'"  data-height="'+block.height+'" class="textBlockClass spaceLink-'+block.spaceTextBlock.id+'"><textarea class="textBlock" style="height:'+height+'px; width:'+width+'px; resize:none; background: rgba(0, 0, 0, 0.4); color:'+block.textColor+'; border-color: '+block.borderColor+';" readonly type="textarea">'+block.spaceTextBlock.text+'</textarea></span>');
-        setLinkPosition(textBlock,block,false,isModal,false, posX, posY, posXModal, posYModal, true);
-        $(divId).append(textBlock);
-        if(spanId === "textBlockId-"){
-            $('#'+spanId+block.spaceTextBlock.id).css('cursor', 'pointer');
-            $('#'+spanId+block.spaceTextBlock.id).click(function(e) {  
-                var blockData = $('#'+spanId+block.spaceTextBlock.id).data();
-                makeTextBlockEditable(blockData["blockid"],blockData["linkId"],blockData["text"],block.positionX,block.positionY,blockData["width"],blockData["height"], block.textColor, block.borderColor);
-            });
-        }
-        
-        if(block.spaceTextBlock.id === selectedTextBlockId) {
-        	var textModalBlock = $("#textModalBlockId-"+selectedTextBlockId).find("textarea")[0];
-        	
-        	tHeight = textModalBlock.clientHeight;
-        	tWidth = textModalBlock.clientWidth;
-            
-            var height = modalBgImageHeight;
-            var width = modalBgImageWidth;
-            textModalBlock.style["resize"] = "both";
-            textModalBlock.onmouseup = function (e) {
-	            if (tHeight !== textModalBlock.clientHeight || tWidth !== textModalBlock.clientWidth ) {
-	                tHeight = textModalBlock.clientHeight;
-	                tWidth = textModalBlock.clientWidth;
-	                let percentileHeight = (tHeight*100)/height;
-	                let percentileWidth = (tWidth*100)/width;
-	                $("#textBoxWidthIDEdit").val(percentileWidth);
-	                $("#textBoxHeightIDEdit").val(percentileHeight);
-	                $("#textContentIDForEdit").val(textModalBlock.value);
-	            }
-            };
-        }
-    }
-}
-
-function drawLinks(){
-    $(".Info_cz_Class").remove();
-    $(".imageLink").remove();
-    $(".alertLink").remove();
-    $(".ellipse_class").remove();
-    $(".unpublishedSpaceClass").remove();
-    $(".textBlockClass").remove();
-    $(".deletedSpaceClass").remove();
-    
-    $.ajax({
-        type: "GET",
-        url: "[(@{'/staff/space/'+${space?.id}+'/links'})]",
-        cache       : false,
-        contentType : false,
-        processData : false,
-        beforeSend: function () {
-            $("#loader").show();
-            },
-       	complete: function () {
-            $("#loader").hide();
-            },
-        success: function(data) {
-            var spaceLinks = data['spaceLinks'];
-            var externalLinks = data['externalLinks'];
-            var moduleLinks = data['moduleLinks'];
-            var textBlocks = data['textBlocks'];
-            
-            var posXModal = $("#bgImage").position().left;
-            var posYModal = $("#bgImage").position().top;
-            var posX = $("#main-bgImage").position().left;
-            var posY = $("#main-bgImage").position().top;
-            
-            spaceLinks.forEach(function(link,index){
-                var spanId= "spacelinkModalId-";
-                var divId = "#space"
-                generateSpaceLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-            })
-            spaceLinks.forEach(function(link,index){
-                var spanId= "spacelinkId-";
-                var divId = "#main-space";
-                generateSpaceLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-            })
-            
-            moduleLinks.forEach(function(link,index){
-                var spanId= "moduleModallinkId-";
-                var divId = "#space";
-                generateModuleLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-            })
-            moduleLinks.forEach(function(link,index){
-                var spanId= "modulelinkId-";
-                var divId = "#main-space";
-                generateModuleLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-            })
-            
-            externalLinks.forEach(function(link,index){
-                var spanId= "externalModallinkId-";
-                var divId = "#space";
-                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
-            })
-            
-            externalLinks.forEach(function(link,index){
-                var spanId= "externallinkId-";
-                var divId = "#main-space";
-                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
-            })
-            
-            textBlocks.forEach(function(block,index){
-                var spanId= "textModalBlockId-";
-                var divId = "#space";
-                var imageHeight = modalBgImageHeight;
-                var imageWidth = modalBgImageWidth;
-                generateTextBlock(block,spanId,divId,true, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
-            })
-            
-            textBlocks.forEach(function(block,index){
-                var spanId= "textBlockId-";
-                var divId = "#main-space";
-                var imageHeight = parseInt($("#main-bgImage").css("height"));
-                var imageWidth = parseInt($("#main-bgImage").css("width"));
-                generateTextBlock(block,spanId,divId,false, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
-            })
-        }
-    });
-}
-
-//--------- show links functions --------------
-function showTextBlock(textBlock, show){
-    $("#textB").remove();
-    $("#text").remove();
-    var posX = $("#bgImage").position().left;
-    var posY = $("#bgImage").position().top;
-    var imageHeight = modalBgImageHeight;
-    var imageWidth = modalBgImageWidth;
-    var textArea = $("<textarea class='textBlock' type='textarea'></textarea>");
-    textArea.css('width', (textBlock["width"]*imageWidth)/100);
-    textArea.css('height', (textBlock["height"]*imageHeight)/100);
-    textArea.css('resize', 'both');
-    textArea.text(textBlock["text"]);
-    var spaceTextBlock;
-    spaceTextBlock = $('<span class="textBlockClass spaceLink-' + textBlock["id"] + '" data-link-id="' + textBlock["id"] + '"></span>');
-    spaceTextBlock.css('position', 'absolute');
-    spaceTextBlock.css('left', textBlock["x"] + posX);
-    spaceTextBlock.css('top', textBlock["y"] + posY);
-    spaceTextBlock.css('font-size', "12px");
-
-    if (textBlock["id"]) {
-        spaceTextBlock.attr("data-link-id", textBlock["id"]);
-        spaceTextBlock.css('cursor', 'pointer');
-        spaceTextBlock.click(function(e) {
-            makeTextBlockEditable(textBlock["displayId"], textBlock["id"], textBlock["text"], textBlock["x"], textBlock["y"], textBlock["width"], textBlock["height"]);
-        });
-    }
-    spaceTextBlock.append(textArea);
-    $("#space").append(spaceTextBlock);
-}
-
-function showTextBlockEdit(textBlock){
-    textBlock["x"]=storeX;
-    textBlock["y"]=storeY;
-    var selectedClass = '#textModalBlockId-'+selectedTextBlockId;
-    var selectedTextArea = "#textModalBlockId-"+selectedTextBlockId+" .textBlock";
-    var posX = $("#bgImage").position().left;
-    var posY = $("#bgImage").position().top;
-    var imageHeight = modalBgImageHeight;
-    var imageWidth = modalBgImageWidth;
-    $(selectedClass).css('left', textBlock["x"]+posX);
-    $(selectedClass).css('top', textBlock["y"]);
-    $(selectedTextArea).css('width', (textBlock["width"]*imageWidth)/100);
-    $(selectedTextArea).css('height', (textBlock["height"]*imageHeight)/100);   
-    $(selectedTextArea).text(textBlock["text"]);
-    $(selectedClass).css('color', textBlock["textColor"]);
-    $(selectedClass).css('border-color', textBlock["borderColor"]);
-}
-
-function showSpaceLink(spaceLink, show, x, y) {
-    $("#space_label").remove();
-    $("#link").remove();
-    $("#undefined").remove();
-    var posX = $("#bgImage").position().left;
-    var posY = $("#bgImage").position().top;
-    var space_label = $("<p id='space_label' class='tooltiptext'></p>");
-    space_label.text(spaceLink["spaceLinkLabel"]);
-
-    var link;
-    if (spaceLink["type"] == "ALERT") {
-        link = $('<div id="link" class="alert alert-primary alertLink spaceLink-"' + spaceLink["id"] + '" role="alert" data-link-id="' + spaceLink["id"] + '"><p>'+spaceLink["spaceLinkLabel"]+'</p></div>');
-    } else if(spaceLink["type"] == "IMAGE" && linkIcon) {
-        link = $('<div id="link" class="spaceLink-' + spaceLink["id"] + '" data-link-id="' + spaceLink["id"] + '"><img src="' + linkIcon + '"></div>');
-    } else {
-        $(space_label).css({
-            'font-size': "12px",
-            'transform': 'rotate(0deg)',
-            'color': 'grey'
-        });
-        link = $('<span id="' + spaceLink["id"] +'" data-link-id="' + spaceLink["id"] + '" class="spaceLink-' + spaceLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-move Icon_awesome_info_staff_c "></span></div></span>');
-    }
-    if(show) {
-        var unpublishedSpaceElement;
-        if(spaceLink["linkedSpaceStatus"]=="UNPUBLISHED"){
-            unpublishedSpaceElement=$('<span data-link-id = "unpublished-' + spaceLink["id"] + '" class="icon-warning secondary fa-lg unpublishedSpaceClass unpublishedClass-' + spaceLink["id"] + '" style="color: var(--secondary);"></span>')
-            unpublishedSpaceElement.css('position', 'absolute');
-            unpublishedSpaceElement.css('left', x + posX + displaceUnpublishedOnX);
-            unpublishedSpaceElement.css('top', y + posY - displaceUnpublishedOnY);
-            unpublishedSpaceElement.css('transform', 'rotate(' +$('#spaceLinkRotation').val()+ 'deg)');
-            unpublishedSpaceElement.css('font-size', "24px");
-        }else{
-            $('[data-link-id="unpublished-' + spaceLink["id"] + '"]').remove();
-        } 
-        link.css('top', spaceLink["y"] + posY);
-    } else {
-    	link.css('top', spaceLink["y"]);
-    }
-
-    link.css('position', 'absolute');
-    link.css('left', spaceLink["x"] + posX);
-    link.css('color', 'rgba(128,128,128,1)');
-    link.css('transform', 'rotate(' +$('#spaceLinkRotation').val()+ 'deg)');
-    link.css('font-size', "12px");
-    if (spaceLink["id"]) {
-        link.attr("class", spaceLink["id"]);
-        link.css('cursor', 'pointer');
-        link.css('color', 'rgba(128,128,128,1)');
-        link.click(function(e) {
-            makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"], spaceLink["rotation"], spaceLink["linkedSpace"], spaceLink["x"], spaceLink["y"], spaceLink["displayId"], spaceLink["type"]);
-        });
-
-        space_label.attr("data-link-id", spaceLink["id"]);
-        space_label.attr("class", "tooltiptext label-"+spaceLink["id"]);
-        space_label.css('cursor', 'pointer');
-        space_label.click(function(e) {
-            makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"], spaceLink["rotation"], spaceLink["linkedSpace"], spaceLink["x"], spaceLink["y"], spaceLink["displayId"], spaceLink["type"]);
-        });
-    }
-
-    $("#space").append(link);
-    $("#space").append(unpublishedSpaceElement);
-    $("#link").append(space_label);
-}
-
-function showModuleLink(moduleLink, show, x, y) {
-    $("#module_label").remove();
-    $("#link").remove();
-    $("#undefined").remove();
-    var posX = $("#bgImage").position().left;
-    var posY = $("#bgImage").position().top;
-    var module_label = $("<p id='module_label' class='tooltiptext'></p>");
-    module_label.text(moduleLink["moduleLinkLabel"]);
-
-    var link;
-    if (moduleLink["type"] == "ALERT") {
-        link = $('<div id="link" class="alert alert-primary alertLink moduleLink-"' + moduleLink["id"] + '" role="alert" data-link-id="' + moduleLink["id"] + '"><p>'+moduleLink["moduleLinkLabel"]+'</p></div>');
-    } else if(moduleLink["type"] == "IMAGE" && moduleLinkIcon) {
-        link = $('<div id="link" class="spaceLink-' + moduleLink["id"] + '" data-link-id="' + moduleLink["id"] + '"><img src="' + moduleLinkIcon + '"></div>');
-    } else{ 
-        $(module_label).css({
-            'position': 'absolute',
-            'font-size': "10px",
-            'transform': 'rotate(0deg)',
-            'color': 'red'
-        });
-        link = $('<span id="' + moduleLink["id"] +'" data-link-id="' + moduleLink["id"] + '" class="moduleLink-' + moduleLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-info Icon_awesome_info_staff_m"></span></div></span>');
-    } 
-    if(show) {
-        link.find("div").css('fill', 'red');
-        link.css('top', moduleLink["y"] + posY);
-    } else {
-    	link.css('top', moduleLink["y"]);
-    }
-    link.css('position', 'absolute');
-    link.css('left', moduleLink["x"] + posX);
-    link.css('color', 'red');
-    link.css('transform', 'rotate(' +$('#moduleLinkRotation').val()+ 'deg)');
-    link.css('font-size', "12px");
-
-    if (moduleLink["id"]) {
-        link.attr("data-link-id", moduleLink["id"]);
-        link.css('cursor', 'pointer');
-        link.click(function(e) {
-            makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"], moduleLink["rotation"], moduleLink["linkedModule"], moduleLink["x"], moduleLink["y"], moduleLink["displayId"], moduleLink["type"]);
-        });
-        module_label.attr("data-link-id", moduleLink["id"]);
-        module_label.css('cursor', 'pointer');
-        module_label.attr("class", "tooltiptext label-"+moduleLink["id"]);
-        module_label.click(function(e) {
-            makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"], moduleLink["rotation"], moduleLink["linkedModule"], moduleLink["x"], moduleLink["y"], moduleLink["displayId"], moduleLink["type"]);
-        });
-    }
-
-    $("#space").append(link);
-    $("#link").append(module_label);
-}
-
-function showModuleLinkEdit(moduleLink, show, posX, posY) {
-    moduleLink["x"]=storeX;
-    moduleLink["y"]=storeY;
-    var selectedLinkClass = '#moduleModallinkId-'+selectedModuleLinkId;
-    var selectedLabelClass = '.label-'+selectedModuleLinkId;
-    updateLinkProperties(selectedLinkClass,selectedLabelClass,moduleLink["rotation"],posX,posY,moduleLink["moduleLinkLabel"]);
-}
-
-
-function showSpaceLinkEdit(spaceLink, show, posX, posY) {
-    spaceLink["x"]=storeX;
-    spaceLink["y"]=storeY;
-    var selectedLinkClass = '#spacelinkModalId-'+selectedSpaceLinkId;
-    var selectedLabelClass = '.label-'+selectedSpaceLinkId;
-    var selectedUnpublishedIconClass = '.unpublishedClass-'+selectedSpaceLinkId;
-    if(show) {
-        var unpublishedSpaceElement;
-        if(spaceLink["linkedSpaceStatus"]=="UNPUBLISHED"){
-            unpublishedSpaceElement=$('<span data-link-id = "unpublished-' + spaceLink["id"] + '" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-' + spaceLink["id"] + '></span>')
-            unpublishedSpaceElement.css('position', 'absolute');
-            unpublishedSpaceElement.css('left', posX + displaceUnpublishedOnX);
-            unpublishedSpaceElement.css('top', posY - displaceUnpublishedOnY);
-            unpublishedSpaceElement.css('transform', 'rotate(' +spaceLink["rotation"]+ 'deg)');
-            unpublishedSpaceElement.css('font-size', "24px");
-            $("#space").append(unpublishedSpaceElement);
-        }else{
-            $('[data-link-id="unpublished-' + spaceLink["id"] + '"]').remove();
-        }    
-    }
-    $(selectedUnpublishedIconClass).css({ 'transform': 'rotate(' + parseInt(spaceLink["rotation"]) + 'deg)'});
-    $(selectedUnpublishedIconClass).css({ 'position': 'absolute'});
-    $(selectedUnpublishedIconClass).css({ 'left': posX + displaceUnpublishedOnXModal});
-    $(selectedUnpublishedIconClass).css({ 'top': posY - displaceUnpublishedOnYModal});
-    updateLinkProperties(selectedLinkClass,selectedLabelClass,spaceLink["rotation"],posX,posY,spaceLink["spaceLinkLabel"]);
-}
-
-function showExternalLinkEdit(externalLink, show, posX, posY) {
-    externalLink["x"]=storeX;
-    externalLink["y"]=storeY;
-    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
-    var selectedLabelClass = '.label-'+selectedExternalLinkId;
-    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
-}
-
-function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
-    var posX, posY;
-    if(show) {
-        posX = $("#main-bgImage").position().left;
-        posY = $("#main-bgImage").position().top;
-    }
-    else{
-        posX = $("#bgImage").position().left;
-        posY = 0
-    }
-    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
-    $(selectedLinkClass).css({ 'position': 'absolute'});
-    $(selectedLinkClass).css({ 'left': x + posX});
-    $(selectedLinkClass).css({ 'top': y + posY});
-    $(selectedLabelClass+' span').remove();
-    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
-    feather.replace();    
-}
-
-function hideLinkInfoTabs(){
-    $("#editExternalLinkInfo").hide();
-    $("#editSpaceLinkInfo").hide();
-    $("#editModuleLinkInfo").hide();
-    $("#editTextBlockInfo").hide();
-    $("#createExternalLinkAlert").hide();
-    $("#createSpaceLinkAlert").hide();
-    $("#createModuleLinkAlert").hide();
-    $("#errorMsg").text("");
-    $('#errorAlert').hide();
-}
-
-function showExternalLinks(externalLink, show, x, y) {
-    $("#ext_label").remove();
-    $("#link").remove();
-    $("#undefined").remove();
-    var posX = $("#bgImage").position().left;
-    var posY = $("#bgImage").position().top;
-    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
-    ext_label.text(externalLink["externalLinkLabel"]);
-
-    var link;
-    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
-        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
-    } else {
-        $(ext_label).css({
-            'position': 'absolute',
-            'font-size': "12px",
-            'transform': 'rotate(0deg)',
-            'color': 'blue'
-        });
-        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
-    }
-    
-    if(show) {
-        link.css('top', externalLink["y"] + posY);
-    } else {
-    	link.css('top', externalLink["y"]);
-    }
-
-    link.css('position', 'absolute');
-    link.css('left', externalLink["x"] + posX);
-    link.css('color', 'blue');
-    link.css('font-size', "12px");
-
-    if (externalLink["id"]) {
-		link.attr("data-link-id", externalLink["id"]);
-		link.css('cursor', 'pointer');
-		link.attr('href', externalLink["url"]);
-		link.click(function(e) {
-			makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-		});
-		
-		ext_label.attr("data-link-id", externalLink["id"]);
-		ext_label.css('cursor', 'pointer');
-		ext_label.attr("class", "label-"+externalLink["id"]);
-		ext_label.click(function(e) {
-			makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
-		});
-    }
-
-    $("#space").append(link);
-    $("#link").append(ext_label);
-    $("#external-link").remove();
-
-}
-
-//--------- Utility functions -------------
-function createSpaceLinkInfo() {
-    var info = {};
-    info["x"] = storeX;
-    info["y"] = storeY;
-    info["rotation"] = $("#spaceLinkRotation").val();
-    info["linkedSpace"] = $("#linkedSpace").val();
-    info["spaceLinkLabel"] = $("#spaceLinkLabel").val();
-    info["type"] = $("#type").val();
-    return info;
-}
-
-function createExternalLinkInfo() {
-	var info = {};
-	info["x"] = storeX;
-	info["y"] = storeY;
-	info["tabOpen"] = $("#extTabOpen").val();
-	info["type"] = $("#extType").val();
-	info["externalLinkLabel"] = $("#externalLinkLabel").val();
-	info["externalLinkURL"] = $("#externalLink").val();
-	return info;
-}
-
-function createModuleLinkInfo() {
-    var info = {};
-    info["x"] = storeX;
-    info["y"] = storeY;
-    info["rotation"] = $("#moduleLinkRotation").val();
-    info["linkedModule"] = $("#linkedModule").val();
-    info["moduleLinkLabel"] = $("#moduleLinkLabel").val();
-    info["type"] = $("#moduleType").val();
-    return info;
-}
-
-function createTextBlockInfo() {
-    var info = {};
-    info["x"] = storeX;
-    info["y"] = storeY;
-    info["text"] = $("#textContentID").val();
-    info["height"] = $("#textBoxHeightID").val();
-    info["width"] = $("#textBoxWidthID").val();
-    info["textColor"] = $("#textColorID").val();
-    info["borderColor"] = $("#borderColorID").val();
-    return info;
-}
-
-function editTextBlockInfo() {
-    var info = {};
-    info["x"] = storeX;
-    info["y"] = storeY;
-    info["text"] = $("#textContentIDForEdit").val();
-    info["height"] = $("#textBoxHeightIDEdit").val();
-    info["width"] = $("#textBoxWidthIDEdit").val();
-    info["textColor"] = $("#textColorIDEdit").val();
-    info["borderColor"] = $("#borderColorIDEdit").val();
-    return info;
-}
-
-function editModuleLinkInfo() {
-    var info = {};
-    info["x"] = storeX;
-    info["y"] = storeY;
-    info["rotation"] = $("#moduleLinkRotationEdit").val();
-    info["linkedModule"] = $("#moduleLinkIdEdit").val();
-    info["moduleLinkLabel"] = $("#moduleLinkLabelEdit").val();
-    info["type"] = $("#moduleTypeEdit").val();
-    return info;
-}
-
-function editSpaceLinkInfo() {
-    var info = {};
-    info["x"] = storeX;
-    info["y"] = storeY;
-    info["rotation"] = $("#spaceLinkRotationEdit").val();
-    info["linkedSpace"] = $("#spaceLinkIdEdit").val();
-    info["spaceLinkLabel"] = $("#spaceLinkLabelEdit").val();
-    info["type"] = $("#typeSpaceEdit").val();
-    return info;
-}
-
-function editExternalLinkInfo() {
-	var info = {};
-	info["x"] = storeX;
-	info["y"] = storeY;
-	info["tabOpen"] = $("#extTabOpenEdit").val();
-	info["type"] = $("#extTypeEdit").val();
-	info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
-	info["externalLinkURL"] = $("#externalLinkURLEdit").val();
-	return info;
-}
-
-function makeSpaceLinksEditable(spaceLinkName, spaceLinkId, rotation, selectedSpaceId, posXEdit, posYEdit, displayLinkId, linkType) {
-    $("#spaceLinkInfoLabel").text(spaceLinkName);
-    $("#spaceLinkId").val(spaceLinkId);
-    selectedSpaceLinkId=spaceLinkId;
-    storeX=posXEdit;
-    storeY=posYEdit;
-    $("#spaceLinkInfoLabel").text(spaceLinkName);
-    $("#spaceLinkDisplayId").val(displayLinkId);
-    $("#spaceLinkInfoLabelEdit").text(spaceLinkName);
-    $("#spaceLinkLabelEdit").val(spaceLinkName);
-    $("#spaceLinkId").val(spaceLinkId);
-    $("#spaceLinkIdValueEdit").val(spaceLinkId);
-    $("#spaceLinkRotationEdit").val(rotation);
-    $("#typeSpaceEdit option:selected").prop('selected', false);
-    $('#typeSpaceEdit option[value="'+linkType+'"]').prop("selected", true);
-    $("#spaceLinkIdEdit option:selected").prop('selected', false);
-    $('#spaceLinkIdEdit option[value="'+selectedSpaceId+'"]').prop("selected", true);
-    if(linkType != "IMAGE"){
-    	resetHighlighting(); 
-    }
-    $('[data-link-id="' + spaceLinkId + '"]').css("color", "var(--secondary)");
-    $('img[data-link-id="' + spaceLinkId + '"]').css("border", "solid 1px #c1bb88");
-    $('[data-link-id="unpublished-' + spaceLinkId + '"]').css("color", "var(--secondary)");
-
-    $("#bgImage").on("click", function(e){
-        e.preventDefault();
-        var posX = $(this).position().left;
-        var posY = $(this).position().top;
-        storeX = e.pageX  - $(this).offset().left;
-        storeY = e.pageY  - $(this).offset().top + 25;
-        showSpaceLinkEdit(editSpaceLinkInfo(),false, storeX,storeY);
-    });
-    hideLinkInfoTabs();
-    displayForms("#editSpaceLinkInfo");
-}
-function displayForms(formToShow){
-    drawLinks();
-    $("#space").css("display", "-webkit-box");
-    $(formToShow).css("display", "flex");
-    modalBgImageHeight = parseInt($("#bgImage").css("height"));
-    modalBgImageWidth = parseInt($("#bgImage").css("width"));
-}
-
-function makeModuleLinksEditable(moduleLinkName, moduleLinkId, rotation, selectedModuleId, posXEdit, posYEdit, displayLinkId, linkType) {
-    selectedModuleLinkId=moduleLinkId;
-    storeX=posXEdit;
-    storeY=posYEdit;
-    $("#moduleLinkInfoLabel").text(moduleLinkName);
-    $("#moduleLinkDisplayId").val(displayLinkId);
-    $("#moduleLinkInfoLabelEdit").text(moduleLinkName);
-    $("#moduleLinkLabelEdit").val(moduleLinkName);
-    $("#moduleLinkId").val(moduleLinkId);
-    $("#moduleLinkIdValueEdit").val(moduleLinkId);
-    $("#moduleLinkRotationEdit").val(rotation);
-    $("#moduleTypeEdit option:selected").prop('selected', false);
-    $('#moduleTypeEdit option[value="'+linkType+'"]').prop("selected", true);
-    $("#moduleLinkIdEdit option:selected").prop('selected', false);
-    $('#moduleLinkIdEdit option[value="'+selectedModuleId+'"]').prop("selected", true);
-    resetHighlighting();     
-    $('[data-link-id="' + moduleLinkId + '"]').css("color", "#c1bb88");
-    $('div[data-link-id="' + moduleLinkId + '"]').removeClass("alert-primary");
-    $('div[data-link-id="' + moduleLinkId + '"]').addClass("alert-warning");
-    $('img[data-link-id="' + moduleLinkId + '"]').css("border", "solid 1px #c1bb88");
-
-    $("#bgImage").on("click", function(e){
-        e.preventDefault();
-        var posX = $(this).position().left;
-        var posY = $(this).position().top;  
-        storeX = e.pageX - $(this).offset().left;
-        storeY = e.pageY - $(this).offset().top + 25;
-        showModuleLinkEdit(editModuleLinkInfo(), false, storeX,storeY);
-    });
-    hideLinkInfoTabs();
-    displayForms("#editModuleLinkInfo");
-}
-
-function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
-    selectedExternalLinkId=linkId;
-    storeX=posXEdit;
-    storeY=posYEdit;
-    $("#externalLinkInfoLabel").text(linkName);
-    $("#externalLinkId").val(linkId);
-    $("#externalLinkDisplayId").val(displayLinkId);
-    $("#externalLinkInfoLabelEdit").text(linkName);
-    $("#externalLinkLabelEdit").val(linkName);
-    $("#externalLinkIdValueEdit").val(linkId);
-    $("#externalLinkURLEdit").val(externalLinkURL);
-    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
-    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
-    
-    resetHighlighting();
-
-    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
-    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
-    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
-    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
-
-    $("#bgImage").on("click", function(e){
-        e.preventDefault();
-        var posX = $(this).position().left;
-        var posY = $(this).position().top;    
-        storeX = e.pageX - $(this).offset().left;
-        storeY = e.pageY - $(this).offset().top + 25;
-        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
-    });
-    hideLinkInfoTabs();
-    displayForms("#editExternalLinkInfo");
-}
-
-function makeTextBlockEditable(blockDisplayId,blockId,text,posX,posY,width,height, textColor, borderColor){
-    selectedTextBlockId=blockId;
-    storeX=posX;
-    storeY=posY;
-    $("#textBlockId").val(blockId);
-    $("#textBlockXEdit").val(posX);
-    $("#textBlockYEdit").val(posY);
-    $("#textBlockDisplayId").val(blockDisplayId);
-    $("#textBoxWidthIDEdit").val(width);
-    $("#textBoxHeightIDEdit").val(height);
-    $("#textContentIDForEdit").val(text);
-    $("#textColorIDEdit").val(textColor);
-    $("#borderColorIDEdit").val(borderColor);
-    resetHighlighting();
-    $("#bgImage").on("click", function(e){
-        e.preventDefault();
-        var posX = $(this).position().left;
-        var posY = $(this).position().top;    
-        storeX = e.pageX - $(this).offset().left;
-        storeY = e.pageY - $(this).offset().top + 25;
-        showTextBlockEdit(editTextBlockInfo());
-    });
-    hideLinkInfoTabs();
-    displayForms("#editTextBlockInfo");
-}
-
-function resetHighlighting() {
-    // reset icon links
-    $('[data-link-id]').css("color", "red");
-
-    // reset alert links
-    $('div[data-link-id]').removeClass("alert-warning");
-    $('div[data-link-id]').addClass("alert-primary");
-
-    // reset image links
-    $('img[data-link-id]').css("border-width", "0");
-}
-
-function getTextArea(x,y) {
-    var posX = $("#bgImage").position().left;
-    var posY = $("#bgImage").position().top;
-    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
-    text.css('position', 'absolute');
-    text.css('left', x + posX);
-    text.css('top', y);
-    $("#space").append(text);
-    
-    var textB = $('#textB')[0],
-    tHeight = textB.clientHeight,
-    tWidth = textB.clientWidth;
-    
-    var height = modalBgImageHeight;
-    var width = modalBgImageWidth;
-    
-    $("#textBoxWidthID").val(tWidth);
-    $("#textBoxHeightID").val(tHeight);
-    textB.onmouseup = function (e) {
-        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
-            tHeight = textB.clientHeight;
-            tWidth = textB.clientWidth;
-            let percentileHeight = (tHeight*100)/height;
-            let percentileWidth = (tWidth*100)/width;
-            $("#textBoxWidthID").val(percentileWidth);
-            $("#textBoxHeightID").val(percentileHeight);
-            $("#textContentID").val(textB.value);
-        }
-    };
-    var percentileHeight = (tHeight*100)/height;
-    var percentileWidth = (tWidth*100)/width;
-    $("#textBoxWidthID").val(percentileWidth);
-    $("#textBoxHeightID").val(percentileHeight);
-    $("#textContentID").val(textB.value);
-}
-
-$(function(){
-    $("#deleteSpace").click(function(){
-        var spaceId = "${space?.id}";
-        checkSpaceLinkPresent('[(${space?.id})]', '[(@{'/staff/'})]', '[('?'+${_csrf.parameterName}+'='+${_csrf.token})]',$('#headerSpaceValue'));
-    });
-
-        $( document ).ready(function() {
-            onPageReady($("#deleteSpace"), $('#confirm-space-delete'));
-            if ($("div#outgoingLinks a").length < 2) {
-                $("#noLinksOnSpace").show()
-            }
-            if ($("div#incomingLinks a").length < 2) {
-                $("#noLinksToSpace").show()
-            }
-        });
-
-        // -------- buttons that open modals (e.g. to create space links) ------
-
-        $("#addTextBlock").click(function(e){
-            hideLinkInfoTabs();
-            $("#changeBgImgAlert").hide();
-            $("#bgImage").off("click");
-            $("#bgImage").on("click", function(e){
-                e.preventDefault();
-                $("#external-arrow").remove();
-                $("#space_label").remove();
-                $("#link").remove();
-                $("#text").remove();
-                var posX = $(this).position().left;
-                var posY = $(this).position().top;    
-                storeX = e.pageX - $(this).offset().left;
-                storeY = e.pageY - $(this).offset().top + 25;
-                getTextArea(storeX,storeY);
-            });
-            hideLinkInfoTabs();
-            displayForms("#addTextFormInfo");
-        });
-
-        $("#addSpaceLinkButton").click(function(e) {
-            $("#createExternalLinkAlert").hide();
-            $("#changeBgImgAlert").hide();
-            $("#bgImage").off("click");
-            $("#bgImage").on("click", function(e){
-                e.preventDefault();
-                $("#external-arrow").remove();
-                $("#space_label").remove();
-                $("#link").remove();
-                var icon;
-                var posX = $(this).position().left;
-                var posY = $(this).position().top;    
-                storeX = e.pageX - $(this).offset().left;
-                storeY = e.pageY - $(this).offset().top + 25;
-                showSpaceLink(createSpaceLinkInfo(), false, storeX, storeY);
-            });
-            hideLinkInfoTabs();
-            displayForms("#createSpaceLinkAlert");
-        });
-
-        $("#addModuleLinkButton").click(function(e) {
-            $("#createModuleLinkAlert").hide();
-            $("#bgImage").off("click");
-            $("#bgImage").on("click", function(e){
-                e.preventDefault();
-                $("#external-arrow").remove();
-                $("#module_label").remove();
-                $("#link").remove();
-                var icon;
-                var posX = $(this).position().left;
-                var posY = $(this).position().top;    
-                storeX = e.pageX - $(this).offset().left;
-                storeY = e.pageY - $(this).offset().top + 25;
-                showModuleLink(createModuleLinkInfo(), false, storeX, storeY);
-            });
-            hideLinkInfoTabs();
-            displayForms("#createModuleLinkAlert");
-        }); 
-
-        $("#addExternalLinkButton").click(function(e) {
-            $("#createSpaceLinkAlert").hide();
-            $("#changeBgImgAlert").hide();
-            $("#bgImage").off("click");
-            $("#bgImage").on("click", function(e){
-                e.preventDefault();
-                $("#link").remove();
-                $("#external-arrow").remove();
-                $("#ext_label").remove();
-                var icon;
-                var posX = $(this).position().left
-                var posY = $(this).position().top;
-                storeX = e.pageX - $(this).offset().left;
-                storeY = e.pageY - $(this).offset().top + 25;
-                showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
-            });
-            hideLinkInfoTabs();
-            displayForms("#createExternalLinkAlert");
-        });
-
-        $('#changeBgImgButton').click(function(file) {
-            $("#createSpaceLinkAlert").hide();
-            $("#createExternalLinkAlert").hide();
-            drawLinks();
-            $("#changeBgImgAlert").show();          
-        });
-
-
-        // ----------- submit buttons (e.g. to create space links) ------------------
-
-        $("#addTextBlockBtn").click(function(e) {
-            e.preventDefault();
-            $("#space").scrollTop(0);
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new block should be located.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            $("#addTextX").val(storeX);
-            $("#addTextY").val(storeY - 25);
-
-            var form = $("#addTextForm");
-            var formData = new FormData(form[0]);
-
-            var textBlockInfo = createTextBlockInfo();
-
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/space/'+${space.id}+'/textblock?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache       : false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData, 
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    textBlockInfo["id"] = linkData["id"];
-                    textBlockInfo["displayId"]=linkData["displayId"];
-                    textBlockInfo["x"]=linkData["x"];
-                    textBlockInfo["y"]=linkData["y"];
-                    showTextBlock(textBlockInfo, true);
-                    $("#errorMsg").text("");
-                    $('#errorAlert').hide();
-                    $("#addTextFormInfo").hide();
-                    $("#space").css("display", "none");
-                    form[0].reset();
-                    drawLinks();
-                }
-            });
-        });
-        
-        $("#editTextBlockBtn").click(function(e) {
-            e.preventDefault();
-            $("#space").scrollTop(0);
-            var blockId = $("#textBlockId").val();
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                $('#errorAlert').show();
-                return;
-            }
-            var linkedTextBlock = $("#textBlockId").val();
-            $("#textBlockXEdit").val(storeX);
-            $("#textBlockYEdit").val(storeY - 25);
-            var form = $("#editTextBlockForm");
-            var formData = new FormData(form[0]);
-            var textBlockInfo = editTextBlockInfo();
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/space/link/textblock/'+${space.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache: false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    textBlockInfo["id"] = linkData["id"];
-                    textBlockInfo["text"]=linkData["textContent"];
-                    textBlockInfo["x"]=linkData["x"];
-                    textBlockInfo["y"]=linkData["y"];
-                    textBlockInfo["height"]=linkData["height"];
-                    textBlockInfo["width"]=linkData["width"];
-                    textBlockInfo["textColor"] = linkData["textColor"];
-                    showTextBlockEdit(textBlockInfo);
-                    hideLinkInfoTabs();
-                    $("#space").css("display", "none");
-                    selectedTextBlockId=undefined;
-                    drawLinks();
-                }
-            });
-        });
-
-        $("#createSpaceLinkBtn").click(function(e) {
-            e.preventDefault();
-            $('#errorAlert').hide();
-            $("#space").scrollTop(0);
-            var label = $("#spaceLinkLabel").val();
-            var spaceName = $("#linkedSpace option:selected").text();
-            var type = $("#type option:selected").text();
-
-            if (label == undefined || label == "") {
-                $("#errorMsg").text("Please fill the Label field before submitting.")
-                $('#errorAlert').show();
-                return;
-            }
-            if (spaceName == undefined || spaceName == "Choose...") {
-                $("#errorMsg").text("Please select a space in Linked Space dropdown.")
-                $('#errorAlert').show();
-                return;
-            }
-            
-            if (type == undefined || type == "Choose...") {
-                $("#errorMsg").text("Please select a link type in Type dropdown.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            $("#spaceLinkX").val(storeX);
-            $("#spaceLinkY").val(storeY - 25);
+	
+	function generateTextBlock(block,spanId,divId,isModal, posX, posY, posXModal, posYModal, imageHeight, imageWidth){
+	    if(block != null){
+	        var height = (block.height*imageHeight)/100;
+	        var width = (block.width*imageWidth)/100;
+	        var textBlock = $('<span id="'+spanId+block.spaceTextBlock.id+'" data-link-id="'+block.spaceTextBlock.id+'" data-blockId="'+block.id+'" data-text="'+block.spaceTextBlock.text+'" data-width="'+block.width+'"  data-height="'+block.height+'" class="textBlockClass spaceLink-'+block.spaceTextBlock.id+'"><textarea class="textBlock" style="height:'+height+'px; width:'+width+'px; resize:none; background: rgba(0, 0, 0, 0.4); color:'+block.textColor+'; border-color: '+block.borderColor+';" readonly type="textarea">'+block.spaceTextBlock.text+'</textarea></span>');
+	        setLinkPosition(textBlock,block,false,isModal,false, posX, posY, posXModal, posYModal, true);
+	        $(divId).append(textBlock);
+	        if(spanId === "textBlockId-"){
+	            $('#'+spanId+block.spaceTextBlock.id).css('cursor', 'pointer');
+	            $('#'+spanId+block.spaceTextBlock.id).click(function(e) {  
+	                var blockData = $('#'+spanId+block.spaceTextBlock.id).data();
+	                makeTextBlockEditable(blockData["blockid"],blockData["linkId"],blockData["text"],block.positionX,block.positionY,blockData["width"],blockData["height"], block.textColor, block.borderColor);
+	            });
+	        }
+	        
+	        if(block.spaceTextBlock.id === selectedTextBlockId) {
+	        	var textModalBlock = $("#textModalBlockId-"+selectedTextBlockId).find("textarea")[0];
+	        	
+	        	tHeight = textModalBlock.clientHeight;
+	        	tWidth = textModalBlock.clientWidth;
+	            
+	            var height = modalBgImageHeight;
+	            var width = modalBgImageWidth;
+	            textModalBlock.style["resize"] = "both";
+	            textModalBlock.onmouseup = function (e) {
+		            if (tHeight !== textModalBlock.clientHeight || tWidth !== textModalBlock.clientWidth ) {
+		                tHeight = textModalBlock.clientHeight;
+		                tWidth = textModalBlock.clientWidth;
+		                let percentileHeight = (tHeight*100)/height;
+		                let percentileWidth = (tWidth*100)/width;
+		                $("#textBoxWidthIDEdit").val(percentileWidth);
+		                $("#textBoxHeightIDEdit").val(percentileHeight);
+		                $("#textContentIDForEdit").val(textModalBlock.value);
+		            }
+	            };
+	        }
+	    }
+	}
+	
+	function drawLinks(){
+	    $(".Info_cz_Class").remove();
+	    $(".imageLink").remove();
+	    $(".alertLink").remove();
+	    $(".ellipse_class").remove();
+	    $(".unpublishedSpaceClass").remove();
+	    $(".textBlockClass").remove();
+	    $(".deletedSpaceClass").remove();
+	    
+	    $.ajax({
+	        type: "GET",
+	        url: "[(@{'/staff/space/'+${space?.id}+'/links'})]",
+	        cache       : false,
+	        contentType : false,
+	        processData : false,
+	        beforeSend: function () {
+	            $("#loader").show();
+	            },
+	       	complete: function () {
+	            $("#loader").hide();
+	            },
+	        success: function(data) {
+	            var spaceLinks = data['spaceLinks'];
+	            var externalLinks = data['externalLinks'];
+	            var moduleLinks = data['moduleLinks'];
+	            var textBlocks = data['textBlocks'];
+	            
+	            var posXModal = $("#bgImage").position().left;
+	            var posYModal = $("#bgImage").position().top;
+	            var posX = $("#main-bgImage").position().left;
+	            var posY = $("#main-bgImage").position().top;
+	            
+	            spaceLinks.forEach(function(link,index){
+	                var spanId= "spacelinkModalId-";
+	                var divId = "#space"
+	                generateSpaceLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+	            })
+	            spaceLinks.forEach(function(link,index){
+	                var spanId= "spacelinkId-";
+	                var divId = "#main-space";
+	                generateSpaceLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+	            })
+	            
+	            moduleLinks.forEach(function(link,index){
+	                var spanId= "moduleModallinkId-";
+	                var divId = "#space";
+	                generateModuleLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+	            })
+	            moduleLinks.forEach(function(link,index){
+	                var spanId= "modulelinkId-";
+	                var divId = "#main-space";
+	                generateModuleLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+	            })
+	            
+	            externalLinks.forEach(function(link,index){
+	                var spanId= "externalModallinkId-";
+	                var divId = "#space";
+	                generateExternalLinks(link,spanId,divId,true, posX, posY, posXModal, posYModal);
+	            })
+	            
+	            externalLinks.forEach(function(link,index){
+	                var spanId= "externallinkId-";
+	                var divId = "#main-space";
+	                generateExternalLinks(link,spanId,divId,false, posX, posY, posXModal, posYModal);
+	            })
+	            
+	            textBlocks.forEach(function(block,index){
+	                var spanId= "textModalBlockId-";
+	                var divId = "#space";
+	                var imageHeight = modalBgImageHeight;
+	                var imageWidth = modalBgImageWidth;
+	                generateTextBlock(block,spanId,divId,true, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
+	            })
+	            
+	            textBlocks.forEach(function(block,index){
+	                var spanId= "textBlockId-";
+	                var divId = "#main-space";
+	                var imageHeight = parseInt($("#main-bgImage").css("height"));
+	                var imageWidth = parseInt($("#main-bgImage").css("width"));
+	                generateTextBlock(block,spanId,divId,false, posX, posY, posXModal, posYModal, imageHeight, imageWidth);
+	            })
+	        }
+	    });
+	}
+	
+	//--------- show links functions --------------
+	function showTextBlock(textBlock, show){
+	    $("#textB").remove();
+	    $("#text").remove();
+	    var posX = $("#bgImage").position().left;
+	    var posY = $("#bgImage").position().top;
+	    var imageHeight = modalBgImageHeight;
+	    var imageWidth = modalBgImageWidth;
+	    var textArea = $("<textarea class='textBlock' type='textarea'></textarea>");
+	    textArea.css('width', (textBlock["width"]*imageWidth)/100);
+	    textArea.css('height', (textBlock["height"]*imageHeight)/100);
+	    textArea.css('resize', 'both');
+	    textArea.text(textBlock["text"]);
+	    var spaceTextBlock;
+	    spaceTextBlock = $('<span class="textBlockClass spaceLink-' + textBlock["id"] + '" data-link-id="' + textBlock["id"] + '"></span>');
+	    spaceTextBlock.css('position', 'absolute');
+	    spaceTextBlock.css('left', textBlock["x"] + posX);
+	    spaceTextBlock.css('top', textBlock["y"] + posY);
+	    spaceTextBlock.css('font-size', "12px");
+	
+	    if (textBlock["id"]) {
+	        spaceTextBlock.attr("data-link-id", textBlock["id"]);
+	        spaceTextBlock.css('cursor', 'pointer');
+	        spaceTextBlock.click(function(e) {
+	            makeTextBlockEditable(textBlock["displayId"], textBlock["id"], textBlock["text"], textBlock["x"], textBlock["y"], textBlock["width"], textBlock["height"]);
+	        });
+	    }
+	    spaceTextBlock.append(textArea);
+	    $("#space").append(spaceTextBlock);
+	}
+	
+	function showTextBlockEdit(textBlock){
+	    textBlock["x"]=storeX;
+	    textBlock["y"]=storeY;
+	    var selectedClass = '#textModalBlockId-'+selectedTextBlockId;
+	    var selectedTextArea = "#textModalBlockId-"+selectedTextBlockId+" .textBlock";
+	    var posX = $("#bgImage").position().left;
+	    var posY = $("#bgImage").position().top;
+	    var imageHeight = modalBgImageHeight;
+	    var imageWidth = modalBgImageWidth;
+	    $(selectedClass).css('left', textBlock["x"]+posX);
+	    $(selectedClass).css('top', textBlock["y"]);
+	    $(selectedTextArea).css('width', (textBlock["width"]*imageWidth)/100);
+	    $(selectedTextArea).css('height', (textBlock["height"]*imageHeight)/100);   
+	    $(selectedTextArea).text(textBlock["text"]);
+	    $(selectedClass).css('color', textBlock["textColor"]);
+	    $(selectedClass).css('border-color', textBlock["borderColor"]);
+	}
+	
+	function showSpaceLink(spaceLink, show, x, y) {
+	    $("#space_label").remove();
+	    $("#link").remove();
+	    $("#undefined").remove();
+	    var posX = $("#bgImage").position().left;
+	    var posY = $("#bgImage").position().top;
+	    var space_label = $("<p id='space_label' class='tooltiptext'></p>");
+	    space_label.text(spaceLink["spaceLinkLabel"]);
+	
+	    var link;
+	    if (spaceLink["type"] == "ALERT") {
+	        link = $('<div id="link" class="alert alert-primary alertLink spaceLink-"' + spaceLink["id"] + '" role="alert" data-link-id="' + spaceLink["id"] + '"><p>'+spaceLink["spaceLinkLabel"]+'</p></div>');
+	    } else if(spaceLink["type"] == "IMAGE" && linkIcon) {
+	        link = $('<div id="link" class="spaceLink-' + spaceLink["id"] + '" data-link-id="' + spaceLink["id"] + '"><img src="' + linkIcon + '"></div>');
+	    } else {
+	        $(space_label).css({
+	            'font-size': "12px",
+	            'transform': 'rotate(0deg)',
+	            'color': 'grey'
+	        });
+	        link = $('<span id="' + spaceLink["id"] +'" data-link-id="' + spaceLink["id"] + '" class="spaceLink-' + spaceLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-move Icon_awesome_info_staff_c "></span></div></span>');
+	    }
+	    if(show) {
+	        var unpublishedSpaceElement;
+	        if(spaceLink["linkedSpaceStatus"]=="UNPUBLISHED"){
+	            unpublishedSpaceElement=$('<span data-link-id = "unpublished-' + spaceLink["id"] + '" class="icon-warning secondary fa-lg unpublishedSpaceClass unpublishedClass-' + spaceLink["id"] + '" style="color: var(--secondary);"></span>')
+	            unpublishedSpaceElement.css('position', 'absolute');
+	            unpublishedSpaceElement.css('left', x + posX + displaceUnpublishedOnX);
+	            unpublishedSpaceElement.css('top', y + posY - displaceUnpublishedOnY);
+	            unpublishedSpaceElement.css('transform', 'rotate(' +$('#spaceLinkRotation').val()+ 'deg)');
+	            unpublishedSpaceElement.css('font-size', "24px");
+	        }else{
+	            $('[data-link-id="unpublished-' + spaceLink["id"] + '"]').remove();
+	        } 
+	        link.css('top', spaceLink["y"] + posY);
+	    } else {
+	    	link.css('top', spaceLink["y"]);
+	    }
+	
+	    link.css('position', 'absolute');
+	    link.css('left', spaceLink["x"] + posX);
+	    link.css('color', 'rgba(128,128,128,1)');
+	    link.css('transform', 'rotate(' +$('#spaceLinkRotation').val()+ 'deg)');
+	    link.css('font-size', "12px");
+	    if (spaceLink["id"]) {
+	        link.attr("class", spaceLink["id"]);
+	        link.css('cursor', 'pointer');
+	        link.css('color', 'rgba(128,128,128,1)');
+	        link.click(function(e) {
+	            makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"], spaceLink["rotation"], spaceLink["linkedSpace"], spaceLink["x"], spaceLink["y"], spaceLink["displayId"], spaceLink["type"]);
+	        });
+	
+	        space_label.attr("data-link-id", spaceLink["id"]);
+	        space_label.attr("class", "tooltiptext label-"+spaceLink["id"]);
+	        space_label.css('cursor', 'pointer');
+	        space_label.click(function(e) {
+	            makeSpaceLinksEditable(spaceLink["spaceLinkLabel"], spaceLink["id"], spaceLink["rotation"], spaceLink["linkedSpace"], spaceLink["x"], spaceLink["y"], spaceLink["displayId"], spaceLink["type"]);
+	        });
+	    }
+	
+	    $("#space").append(link);
+	    $("#space").append(unpublishedSpaceElement);
+	    $("#link").append(space_label);
+	}
+	
+	function showModuleLink(moduleLink, show, x, y) {
+	    $("#module_label").remove();
+	    $("#link").remove();
+	    $("#undefined").remove();
+	    var posX = $("#bgImage").position().left;
+	    var posY = $("#bgImage").position().top;
+	    var module_label = $("<p id='module_label' class='tooltiptext'></p>");
+	    module_label.text(moduleLink["moduleLinkLabel"]);
+	
+	    var link;
+	    if (moduleLink["type"] == "ALERT") {
+	        link = $('<div id="link" class="alert alert-primary alertLink moduleLink-"' + moduleLink["id"] + '" role="alert" data-link-id="' + moduleLink["id"] + '"><p>'+moduleLink["moduleLinkLabel"]+'</p></div>');
+	    } else if(moduleLink["type"] == "IMAGE" && moduleLinkIcon) {
+	        link = $('<div id="link" class="spaceLink-' + moduleLink["id"] + '" data-link-id="' + moduleLink["id"] + '"><img src="' + moduleLinkIcon + '"></div>');
+	    } else{ 
+	        $(module_label).css({
+	            'position': 'absolute',
+	            'font-size': "10px",
+	            'transform': 'rotate(0deg)',
+	            'color': 'red'
+	        });
+	        link = $('<span id="' + moduleLink["id"] +'" data-link-id="' + moduleLink["id"] + '" class="moduleLink-' + moduleLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-info Icon_awesome_info_staff_m"></span></div></span>');
+	    } 
+	    if(show) {
+	        link.find("div").css('fill', 'red');
+	        link.css('top', moduleLink["y"] + posY);
+	    } else {
+	    	link.css('top', moduleLink["y"]);
+	    }
+	    link.css('position', 'absolute');
+	    link.css('left', moduleLink["x"] + posX);
+	    link.css('color', 'red');
+	    link.css('transform', 'rotate(' +$('#moduleLinkRotation').val()+ 'deg)');
+	    link.css('font-size', "12px");
+	
+	    if (moduleLink["id"]) {
+	        link.attr("data-link-id", moduleLink["id"]);
+	        link.css('cursor', 'pointer');
+	        link.click(function(e) {
+	            makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"], moduleLink["rotation"], moduleLink["linkedModule"], moduleLink["x"], moduleLink["y"], moduleLink["displayId"], moduleLink["type"]);
+	        });
+	        module_label.attr("data-link-id", moduleLink["id"]);
+	        module_label.css('cursor', 'pointer');
+	        module_label.attr("class", "tooltiptext label-"+moduleLink["id"]);
+	        module_label.click(function(e) {
+	            makeModuleLinksEditable(moduleLink["moduleLinkLabel"], moduleLink["id"], moduleLink["rotation"], moduleLink["linkedModule"], moduleLink["x"], moduleLink["y"], moduleLink["displayId"], moduleLink["type"]);
+	        });
+	    }
+	
+	    $("#space").append(link);
+	    $("#link").append(module_label);
+	}
+	
+	function showModuleLinkEdit(moduleLink, show, posX, posY) {
+	    moduleLink["x"]=storeX;
+	    moduleLink["y"]=storeY;
+	    var selectedLinkClass = '#moduleModallinkId-'+selectedModuleLinkId;
+	    var selectedLabelClass = '.label-'+selectedModuleLinkId;
+	    updateLinkProperties(selectedLinkClass,selectedLabelClass,moduleLink["rotation"],posX,posY,moduleLink["moduleLinkLabel"]);
+	}
+	
+	
+	function showSpaceLinkEdit(spaceLink, show, posX, posY) {
+	    spaceLink["x"]=storeX;
+	    spaceLink["y"]=storeY;
+	    var selectedLinkClass = '#spacelinkModalId-'+selectedSpaceLinkId;
+	    var selectedLabelClass = '.label-'+selectedSpaceLinkId;
+	    var selectedUnpublishedIconClass = '.unpublishedClass-'+selectedSpaceLinkId;
+	    if(show) {
+	        var unpublishedSpaceElement;
+	        if(spaceLink["linkedSpaceStatus"]=="UNPUBLISHED"){
+	            unpublishedSpaceElement=$('<span data-link-id = "unpublished-' + spaceLink["id"] + '" class="icon-warning secondary unpublishedSpaceClass unpublishedClass-' + spaceLink["id"] + '></span>')
+	            unpublishedSpaceElement.css('position', 'absolute');
+	            unpublishedSpaceElement.css('left', posX + displaceUnpublishedOnX);
+	            unpublishedSpaceElement.css('top', posY - displaceUnpublishedOnY);
+	            unpublishedSpaceElement.css('transform', 'rotate(' +spaceLink["rotation"]+ 'deg)');
+	            unpublishedSpaceElement.css('font-size', "24px");
+	            $("#space").append(unpublishedSpaceElement);
+	        }else{
+	            $('[data-link-id="unpublished-' + spaceLink["id"] + '"]').remove();
+	        }    
+	    }
+	    $(selectedUnpublishedIconClass).css({ 'transform': 'rotate(' + parseInt(spaceLink["rotation"]) + 'deg)'});
+	    $(selectedUnpublishedIconClass).css({ 'position': 'absolute'});
+	    $(selectedUnpublishedIconClass).css({ 'left': posX + displaceUnpublishedOnXModal});
+	    $(selectedUnpublishedIconClass).css({ 'top': posY - displaceUnpublishedOnYModal});
+	    updateLinkProperties(selectedLinkClass,selectedLabelClass,spaceLink["rotation"],posX,posY,spaceLink["spaceLinkLabel"]);
+	}
+	
+	function showExternalLinkEdit(externalLink, show, posX, posY) {
+	    externalLink["x"]=storeX;
+	    externalLink["y"]=storeY;
+	    var selectedLinkClass = '#externalModallinkId-'+selectedExternalLinkId;
+	    var selectedLabelClass = '.label-'+selectedExternalLinkId;
+	    updateLinkProperties(selectedLinkClass,selectedLabelClass,externalLink["rotation"],posX,posY,externalLink["externalLinkLabel"]);
+	}
+	
+	function updateLinkProperties(selectedLinkClass,selectedLabelClass,rotation,x,y,linkLabel, show){
+	    var posX, posY;
+	    if(show) {
+	        posX = $("#main-bgImage").position().left;
+	        posY = $("#main-bgImage").position().top;
+	    }
+	    else{
+	        posX = $("#bgImage").position().left;
+	        posY = 0
+	    }
+	    $(selectedLinkClass).css({ 'transform': 'rotate(' + rotation + 'deg)'});
+	    $(selectedLinkClass).css({ 'position': 'absolute'});
+	    $(selectedLinkClass).css({ 'left': x + posX});
+	    $(selectedLinkClass).css({ 'top': y + posY});
+	    $(selectedLabelClass+' span').remove();
+	    $(selectedLabelClass).append('<span class = "tooltiptext" style="fill: grey;">' + linkLabel + '</span>');
+	    feather.replace();    
+	}
+	
+	function hideLinkInfoTabs(){
+	    $("#editExternalLinkInfo").hide();
+	    $("#editSpaceLinkInfo").hide();
+	    $("#editModuleLinkInfo").hide();
+	    $("#editTextBlockInfo").hide();
+	    $("#createExternalLinkAlert").hide();
+	    $("#createSpaceLinkAlert").hide();
+	    $("#createModuleLinkAlert").hide();
+	    $("#errorMsg").text("");
+	    $('#errorAlert').hide();
+	}
+	
+	function showExternalLinks(externalLink, show, x, y) {
+	    $("#ext_label").remove();
+	    $("#link").remove();
+	    $("#undefined").remove();
+	    var posX = $("#bgImage").position().left;
+	    var posY = $("#bgImage").position().top;
+	    var ext_label = $("<p id='ext_label' class='tooltiptext'></p>");
+	    ext_label.text(externalLink["externalLinkLabel"]);
+	
+	    var link;
+	    if(externalLink["type"] == "IMAGE" && externalLinkIcon) {
+	        link = $('<div id="link" data-link-id="' + externalLink["id"] + '"><img src="' + externalLinkIcon + '"></div>');
+	    } else {
+	        $(ext_label).css({
+	            'position': 'absolute',
+	            'font-size': "12px",
+	            'transform': 'rotate(0deg)',
+	            'color': 'blue'
+	        });
+	        link = $('<span id="' + externalLink["id"] +'" data-link-id="' + externalLink["id"] + '"  class="externalLink-' + externalLink["id"] + '"><div id="link" class="Info_cz_Class"><svg class="Ellipse_8_c ellipse_class"><ellipse fill="rgba(222,222,222,1)" class="Ellipse_8_c_Class" rx="14.5" ry="14.5" cx="14.5" cy="14.5"></ellipse></svg><svg class="Ellipse_10_c ellipse_class"><ellipse fill="rgba(240,240,240,1)" class="Ellipse_10_c_Class" rx="12.5" ry="12.5" cx="12.5" cy="12.5"></ellipse></svg><svg class="Ellipse_9_c ellipse_class"><ellipse fill="rgba(255,255,255,1)" class="Ellipse_9_c_Class" rx="10.5" ry="10.5" cx="10.5" cy="10.5"></ellipse></svg><span class="icon-ext-link Icon_awesome_info_staff_e"></span></div></span>');
+	    }
+	    
+	    if(show) {
+	        link.css('top', externalLink["y"] + posY);
+	    } else {
+	    	link.css('top', externalLink["y"]);
+	    }
+	
+	    link.css('position', 'absolute');
+	    link.css('left', externalLink["x"] + posX);
+	    link.css('color', 'blue');
+	    link.css('font-size', "12px");
+	
+	    if (externalLink["id"]) {
+			link.attr("data-link-id", externalLink["id"]);
+			link.css('cursor', 'pointer');
+			link.attr('href', externalLink["url"]);
+			link.click(function(e) {
+				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+			});
 			
-            var form = $("#createSpaceLinkForm");
-            var label = $("#spaceLinkLabel").val();
-            var spaceName = $("#linkedSpace option:selected").text();
-            var spaceId = $("#linkedSpace option:selected").val(); 
-            var formData = new FormData(form[0]);
-            var spaceLinkInfo = createSpaceLinkInfo();
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/space/'+${space?.id}+'/spacelink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache       : false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    spaceLinkInfo["id"] = linkData["id"];
-                    spaceLinkInfo["displayId"]=linkData["displayId"];
-                    spaceLinkInfo["x"]=linkData["x"];
-                    spaceLinkInfo["y"]=linkData["y"];
-                    spaceLinkInfo["linkedSpaceStatus"]=linkData["linkedSpaceStatus"];
-                    showSpaceLink(spaceLinkInfo, true);
-                    $("#space_label").attr("id","");
-                    $("#link").attr("id","");
-                    $("#createSpaceLinkAlert").hide();  
-                    $("#errorMsg").text("");
-                    $('#errorAlert').hide();
-                    $("#noLinksOnSpace").hide();
-                    $("."+linkData["id"]).remove();
-                    form[0].reset();
-                    var newSpaceLinkURL = [[@{|/staff/space/|}]]+spaceId;
-                    $("#outgoingLinks").append("<a href="+newSpaceLinkURL+" style='padding: .25rem .25rem;' class='list-group-item' id="+linkData["id"]+">"+label+"  &nbsp;-> &nbsp;"+spaceName+"</a>");
-                    if (spaceName == "${space?.name}") {
-                        $("#noLinksToSpace").hide();
-                        $("div#incomingLinks").append("<a href="+newSpaceLinkURL+" style='padding: .25rem .25rem;' class='list-group-item' id="+linkData["id"]+">"+spaceName+"</a>");
-                    }
-                    $("#space").css("display", "none");
-                    linkIcon=null;
-                    drawLinks();
-                }
-            });
-        });
-
-        $("#createModuleLinkBtn").click(function(e) {
-            e.preventDefault();
-            $("#space").scrollTop(0);
-            $('#errorAlert').hide();
-            
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            var linkedModules = $("#linkedModule").val();
-            var moduleLabel = $("#moduleLinkLabel").val();
-            var type = $("#moduleType option:selected").text();
-            
-            if (moduleLabel == undefined || moduleLabel == "") {
-                $("#errorMsg").text("Please enter the label for module.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            if (linkedModules == undefined || linkedModules == "Choose...") {
-                $("#errorMsg").text("Please select linked modules.")
-                $('#errorAlert').show();
-                return;
-            }
-            
-            if (type == undefined || type == "Choose...") {
-                $("#errorMsg").text("Please select a link type in Type dropdown.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            $("#moduleLinkX").val(storeX);
-            $("#moduleLinkY").val(storeY - 25);
-
-            var form = $("#createModuleLinkForm");
-            var formData = new FormData(form[0]);
-
-            var moduleLinkInfo = createModuleLinkInfo();
-
-            $.ajax({
-                type: "POST",
-
-                url: "[(@{'/staff/space/'+${space?.id}+'/modulelink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache       : false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    moduleLinkInfo["id"] = linkData["id"];
-                    moduleLinkInfo["displayId"]=linkData["displayId"];
-                    moduleLinkInfo["x"]=linkData["x"];
-                    moduleLinkInfo["y"]=linkData["y"];
-                    showModuleLink(moduleLinkInfo, true);
-                    $("#module_label").attr("id","");
-                    $("#link").attr("id","");
-                    $("#createModuleLinkAlert").hide();
-                    $("#errorMsg").text("");
-                    $('#errorAlert').hide();
-                    $("."+linkData["id"]).remove();
-                    form[0].reset();
-                    $("#space").css("display", "none");
-                    moduleLinkIcon=null;
-                    drawLinks();
-                }
-            });
-        });
-        $("#editModuleLinkBtn").click(function(e) {
-            e.preventDefault();
-            var linkId = $("#moduleLinkIdEdit").val();
-            if(storeX == undefined || storeY == undefined){
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.");
-                $('#errorAlert').show();
-                return;    
-            }
-            $("#space").scrollTop(0);
-            var linkedModules = $("#moduleLinkIdEdit").val();
-            $("#moduleLinkXEdit").val(storeX);
-            $("#moduleLinkYEdit").val(storeY - 25);
-            var form = $("#editModuleLinkForm");
-            var formData = new FormData(form[0]);
-            var moduleLinkInfo = editModuleLinkInfo();
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/space/link/module/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache: false,
-                contentType: false,
-                processData: false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data){
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    moduleLinkInfo["id"] = linkData["id"];
-                    moduleLinkInfo["displayId"]=linkData["displayId"];
-                    moduleLinkInfo["x"]=linkData["x"];
-                    moduleLinkInfo["y"]=linkData["y"];
-                    $('#linkRotation-'+selectedModuleLinkId).val(linkData["rotation"]);
-                    $('#linkLabel-'+selectedModuleLinkId).val(linkData["label"]);
-                    $('#linkType-'+selectedModuleLinkId).val(linkData["dislpayType"]);
-                    $('#moduleLinkTarget-'+selectedModuleLinkId).val(linkData["linkedId"]);
-                    showModuleLinkEdit(moduleLinkInfo, true);
-                    hideLinkInfoTabs();
-                    $("#space").css("display", "none");
-                    selectedModuleLinkId=undefined;
-                    drawLinks();
-                }
-            });
-        });
-
-        $("#editSpaceLinkBtn").click(function(e) {
-            e.preventDefault();
-            var linkId = $("#spaceLinkIdEdit").val();
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                $('#errorAlert').show();
-                return;    
-            }
-            $("#space").scrollTop(0);
-            var linkedSpace = $("#spaceLinkIdEdit").val();
-            $("#spaceLinkXEdit").val(storeX);
-            $("#spaceLinkYEdit").val(storeY - 25);
-            
-
-            var form = $("#editSpaceLinkForm");
-            var formData = new FormData(form[0]);
-            var spaceLinkInfo = editSpaceLinkInfo();
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/space/link/space/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache: false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#main-bgImage").off("click");
-                    spaceLinkInfo["id"] = linkData["id"];
-                    spaceLinkInfo["displayId"]=linkData["displayId"];
-                    spaceLinkInfo["x"]=linkData["x"];
-                    spaceLinkInfo["y"]=linkData["y"];
-                    spaceLinkInfo["linkedSpaceStatus"]=linkData["linkedSpaceStatus"];
-                    showSpaceLinkEdit(spaceLinkInfo, true);
-                    $('#linkRotation-'+selectedSpaceLinkId).val(linkData["rotation"]);
-                    $('#linkLabel-'+selectedSpaceLinkId).val(linkData["label"]);
-                    $('#linkType-'+selectedSpaceLinkId).val(linkData["dislpayType"]);
-                    $('#linkTarget-'+selectedSpaceLinkId).val(linkData["linkedId"]);
-                    hideLinkInfoTabs();
-                    $("#space").css("display", "none");
-                    selectedSpaceLinkId=undefined;
-                    drawLinks();
-                }
-            });
-        });
-
-        $("#editExternalLinkBtn").click(function(e) {
-            e.preventDefault();
-            $("#space").scrollTop(0);
-            var linkId = $("#externalLinkIdEdit").val();
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                $('#errorAlert').show();
-                return;
-            }
-            var linkedSpace = $("#externalLinkIdEdit").val();
-            $("#externalLinkXEdit").val(storeX);
-            $("#externalLinkYEdit").val(storeY - 25);
-            var form = $("#editExternalLinkForm");
-            var formData = new FormData(form[0]);
-            var externalLinkInfo = editExternalLinkInfo();
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/space/link/external/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache: false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    externalLinkInfo["id"] = linkData["id"];
-                    externalLinkInfo["displayId"]=linkData["displayId"];
-                    externalLinkInfo["x"]=linkData["x"];
-                    externalLinkInfo["y"]=linkData["y"];
-                    $('#linkLabel-'+selectedExternalLinkId).val(linkData["label"]);
-                    $('#linkType-'+selectedExternalLinkId).val(linkData["dislpayType"]);
-                    $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]);
-                    showExternalLinkEdit(editExternalLinkInfo, true);
-                    hideLinkInfoTabs();
-                    $("#space").css("display", "none");
-                    selectedExternalLinkId=undefined;
-                    drawLinks();
-                }
-            });
-        });
-
-        $("#createExternalLinkBtn").click(function(e) {
-            e.preventDefault();
-            $("#space").scrollTop(0);
-            var payload = {};
-
-            if (storeX == undefined || storeY == undefined) {
-                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            var externalLink = $("#externalLink").val();
-            var externalLinkLabel = $("#externalLinkLabel").val();
-            var type = $("#extType option:selected").text();
-
-            if (externalLink == undefined || externalLink == "") {
-                $("#errorMsg").text("Please provide the link to the external link.")
-                $('#errorAlert').show();
-                return;
-            }
-
-            if (externalLinkLabel == undefined || externalLinkLabel == "") {
-                $("#errorMsg").text("Please enter a label for this external link.")
-                $('#errorAlert').show();
-                return;
-            }
-            
-            if (type == undefined || type == "Choose...") {
-                $("#errorMsg").text("Please select a link type in Type dropdown.")
-                $('#errorAlert').show();
-                return;
-            }
-            $("#externalLinkX").val(storeX);
-            $("#externalLinkY").val(storeY - 25);
-
-            var form = $("#createExternalLinkForm");
-            var formData = new FormData(form[0]);
-            var externalLinkInfo = createExternalLinkInfo();
-
-            $.ajax({
-                type: "POST",
-                url: "[(@{'/staff/space/'+${space?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
-                cache       : false,
-                contentType : false,
-                processData : false,
-                enctype: 'multipart/form-data',
-                data: formData,
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success: function(data) {
-                    var linkData = JSON.parse(data);
-                    $("#bgImage").off("click");
-                    externalLinkInfo["id"] = linkData["id"];
-                    externalLinkInfo["displayId"]=linkData["displayId"];
-                    externalLinkInfo["x"]=linkData["x"];
-                    externalLinkInfo["y"]=linkData["y"];
-                    showExternalLinks(externalLinkInfo, true);
-                    $("#ext_label").attr("id","");
-                    $("#link").attr("id","");
-                    $("#createExternalLinkAlert").hide();
-                    $("#errorMsg").text("");
-                    $('#errorAlert').hide();
-                    $("."+linkData["id"]).remove();
-                    form[0].reset();
-                    $("#external-arrow").attr("id","");
-                    $("#space").css("display", "none");
-                    externalLinkIcon=null;
-                    drawLinks();
-                }
-            });
-        });
-
-        // ------------- other buttons ------------
-        $("#deleteSpaceLinkButton").click(function() {
-            var linkId = $("#spaceLinkIdValueEdit").val();
-            $.ajax({
-                url: "[(@{'/staff/space/'+${space?.id}+'/spacelink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
-                method: "DELETE",
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success:function(data) {
-                    $('[data-link-id="' + linkId + '"]').remove();
-                    $('[data-link-id="unpublished-' + linkId + '"]').remove();
-                    hideLinkInfoTabs();
-                    $('a#'+linkId).remove();
-                    if ($("div#outgoingLinks a").length < 2) {
-                        $("#noLinksOnSpace").show();
-                    }
-                    if ($("div#incomingLinks a").length < 2) {
-                        $("#noLinksToSpace").show();
-                    }
-                    $("#spaceLinkInfo").hide();
-                    $("#space").css("display", "none");
-                    drawLinks();
-                }
-            });
-        });
-
-
-        $("#deleteModuleLinkButton").click(function() {
-            var linkId = $("#moduleLinkIdValueEdit").val();
-            $.ajax({
-                url: "[(@{'/staff/space/'+${space?.id}+'/modulelink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
-                method: "DELETE",
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success:function(data) {
-                    $('[data-link-id="' + linkId + '"]').remove();
-                    hideLinkInfoTabs();
-                    $("#space").css("display", "none");
-                    drawLinks();
-                }
-            });
-        });
-
-        $("#deleteExternalLinkButton").click(function() {
-            var linkId = $("#externalLinkIdValueEdit").val();
-            $.ajax({
-                url: "[(@{'/staff/space/'+${space?.id}+'/externallink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
-                method: "DELETE",
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success:function(data) {
-                    $('[data-link-id="' + linkId + '"]').remove();
-                    hideLinkInfoTabs();
-                    $("#space").css("display", "none");
-                    drawLinks();
-                }
-            });
-        });
-        
-        $("#deleteTextBlockButton").click(function() {
-            var blockId = $("#textBlockId").val();
-            $.ajax({
-                url: "[(@{'/staff/space/'+${space.id}+'/textblock/'})]"+ blockId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
-                method: "DELETE",
-                beforeSend: function () {
-                    $(".saveLoader").show();
-                    },
-               	complete: function () {
-                    $(".saveLoader").hide();
-                    },
-                success:function(data) {
-                    $('[data-link-id="' + blockId + '"]').remove();
-                    hideLinkInfoTabs();
-                    $("#space").css("display", "none");
-                    drawLinks();
-                }
-            });
-        });
-
-        $("#closeAlert").click(function() {
-            $('#errorAlert').hide();
-        });
-
-        // ------------- adjust links on background image (e.g. when inputs are changed) ------------
-        // external links
-        $(".extlink-target").change(function() {
-            var externalLink = {};
-            externalLink["x"] = storeX;
-            externalLink["y"] = storeY;
-            externalLink["externalLinkLabel"] = $("#externalLinkLabel").val();
-            externalLink["url"] = $("#externalLink").val();
-            externalLink["type"] = $("#extType").val();
-            showExternalLinks(externalLink);
-        });     
-
-        // space links
-        $('#spaceLinkRotation').change(function() {
-            $('#link').css('transform', 'rotate(' +$('#spaceLinkRotation').val()+ 'deg)');
-        });
-
-        $(".target").change(function() {
-            showSpaceLink(createSpaceLinkInfo());
-        }); 
-
-        $(".modulelink-target").change(function() {
-            showModuleLink(createModuleLinkInfo());
-        }); 
-
-        // link icons for space links
-
-        $('#moduleLinkRotation').change(function() {
-            $('#link').css('transform', 'rotate(' +$('#moduleLinkRotation').val()+ 'deg)');
-        });
-
-        $('#moduleLinkRotationEdit').change(function() {
-            $('#link').css('transform', 'rotate(' +$('#moduleLinkRotationEdit').val()+ 'deg)');
-        });
-
-        $(".modulelink-targetEdit").change(function() {
-            showModuleLinkEdit(editModuleLinkInfo());
-        }); 
-
-        $(".spacelink-targetEdit").change(function() {
-            showSpaceLinkEdit(editSpaceLinkInfo());
-        });
-
-        $(".externallink-targetEdit").change(function() {
-            showExternalLinkEdit(editExternalLinkInfo());
-        });
-
-
-        $("#spaceLinkImage").change(function() {
-            if (this.files && this.files[0]) {
-                linkIconReader.readAsDataURL(this.files[0]);
-            }
-        });
-        
-        $("#moduleLinkImage").change(function() {
-            if (this.files && this.files[0]) {
-                moduleLinkIconReader.readAsDataURL(this.files[0]);
-            }
-        });
-
-        $("#externalLinkImage").change(function() {
-            if (this.files && this.files[0]) {
-                externalLinkIconReader.readAsDataURL(this.files[0]);
-            }
-        });
-
-        // ------------ Cancel buttons -----------------
-
-        $(".cancelSpaceLinkBtn").click(function() {
-            storeX = null;
-            storeY = null;
-            linkIcon = null;
-            $("#space").scrollTop(0);
-            $("#link").remove();
-            $("#undefined").remove();
-            $("#space_label").remove();
-            $("#space").hide();
-            $("#createSpaceLinkAlert").hide(); 
-            $('#errorAlert').hide();
-            $("#bgImage").off("click");
-            drawLinks();
-        });
-
-        $(".cancelModuleLinkBtn").click(function() {
-            storeX = null;
-            storeY = null;
-            $("#space").scrollTop(0);
-            moduleLinkIcon=null;
-            $("#link").remove();
-            $("#undefined").remove();
-            $("#module_label").remove();
-            $("#space").hide();
-            $("#createModuleLinkAlert").hide();  
-            $('#errorAlert').hide();
-            $("#bgImage").off("click");
-            drawLinks();
-        }); 
-
-        $(".cancelExternalLinkBtn").click(function() {
-            storeX = null;
-            storeY = null;
-            $("#space").scrollTop(0);
-            externalLinkIcon=null;
-            $("#external-link").remove();
-            $("#undefined").remove();
-            $("div#link").remove();
-            $("#external-arrow").remove();
-            $("#ext_label").remove();
-            $("#space").hide();
-            $("#createExternalLinkAlert").hide();
-            $("#bgImage").off("click");
-            $('#errorAlert').hide();
-            drawLinks();
-        });
-        
-        $(".cancelAddTextBlockBtn").click(function() {
-            storeX = null;
-            storeY = null;
-            $("#space").scrollTop(0);
-            $("#textContentID").val(""); 
-            $("span#text").remove();
-            $("#space").hide();
-            $("#addTextFormInfo").hide();
-            $('#errorAlert').hide();
-            $("#bgImage").off("click");
-            drawLinks();
-        });
-
-        $("#cancelBgImgBtn").click(function() {
-        	$("#space").scrollTop(0);
-            drawLinks();
-            $("#file").val('');
-            $("#changeBgImgAlert").hide();
-        });
-
-        $("#closeEditModuleLinkInfo").click(function(e) {
-            e.preventDefault();
-            selectedModuleLinkId=undefined;
-            $("#moduleLinkInfoLabel").text("");
-            $("#moduleLinkId").val("");
-            resetHighlighting();
-            $("#space").hide();
-            $("#editModuleLinkInfo").hide();
-            drawLinks();
-        }); 
-
-        $("#closeEditSpaceLinkInfo").click(function(e) {
-            e.preventDefault();
-            selectedSpaceLinkId=undefined;
-            $("#spaceLinkInfoLabel").text("");
-            $("#spaceLinkId").val("");
-            resetHighlighting();
-            $("#space").hide();
-            $("#editSpaceLinkInfo").hide();
-            drawLinks();
-        }); 
-
-        $("#closeEditExternalLinkInfo").click(function(e) {
-            e.preventDefault();
-            selectedExternalLinkId=undefined;
-            $("#externalLinkInfoLabel").text("");
-            $("#externalLinkId").val("");
-            resetHighlighting();
-            $("#space").hide();
-            $("#editExternalLinkInfo").hide();
-            drawLinks();
-        });
-        
-        $("#closeEditTextBlockInfo").click(function(e) {
-            e.preventDefault();
-            selectedTextBlockId=undefined;
-            $("#textBoxHeightIDEdit").val("");
-            $("#textBoxWidthIDEdit").val("");
-            $("#textContentIDForEdit").val("");
-            resetHighlighting();
-            $("#space").hide();
-            $("#editTextBlockInfo").hide();
-            drawLinks();
-        });
-});
+			ext_label.attr("data-link-id", externalLink["id"]);
+			ext_label.css('cursor', 'pointer');
+			ext_label.attr("class", "label-"+externalLink["id"]);
+			ext_label.click(function(e) {
+				makeExternalLinksEditable(externalLink["externalLinkLabel"], externalLink["id"], externalLink["externalLinkURL"], externalLink["x"], externalLink["y"], externalLink["displayId"], externalLink["type"],externalLink["howToOpen"],externalLink["tabOpen"]);
+			});
+	    }
+	
+	    $("#space").append(link);
+	    $("#link").append(ext_label);
+	    $("#external-link").remove();
+	
+	}
+	
+	//--------- Utility functions -------------
+	function createSpaceLinkInfo() {
+	    var info = {};
+	    info["x"] = storeX;
+	    info["y"] = storeY;
+	    info["rotation"] = $("#spaceLinkRotation").val();
+	    info["linkedSpace"] = $("#linkedSpace").val();
+	    info["spaceLinkLabel"] = $("#spaceLinkLabel").val();
+	    info["type"] = $("#type").val();
+	    return info;
+	}
+	
+	function createExternalLinkInfo() {
+		var info = {};
+		info["x"] = storeX;
+		info["y"] = storeY;
+		info["tabOpen"] = $("#extTabOpen").val();
+		info["type"] = $("#extType").val();
+		info["externalLinkLabel"] = $("#externalLinkLabel").val();
+		info["externalLinkURL"] = $("#externalLink").val();
+		return info;
+	}
+	
+	function createModuleLinkInfo() {
+	    var info = {};
+	    info["x"] = storeX;
+	    info["y"] = storeY;
+	    info["rotation"] = $("#moduleLinkRotation").val();
+	    info["linkedModule"] = $("#linkedModule").val();
+	    info["moduleLinkLabel"] = $("#moduleLinkLabel").val();
+	    info["type"] = $("#moduleType").val();
+	    return info;
+	}
+	
+	function createTextBlockInfo() {
+	    var info = {};
+	    info["x"] = storeX;
+	    info["y"] = storeY;
+	    info["text"] = $("#textContentID").val();
+	    info["height"] = $("#textBoxHeightID").val();
+	    info["width"] = $("#textBoxWidthID").val();
+	    info["textColor"] = $("#textColorID").val();
+	    info["borderColor"] = $("#borderColorID").val();
+	    return info;
+	}
+	
+	function editTextBlockInfo() {
+	    var info = {};
+	    info["x"] = storeX;
+	    info["y"] = storeY;
+	    info["text"] = $("#textContentIDForEdit").val();
+	    info["height"] = $("#textBoxHeightIDEdit").val();
+	    info["width"] = $("#textBoxWidthIDEdit").val();
+	    info["textColor"] = $("#textColorIDEdit").val();
+	    info["borderColor"] = $("#borderColorIDEdit").val();
+	    return info;
+	}
+	
+	function editModuleLinkInfo() {
+	    var info = {};
+	    info["x"] = storeX;
+	    info["y"] = storeY;
+	    info["rotation"] = $("#moduleLinkRotationEdit").val();
+	    info["linkedModule"] = $("#moduleLinkIdEdit").val();
+	    info["moduleLinkLabel"] = $("#moduleLinkLabelEdit").val();
+	    info["type"] = $("#moduleTypeEdit").val();
+	    return info;
+	}
+	
+	function editSpaceLinkInfo() {
+	    var info = {};
+	    info["x"] = storeX;
+	    info["y"] = storeY;
+	    info["rotation"] = $("#spaceLinkRotationEdit").val();
+	    info["linkedSpace"] = $("#spaceLinkIdEdit").val();
+	    info["spaceLinkLabel"] = $("#spaceLinkLabelEdit").val();
+	    info["type"] = $("#typeSpaceEdit").val();
+	    return info;
+	}
+	
+	function editExternalLinkInfo() {
+		var info = {};
+		info["x"] = storeX;
+		info["y"] = storeY;
+		info["tabOpen"] = $("#extTabOpenEdit").val();
+		info["type"] = $("#extTypeEdit").val();
+		info["externalLinkLabel"] = $("#externalLinkLabelEdit").val();
+		info["externalLinkURL"] = $("#externalLinkURLEdit").val();
+		return info;
+	}
+	
+	function makeSpaceLinksEditable(spaceLinkName, spaceLinkId, rotation, selectedSpaceId, posXEdit, posYEdit, displayLinkId, linkType) {
+	    $("#spaceLinkInfoLabel").text(spaceLinkName);
+	    $("#spaceLinkId").val(spaceLinkId);
+	    selectedSpaceLinkId=spaceLinkId;
+	    storeX=posXEdit;
+	    storeY=posYEdit;
+	    $("#spaceLinkInfoLabel").text(spaceLinkName);
+	    $("#spaceLinkDisplayId").val(displayLinkId);
+	    $("#spaceLinkInfoLabelEdit").text(spaceLinkName);
+	    $("#spaceLinkLabelEdit").val(spaceLinkName);
+	    $("#spaceLinkId").val(spaceLinkId);
+	    $("#spaceLinkIdValueEdit").val(spaceLinkId);
+	    $("#spaceLinkRotationEdit").val(rotation);
+	    $("#typeSpaceEdit option:selected").prop('selected', false);
+	    $('#typeSpaceEdit option[value="'+linkType+'"]').prop("selected", true);
+	    $("#spaceLinkIdEdit option:selected").prop('selected', false);
+	    $('#spaceLinkIdEdit option[value="'+selectedSpaceId+'"]').prop("selected", true);
+	    if(linkType != "IMAGE"){
+	    	resetHighlighting(); 
+	    }
+	    $('[data-link-id="' + spaceLinkId + '"]').css("color", "var(--secondary)");
+	    $('img[data-link-id="' + spaceLinkId + '"]').css("border", "solid 1px #c1bb88");
+	    $('[data-link-id="unpublished-' + spaceLinkId + '"]').css("color", "var(--secondary)");
+	
+	    $("#bgImage").on("click", function(e){
+	        e.preventDefault();
+	        var posX = $(this).position().left;
+	        var posY = $(this).position().top;
+	        storeX = e.pageX  - $(this).offset().left;
+	        storeY = e.pageY  - $(this).offset().top + 25;
+	        showSpaceLinkEdit(editSpaceLinkInfo(),false, storeX,storeY);
+	    });
+	    hideLinkInfoTabs();
+	    displayForms("#editSpaceLinkInfo");
+	}
+	function displayForms(formToShow){
+	    drawLinks();
+	    $("#space").css("display", "-webkit-box");
+	    $(formToShow).css("display", "flex");
+	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
+	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
+	}
+	
+	function makeModuleLinksEditable(moduleLinkName, moduleLinkId, rotation, selectedModuleId, posXEdit, posYEdit, displayLinkId, linkType) {
+	    selectedModuleLinkId=moduleLinkId;
+	    storeX=posXEdit;
+	    storeY=posYEdit;
+	    $("#moduleLinkInfoLabel").text(moduleLinkName);
+	    $("#moduleLinkDisplayId").val(displayLinkId);
+	    $("#moduleLinkInfoLabelEdit").text(moduleLinkName);
+	    $("#moduleLinkLabelEdit").val(moduleLinkName);
+	    $("#moduleLinkId").val(moduleLinkId);
+	    $("#moduleLinkIdValueEdit").val(moduleLinkId);
+	    $("#moduleLinkRotationEdit").val(rotation);
+	    $("#moduleTypeEdit option:selected").prop('selected', false);
+	    $('#moduleTypeEdit option[value="'+linkType+'"]').prop("selected", true);
+	    $("#moduleLinkIdEdit option:selected").prop('selected', false);
+	    $('#moduleLinkIdEdit option[value="'+selectedModuleId+'"]').prop("selected", true);
+	    resetHighlighting();     
+	    $('[data-link-id="' + moduleLinkId + '"]').css("color", "#c1bb88");
+	    $('div[data-link-id="' + moduleLinkId + '"]').removeClass("alert-primary");
+	    $('div[data-link-id="' + moduleLinkId + '"]').addClass("alert-warning");
+	    $('img[data-link-id="' + moduleLinkId + '"]').css("border", "solid 1px #c1bb88");
+	
+	    $("#bgImage").on("click", function(e){
+	        e.preventDefault();
+	        var posX = $(this).position().left;
+	        var posY = $(this).position().top;  
+	        storeX = e.pageX - $(this).offset().left;
+	        storeY = e.pageY - $(this).offset().top + 25;
+	        showModuleLinkEdit(editModuleLinkInfo(), false, storeX,storeY);
+	    });
+	    hideLinkInfoTabs();
+	    displayForms("#editModuleLinkInfo");
+	}
+	
+	function makeExternalLinksEditable(linkName, linkId, externalLinkURL, posXEdit, posYEdit, displayLinkId, linkType,tabOpenType) {
+	    selectedExternalLinkId=linkId;
+	    storeX=posXEdit;
+	    storeY=posYEdit;
+	    $("#externalLinkInfoLabel").text(linkName);
+	    $("#externalLinkId").val(linkId);
+	    $("#externalLinkDisplayId").val(displayLinkId);
+	    $("#externalLinkInfoLabelEdit").text(linkName);
+	    $("#externalLinkLabelEdit").val(linkName);
+	    $("#externalLinkIdValueEdit").val(linkId);
+	    $("#externalLinkURLEdit").val(externalLinkURL);
+	    $('#extTypeEdit option[value="'+linkType+'"]').prop("selected", true);
+	    $('#extTabOpenEdit option[value="'+tabOpenType+'"]').prop("selected",true);
+	    
+	    resetHighlighting();
+	
+	    $('[data-link-id="' + linkId + '"]').css("color", "#c1bb88");
+	    $('div[data-link-id="' + linkId + '"]').removeClass("alert-primary");
+	    $('div[data-link-id="' + linkId + '"]').addClass("alert-warning");
+	    $('img[data-link-id="' + linkId + '"]').css("border", "solid 1px #c1bb88");
+	
+	    $("#bgImage").on("click", function(e){
+	        e.preventDefault();
+	        var posX = $(this).position().left;
+	        var posY = $(this).position().top;    
+	        storeX = e.pageX - $(this).offset().left;
+	        storeY = e.pageY - $(this).offset().top + 25;
+	        showExternalLinkEdit(editExternalLinkInfo(), false, storeX,storeY);
+	    });
+	    hideLinkInfoTabs();
+	    displayForms("#editExternalLinkInfo");
+	}
+	
+	function makeTextBlockEditable(blockDisplayId,blockId,text,posX,posY,width,height, textColor, borderColor){
+	    selectedTextBlockId=blockId;
+	    storeX=posX;
+	    storeY=posY;
+	    $("#textBlockId").val(blockId);
+	    $("#textBlockXEdit").val(posX);
+	    $("#textBlockYEdit").val(posY);
+	    $("#textBlockDisplayId").val(blockDisplayId);
+	    $("#textBoxWidthIDEdit").val(width);
+	    $("#textBoxHeightIDEdit").val(height);
+	    $("#textContentIDForEdit").val(text);
+	    $("#textColorIDEdit").val(textColor);
+	    $("#borderColorIDEdit").val(borderColor);
+	    resetHighlighting();
+	    $("#bgImage").on("click", function(e){
+	        e.preventDefault();
+	        var posX = $(this).position().left;
+	        var posY = $(this).position().top;    
+	        storeX = e.pageX - $(this).offset().left;
+	        storeY = e.pageY - $(this).offset().top + 25;
+	        showTextBlockEdit(editTextBlockInfo());
+	    });
+	    hideLinkInfoTabs();
+	    displayForms("#editTextBlockInfo");
+	}
+	
+	function resetHighlighting() {
+	    // reset icon links
+	    $('[data-link-id]').css("color", "red");
+	
+	    // reset alert links
+	    $('div[data-link-id]').removeClass("alert-warning");
+	    $('div[data-link-id]').addClass("alert-primary");
+	
+	    // reset image links
+	    $('img[data-link-id]').css("border-width", "0");
+	}
+	
+	function getTextArea(x,y) {
+	    var posX = $("#bgImage").position().left;
+	    var posY = $("#bgImage").position().top;
+	    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
+	    text.css('position', 'absolute');
+	    text.css('left', x + posX);
+	    text.css('top', y);
+	    $("#space").append(text);
+	    
+	    var textB = $('#textB')[0],
+	    tHeight = textB.clientHeight,
+	    tWidth = textB.clientWidth;
+	    
+	    var height = modalBgImageHeight;
+	    var width = modalBgImageWidth;
+	    
+	    $("#textBoxWidthID").val(tWidth);
+	    $("#textBoxHeightID").val(tHeight);
+	    textB.onmouseup = function (e) {
+	        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
+	            tHeight = textB.clientHeight;
+	            tWidth = textB.clientWidth;
+	            let percentileHeight = (tHeight*100)/height;
+	            let percentileWidth = (tWidth*100)/width;
+	            $("#textBoxWidthID").val(percentileWidth);
+	            $("#textBoxHeightID").val(percentileHeight);
+	            $("#textContentID").val(textB.value);
+	        }
+	    };
+	    var percentileHeight = (tHeight*100)/height;
+	    var percentileWidth = (tWidth*100)/width;
+	    $("#textBoxWidthID").val(percentileWidth);
+	    $("#textBoxHeightID").val(percentileHeight);
+	    $("#textContentID").val(textB.value);
+	}
+	
+	$(function(){
+	    $("#deleteSpace").click(function(){
+	        var spaceId = "${space?.id}";
+	        checkSpaceLinkPresent('[(${space?.id})]', '[(@{'/staff/'})]', '[('?'+${_csrf.parameterName}+'='+${_csrf.token})]',$('#headerSpaceValue'));
+	    });
+	
+	        $( document ).ready(function() {
+	            onPageReady($("#deleteSpace"), $('#confirm-space-delete'));
+	            if ($("div#outgoingLinks a").length < 2) {
+	                $("#noLinksOnSpace").show()
+	            }
+	            if ($("div#incomingLinks a").length < 2) {
+	                $("#noLinksToSpace").show()
+	            }
+	        });
+	
+	        // -------- buttons that open modals (e.g. to create space links) ------
+	
+	        $("#addTextBlock").click(function(e){
+	            hideLinkInfoTabs();
+	            $("#changeBgImgAlert").hide();
+	            $("#bgImage").off("click");
+	            $("#bgImage").on("click", function(e){
+	                e.preventDefault();
+	                $("#external-arrow").remove();
+	                $("#space_label").remove();
+	                $("#link").remove();
+	                $("#text").remove();
+	                var posX = $(this).position().left;
+	                var posY = $(this).position().top;    
+	                storeX = e.pageX - $(this).offset().left;
+	                storeY = e.pageY - $(this).offset().top + 25;
+	                getTextArea(storeX,storeY);
+	            });
+	            hideLinkInfoTabs();
+	            displayForms("#addTextFormInfo");
+	        });
+	
+	        $("#addSpaceLinkButton").click(function(e) {
+	            $("#createExternalLinkAlert").hide();
+	            $("#changeBgImgAlert").hide();
+	            $("#bgImage").off("click");
+	            $("#bgImage").on("click", function(e){
+	                e.preventDefault();
+	                $("#external-arrow").remove();
+	                $("#space_label").remove();
+	                $("#link").remove();
+	                var icon;
+	                var posX = $(this).position().left;
+	                var posY = $(this).position().top;    
+	                storeX = e.pageX - $(this).offset().left;
+	                storeY = e.pageY - $(this).offset().top + 25;
+	                showSpaceLink(createSpaceLinkInfo(), false, storeX, storeY);
+	            });
+	            hideLinkInfoTabs();
+	            displayForms("#createSpaceLinkAlert");
+	        });
+	
+	        $("#addModuleLinkButton").click(function(e) {
+	            $("#createModuleLinkAlert").hide();
+	            $("#bgImage").off("click");
+	            $("#bgImage").on("click", function(e){
+	                e.preventDefault();
+	                $("#external-arrow").remove();
+	                $("#module_label").remove();
+	                $("#link").remove();
+	                var icon;
+	                var posX = $(this).position().left;
+	                var posY = $(this).position().top;    
+	                storeX = e.pageX - $(this).offset().left;
+	                storeY = e.pageY - $(this).offset().top + 25;
+	                showModuleLink(createModuleLinkInfo(), false, storeX, storeY);
+	            });
+	            hideLinkInfoTabs();
+	            displayForms("#createModuleLinkAlert");
+	        }); 
+	
+	        $("#addExternalLinkButton").click(function(e) {
+	            $("#createSpaceLinkAlert").hide();
+	            $("#changeBgImgAlert").hide();
+	            $("#bgImage").off("click");
+	            $("#bgImage").on("click", function(e){
+	                e.preventDefault();
+	                $("#link").remove();
+	                $("#external-arrow").remove();
+	                $("#ext_label").remove();
+	                var icon;
+	                var posX = $(this).position().left
+	                var posY = $(this).position().top;
+	                storeX = e.pageX - $(this).offset().left;
+	                storeY = e.pageY - $(this).offset().top + 25;
+	                showExternalLinks(createExternalLinkInfo(), false, storeX, storeY);
+	            });
+	            hideLinkInfoTabs();
+	            displayForms("#createExternalLinkAlert");
+	        });
+	
+	        $('#changeBgImgButton').click(function(file) {
+	            $("#createSpaceLinkAlert").hide();
+	            $("#createExternalLinkAlert").hide();
+	            drawLinks();
+	            $("#changeBgImgAlert").show();          
+	        });
+	
+	
+	        // ----------- submit buttons (e.g. to create space links) ------------------
+	
+	        $("#addTextBlockBtn").click(function(e) {
+	            e.preventDefault();
+	            $("#space").scrollTop(0);
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new block should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            $("#addTextX").val(storeX);
+	            $("#addTextY").val(storeY - 25);
+	
+	            var form = $("#addTextForm");
+	            var formData = new FormData(form[0]);
+	
+	            var textBlockInfo = createTextBlockInfo();
+	
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/'+${space.id}+'/textblock?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache       : false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData, 
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    textBlockInfo["id"] = linkData["id"];
+	                    textBlockInfo["displayId"]=linkData["displayId"];
+	                    textBlockInfo["x"]=linkData["x"];
+	                    textBlockInfo["y"]=linkData["y"];
+	                    showTextBlock(textBlockInfo, true);
+	                    $("#errorMsg").text("");
+	                    $('#errorAlert').hide();
+	                    $("#addTextFormInfo").hide();
+	                    $("#space").css("display", "none");
+	                    form[0].reset();
+	                    drawLinks();
+	                }
+	            });
+	        });
+	        
+	        $("#editTextBlockBtn").click(function(e) {
+	            e.preventDefault();
+	            $("#space").scrollTop(0);
+	            var blockId = $("#textBlockId").val();
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            var linkedTextBlock = $("#textBlockId").val();
+	            $("#textBlockXEdit").val(storeX);
+	            $("#textBlockYEdit").val(storeY - 25);
+	            var form = $("#editTextBlockForm");
+	            var formData = new FormData(form[0]);
+	            var textBlockInfo = editTextBlockInfo();
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/link/textblock/'+${space.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache: false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    textBlockInfo["id"] = linkData["id"];
+	                    textBlockInfo["text"]=linkData["textContent"];
+	                    textBlockInfo["x"]=linkData["x"];
+	                    textBlockInfo["y"]=linkData["y"];
+	                    textBlockInfo["height"]=linkData["height"];
+	                    textBlockInfo["width"]=linkData["width"];
+	                    textBlockInfo["textColor"] = linkData["textColor"];
+	                    showTextBlockEdit(textBlockInfo);
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    selectedTextBlockId=undefined;
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        $("#createSpaceLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            $('#errorAlert').hide();
+	            $("#space").scrollTop(0);
+	            var label = $("#spaceLinkLabel").val();
+	            var spaceName = $("#linkedSpace option:selected").text();
+	            var type = $("#type option:selected").text();
+	
+	            if (label == undefined || label == "") {
+	                $("#errorMsg").text("Please fill the Label field before submitting.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            if (spaceName == undefined || spaceName == "Choose...") {
+	                $("#errorMsg").text("Please select a space in Linked Space dropdown.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            
+	            if (type == undefined || type == "Choose...") {
+	                $("#errorMsg").text("Please select a link type in Type dropdown.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            $("#spaceLinkX").val(storeX);
+	            $("#spaceLinkY").val(storeY - 25);
+				
+	            var form = $("#createSpaceLinkForm");
+	            var label = $("#spaceLinkLabel").val();
+	            var spaceName = $("#linkedSpace option:selected").text();
+	            var spaceId = $("#linkedSpace option:selected").val(); 
+	            var formData = new FormData(form[0]);
+	            var spaceLinkInfo = createSpaceLinkInfo();
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/'+${space?.id}+'/spacelink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache       : false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    spaceLinkInfo["id"] = linkData["id"];
+	                    spaceLinkInfo["displayId"]=linkData["displayId"];
+	                    spaceLinkInfo["x"]=linkData["x"];
+	                    spaceLinkInfo["y"]=linkData["y"];
+	                    spaceLinkInfo["linkedSpaceStatus"]=linkData["linkedSpaceStatus"];
+	                    showSpaceLink(spaceLinkInfo, true);
+	                    $("#space_label").attr("id","");
+	                    $("#link").attr("id","");
+	                    $("#createSpaceLinkAlert").hide();  
+	                    $("#errorMsg").text("");
+	                    $('#errorAlert').hide();
+	                    $("#noLinksOnSpace").hide();
+	                    $("."+linkData["id"]).remove();
+	                    form[0].reset();
+	                    var newSpaceLinkURL = [[@{|/staff/space/|}]]+spaceId;
+	                    $("#outgoingLinks").append("<a href="+newSpaceLinkURL+" style='padding: .25rem .25rem;' class='list-group-item' id="+linkData["id"]+">"+label+"  &nbsp;-> &nbsp;"+spaceName+"</a>");
+	                    if (spaceName == "${space?.name}") {
+	                        $("#noLinksToSpace").hide();
+	                        $("div#incomingLinks").append("<a href="+newSpaceLinkURL+" style='padding: .25rem .25rem;' class='list-group-item' id="+linkData["id"]+">"+spaceName+"</a>");
+	                    }
+	                    $("#space").css("display", "none");
+	                    linkIcon=null;
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        $("#createModuleLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            $("#space").scrollTop(0);
+	            $('#errorAlert').hide();
+	            
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            var linkedModules = $("#linkedModule").val();
+	            var moduleLabel = $("#moduleLinkLabel").val();
+	            var type = $("#moduleType option:selected").text();
+	            
+	            if (moduleLabel == undefined || moduleLabel == "") {
+	                $("#errorMsg").text("Please enter the label for module.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            if (linkedModules == undefined || linkedModules == "Choose...") {
+	                $("#errorMsg").text("Please select linked modules.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            
+	            if (type == undefined || type == "Choose...") {
+	                $("#errorMsg").text("Please select a link type in Type dropdown.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            $("#moduleLinkX").val(storeX);
+	            $("#moduleLinkY").val(storeY - 25);
+	
+	            var form = $("#createModuleLinkForm");
+	            var formData = new FormData(form[0]);
+	
+	            var moduleLinkInfo = createModuleLinkInfo();
+	
+	            $.ajax({
+	                type: "POST",
+	
+	                url: "[(@{'/staff/space/'+${space?.id}+'/modulelink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache       : false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    moduleLinkInfo["id"] = linkData["id"];
+	                    moduleLinkInfo["displayId"]=linkData["displayId"];
+	                    moduleLinkInfo["x"]=linkData["x"];
+	                    moduleLinkInfo["y"]=linkData["y"];
+	                    showModuleLink(moduleLinkInfo, true);
+	                    $("#module_label").attr("id","");
+	                    $("#link").attr("id","");
+	                    $("#createModuleLinkAlert").hide();
+	                    $("#errorMsg").text("");
+	                    $('#errorAlert').hide();
+	                    $("."+linkData["id"]).remove();
+	                    form[0].reset();
+	                    $("#space").css("display", "none");
+	                    moduleLinkIcon=null;
+	                    drawLinks();
+	                }
+	            });
+	        });
+	        $("#editModuleLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            var linkId = $("#moduleLinkIdEdit").val();
+	            if(storeX == undefined || storeY == undefined){
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.");
+	                $('#errorAlert').show();
+	                return;    
+	            }
+	            $("#space").scrollTop(0);
+	            var linkedModules = $("#moduleLinkIdEdit").val();
+	            $("#moduleLinkXEdit").val(storeX);
+	            $("#moduleLinkYEdit").val(storeY - 25);
+	            var form = $("#editModuleLinkForm");
+	            var formData = new FormData(form[0]);
+	            var moduleLinkInfo = editModuleLinkInfo();
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/link/module/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache: false,
+	                contentType: false,
+	                processData: false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data){
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    moduleLinkInfo["id"] = linkData["id"];
+	                    moduleLinkInfo["displayId"]=linkData["displayId"];
+	                    moduleLinkInfo["x"]=linkData["x"];
+	                    moduleLinkInfo["y"]=linkData["y"];
+	                    $('#linkRotation-'+selectedModuleLinkId).val(linkData["rotation"]);
+	                    $('#linkLabel-'+selectedModuleLinkId).val(linkData["label"]);
+	                    $('#linkType-'+selectedModuleLinkId).val(linkData["dislpayType"]);
+	                    $('#moduleLinkTarget-'+selectedModuleLinkId).val(linkData["linkedId"]);
+	                    showModuleLinkEdit(moduleLinkInfo, true);
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    selectedModuleLinkId=undefined;
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        $("#editSpaceLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            var linkId = $("#spaceLinkIdEdit").val();
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;    
+	            }
+	            $("#space").scrollTop(0);
+	            var linkedSpace = $("#spaceLinkIdEdit").val();
+	            $("#spaceLinkXEdit").val(storeX);
+	            $("#spaceLinkYEdit").val(storeY - 25);
+	            
+	
+	            var form = $("#editSpaceLinkForm");
+	            var formData = new FormData(form[0]);
+	            var spaceLinkInfo = editSpaceLinkInfo();
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/link/space/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache: false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#main-bgImage").off("click");
+	                    spaceLinkInfo["id"] = linkData["id"];
+	                    spaceLinkInfo["displayId"]=linkData["displayId"];
+	                    spaceLinkInfo["x"]=linkData["x"];
+	                    spaceLinkInfo["y"]=linkData["y"];
+	                    spaceLinkInfo["linkedSpaceStatus"]=linkData["linkedSpaceStatus"];
+	                    showSpaceLinkEdit(spaceLinkInfo, true);
+	                    $('#linkRotation-'+selectedSpaceLinkId).val(linkData["rotation"]);
+	                    $('#linkLabel-'+selectedSpaceLinkId).val(linkData["label"]);
+	                    $('#linkType-'+selectedSpaceLinkId).val(linkData["dislpayType"]);
+	                    $('#linkTarget-'+selectedSpaceLinkId).val(linkData["linkedId"]);
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    selectedSpaceLinkId=undefined;
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        $("#editExternalLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            $("#space").scrollTop(0);
+	            var linkId = $("#externalLinkIdEdit").val();
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            var linkedSpace = $("#externalLinkIdEdit").val();
+	            $("#externalLinkXEdit").val(storeX);
+	            $("#externalLinkYEdit").val(storeY - 25);
+	            var form = $("#editExternalLinkForm");
+	            var formData = new FormData(form[0]);
+	            var externalLinkInfo = editExternalLinkInfo();
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/link/external/'+${space?.id}+'?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache: false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    externalLinkInfo["id"] = linkData["id"];
+	                    externalLinkInfo["displayId"]=linkData["displayId"];
+	                    externalLinkInfo["x"]=linkData["x"];
+	                    externalLinkInfo["y"]=linkData["y"];
+	                    $('#linkLabel-'+selectedExternalLinkId).val(linkData["label"]);
+	                    $('#linkType-'+selectedExternalLinkId).val(linkData["dislpayType"]);
+	                    $('#externalLinkTarget-'+selectedExternalLinkId).val(linkData["url"]);
+	                    showExternalLinkEdit(editExternalLinkInfo, true);
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    selectedExternalLinkId=undefined;
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        $("#createExternalLinkBtn").click(function(e) {
+	            e.preventDefault();
+	            $("#space").scrollTop(0);
+	            var payload = {};
+	
+	            if (storeX == undefined || storeY == undefined) {
+	                $("#errorMsg").text("Please click on the image to specify where the new link should be located.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            var externalLink = $("#externalLink").val();
+	            var externalLinkLabel = $("#externalLinkLabel").val();
+	            var type = $("#extType option:selected").text();
+	
+	            if (externalLink == undefined || externalLink == "") {
+	                $("#errorMsg").text("Please provide the link to the external link.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	
+	            if (externalLinkLabel == undefined || externalLinkLabel == "") {
+	                $("#errorMsg").text("Please enter a label for this external link.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            
+	            if (type == undefined || type == "Choose...") {
+	                $("#errorMsg").text("Please select a link type in Type dropdown.")
+	                $('#errorAlert').show();
+	                return;
+	            }
+	            $("#externalLinkX").val(storeX);
+	            $("#externalLinkY").val(storeY - 25);
+	
+	            var form = $("#createExternalLinkForm");
+	            var formData = new FormData(form[0]);
+	            var externalLinkInfo = createExternalLinkInfo();
+	
+	            $.ajax({
+	                type: "POST",
+	                url: "[(@{'/staff/space/'+${space?.id}+'/externallink?'+${_csrf.parameterName}+'='+${_csrf.token}})]",
+	                cache       : false,
+	                contentType : false,
+	                processData : false,
+	                enctype: 'multipart/form-data',
+	                data: formData,
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success: function(data) {
+	                    var linkData = JSON.parse(data);
+	                    $("#bgImage").off("click");
+	                    externalLinkInfo["id"] = linkData["id"];
+	                    externalLinkInfo["displayId"]=linkData["displayId"];
+	                    externalLinkInfo["x"]=linkData["x"];
+	                    externalLinkInfo["y"]=linkData["y"];
+	                    showExternalLinks(externalLinkInfo, true);
+	                    $("#ext_label").attr("id","");
+	                    $("#link").attr("id","");
+	                    $("#createExternalLinkAlert").hide();
+	                    $("#errorMsg").text("");
+	                    $('#errorAlert').hide();
+	                    $("."+linkData["id"]).remove();
+	                    form[0].reset();
+	                    $("#external-arrow").attr("id","");
+	                    $("#space").css("display", "none");
+	                    externalLinkIcon=null;
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        // ------------- other buttons ------------
+	        $("#deleteSpaceLinkButton").click(function() {
+	            var linkId = $("#spaceLinkIdValueEdit").val();
+	            $.ajax({
+	                url: "[(@{'/staff/space/'+${space?.id}+'/spacelink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+	                method: "DELETE",
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success:function(data) {
+	                    $('[data-link-id="' + linkId + '"]').remove();
+	                    $('[data-link-id="unpublished-' + linkId + '"]').remove();
+	                    hideLinkInfoTabs();
+	                    $('a#'+linkId).remove();
+	                    if ($("div#outgoingLinks a").length < 2) {
+	                        $("#noLinksOnSpace").show();
+	                    }
+	                    if ($("div#incomingLinks a").length < 2) {
+	                        $("#noLinksToSpace").show();
+	                    }
+	                    $("#spaceLinkInfo").hide();
+	                    $("#space").css("display", "none");
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	
+	        $("#deleteModuleLinkButton").click(function() {
+	            var linkId = $("#moduleLinkIdValueEdit").val();
+	            $.ajax({
+	                url: "[(@{'/staff/space/'+${space?.id}+'/modulelink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+	                method: "DELETE",
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success:function(data) {
+	                    $('[data-link-id="' + linkId + '"]').remove();
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        $("#deleteExternalLinkButton").click(function() {
+	            var linkId = $("#externalLinkIdValueEdit").val();
+	            $.ajax({
+	                url: "[(@{'/staff/space/'+${space?.id}+'/externallink/'})]"+ linkId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+	                method: "DELETE",
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success:function(data) {
+	                    $('[data-link-id="' + linkId + '"]').remove();
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    drawLinks();
+	                }
+	            });
+	        });
+	        
+	        $("#deleteTextBlockButton").click(function() {
+	            var blockId = $("#textBlockId").val();
+	            $.ajax({
+	                url: "[(@{'/staff/space/'+${space.id}+'/textblock/'})]"+ blockId + '?[(${_csrf.parameterName})]=[(${_csrf.token})]',
+	                method: "DELETE",
+	                beforeSend: function () {
+	                    $(".saveLoader").show();
+	                    },
+	               	complete: function () {
+	                    $(".saveLoader").hide();
+	                    },
+	                success:function(data) {
+	                    $('[data-link-id="' + blockId + '"]').remove();
+	                    hideLinkInfoTabs();
+	                    $("#space").css("display", "none");
+	                    drawLinks();
+	                }
+	            });
+	        });
+	
+	        $("#closeAlert").click(function() {
+	            $('#errorAlert').hide();
+	        });
+	
+	        // ------------- adjust links on background image (e.g. when inputs are changed) ------------
+	        // external links
+	        $(".extlink-target").change(function() {
+	            var externalLink = {};
+	            externalLink["x"] = storeX;
+	            externalLink["y"] = storeY;
+	            externalLink["externalLinkLabel"] = $("#externalLinkLabel").val();
+	            externalLink["url"] = $("#externalLink").val();
+	            externalLink["type"] = $("#extType").val();
+	            showExternalLinks(externalLink);
+	        });     
+	
+	        // space links
+	        $('#spaceLinkRotation').change(function() {
+	            $('#link').css('transform', 'rotate(' +$('#spaceLinkRotation').val()+ 'deg)');
+	        });
+	
+	        $(".target").change(function() {
+	            showSpaceLink(createSpaceLinkInfo());
+	        }); 
+	
+	        $(".modulelink-target").change(function() {
+	            showModuleLink(createModuleLinkInfo());
+	        }); 
+	
+	        // link icons for space links
+	
+	        $('#moduleLinkRotation').change(function() {
+	            $('#link').css('transform', 'rotate(' +$('#moduleLinkRotation').val()+ 'deg)');
+	        });
+	
+	        $('#moduleLinkRotationEdit').change(function() {
+	            $('#link').css('transform', 'rotate(' +$('#moduleLinkRotationEdit').val()+ 'deg)');
+	        });
+	
+	        $(".modulelink-targetEdit").change(function() {
+	            showModuleLinkEdit(editModuleLinkInfo());
+	        }); 
+	
+	        $(".spacelink-targetEdit").change(function() {
+	            showSpaceLinkEdit(editSpaceLinkInfo());
+	        });
+	
+	        $(".externallink-targetEdit").change(function() {
+	            showExternalLinkEdit(editExternalLinkInfo());
+	        });
+	
+	
+	        $("#spaceLinkImage").change(function() {
+	            if (this.files && this.files[0]) {
+	                linkIconReader.readAsDataURL(this.files[0]);
+	            }
+	        });
+	        
+	        $("#moduleLinkImage").change(function() {
+	            if (this.files && this.files[0]) {
+	                moduleLinkIconReader.readAsDataURL(this.files[0]);
+	            }
+	        });
+	
+	        $("#externalLinkImage").change(function() {
+	            if (this.files && this.files[0]) {
+	                externalLinkIconReader.readAsDataURL(this.files[0]);
+	            }
+	        });
+	
+	        // ------------ Cancel buttons -----------------
+	
+	        $(".cancelSpaceLinkBtn").click(function() {
+	            storeX = null;
+	            storeY = null;
+	            linkIcon = null;
+	            $("#space").scrollTop(0);
+	            $("#link").remove();
+	            $("#undefined").remove();
+	            $("#space_label").remove();
+	            $("#space").hide();
+	            $("#createSpaceLinkAlert").hide(); 
+	            $('#errorAlert').hide();
+	            $("#bgImage").off("click");
+	            drawLinks();
+	        });
+	
+	        $(".cancelModuleLinkBtn").click(function() {
+	            storeX = null;
+	            storeY = null;
+	            $("#space").scrollTop(0);
+	            moduleLinkIcon=null;
+	            $("#link").remove();
+	            $("#undefined").remove();
+	            $("#module_label").remove();
+	            $("#space").hide();
+	            $("#createModuleLinkAlert").hide();  
+	            $('#errorAlert').hide();
+	            $("#bgImage").off("click");
+	            drawLinks();
+	        }); 
+	
+	        $(".cancelExternalLinkBtn").click(function() {
+	            storeX = null;
+	            storeY = null;
+	            $("#space").scrollTop(0);
+	            externalLinkIcon=null;
+	            $("#external-link").remove();
+	            $("#undefined").remove();
+	            $("div#link").remove();
+	            $("#external-arrow").remove();
+	            $("#ext_label").remove();
+	            $("#space").hide();
+	            $("#createExternalLinkAlert").hide();
+	            $("#bgImage").off("click");
+	            $('#errorAlert').hide();
+	            drawLinks();
+	        });
+	        
+	        $(".cancelAddTextBlockBtn").click(function() {
+	            storeX = null;
+	            storeY = null;
+	            $("#space").scrollTop(0);
+	            $("#textContentID").val(""); 
+	            $("span#text").remove();
+	            $("#space").hide();
+	            $("#addTextFormInfo").hide();
+	            $('#errorAlert').hide();
+	            $("#bgImage").off("click");
+	            drawLinks();
+	        });
+	
+	        $("#cancelBgImgBtn").click(function() {
+	        	$("#space").scrollTop(0);
+	            drawLinks();
+	            $("#file").val('');
+	            $("#changeBgImgAlert").hide();
+	        });
+	
+	        $("#closeEditModuleLinkInfo").click(function(e) {
+	            e.preventDefault();
+	            selectedModuleLinkId=undefined;
+	            $("#moduleLinkInfoLabel").text("");
+	            $("#moduleLinkId").val("");
+	            resetHighlighting();
+	            $("#space").hide();
+	            $("#editModuleLinkInfo").hide();
+	            drawLinks();
+	        }); 
+	
+	        $("#closeEditSpaceLinkInfo").click(function(e) {
+	            e.preventDefault();
+	            selectedSpaceLinkId=undefined;
+	            $("#spaceLinkInfoLabel").text("");
+	            $("#spaceLinkId").val("");
+	            resetHighlighting();
+	            $("#space").hide();
+	            $("#editSpaceLinkInfo").hide();
+	            drawLinks();
+	        }); 
+	
+	        $("#closeEditExternalLinkInfo").click(function(e) {
+	            e.preventDefault();
+	            selectedExternalLinkId=undefined;
+	            $("#externalLinkInfoLabel").text("");
+	            $("#externalLinkId").val("");
+	            resetHighlighting();
+	            $("#space").hide();
+	            $("#editExternalLinkInfo").hide();
+	            drawLinks();
+	        });
+	        
+	        $("#closeEditTextBlockInfo").click(function(e) {
+	            e.preventDefault();
+	            selectedTextBlockId=undefined;
+	            $("#textBoxHeightIDEdit").val("");
+	            $("#textBoxWidthIDEdit").val("");
+	            $("#textContentIDForEdit").val("");
+	            resetHighlighting();
+	            $("#space").hide();
+	            $("#editTextBlockInfo").hide();
+	            drawLinks();
+	        });
+	});
 </script>
 <style>
 .Info_cz_Class .tooltiptext {
diff --git a/vspace/src/main/webapp/resources/extra/Module_1.css b/vspace/src/main/webapp/resources/extra/Module_1.css
index 38f8c3ffb..2864d16c7 100644
--- a/vspace/src/main/webapp/resources/extra/Module_1.css
+++ b/vspace/src/main/webapp/resources/extra/Module_1.css
@@ -24,7 +24,7 @@
     font-size: larger;
 }
 
-.SLideshow_option_Class {
+.Slideshow_option_Class {
     position: absolute;
     width: 43.846px;
     height: 44px;
@@ -217,9 +217,10 @@ a, a:hover, a:focus {
 
 .textBlock{
     color: white;
-    font-size: 12px padding: 3px 0;
+    font-size: 12px;
+    padding: 3px 0;
     border-radius: 6px;
     position: absolute;
     z-index: 1;
     background: rgba(0, 0, 0, 0.6);
-}
\ No newline at end of file
+}
diff --git a/vspace/src/main/webapp/resources/extra/Module_1_slideshow_1.css b/vspace/src/main/webapp/resources/extra/Module_1_slideshow_1.css
index be172b67d..4fc198e92 100644
--- a/vspace/src/main/webapp/resources/extra/Module_1_slideshow_1.css
+++ b/vspace/src/main/webapp/resources/extra/Module_1_slideshow_1.css
@@ -168,9 +168,7 @@ a, a:hover, a:focus {
 }
 
 .imgDiv {
-    position: relative;
     overflow: visible;
-    display: block;
 }
 
 .textDiv {
@@ -200,7 +198,7 @@ a, a:hover, a:focus {
 }
 
 .Mask_Group_9_Class {
-    position: realtive;
+    position: relative;
     width: 34px;
     height: 34px;
     left: 0px;

From 7dd2a82c9bc521dd2f16eb95603ce17371f5a1bb Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Fri, 7 Jun 2024 16:49:38 -0700
Subject: [PATCH 56/64] [VSPC-242]Fixed code factor issues

---
 .../core/factory/impl/SlideExternalLinkFactory.java |  3 ---
 .../display/impl/SlideExternalLinkDisplay.java      |  4 ++--
 .../core/services/ISlideExternalLinkManager.java    |  5 -----
 .../services/impl/SlideExternalLinkManager.java     | 13 ++++++-------
 .../vspace/core/services/impl/SlideLinkManager.java |  5 +----
 .../web/exhibit/view/ExhibitionSlideController.java |  2 --
 .../vspace/web/staff/DeleteLinkController.java      |  1 -
 .../web/staff/EditExternalLinkController.java       |  3 +--
 .../web/staff/EditSlideExternalLinkController.java  |  2 +-
 .../diging/vspace/web/staff/SlideController.java    |  4 ++--
 .../WEB-INF/views/staff/modules/slides/slide.html   |  2 +-
 11 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
index 6ad454893..04bd8f3bc 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
@@ -19,11 +19,8 @@ public class SlideExternalLinkFactory implements ISlideExternalLinkFactory{
     @Override
     public IExternalLinkSlide createExternalLink(String title, ISlide slide) {
         IExternalLinkSlide link = new ExternalLinkSlide();
-        System.out.println("LINK FACTORY: " + link);
-        System.out.println("LINK ID: " + link.getId());
         link.setName(title);
         link.setSlide(slide);
-        System.out.println("LINK ID 2: " + link.getId());
         return link;
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
index 69711b0e0..2cefd4205 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
@@ -19,8 +19,8 @@ public class SlideExternalLinkDisplay extends LinkDisplay implements ISlideExter
     @Id
     @GeneratedValue(generator = "externallink_display_id_generator")
     @GenericGenerator(name = "externallink_display_id_generator", 
-      parameters = @Parameter(name = "prefix", value = "EXLDS"),
-      strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+      	parameters = @Parameter(name = "prefix", value = "EXLDS"),
+      	strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
     private String id;
 
     @OneToOne(targetEntity = ExternalLinkSlide.class)
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
index 507f4afc1..6eabb086c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -2,12 +2,7 @@
 
 import java.util.List;
 
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index 2def7aa56..8f6ad8023 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -24,7 +24,7 @@
 @Transactional
 @Service
 public class SlideExternalLinkManager extends SlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>
-implements ISlideExternalLinkManager{
+	implements ISlideExternalLinkManager{
     
     @Autowired
     private ISlideManager slideManager;
@@ -45,11 +45,10 @@ public List<IExternalLinkSlide> getLinks(String slideId) {
         return externalLinkRepo.findExternalLinkSlides(slideId);
     }
     
-	@Override
+    @Override
 	public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    	return null;
+    }
 
     @Override
     protected IExternalLinkSlide createLinkObject(String title, String id) {
@@ -123,8 +122,8 @@ public IExternalLinkSlide updateExternalLink(String title, String url, String id
     	IExternalLinkSlide externalLink = getLink(id);
     	if (externalLink != null) {
 			externalLink.setExternalLink(url);
-	    	externalLink.setName(title);
-	    	externalLinkRepo.save((ExternalLinkSlide) externalLink);
+			externalLink.setName(title);
+			externalLinkRepo.save((ExternalLinkSlide) externalLink);
     	} else {
     		externalLink = new ExternalLinkSlide();
     	}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
index 421c79aa1..c98acb562 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
@@ -23,7 +23,7 @@
 
 @Transactional
 public abstract class SlideLinkManager<L extends ILinkSlide<T>, T extends IVSpaceElement, U extends ILinkDisplay>
-implements ISlideLinkManager<L, T, U> {
+	implements ISlideLinkManager<L, T, U> {
     
     @Autowired
     private ISlideManager slideManager;
@@ -43,12 +43,9 @@ public U createLink(String title, String id, String linkedId,
             throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
 
         L link = createLinkObject(title, id);
-        System.out.println("LINK ID 3: " + id);
-        System.out.println("LINK ID 4: " + link.getId());
         T target = getTarget(linkedId);
         link.setName(linkLabel);
         link.setTarget(target);
-        System.out.println("LINK TARGET: " + link.getTarget());
         U displayLink = createDisplayLink(link);
         setDisplayProperties(displayLink, id, displayType, linkImage, imageFilename);
         return updateLinkAndDisplay(link, displayLink);
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
index 67904e5f8..ac0741bc2 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
@@ -136,9 +136,7 @@ public String slide(Model model, @PathVariable("slideId") String slideId, @PathV
         model.addAttribute("currentNumOfSlide", slideIndex + 1);
         model.addAttribute("spaceId", spaceId);
         model.addAttribute("spaceName", spaceManager.getSpace(spaceId).getName());
-        System.out.println("SLIDE ID: " + slideId);
         model.addAttribute("slideExternalLinkList", slideExternalLinkManager.getLinkDisplays(slideId));
-        System.out.println("SLIDE LIST: " + slideExternalLinkManager.getLinkDisplays(slideId));
         return "exhibition/module";
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
index c70df4d24..e9903dc2d 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
@@ -48,7 +48,6 @@ public ResponseEntity<String> deleteExternalLink(@PathVariable("id") String spac
     
     @RequestMapping(value = "/staff/module/{id}/slide/{slideId}/externallink/{linkId}", method = RequestMethod.DELETE)
     public ResponseEntity<String> deleteSlideExternalLink(@PathVariable("id") String moduleId, @PathVariable("slideId") String slideId, @PathVariable("linkId") String linkId) {
-    	System.out.println("IDs: " + moduleId + " " + slideId + " " + linkId);
         slideExternalLinkManager.deleteLink(linkId);
         return new ResponseEntity<String>(HttpStatus.OK);
     }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
index 13ea564fa..4410bd5aa 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
@@ -19,7 +19,6 @@
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-import edu.asu.diging.vspace.core.services.impl.ExternalLinkManager;
 
 @Controller
 public class EditExternalLinkController extends EditSpaceLinksController {
@@ -29,7 +28,7 @@ public class EditExternalLinkController extends EditSpaceLinksController {
 
     @Autowired
     private IExternalLinkManager externalLinkManager;
-
+    
     @RequestMapping(value = "/staff/space/link/external/{id}", method = RequestMethod.POST)
     public ResponseEntity<String> createExternalLink(@PathVariable("id") String id, @RequestParam("x") String x,
             @RequestParam("y") String y, @RequestParam("externalLinkLabel") String title,
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
index f515db19e..79efcbaac 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
@@ -30,7 +30,7 @@ public class EditSlideExternalLinkController extends EditSlideLinksController{
     public ResponseEntity<String> editExternalLink(@PathVariable("id") String id, @PathVariable("slideId") String slideId,
     		@RequestParam("externalLinkLabel") String title,
             @RequestParam("url") String externalLink
-            ) throws SlideDoesNotExistException, IOException, LinkDoesNotExistsException, NumberFormatException {
+    	) throws SlideDoesNotExistException, IOException, LinkDoesNotExistsException, NumberFormatException {
 
         ResponseEntity<String> validation = checkIfSlideExists(slideManager, slideId);
         if (validation != null) {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index d6d72416e..5a7dafc2a 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -59,14 +59,14 @@ public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId"
         model.addAttribute("slideSequences", slideManager.getSlideSequences(id, moduleId));
         List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(id);
         if (slideContents.size()>0) {
-    		IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
+        	IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
             slideManager.storeSlideDisplay(slide, imageblock.getImage());
             model.addAttribute("display", slideDisplayManager.getBySlide(slide,imageblock.getImage()));
         }
         model.addAttribute("slideContents", slideContents);
         model.addAttribute("contentCount",slideContents.size()>0 ? slideContents.get(slideContents.size()-1).getContentOrder() : 0);
         if(slideManager.getSlide(id) instanceof BranchingPoint) {
-        model.addAttribute("choices", ((IBranchingPoint)slide).getChoices());
+        	model.addAttribute("choices", ((IBranchingPoint)slide).getChoices());
         }
         return "staff/modules/slides/slide";
     }
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 12fac7919..7b6b207cc 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -96,7 +96,7 @@
 			#Ext_Links_Module_Slide2 {
 				text-align: left;
 				display: inline-block;
-				margin: 15px 15px 15px 15px;
+				margin: 15px;
 			}
 			
 			.imgDiv {

From 1888c1cde87dd2a0ef689a0de2c59cba01f3e218 Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Mon, 10 Jun 2024 11:57:43 -0700
Subject: [PATCH 57/64] [VSPC-242] more CodeFactor indentation fixes

---
 .../data/SlideExternalLinkRepository.java     |  4 +-
 .../diging/vspace/core/model/impl/Slide.java  | 26 ++++----
 .../services/ISlideExternalLinkManager.java   | 15 ++---
 .../impl/SlideExternalLinkManager.java        | 59 ++++++++++---------
 .../EditSlideExternalLinkController.java      | 19 +++---
 .../vspace/web/staff/SlideController.java     | 29 ++++-----
 6 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
index 17d15d78b..4a817011e 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
@@ -12,9 +12,9 @@
 
 @Repository
 @JaversSpringDataAuditable
-public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String>{
+public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String> {
 
-	@Query("SELECT d FROM ExternalLinkSlide d WHERE d.slide.id = ?1")
+    @Query("SELECT d FROM ExternalLinkSlide d WHERE d.slide.id = ?1")
     public List<IExternalLinkSlide> findExternalLinkSlides(String slideId);
 
     public void deleteByExternalLink(IExternalLinkSlide link);
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 2731bb4f7..971624783 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -1,6 +1,5 @@
 package edu.asu.diging.vspace.core.model.impl;
 
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -34,7 +33,7 @@
 
 @Entity
 public class Slide extends VSpaceElement implements ISlide {
-	
+
     @Id
     @GeneratedValue(generator = "slide_id_generator")
     @GenericGenerator(name = "slide_id_generator", parameters = @Parameter(name = "prefix", value = "SLI"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
@@ -42,7 +41,7 @@ public class Slide extends VSpaceElement implements ISlide {
 
     @ManyToOne(targetEntity = Module.class)
     private IModule module;
-    
+
     // -------- @JsonIgnore used as this entity will be returned in a controller
     @JsonIgnore
     @OneToMany(targetEntity = ContentBlock.class, mappedBy = "slide", cascade = CascadeType.ALL)
@@ -51,11 +50,11 @@ public class Slide extends VSpaceElement implements ISlide {
     @JsonIgnore
     @ManyToMany(mappedBy = "slides", targetEntity = Sequence.class)
     private List<ISequence> sequence;
-    
+
     @JsonIgnore
     @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class, cascade = CascadeType.ALL)
     private List<IExternalLinkSlide> externalLinks;
-    
+
     @OneToOne(targetEntity = VSImage.class)
     @NotFound(action = NotFoundAction.IGNORE)
     private IVSImage image;
@@ -100,7 +99,7 @@ public IModule getModule() {
     public void setModule(IModule module) {
         this.module = module;
     }
-    
+
     /*
      * (non-Javadoc)
      * 
@@ -108,24 +107,23 @@ public void setModule(IModule module) {
      */
     @Override
     public List<IExternalLinkSlide> getExternalLinks() {
-    	if (externalLinks == null) {
-    		externalLinks = new ArrayList<IExternalLinkSlide>();
-    	}
+        if (externalLinks == null) {
+            externalLinks = new ArrayList<IExternalLinkSlide>();
+        }
         return externalLinks;
     }
 
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * edu.asu.diging.vspace.core.model.impl.ISlide#setExternalLinks(java.util.
+     * @see edu.asu.diging.vspace.core.model.impl.ISlide#setExternalLinks(java.util.
      * List)
      */
     @Override
     public void setExternalLinks(List<IExternalLinkSlide> externalLinks) {
         this.externalLinks = externalLinks;
     }
-    
+
     public IVSImage getImage() {
         return image;
     }
@@ -133,7 +131,7 @@ public IVSImage getImage() {
     public void setImage(IVSImage image) {
         this.image = image;
     }
-    
+
     /*
      * (non-Javadoc)
      * 
@@ -179,7 +177,7 @@ public List<ISequence> getSequence() {
     public void setSequence(List<ISequence> sequence) {
         this.sequence = sequence;
     }
-    
+
     /**
      * This Method will retrieve the first ImageBlock of a slide if the ImageBlock
      * is present
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
index 6eabb086c..e28fa7eb1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -6,11 +6,12 @@
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 
-public interface ISlideExternalLinkManager extends ISlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>{
-    
-	List<IExternalLinkSlide> getLinks(String slideId);
-	
-	IExternalLinkSlide createExternalLink(String title, String url, String slideId);
-	
-	IExternalLinkSlide updateExternalLink(String title, String url, String id);
+public interface ISlideExternalLinkManager
+        extends ISlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay> {
+
+    List<IExternalLinkSlide> getLinks(String slideId);
+
+    IExternalLinkSlide createExternalLink(String title, String url, String slideId);
+
+    IExternalLinkSlide updateExternalLink(String title, String url, String id);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index 8f6ad8023..1d8f3a017 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -23,12 +23,13 @@
 
 @Transactional
 @Service
-public class SlideExternalLinkManager extends SlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>
-	implements ISlideExternalLinkManager{
-    
+public class SlideExternalLinkManager
+        extends SlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>
+        implements ISlideExternalLinkManager {
+
     @Autowired
     private ISlideManager slideManager;
-    
+
     @Autowired
     private SlideExternalLinkRepository externalLinkRepo;
 
@@ -40,14 +41,14 @@ public class SlideExternalLinkManager extends SlideLinkManager<IExternalLinkSlid
 
     @Autowired
     private ISlideExternalLinkDisplayFactory externalLinkDisplayFactory;
-    
+
     public List<IExternalLinkSlide> getLinks(String slideId) {
         return externalLinkRepo.findExternalLinkSlides(slideId);
     }
-    
+
     @Override
-	public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
-    	return null;
+    public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
+        return null;
     }
 
     @Override
@@ -56,21 +57,23 @@ protected IExternalLinkSlide createLinkObject(String title, String id) {
         IExternalLinkSlide link = externalLinkFactory.createExternalLink(title, source);
         return externalLinkRepo.save((ExternalLinkSlide) link);
     }
-    
+
     @Override
     protected ExternalLinkValue getTarget(String externalLink) {
         return new ExternalLinkValue(externalLink);
     }
 
     @Override
-    protected ISlideExternalLinkDisplay updateLinkAndDisplay(IExternalLinkSlide link, ISlideExternalLinkDisplay displayLink) {
+    protected ISlideExternalLinkDisplay updateLinkAndDisplay(IExternalLinkSlide link,
+            ISlideExternalLinkDisplay displayLink) {
         externalLinkRepo.save((ExternalLinkSlide) link);
         return externalLinkDisplayRepo.save((SlideExternalLinkDisplay) displayLink);
     }
 
     @Override
     protected ISlideExternalLinkDisplay getDisplayLink(String externalLinkDisplayId) {
-        Optional<SlideExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo.findById(externalLinkDisplayId);
+        Optional<SlideExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo
+                .findById(externalLinkDisplayId);
         if (externalLinkDisplay.isPresent()) {
             return externalLinkDisplay.get();
         }
@@ -108,25 +111,25 @@ protected void deleteLinkRepo(IExternalLinkSlide link) {
 
     @Override
     public IExternalLinkSlide createExternalLink(String title, String url, String slideId) {
-    	ISlide slide = slideManager.getSlide(slideId);
-    	IExternalLinkSlide externalLink = new ExternalLinkSlide();
-    	externalLink.setExternalLink(url);
-    	externalLink.setName(title);
-    	externalLink.setSlide(slide);
-    	externalLinkRepo.save((ExternalLinkSlide) externalLink);
-    	return externalLink;
+        ISlide slide = slideManager.getSlide(slideId);
+        IExternalLinkSlide externalLink = new ExternalLinkSlide();
+        externalLink.setExternalLink(url);
+        externalLink.setName(title);
+        externalLink.setSlide(slide);
+        externalLinkRepo.save((ExternalLinkSlide) externalLink);
+        return externalLink;
     }
-    
+
     @Override
     public IExternalLinkSlide updateExternalLink(String title, String url, String id) {
-    	IExternalLinkSlide externalLink = getLink(id);
-    	if (externalLink != null) {
-			externalLink.setExternalLink(url);
-			externalLink.setName(title);
-			externalLinkRepo.save((ExternalLinkSlide) externalLink);
-    	} else {
-    		externalLink = new ExternalLinkSlide();
-    	}
-    	return externalLink;
+        IExternalLinkSlide externalLink = getLink(id);
+        if (externalLink != null) {
+            externalLink.setExternalLink(url);
+            externalLink.setName(title);
+            externalLinkRepo.save((ExternalLinkSlide) externalLink);
+        } else {
+            externalLink = new ExternalLinkSlide();
+        }
+        return externalLink;
     }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
index 79efcbaac..8e542134c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
@@ -17,20 +17,19 @@
 import edu.asu.diging.vspace.core.services.ISlideManager;
 
 @Controller
-public class EditSlideExternalLinkController extends EditSlideLinksController{
-    
+public class EditSlideExternalLinkController extends EditSlideLinksController {
+
     @Autowired
     private ISlideManager slideManager;
 
     @Autowired
     private ISlideExternalLinkManager externalLinkManager;
-    
-    
+
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{slideId}/link/external/{id}", method = RequestMethod.POST)
-    public ResponseEntity<String> editExternalLink(@PathVariable("id") String id, @PathVariable("slideId") String slideId,
-    		@RequestParam("externalLinkLabel") String title,
-            @RequestParam("url") String externalLink
-    	) throws SlideDoesNotExistException, IOException, LinkDoesNotExistsException, NumberFormatException {
+    public ResponseEntity<String> editExternalLink(@PathVariable("id") String id,
+            @PathVariable("slideId") String slideId, @RequestParam("externalLinkLabel") String title,
+            @RequestParam("url") String externalLink)
+            throws SlideDoesNotExistException, IOException, LinkDoesNotExistsException, NumberFormatException {
 
         ResponseEntity<String> validation = checkIfSlideExists(slideManager, slideId);
         if (validation != null) {
@@ -38,10 +37,8 @@ public ResponseEntity<String> editExternalLink(@PathVariable("id") String id, @P
         }
 
         IExternalLinkSlide link = externalLinkManager.updateExternalLink(title, externalLink, id);
-        return success(link.getId(), link.getExternalLink(), title, null, 0, 0, 0,
-        		null, null, null);
+        return success(link.getId(), link.getExternalLink(), title, null, 0, 0, 0, null, null, null);
 
     }
 
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index 5a7dafc2a..2de4e7f97 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -42,13 +42,12 @@ public class SlideController {
 
     @Autowired
     private IContentBlockManager contentBlockManager;
-    
+
     @Autowired
     private ISlideExternalLinkManager externalLinkManager;
-    
+
     @Autowired
     private ISlideDisplayManager slideDisplayManager;
-   
 
     @RequestMapping("/staff/module/{moduleId}/slide/{id}")
     public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) {
@@ -58,30 +57,32 @@ public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId"
         model.addAttribute("externalLinks", externalLinkManager.getLinks(id));
         model.addAttribute("slideSequences", slideManager.getSlideSequences(id, moduleId));
         List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(id);
-        if (slideContents.size()>0) {
-        	IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
+        if (slideContents.size() > 0) {
+            IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
             slideManager.storeSlideDisplay(slide, imageblock.getImage());
-            model.addAttribute("display", slideDisplayManager.getBySlide(slide,imageblock.getImage()));
+            model.addAttribute("display", slideDisplayManager.getBySlide(slide, imageblock.getImage()));
         }
         model.addAttribute("slideContents", slideContents);
-        model.addAttribute("contentCount",slideContents.size()>0 ? slideContents.get(slideContents.size()-1).getContentOrder() : 0);
-        if(slideManager.getSlide(id) instanceof BranchingPoint) {
-        	model.addAttribute("choices", ((IBranchingPoint)slide).getChoices());
+        model.addAttribute("contentCount",
+                slideContents.size() > 0 ? slideContents.get(slideContents.size() - 1).getContentOrder() : 0);
+        if (slideManager.getSlide(id) instanceof BranchingPoint) {
+            model.addAttribute("choices", ((IBranchingPoint) slide).getChoices());
         }
         return "staff/modules/slides/slide";
     }
 
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/contents", method = RequestMethod.GET)
-    public ResponseEntity<List<IContentBlock>> getAllContentBlocks(Model model, @PathVariable("moduleId") String moduleId, @PathVariable("id") String slideId, @ModelAttribute SequenceForm sequenceForm,
-            Principal principal) {
+    public ResponseEntity<List<IContentBlock>> getAllContentBlocks(Model model,
+            @PathVariable("moduleId") String moduleId, @PathVariable("id") String slideId,
+            @ModelAttribute SequenceForm sequenceForm, Principal principal) {
 
         List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(slideId);
         return new ResponseEntity<List<IContentBlock>>(slideContents, HttpStatus.OK);
     }
-    
+
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/links", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<Map<String,Object>> showSlideLinks(@PathVariable String id, Model model) {
-        Map<String,Object> responseData = new HashMap<String,Object>();
+    public ResponseEntity<Map<String, Object>> showSlideLinks(@PathVariable String id, Model model) {
+        Map<String, Object> responseData = new HashMap<String, Object>();
         responseData.put("externalLinks", externalLinkManager.getLinks(id));
         return new ResponseEntity<>(responseData, HttpStatus.OK);
     }

From 36c2f5eeb9206d1d33b8359a4da18cfce26a13fe Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Wed, 12 Jun 2024 14:41:29 -0700
Subject: [PATCH 58/64] [VSPC-242] removed some unnecessary classes, methods,
 repositories, etc...

---
 .../SlideExternalLinkDisplayRepository.java   |  23 ----
 .../data/SlideExternalLinkRepository.java     |   4 +-
 .../data/display/SlideDisplayRepository.java  |  22 ----
 .../factory/IExternalLinkDisplayFactory.java  |   1 -
 .../core/factory/IExternalLinkFactory.java    |   1 -
 .../core/factory/ISlideDisplayFactory.java    |   8 --
 .../ISlideExternalLinkDisplayFactory.java     |  22 ----
 .../factory/ISlideExternalLinkFactory.java    |  10 --
 .../impl/ExternalLinkDisplayFactory.java      |   1 -
 .../factory/impl/ExternalLinkFactory.java     |   1 -
 .../factory/impl/SlideDisplayFactory.java     |  16 ---
 .../impl/SlideExternalLinkDisplayFactory.java |  26 ----
 .../impl/SlideExternalLinkFactory.java        |  27 ----
 .../core/model/display/ISlideDisplay.java     |  23 ----
 .../core/model/display/impl/SlideDisplay.java | 118 ------------------
 .../core/services/ISlideDisplayManager.java   |  12 --
 .../core/services/ISlideLinkManager.java      |   1 -
 .../services/impl/ExternalLinkManager.java    |  80 ++++--------
 .../services/impl/SlideDisplayManager.java    |  88 -------------
 .../impl/SlideExternalLinkManager.java        |  86 +++++--------
 .../core/services/impl/SlideManager.java      |  67 +---------
 .../web/staff/EditExternalLinkController.java |   1 -
 .../vspace/web/staff/SlideController.java     |   5 -
 23 files changed, 63 insertions(+), 580 deletions(-)
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java
deleted file mode 100644
index ad507c87e..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkDisplayRepository.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package edu.asu.diging.vspace.core.data;
-
-import java.util.List;
-
-import org.javers.spring.annotation.JaversSpringDataAuditable;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
-
-@Repository
-@JaversSpringDataAuditable
-public interface SlideExternalLinkDisplayRepository extends PagingAndSortingRepository<SlideExternalLinkDisplay, String> {
-    
-    @Query("SELECT d FROM SlideExternalLinkDisplay d WHERE d.externalLink.slide.id = ?1")
-    public List<ISlideExternalLinkDisplay> findSlideExternalLinkDisplaysForSlide(String slideId);
-
-    public void deleteByExternalLink(IExternalLinkSlide link);
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
index 4a817011e..4836c3d6e 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import org.javers.spring.annotation.JaversSpringDataAuditable;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
@@ -14,8 +13,7 @@
 @JaversSpringDataAuditable
 public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String> {
 
-    @Query("SELECT d FROM ExternalLinkSlide d WHERE d.slide.id = ?1")
-    public List<IExternalLinkSlide> findExternalLinkSlides(String slideId);
+    public List<IExternalLinkSlide> findbySlide(String slideId);
 
     public void deleteByExternalLink(IExternalLinkSlide link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java
deleted file mode 100644
index db4a7ccf7..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/display/SlideDisplayRepository.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package edu.asu.diging.vspace.core.data.display;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
-import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
-
-public interface SlideDisplayRepository extends PagingAndSortingRepository<SlideDisplay, String>{
-    
-    @Modifying
-    @Query("delete from SlideDisplay where slide_id = ?1")
-    void deleteBySlideId(String id);
-
-    public List<SlideDisplay> getBySlide(ISlide slide);
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java
index 18c262195..a9c2c24bc 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkDisplayFactory.java
@@ -1,7 +1,6 @@
 package edu.asu.diging.vspace.core.factory;
 
 import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 
 /*
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
index f80632485..b2a644ebf 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
@@ -1,7 +1,6 @@
 package edu.asu.diging.vspace.core.factory;
 
 import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 
 public interface IExternalLinkFactory {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java
deleted file mode 100644
index b669aa786..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideDisplayFactory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.asu.diging.vspace.core.factory;
-
-import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-
-public interface ISlideDisplayFactory {
-    ISlideDisplay createSlideDisplay();
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java
deleted file mode 100644
index af20331d3..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkDisplayFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package edu.asu.diging.vspace.core.factory;
-
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-
-/*
-*(non-javadoc)
-*This interface represents a factory for creating external link displays.
-*/
-public interface ISlideExternalLinkDisplayFactory {
-    
-    /*
-     *(non-javadoc)
-     *Creates an external link display based on the provided external link.
-     *@param link the external link to create a display for
-     *@return  edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay that 
-     *represents the provided external link
-     *
-     */
-    ISlideExternalLinkDisplay createExternalLinkDisplay(IExternalLinkSlide link);
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java
deleted file mode 100644
index d1952666c..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/ISlideExternalLinkFactory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.asu.diging.vspace.core.factory;
-
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.ISlide;
-
-public interface ISlideExternalLinkFactory {
-    
-    IExternalLinkSlide createExternalLink(String title, ISlide slide);
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java
index cd04dd0f6..89a972ed8 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactory.java
@@ -4,7 +4,6 @@
 
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
index 6a39292b3..14b68b41a 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkFactory.java
@@ -4,7 +4,6 @@
 
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
 import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java
deleted file mode 100644
index 6dc0b21ac..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideDisplayFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package edu.asu.diging.vspace.core.factory.impl;
-
-import org.springframework.stereotype.Component;
-
-import edu.asu.diging.vspace.core.factory.ISlideDisplayFactory;
-import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
-
-@Component
-public class SlideDisplayFactory implements ISlideDisplayFactory{
-    
-    public ISlideDisplay createSlideDisplay() {
-        return new SlideDisplay();
-    }
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java
deleted file mode 100644
index b3866733a..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package edu.asu.diging.vspace.core.factory.impl;
-
-import org.springframework.stereotype.Service;
-
-import edu.asu.diging.vspace.core.factory.ISlideExternalLinkDisplayFactory;
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
-
-@Service
-public class SlideExternalLinkDisplayFactory implements ISlideExternalLinkDisplayFactory {
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.factory.impl.ISlideExternalLinkDisplayFactory#
-     * createExternalLinkDisplay(edu.asu.diging.vspace.core.model.IExternalLinkSlide)
-     */
-    @Override
-    public ISlideExternalLinkDisplay createExternalLinkDisplay(IExternalLinkSlide link) {
-        ISlideExternalLinkDisplay display = new SlideExternalLinkDisplay();
-        display.setExternalLink(link);
-        return display;
-    }
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
deleted file mode 100644
index 04bd8f3bc..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package edu.asu.diging.vspace.core.factory.impl;
-
-import org.springframework.stereotype.Service;
-
-import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
-
-@Service
-public class SlideExternalLinkFactory implements ISlideExternalLinkFactory{
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.factory.impl.ISlideExternalLinkFactory#
-     * createExternalLink(java.lang.String, edu.asu.diging.vspace.core.model.ISlide)
-     */
-    @Override
-    public IExternalLinkSlide createExternalLink(String title, ISlide slide) {
-        IExternalLinkSlide link = new ExternalLinkSlide();
-        link.setName(title);
-        link.setSlide(slide);
-        return link;
-    }
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java
deleted file mode 100644
index 316b99c31..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideDisplay.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package edu.asu.diging.vspace.core.model.display;
-
-import edu.asu.diging.vspace.core.model.ISlide;
-
-public interface ISlideDisplay {
-    
-    String getId();
-
-    void setId(String id);
-
-    ISlide getSlide();
-
-    void setSlide(ISlide slide);
-
-    int getWidth();
-
-    void setWidth(int width);
-
-    int getHeight();
-
-    void setHeight(int height);
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java
deleted file mode 100644
index 51544ffe7..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideDisplay.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package edu.asu.diging.vspace.core.model.display.impl;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
-
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
-import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
-import edu.asu.diging.vspace.core.model.impl.Slide;
-import edu.asu.diging.vspace.core.model.impl.Space;
-
-@Entity
-public class SlideDisplay implements ISlideDisplay{
-    
-    @Id
-    @GeneratedValue(generator = "slide_display_id_generator")
-    @GenericGenerator(name = "slide_display_id_generator", parameters = @Parameter(name = "prefix", value = "SLD"), strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
-    private String id;
-
-    @OneToOne(targetEntity = Slide.class)
-    private ISlide slide;
-
-    private int width;
-    private int height;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideeDisplay#getId()
-     */
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setId(java.lang.
-     * String)
-     */
-    @Override
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#getSlide()
-     */
-    @Override
-    public ISlide getSlide() {
-        return slide;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setSlide(edu.asu.
-     * diging.vspace.core.model.ISlide)
-     */
-    @Override
-    public void setSlide(ISlide slide) {
-        this.slide = slide;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#getWidth()
-     */
-    @Override
-    public int getWidth() {
-        return width;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setWidth(int)
-     */
-    @Override
-    public void setWidth(int width) {
-        this.width = width;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#getHeight()
-     */
-    @Override
-    public int getHeight() {
-        return height;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * edu.asu.diging.vspace.core.model.display.impl.ISlideDisplay#setHeight(int)
-     */
-    @Override
-    public void setHeight(int height) {
-        this.height = height;
-    }
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
deleted file mode 100644
index 066290f91..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideDisplayManager.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.asu.diging.vspace.core.services;
-
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
-import edu.asu.diging.vspace.core.model.IVSImage;
-import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
-
-public interface ISlideDisplayManager {
-    ISlideDisplay getBySlide(ISlide slide, IVSImage img);
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
index def6a7ac3..faad5ba55 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
@@ -5,7 +5,6 @@
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.model.ILink;
 import edu.asu.diging.vspace.core.model.ILinkSlide;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
index 289f6cad5..c6c414725 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
@@ -8,28 +8,19 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
-import edu.asu.diging.vspace.core.data.ImageRepository;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
-import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
-import edu.asu.diging.vspace.core.factory.IImageFactory;
-import edu.asu.diging.vspace.core.file.IStorageEngine;
 import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
-import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Transactional
@@ -44,27 +35,7 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
     private ExternalLinkRepository externalLinkRepo;
 
     @Autowired
-    private ExternalLinkDisplayRepository externalLinkDisplayRepo;
-
-    @Autowired
-    private IExternalLinkFactory externalLinkFactory;
-
-    @Autowired
-    private IExternalLinkDisplayFactory externalLinkDisplayFactory;
-
-    @Autowired
-    private IImageFactory imageFactory;
-
-    @Autowired
-    private ImageRepository imageRepo;
-
-    @Autowired
-    private IStorageEngine storage;
-
-    @Override
-    public List<IExternalLinkDisplay> getLinkDisplays(String spaceId) {
-        return externalLinkDisplayRepo.findExternalLinkDisplaysForSpace(spaceId);
-    }
+    private IExternalLinkFactory externalLinkFactory;   
 
     @Override
     protected IExternalLink createLinkObject(String title, String id) {
@@ -78,21 +49,6 @@ protected ExternalLinkValue getTarget(String externalLink) {
         return new ExternalLinkValue(externalLink);
     }
 
-    @Override
-    protected IExternalLinkDisplay updateLinkAndDisplay(IExternalLink link, IExternalLinkDisplay displayLink) {
-        externalLinkRepo.save((ExternalLink) link);
-        return externalLinkDisplayRepo.save((ExternalLinkDisplay) displayLink);
-    }
-
-    @Override
-    protected IExternalLinkDisplay getDisplayLink(String externalLinkDisplayId) {
-        Optional<ExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo.findById(externalLinkDisplayId);
-        if (externalLinkDisplay.isPresent()) {
-            return externalLinkDisplay.get();
-        }
-        return null;
-    }
-
     @Override
     protected IExternalLink getLink(String externalLinkID) {
         Optional<ExternalLink> externalLink = externalLinkRepo.findById(externalLinkID);
@@ -102,16 +58,6 @@ protected IExternalLink getLink(String externalLinkID) {
         return null;
     }
 
-    @Override
-    protected IExternalLinkDisplay createDisplayLink(IExternalLink link) {
-        return externalLinkDisplayFactory.createExternalLinkDisplay(link);
-    }
-
-    @Override
-    protected void deleteLinkDisplayRepo(IExternalLink link) {
-        externalLinkDisplayRepo.deleteByExternalLink(link);
-    }
-
     @Override
     protected void removeFromLinkList(ISpace space, IExternalLink link) {
         space.getExternalLinks().remove(link);
@@ -161,4 +107,28 @@ public IExternalLinkDisplay updateLink(String title, String id, float positionX,
         return externalLinkDisplay;
     }
 
+    @Override
+    public List<IExternalLinkDisplay> getLinkDisplays(String spaceId) {
+        return null;
+    }
+
+    @Override
+    protected void deleteLinkDisplayRepo(IExternalLink link) {        
+    }
+
+    @Override
+    protected IExternalLinkDisplay updateLinkAndDisplay(IExternalLink link, IExternalLinkDisplay displayLink) {
+        return null;
+    }
+
+    @Override
+    protected IExternalLinkDisplay getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException {
+        return null;
+    }
+
+    @Override
+    protected IExternalLinkDisplay createDisplayLink(IExternalLink link) {
+        return null;
+    }
+
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
deleted file mode 100644
index 37b2861ea..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideDisplayManager.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package edu.asu.diging.vspace.core.services.impl;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.stereotype.Service;
-
-import edu.asu.diging.vspace.core.data.display.SlideDisplayRepository;
-import edu.asu.diging.vspace.core.factory.ISlideDisplayFactory;
-import edu.asu.diging.vspace.core.file.IStorageEngine;
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.IVSImage;
-import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
-import edu.asu.diging.vspace.core.services.IImageService;
-import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
-import edu.asu.diging.vspace.core.services.impl.model.ImageData;
-
-@Service
-@PropertySource("classpath:config.properties")
-public class SlideDisplayManager implements ISlideDisplayManager{
-    
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Value("${bg_image_max_width}")
-    private int maxBgImageWidth;
-
-    @Value("${bg_image_max_height}")
-    private int maxBgImageHeight;
-
-    @Autowired
-    private SlideDisplayRepository slideDisplayRepo;
-
-    @Autowired
-    private ISlideDisplayFactory displayFactory;
-
-    @Autowired
-    private IImageService imageService;
-
-    @Autowired
-    private IStorageEngine storage;
-    
-    @Override
-    public ISlideDisplay getBySlide(ISlide slide, IVSImage img) {
-        
-        IVSImage image = slide!=null ? img:null;
-        List<SlideDisplay> displays = slideDisplayRepo.getBySlide(slide);
-        ISlideDisplay display = displays.isEmpty() ? null:displays.get(0);
-        if(display==null) {
-            display = displayFactory.createSlideDisplay();
-        }
-     
-        if(image!=null) {
-            if(image.getWidth()<=0 || image.getHeight()<=0) {
-                try {
-                    ImageData data = imageService.getImageData(storage.getMediaContent(image.getId(), image.getFilename()));
-                    if (data != null) {
-                        image.setWidth(data.getWidth());
-                        image.setHeight(data.getHeight());
-                    }
-                    
-                } catch (IOException e) {
-                    logger.error("Could not get image.", e);
-                    return display;
-                }
-            }
-
-            if(image.getWidth()<=maxBgImageWidth && image.getHeight()<=maxBgImageHeight) {
-                display.setWidth(image.getWidth());
-                display.setHeight(image.getHeight());
-                return display;
-            }
-
-            ImageData data = imageService.getImageDimensions(image, maxBgImageWidth, maxBgImageHeight);
-            display.setHeight(data.getHeight());
-            display.setWidth(data.getWidth());
-            slideDisplayRepo.save((SlideDisplay) display);
-        }
-
-        return display;
-    }
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index 1d8f3a017..f786bfa6e 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -8,14 +8,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import edu.asu.diging.vspace.core.data.SlideExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
-import edu.asu.diging.vspace.core.factory.ISlideExternalLinkDisplayFactory;
-import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
+import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
@@ -33,29 +30,8 @@ public class SlideExternalLinkManager
     @Autowired
     private SlideExternalLinkRepository externalLinkRepo;
 
-    @Autowired
-    private SlideExternalLinkDisplayRepository externalLinkDisplayRepo;
-
-    @Autowired
-    private ISlideExternalLinkFactory externalLinkFactory;
-
-    @Autowired
-    private ISlideExternalLinkDisplayFactory externalLinkDisplayFactory;
-
     public List<IExternalLinkSlide> getLinks(String slideId) {
-        return externalLinkRepo.findExternalLinkSlides(slideId);
-    }
-
-    @Override
-    public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
-        return null;
-    }
-
-    @Override
-    protected IExternalLinkSlide createLinkObject(String title, String id) {
-        ISlide source = slideManager.getSlide(id);
-        IExternalLinkSlide link = externalLinkFactory.createExternalLink(title, source);
-        return externalLinkRepo.save((ExternalLinkSlide) link);
+        return externalLinkRepo.findbySlide(slideId);
     }
 
     @Override
@@ -63,23 +39,6 @@ protected ExternalLinkValue getTarget(String externalLink) {
         return new ExternalLinkValue(externalLink);
     }
 
-    @Override
-    protected ISlideExternalLinkDisplay updateLinkAndDisplay(IExternalLinkSlide link,
-            ISlideExternalLinkDisplay displayLink) {
-        externalLinkRepo.save((ExternalLinkSlide) link);
-        return externalLinkDisplayRepo.save((SlideExternalLinkDisplay) displayLink);
-    }
-
-    @Override
-    protected ISlideExternalLinkDisplay getDisplayLink(String externalLinkDisplayId) {
-        Optional<SlideExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo
-                .findById(externalLinkDisplayId);
-        if (externalLinkDisplay.isPresent()) {
-            return externalLinkDisplay.get();
-        }
-        return null;
-    }
-
     @Override
     protected IExternalLinkSlide getLink(String externalLinkID) {
         Optional<ExternalLinkSlide> externalLink = externalLinkRepo.findById(externalLinkID);
@@ -89,16 +48,6 @@ protected IExternalLinkSlide getLink(String externalLinkID) {
         return null;
     }
 
-    @Override
-    protected ISlideExternalLinkDisplay createDisplayLink(IExternalLinkSlide link) {
-        return externalLinkDisplayFactory.createExternalLinkDisplay(link);
-    }
-
-    @Override
-    protected void deleteLinkDisplayRepo(IExternalLinkSlide link) {
-        externalLinkDisplayRepo.deleteByExternalLink(link);
-    }
-
     @Override
     protected void removeFromLinkList(ISlide slide, IExternalLinkSlide link) {
         slide.getExternalLinks().remove(link);
@@ -132,4 +81,35 @@ public IExternalLinkSlide updateExternalLink(String title, String url, String id
         }
         return externalLink;
     }
+
+    @Override
+    protected void deleteLinkDisplayRepo(IExternalLinkSlide link) {        
+    }
+
+    @Override
+    protected ISlideExternalLinkDisplay updateLinkAndDisplay(IExternalLinkSlide link,
+            ISlideExternalLinkDisplay displayLink) {
+        return null;
+    }
+
+    @Override
+    protected ISlideExternalLinkDisplay getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException {
+        return null;
+    }
+
+    @Override
+    protected ISlideExternalLinkDisplay createDisplayLink(IExternalLinkSlide link) {
+        return null;
+    }
+
+    @Override
+    public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
+        return null;
+    }
+
+
+    @Override
+    protected IExternalLinkSlide createLinkObject(String title, String id) {
+        return null;
+    }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
index 340331759..4629e58c3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
@@ -18,39 +18,20 @@
 
 import edu.asu.diging.vspace.core.data.BranchingPointRepository;
 import edu.asu.diging.vspace.core.data.ChoiceRepository;
-import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
-import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
 import edu.asu.diging.vspace.core.data.SequenceRepository;
 import edu.asu.diging.vspace.core.data.SlideRepository;
-import edu.asu.diging.vspace.core.data.display.SlideDisplayRepository;
-import edu.asu.diging.vspace.core.data.display.SpaceDisplayRepository;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
-import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
-import edu.asu.diging.vspace.core.factory.ISlideDisplayFactory;
-import edu.asu.diging.vspace.core.factory.ISpaceDisplayFactory;
 import edu.asu.diging.vspace.core.factory.impl.ChoiceFactory;
 import edu.asu.diging.vspace.core.factory.impl.SlideFactory;
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
 import edu.asu.diging.vspace.core.model.IChoice;
-import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 import edu.asu.diging.vspace.core.model.display.SlideType;
-import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.model.impl.Choice;
-import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
 import edu.asu.diging.vspace.core.model.impl.Slide;
-import edu.asu.diging.vspace.core.model.impl.Space;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.web.staff.forms.SlideForm;
 
@@ -63,15 +44,6 @@ public class SlideManager implements ISlideManager {
 
     @Autowired
     private SlideRepository slideRepo;
-    
-    @Autowired
-    private ISlideDisplayFactory slideDisplayFactory;
-    
-    @Autowired
-    private SlideDisplayRepository slideDisplayRepo;
-    
-    @Autowired
-    private IExternalLinkFactory externalLinkFactory;
 
     @Autowired
     private SequenceRepository sequenceRepo;
@@ -84,16 +56,6 @@ public class SlideManager implements ISlideManager {
 
     @Autowired
     private ChoiceFactory choiceFactory;
-    
-    @Autowired
-    private ExternalLinkRepository externalLinkRepo;
-    
-    @Autowired
-    private IExternalLinkDisplayFactory externalLinkDisplayFactory;
-    
-    @Autowired
-    private ExternalLinkDisplayRepository externalLinkDisplayRepo;
-
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -102,31 +64,6 @@ public ISlide createSlide(IModule module, SlideForm slideForm, SlideType type) {
         ISlide slide = slideFactory.createSlide(module, slideForm, type);
         return slideRepo.save((Slide) slide);
     }
-    
-    @Override
-    public void storeSlideDisplay(ISlide slide, IVSImage image) {
-        
-        List<SlideDisplay> displays = null;
-        if (slide.getId() != null) {
-            displays = slideDisplayRepo.getBySlide(slide);
-        }
-        ISlideDisplay slideDisplay;
-        if (displays == null || displays.isEmpty()) {
-            slideDisplay = slideDisplayFactory.createSlideDisplay();
-        } else {
-            slideDisplay = displays.get(0);
-        }
-
-        if (image != null) {
-            slide.setImage(image);
-            slideDisplay.setHeight(image.getHeight());
-            slideDisplay.setWidth(image.getWidth());
-        }
-
-        slideDisplay.setSlide(slide);
-        slideDisplayRepo.save((SlideDisplay) slideDisplay);
-        
-    }
 
     @Override
     public IBranchingPoint createBranchingPoint(IModule module, SlideForm slideForm, SlideType type) {
@@ -235,4 +172,8 @@ public Page<ISlide> findByNameOrDescription(Pageable requestedPage, String searc
         return slideRepo.findDistinctByNameContainingOrDescriptionContaining(requestedPage, searchText,searchText);
     }
 
+    @Override
+    public void storeSlideDisplay(ISlide slide, IVSImage image) {        
+    }
+
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
index 4410bd5aa..61c9353b3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditExternalLinkController.java
@@ -58,6 +58,5 @@ public ResponseEntity<String> createExternalLink(@PathVariable("id") String id,
         return success(display.getExternalLink().getId(), display.getId(), display.getPositionX(),
                 display.getPositionY(), display.getRotation(), display.getExternalLink().getExternalLink(), title,
                 displayType, null, null);
-
     }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index 2de4e7f97..64ddcb522 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -25,7 +25,6 @@
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
-import edu.asu.diging.vspace.core.services.ISlideDisplayManager;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.web.staff.forms.SequenceForm;
@@ -46,9 +45,6 @@ public class SlideController {
     @Autowired
     private ISlideExternalLinkManager externalLinkManager;
 
-    @Autowired
-    private ISlideDisplayManager slideDisplayManager;
-
     @RequestMapping("/staff/module/{moduleId}/slide/{id}")
     public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) {
         ISlide slide = slideManager.getSlide(id);
@@ -60,7 +56,6 @@ public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId"
         if (slideContents.size() > 0) {
             IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
             slideManager.storeSlideDisplay(slide, imageblock.getImage());
-            model.addAttribute("display", slideDisplayManager.getBySlide(slide, imageblock.getImage()));
         }
         model.addAttribute("slideContents", slideContents);
         model.addAttribute("contentCount",

From b4bf072a9b9722f19652eae00676c62057fa3321 Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Wed, 12 Jun 2024 18:04:21 -0700
Subject: [PATCH 59/64] [VSPC-242] fixed findBySlide query

---
 .../diging/vspace/core/data/SlideExternalLinkRepository.java   | 2 +-
 .../vspace/core/services/impl/SlideExternalLinkManager.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
index 4836c3d6e..251ba9a0c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
@@ -13,7 +13,7 @@
 @JaversSpringDataAuditable
 public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String> {
 
-    public List<IExternalLinkSlide> findbySlide(String slideId);
+    public List<IExternalLinkSlide> findBySlide(String slideId);
 
     public void deleteByExternalLink(IExternalLinkSlide link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index f786bfa6e..04d3c22a0 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -30,8 +30,9 @@ public class SlideExternalLinkManager
     @Autowired
     private SlideExternalLinkRepository externalLinkRepo;
 
+    @Transactional
     public List<IExternalLinkSlide> getLinks(String slideId) {
-        return externalLinkRepo.findbySlide(slideId);
+        return externalLinkRepo.findBySlide(slideId);
     }
 
     @Override

From 9a3567a86f02da4e158bec5281d2431084ecd5e2 Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Fri, 14 Jun 2024 16:33:49 -0700
Subject: [PATCH 60/64] [VSPC-242] fixed SlideExternalLink repo, unnecessary
 spacing, imports, slide.html errors, and deleted unnecessary classes

---
 .../data/ExternalLinkDisplayRepository.java   |   2 +-
 .../data/SlideExternalLinkRepository.java     |   2 +-
 .../core/factory/IExternalLinkFactory.java    |   4 +-
 .../vspace/core/model/IExternalLink.java      |   4 +-
 .../vspace/core/model/IExternalLinkSlide.java |  12 +-
 .../asu/diging/vspace/core/model/ILink.java   |   3 +-
 .../diging/vspace/core/model/ILinkSlide.java  |  12 -
 .../asu/diging/vspace/core/model/ISlide.java  |   6 -
 .../display/ISlideExternalLinkDisplay.java    |  15 --
 .../impl/SlideExternalLinkDisplay.java        |  98 --------
 .../vspace/core/model/impl/ExternalLink.java  |   7 +-
 .../core/model/impl/ExternalLinkSlide.java    |  13 +-
 .../diging/vspace/core/model/impl/Slide.java  |   8 -
 .../vspace/core/services/ILinkManager.java    |   3 -
 .../services/ISlideExternalLinkManager.java   |  14 +-
 .../core/services/ISlideLinkManager.java      |  28 ---
 .../vspace/core/services/ISlideManager.java   |   3 -
 .../core/services/impl/LinkManager.java       |   4 -
 .../impl/SlideExternalLinkManager.java        |  63 ++----
 .../core/services/impl/SlideLinkManager.java  | 126 -----------
 .../view/ExhibitionSlideController.java       |   2 +-
 .../staff/AddSlideExternalLinkController.java |   2 +-
 .../EditSlideExternalLinkController.java      |  33 ++-
 .../web/staff/EditSlideLinksController.java   |  44 ----
 .../WEB-INF/views/exhibition/space.html       |  41 ++--
 .../views/staff/modules/slides/slide.html     | 210 +++++++++---------
 26 files changed, 203 insertions(+), 556 deletions(-)
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
 delete mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
index 322e89a6c..c91fbac33 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/ExternalLinkDisplayRepository.java
@@ -17,6 +17,6 @@ public interface ExternalLinkDisplayRepository extends PagingAndSortingRepositor
 
     @Query("SELECT d FROM ExternalLinkDisplay d WHERE d.externalLink.space.id = ?1")
     public List<IExternalLinkDisplay> findExternalLinkDisplaysForSpace(String spaceId);
-  
+
     public void deleteByExternalLink(IExternalLink link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
index 251ba9a0c..c6768a702 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
@@ -13,7 +13,7 @@
 @JaversSpringDataAuditable
 public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String> {
 
-    public List<IExternalLinkSlide> findBySlide(String slideId);
+    public List<IExternalLinkSlide> findBySlide_Id(String slideId);
 
     public void deleteByExternalLink(IExternalLinkSlide link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
index b2a644ebf..bebdbd1c1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java
@@ -6,5 +6,5 @@
 public interface IExternalLinkFactory {
 
     IExternalLink createExternalLink(String title, ISpace space);
-    
-}
+
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
index 6a27edf92..885256577 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java
@@ -11,5 +11,5 @@ public interface IExternalLink extends ILink<ExternalLinkValue> {
     String getExternalLink();
 
     void setExternalLink(String externalLink);
-  
-}
+
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
index 976ea09b4..948478b0b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java
@@ -1,8 +1,10 @@
 package edu.asu.diging.vspace.core.model;
 
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
-
-public interface IExternalLinkSlide extends ILinkSlide<ExternalLinkValue>{
+public interface IExternalLinkSlide{
+    
+    String getId();
+    
+    void setId(String id);
     
     ISlide getSlide();
 
@@ -11,4 +13,8 @@ public interface IExternalLinkSlide extends ILinkSlide<ExternalLinkValue>{
     String getExternalLink();
 
     void setExternalLink(String externalLink);
+    
+    String getLabel();
+    
+    void setLabel(String label);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
index 4422b5691..4527926d1 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java
@@ -9,5 +9,4 @@ public interface ILink<T extends IVSpaceElement> extends IVSpaceElement{
     T getTarget();
 
     void setTarget(T target);
-
-}
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java
deleted file mode 100644
index ff00281ee..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ILinkSlide.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.asu.diging.vspace.core.model;
-
-public interface ILinkSlide<T extends IVSpaceElement> extends IVSpaceElement {
-    
-    ISlide getSlide();
-
-    void setSlide(ISlide slide);
-
-    T getTarget();
-
-    void setTarget(T target);
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
index 83287a8ee..cb422f997 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java
@@ -19,10 +19,4 @@ public interface ISlide extends IVSpaceElement {
     List<IExternalLinkSlide> getExternalLinks();
 
     void setExternalLinks(List<IExternalLinkSlide> externalLinks);
-        
-    IVSImage getImage();
-
-    void setImage(IVSImage image);
-   
-    
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java
deleted file mode 100644
index c10898d2f..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/ISlideExternalLinkDisplay.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package edu.asu.diging.vspace.core.model.display;
-
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-
-public interface ISlideExternalLinkDisplay extends ILinkDisplay {
-    
-    String getId();
-
-    void setId(String id);
-
-    void setExternalLink(IExternalLinkSlide link);
-
-    IExternalLinkSlide getExternalLink();
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
deleted file mode 100644
index 2cefd4205..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/display/impl/SlideExternalLinkDisplay.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package edu.asu.diging.vspace.core.model.display.impl;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
-
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
-
-@Entity
-public class SlideExternalLinkDisplay extends LinkDisplay implements ISlideExternalLinkDisplay {
-    
-    @Id
-    @GeneratedValue(generator = "externallink_display_id_generator")
-    @GenericGenerator(name = "externallink_display_id_generator", 
-      	parameters = @Parameter(name = "prefix", value = "EXLDS"),
-      	strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
-    private String id;
-
-    @OneToOne(targetEntity = ExternalLinkSlide.class)
-    private IExternalLinkSlide externalLink;
-    
-    private DisplayType type;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.ISpaceLinkDisplay#getId()
-     */
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * edu.asu.diging.vspace.core.model.display.impl.ISpaceLinkDisplay#setId(java.
-     * lang.String)
-     */
-    @Override
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
-     * getExternalLinkSlide()
-     */
-    @Override
-    public IExternalLinkSlide getExternalLink() {
-        return externalLink;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
-     * setExternalLink(IExternalLinkSlide)
-     */
-    @Override
-    public void setExternalLink(IExternalLinkSlide externalLink) {
-        this.externalLink = externalLink;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
-     * getType()
-     */
-    @Override
-    public DisplayType getType() {
-        return type;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see edu.asu.diging.vspace.core.model.display.impl.IExternalLinkDisplay#
-     * setType(DisplayType)
-     */
-    @Override
-    public void setType(DisplayType type) {
-        this.type = type;
-    }
-    
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
index 2d740cea0..0ed9fa8dd 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLink.java
@@ -25,7 +25,7 @@ public class ExternalLink extends VSpaceElement implements IExternalLink {
     @ManyToOne(targetEntity=Space.class)
     @JoinColumn(name="space_id", nullable=false)
     private ISpace space;
-  
+
     private String externalLink;
 
     /* (non-Javadoc)
@@ -43,7 +43,10 @@ public String getId() {
     public void setId(String id) {
         this.id = id;
     }
-    
+
+    /* (non-Javadoc)
+     * @see edu.asu.diging.vspace.core.model.impl.IExternalLink#getSpace()
+     */
     @Override
     public ISpace getSpace() {
         return space;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
index b2d4a481d..2944c5317 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
@@ -26,6 +26,8 @@ public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSli
     private ISlide slide;
   
     private String externalLink;
+    
+    private String label;
         
     @Override
     public String getId() {
@@ -56,15 +58,14 @@ public String getExternalLink() {
     public void setExternalLink(String externalLink) {
         this.externalLink = externalLink;
     }
-
+    
     @Override
-    public ExternalLinkValue getTarget() {
-        return new ExternalLinkValue(this.externalLink);
+    public String getLabel() {
+        return label;
     }
 
     @Override
-    public void setTarget(ExternalLinkValue target) {
-        this.externalLink = target.getValue();
+    public void setLabel(String label) {
+        this.label = label;
     }
-    
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 971624783..746ff33fd 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -124,14 +124,6 @@ public void setExternalLinks(List<IExternalLinkSlide> externalLinks) {
         this.externalLinks = externalLinks;
     }
 
-    public IVSImage getImage() {
-        return image;
-    }
-
-    public void setImage(IVSImage image) {
-        this.image = image;
-    }
-
     /*
      * (non-Javadoc)
      * 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
index 7ab5695e6..b34febced 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ILinkManager.java
@@ -10,7 +10,6 @@
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 
-
 public interface ILinkManager<L extends ILink<T>, T extends IVSpaceElement, U extends ILinkDisplay> {
 
     U createLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
@@ -26,6 +25,4 @@ U updateLink(String title, String id, float positionX, float positionY, int rota
 
     void deleteLink(String linkId);
 
-    
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
index e28fa7eb1..2bff26cc8 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -3,15 +3,21 @@
 import java.util.List;
 
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
+import edu.asu.diging.vspace.core.model.ISlide;
 
-public interface ISlideExternalLinkManager
-        extends ISlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay> {
+public interface ISlideExternalLinkManager {
 
+    IExternalLinkSlide getLink(String externalLinkID);
+    
     List<IExternalLinkSlide> getLinks(String slideId);
 
     IExternalLinkSlide createExternalLink(String title, String url, String slideId);
 
     IExternalLinkSlide updateExternalLink(String title, String url, String id);
+    
+    void deleteLink(String linkId);
+
+    void removeFromLinkList(ISlide slide, IExternalLinkSlide link);
+
+    void addToLinkList(ISlide slide, IExternalLinkSlide link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
deleted file mode 100644
index faad5ba55..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideLinkManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package edu.asu.diging.vspace.core.services;
-
-import java.util.List;
-
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.model.ILinkSlide;
-import edu.asu.diging.vspace.core.model.IVSpaceElement;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
-
-public interface ISlideLinkManager<L extends ILinkSlide<T>, T extends IVSpaceElement, U extends ILinkDisplay> {
-    
-    U createLink(String title, String id, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException;
-
-    U updateLink(String title, String id, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
-
-    List<U> getLinkDisplays(String slideId);
-
-    void deleteLink(String linkId);
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
index 7834c72b1..fb9890819 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
@@ -5,16 +5,13 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
 import edu.asu.diging.vspace.core.model.IChoice;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.IVSImage;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
-import edu.asu.diging.vspace.core.model.impl.Slide;
 import edu.asu.diging.vspace.web.staff.forms.SlideForm;
 
 public interface ISlideManager {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
index eaae78ac2..74e5d5a93 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java
@@ -8,13 +8,10 @@
 import edu.asu.diging.vspace.core.exception.FileStorageException;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IImageFactory;
 import edu.asu.diging.vspace.core.file.IStorageEngine;
-import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.ILink;
-import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.IVSpaceElement;
@@ -22,7 +19,6 @@
 import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.VSImage;
 import edu.asu.diging.vspace.core.services.ILinkManager;
-import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Transactional
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index 04d3c22a0..69248e7b3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -9,19 +9,15 @@
 import org.springframework.stereotype.Service;
 
 import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 
 @Transactional
 @Service
 public class SlideExternalLinkManager
-        extends SlideLinkManager<IExternalLinkSlide, ExternalLinkValue, ISlideExternalLinkDisplay>
         implements ISlideExternalLinkManager {
 
     @Autowired
@@ -32,85 +28,56 @@ public class SlideExternalLinkManager
 
     @Transactional
     public List<IExternalLinkSlide> getLinks(String slideId) {
-        return externalLinkRepo.findBySlide(slideId);
+        return externalLinkRepo.findBySlide_Id(slideId);
     }
 
     @Override
-    protected ExternalLinkValue getTarget(String externalLink) {
-        return new ExternalLinkValue(externalLink);
-    }
-
-    @Override
-    protected IExternalLinkSlide getLink(String externalLinkID) {
+    public IExternalLinkSlide getLink(String externalLinkID) {
         Optional<ExternalLinkSlide> externalLink = externalLinkRepo.findById(externalLinkID);
         if (externalLink.isPresent()) {
             return externalLink.get();
         }
         return null;
     }
+    
+    @Override
+    public void addToLinkList(ISlide slide, IExternalLinkSlide link) {
+        slide.getExternalLinks().add(link);
+    }
 
     @Override
-    protected void removeFromLinkList(ISlide slide, IExternalLinkSlide link) {
+    public void removeFromLinkList(ISlide slide, IExternalLinkSlide link) {
         slide.getExternalLinks().remove(link);
     }
 
     @Override
-    protected void deleteLinkRepo(IExternalLinkSlide link) {
+    public void deleteLink(String linkId) {
+        IExternalLinkSlide link = getLink(linkId);
+        removeFromLinkList(link.getSlide(), link);
         externalLinkRepo.delete((ExternalLinkSlide) link);
     }
 
     @Override
-    public IExternalLinkSlide createExternalLink(String title, String url, String slideId) {
+    public IExternalLinkSlide createExternalLink(String label, String url, String slideId) {
         ISlide slide = slideManager.getSlide(slideId);
         IExternalLinkSlide externalLink = new ExternalLinkSlide();
         externalLink.setExternalLink(url);
-        externalLink.setName(title);
+        externalLink.setLabel(label);
         externalLink.setSlide(slide);
         externalLinkRepo.save((ExternalLinkSlide) externalLink);
         return externalLink;
     }
 
     @Override
-    public IExternalLinkSlide updateExternalLink(String title, String url, String id) {
+    public IExternalLinkSlide updateExternalLink(String label, String url, String id) {
         IExternalLinkSlide externalLink = getLink(id);
         if (externalLink != null) {
             externalLink.setExternalLink(url);
-            externalLink.setName(title);
+            externalLink.setLabel(label);
             externalLinkRepo.save((ExternalLinkSlide) externalLink);
         } else {
             externalLink = new ExternalLinkSlide();
         }
         return externalLink;
     }
-
-    @Override
-    protected void deleteLinkDisplayRepo(IExternalLinkSlide link) {        
-    }
-
-    @Override
-    protected ISlideExternalLinkDisplay updateLinkAndDisplay(IExternalLinkSlide link,
-            ISlideExternalLinkDisplay displayLink) {
-        return null;
-    }
-
-    @Override
-    protected ISlideExternalLinkDisplay getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException {
-        return null;
-    }
-
-    @Override
-    protected ISlideExternalLinkDisplay createDisplayLink(IExternalLinkSlide link) {
-        return null;
-    }
-
-    @Override
-    public List<ISlideExternalLinkDisplay> getLinkDisplays(String slideId) {
-        return null;
-    }
-
-
-    @Override
-    protected IExternalLinkSlide createLinkObject(String title, String id) {
-        return null;
-    }
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
deleted file mode 100644
index c98acb562..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideLinkManager.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package edu.asu.diging.vspace.core.services.impl;
-
-import org.apache.tika.Tika;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
-import edu.asu.diging.vspace.core.data.ImageRepository;
-import edu.asu.diging.vspace.core.exception.FileStorageException;
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.factory.IImageFactory;
-import edu.asu.diging.vspace.core.file.IStorageEngine;
-import edu.asu.diging.vspace.core.model.ILinkSlide;
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.IVSImage;
-import edu.asu.diging.vspace.core.model.IVSpaceElement;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.ILinkDisplay;
-import edu.asu.diging.vspace.core.model.impl.VSImage;
-import edu.asu.diging.vspace.core.services.ISlideLinkManager;
-import edu.asu.diging.vspace.core.services.ISlideManager;
-
-@Transactional
-public abstract class SlideLinkManager<L extends ILinkSlide<T>, T extends IVSpaceElement, U extends ILinkDisplay>
-	implements ISlideLinkManager<L, T, U> {
-    
-    @Autowired
-    private ISlideManager slideManager;
-
-    @Autowired
-    private IImageFactory imageFactory;
-
-    @Autowired
-    private ImageRepository imageRepo;
-
-    @Autowired
-    private IStorageEngine storage;
-    
-    @Override
-    public U createLink(String title, String id, String linkedId,
-            String linkLabel, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws SlideDoesNotExistException, ImageCouldNotBeStoredException, SlideDoesNotExistException {
-
-        L link = createLinkObject(title, id);
-        T target = getTarget(linkedId);
-        link.setName(linkLabel);
-        link.setTarget(target);
-        U displayLink = createDisplayLink(link);
-        setDisplayProperties(displayLink, id, displayType, linkImage, imageFilename);
-        return updateLinkAndDisplay(link, displayLink);
-
-    }
-    
-    @Override
-    public U updateLink(String title, String id, String linkedId,
-            String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
-            String imageFilename)
-            throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
-
-        validateSlide(id);
-
-        L link = getLink(linkId);
-        T target = getTarget(linkedId);
-        link.setName(title);
-        link.setTarget(target);
-        U displayLink = getDisplayLink(linkDisplayId);
-        setDisplayProperties(displayLink, id, displayType, linkImage, imageFilename);
-        return updateLinkAndDisplay(link, displayLink);
-    }
-    
-    @Override
-    public void deleteLink(String linkId) {
-        L link = getLink(linkId);
-        removeFromLinkList(link.getSlide(), link);
-        deleteLinkDisplayRepo(link);
-        deleteLinkRepo(link);
-    }
-
-    protected abstract void deleteLinkRepo(L link);
-
-    protected abstract void deleteLinkDisplayRepo(L link);
-
-    protected abstract void removeFromLinkList(ISlide slide, L link);
-
-    protected abstract U updateLinkAndDisplay(L link, U displayLink);
-
-    protected abstract U getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException;
-
-    protected abstract L getLink(String linkId);
-
-    protected abstract L createLinkObject(String title, String id);
-   
-    protected abstract T getTarget(String linkedId);
-
-    protected abstract U createDisplayLink(L link);
-
-    protected void validateSlide(String id) throws SlideDoesNotExistException {
-        ISlide source = slideManager.getSlide(id);
-        if (source == null) {
-            throw new SlideDoesNotExistException();
-        }
-    }
-    
-    protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, DisplayType displayType, byte[] linkImage, String imageFilename)
-            throws ImageCouldNotBeStoredException {
-        linkDisplay.setType(displayType != null ? displayType : DisplayType.ARROW);
-        if (linkImage != null && linkImage.length > 0) {
-            Tika tika = new Tika();
-            String contentType = tika.detect(linkImage);
-            IVSImage image = imageFactory.createImage(imageFilename, contentType);
-            image = imageRepo.save((VSImage) image);
-            String relativePath = null;
-            try {
-                relativePath = storage.storeFile(linkImage, imageFilename, image.getId());
-            } catch (FileStorageException e) {
-                throw new ImageCouldNotBeStoredException(e);
-            }
-            image.setParentPath(relativePath);
-            imageRepo.save((VSImage) image);
-            linkDisplay.setImage(image);
-        }
-
-    }
-
-}
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
index ac0741bc2..d7df69821 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
@@ -136,7 +136,7 @@ public String slide(Model model, @PathVariable("slideId") String slideId, @PathV
         model.addAttribute("currentNumOfSlide", slideIndex + 1);
         model.addAttribute("spaceId", spaceId);
         model.addAttribute("spaceName", spaceManager.getSpace(spaceId).getName());
-        model.addAttribute("slideExternalLinkList", slideExternalLinkManager.getLinkDisplays(slideId));
+        model.addAttribute("slideExternalLinkList", slideExternalLinkManager.getLinks(slideId));
         return "exhibition/module";
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index 34a447e40..f4b04c693 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -45,7 +45,7 @@ public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String
     	slideManager.updateSlide(slide);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
-        linkNode.put("label", externalLinkSlide.getName());
+        linkNode.put("label", externalLinkSlide.getLabel());
         linkNode.put("id", externalLinkSlide.getId());
         linkNode.put("url", externalLinkSlide.getExternalLink());
  
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
index 8e542134c..2de4e9820 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -10,14 +11,18 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 
 @Controller
-public class EditSlideExternalLinkController extends EditSlideLinksController {
+public class EditSlideExternalLinkController {
 
     @Autowired
     private ISlideManager slideManager;
@@ -37,8 +42,32 @@ public ResponseEntity<String> editExternalLink(@PathVariable("id") String id,
         }
 
         IExternalLinkSlide link = externalLinkManager.updateExternalLink(title, externalLink, id);
-        return success(link.getId(), link.getExternalLink(), title, null, 0, 0, 0, null, null, null);
+        return success(link.getId(), link.getExternalLink(), title, null, null);
 
     }
+    
+    public ResponseEntity<String> checkIfSlideExists(ISlideManager slideManager, String id) throws IOException{
+        ISlide source = slideManager.getSlide(id);
+        if (source == null) {
+            return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
+        }
+        return null;
+    }
+    
+    public ResponseEntity<String> success(String id, String url, String label, String linkedId, String linkedSlideStatus) throws IOException{
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode linkNode = mapper.createObjectNode();
+        linkNode.put("id", id);
+        linkNode.put("label", label);
+        linkNode.put("linkedId", linkedId);
+        if(linkedSlideStatus!=null) {
+            linkNode.put("linkedSlideStatus", linkedSlideStatus);
+        }
+        if(url!=null) {
+            linkNode.put("url", url);
+        }
+        return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
+    }
+
 
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java
deleted file mode 100644
index 91f947cf2..000000000
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideLinksController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package edu.asu.diging.vspace.web.staff;
-
-import java.io.IOException;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.services.ISlideManager;
-
-public class EditSlideLinksController {
-    
-    protected ResponseEntity<String> checkIfSlideExists(ISlideManager slideManager, String id) throws IOException{
-        ISlide source = slideManager.getSlide(id);
-        if (source == null) {
-            return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
-        }
-        return null;
-    }
-    
-    protected ResponseEntity<String> success(String id, String url, String label, String  displayId, float posX, float posY, int rotation, String displayType, String linkedId, String linkedSlideStatus) throws IOException{
-        ObjectMapper mapper = new ObjectMapper();
-        ObjectNode linkNode = mapper.createObjectNode();
-        linkNode.put("id", id);
-        linkNode.put("displayId", displayId);
-        linkNode.put("x", posX);
-        linkNode.put("y", posY);
-        linkNode.put("rotation", rotation);
-        linkNode.put("label", label);
-        linkNode.put("displayType", displayType);
-        linkNode.put("linkedId", linkedId);
-        if(linkedSlideStatus!=null) {
-            linkNode.put("linkedSlideStatus", linkedSlideStatus);
-        }
-        if(url!=null) {
-            linkNode.put("url", url);
-        }
-        return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
-    }
-
-}
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
index 01648db2c..4eb2717c4 100644
--- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
+++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
@@ -1,3 +1,4 @@
+
 <html layout:decorate="~{layouts/main}">
 <head>
 <style>
@@ -208,18 +209,13 @@
 
 <script th:inline="javascript">
 $(document).ready(function() {
-	const textBlockElements = document.getElementsByClassName("textBlock");
-	Array.from(textBlockElements).forEach(function(textBlock, index){
-    	if(textBlock != null) {
-    		const color = textBlock.style.borderColor;
-    		console.log("color 1: ", color);
-    	}
-		textBlock.addEventListener('focus-visible', function(e) {
-			e.target.style.outline = "2px solid blue";
-		});
-
+	const textBlock = document.getElementByClassName("textBlock");
+	const color = textBlock.style.borderColor;
+	textBlock.addEventListener('focus-visible', function(e) {
+		e.target.style.outline = "2px solid blue";
 	});
-});
+
+}
 
 </script>
 </head>
@@ -251,7 +247,7 @@
 					$("#Module_1").css("min-height", "0");
 					$("#Module_1").css("margin-bottom", "0px");
 				}
-       		}
+        		}
 			else {
 				$("#toggleImgClass").attr('class', "icon-expand secondary");
 				if(maxImgWidthOrig > maxImgWidth) {
@@ -364,15 +360,15 @@
 			if(isResizeImgBtnClicked == null || isResizeImgBtnClicked == "") {
 				setCookie('isResizeImgBtnClicked', -1, null);
 			} 
-	    	let spaceHeight = $("#bgImage").css("height");
-	    	$("#Module_1").css("height",spaceHeight);
+		    	let spaceHeight = $("#bgImage").css("height");
+		    	$("#Module_1").css("height",spaceHeight);
 			$( window ).resize(function() {
-				$("#space a").remove();
-				$(".Info_cz_Class").remove();
+					$("#space a").remove();
+					$(".Info_cz_Class").remove();
+			    	drawLinks();
+		    	});
 		    	drawLinks();
-	    	});
-	    	drawLinks();
-	    	toggleImgSize(false);
+		    	toggleImgSize(false);
 		});
 		
 		function drawLinks() {
@@ -467,8 +463,7 @@
             })
             externalLinks.forEach(function(link,index){
                 if(link!=null){
-                    var posX = parseInt($("#space").css('margin-left')) + $("#space").position().left;
-                    console.log('posX: ', parseInt($("#space").css('margin-left')), $("#space").position());
+                    var posX = parseInt($("#space").css('margin-left')) + $("#space").position().left; 
                     var posY = $("#space").position().top;
                     var externalLink = $('<a></a>');
                     externalLink.attr('href', link.externalLink.externalLink);
@@ -491,7 +486,6 @@
                     linkDisplay.css('transform', 'rotate('+link.rotation+'deg)');
                     linkDisplay.css('fill', 'grey'); 
                     linkDisplay.css('color', 'rgba(128,128,128,1)');
-                    console.log('LINK DISPLAY: ', linkDisplay);
                     var linkPosX=(width*link.positionX)/[(${display?.width})];
                     var linkPosY=(height*link.positionY)/relativeHeight;
                     linkDisplay.css('left',linkPosX + posX);
@@ -533,7 +527,6 @@
             Array.from(textBlockElements).forEach(function(textBlock, index){
             	if(textBlock != null) {
             	   	const color = textBlock.style.borderColor;
-                 	console.log("color 2:", color);
                  	textBlock.addEventListener('focus', function(e) {
                		e.target.style.outline = "2px solid "+ color;
                  	});
@@ -705,4 +698,4 @@ <h3 class="spaceName">
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 7b6b207cc..4a5304284 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -879,7 +879,6 @@
                       },
                       success: function(data) {
                     	  var linkData = JSON.parse(data);
-                    	  console.log('LINK DATA: ', linkData);
                           hideLinkInfoTabs();
                           $("#space").css("display", "none");
                    	      $('#'+ externalLink["id"]).remove();
@@ -985,12 +984,6 @@
                });
 
                // ------------- adjust links on background image (e.g. when inputs are changed) ------------
-               // external links
-//                $(".extlink-target").change(function() {
-//                    var externalLink = {};
-//                    externalLink["label"] = $("#externalLinkLabel").val();
-//                    externalLink["url"] = $("#externalLink").val();
-//                });
                
                $("#externalLinkImage").change(function() {
                    if (this.files && this.files[0]) {
@@ -2023,110 +2016,107 @@ <h5 class="modal-title">Select from the
             </div>
             
             
-            <div th:each="contents: ${slideContents}">
-	           	<div id="space" style="max-width: 861px; display: -webkit-box;" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}" class="link-modal flex-spacing">
-		           	<div id="Ext_Links_Module_Slide1"> External Resources:
-			     		<div th:if="${externalLinks}" th:each="link: ${externalLinks}" th:id="${link.id}+'form'"> -
-			      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.externalLink}}">[[${link.name}]]</a>
-			     		</div>
-		     		</div>     	
-		        	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
-				        	<div class="divider"></div>
-					        <form id="createExternalLinkForm" style="z-index: 1;">
-					            <div role="alert" style="margin-top: 30px;">
-				                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
-				                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-				                    </div>
-					            	<div class="row">	
-					            		<div class="col">
-					            			<h5 class="alert-heading">Create new External Link</h5>
-							                <p>Please fill out each field and then click
-							                   "Create External Link".</p>
-					            		</div>
-					                </div>
-					                <div class="row">
-					                	<div class="col-sm-4">
-					                		<label>Label</label>
-					                	</div>
-					                	<div class="col-sm-8">
-					                		<input class="form-control-sm extlink-target externalLinkLabel" type="text" style="width: inherit; background: var(--base-grey)"
-					                			 name="externalLinkLabel">
-					                	</div>
-					                </div>
-					                 
-					                <div class="row">
-					                	<div class="col-sm-4">
-					                		<label>External Link</label>
-					                	</div>
-					                	<div class="col-sm-8">
-					                		<input class="form-control-sm extlink-target externalLink" type="text" style="width: inherit; background: var(--base-grey)"
-					                    		size="15" name="url">	
-					                	</div>
-					                </div>               
-					                <p class="mt-5 text-center">
-					                    <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
-					                    <button id="createExternalLinkBtn" type="submit" class="btn primary-btn btn-sm">Create External Link</button>
-					                </p>
-					                <div id="errorAlert" class="alert customWindow"></div>
-					            </div>
-					        </form>
-						</div>
-			        
-				        <div id="editExternalLinkInfo" class="custom_form_style" style="z-index: 1;">
-				            <div class="divider"></div>
-				            <form id="editExternalLinkForm" style="z-index: 1;">
-				                <div role="alert" style="margin-top: 30px;">
-				                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
-				                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-				                    </div>
-				                    <div class="row">
-				                        <div class="col">
-				                            <h6 class="alert-heading">
-				                                <span style="color: var(--dark-grey)">Modify External
-				                                    Link: </span><span
-				                                    id="externalLinkInfoLabelEdit"></span>
-				                            </h6>
-				                            <p>Please fill out each field and then click "Save External Link".</p>
-				                        </div>
-				                    </div>
-				                    <input hidden name="externalLinkIdEdit"
-				                        class="externalLinkIdEdit"/>
-				
-				                    <div class="row">
-				                        <div class="col-sm-4">
-				                            <label>Label:</label>
-				                        </div>
-				                        <div class="col-sm-8">
-				                            <input
-				                                class="form-control-sm externalLinkLabelEdit"
-				                                type="text" name="externalLinkLabel"
-				                                style="width: inherit; background: var(--base-grey)"><br>
-				                        </div>
-				                    </div>
-				
-				                    <div class="row">
-				                        <div class="col-sm-4" style="padding-right: 0;">
-				                            <label>External Link
-				                            </label>
-				                        </div>
-				                        <div class="col-sm-8">
-				                            <input
-				                                class="form-control-sm externalLinkURLEdit"
-				                                type="text" name="url"
-				                                style="width: inherit; background: var(--base-grey)">
-				                        </div>
-				                    </div>
-				                    <p class="mt-5 text-center">
-				                        <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
-				                        <button id="editExternalLinkBtn" type="reset" class="btn primary-btn btn-sm">Save External Link</button>
-				                    </p>
-				                    
+           	<div id="space" style="max-width: 861px; display: -webkit-box;"  class="link-modal flex-spacing">
+	           	<div id="Ext_Links_Module_Slide1"> External Resources:
+		     		<div th:if="${externalLinks}" th:each="link: ${externalLinks}" th:id="${link.id}+'form'"> -
+		      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.externalLink}}">[[${link.label}]]</a>
+		     		</div>
+	     		</div>     	
+	        	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
+			        	<div class="divider"></div>
+				        <form id="createExternalLinkForm" style="z-index: 1;">
+				            <div role="alert" style="margin-top: 30px;">
+			                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+			                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+			                    </div>
+				            	<div class="row">	
+				            		<div class="col">
+				            			<h5 class="alert-heading">Create new External Link</h5>
+						                <p>Please fill out each field and then click
+						                   "Create External Link".</p>
+				            		</div>
 				                </div>
-				            </form>
-				        </div>
-			        </div>
-		        </div>
+				                <div class="row">
+				                	<div class="col-sm-4">
+				                		<label>Label</label>
+				                	</div>
+				                	<div class="col-sm-8">
+				                		<input class="form-control-sm extlink-target externalLinkLabel" type="text" style="width: inherit; background: var(--base-grey)"
+				                			 name="externalLinkLabel">
+				                	</div>
+				                </div>
+				                 
+				                <div class="row">
+				                	<div class="col-sm-4">
+				                		<label>External Link</label>
+				                	</div>
+				                	<div class="col-sm-8">
+				                		<input class="form-control-sm extlink-target externalLink" type="text" style="width: inherit; background: var(--base-grey)"
+				                    		size="15" name="url">	
+				                	</div>
+				                </div>               
+				                <p class="mt-5 text-center">
+				                    <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
+				                    <button id="createExternalLinkBtn" type="submit" class="btn primary-btn btn-sm">Create External Link</button>
+				                </p>
+				                <div id="errorAlert" class="alert customWindow"></div>
+				            </div>
+				        </form>
+					</div>
 		        
+			        <div id="editExternalLinkInfo" class="custom_form_style" style="z-index: 1;">
+			            <div class="divider"></div>
+			            <form id="editExternalLinkForm" style="z-index: 1;">
+			                <div role="alert" style="margin-top: 30px;">
+			                    <div class = "saveLoader" style="font-size: 30px; display: none; text-align: center;">
+			                        <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+			                    </div>
+			                    <div class="row">
+			                        <div class="col">
+			                            <h6 class="alert-heading">
+			                                <span style="color: var(--dark-grey)">Modify External
+			                                    Link: </span><span
+			                                    id="externalLinkInfoLabelEdit"></span>
+			                            </h6>
+			                            <p>Please fill out each field and then click "Save External Link".</p>
+			                        </div>
+			                    </div>
+			                    <input hidden name="externalLinkIdEdit"
+			                        class="externalLinkIdEdit"/>
+			
+			                    <div class="row">
+			                        <div class="col-sm-4">
+			                            <label>Label:</label>
+			                        </div>
+			                        <div class="col-sm-8">
+			                            <input
+			                                class="form-control-sm externalLinkLabelEdit"
+			                                type="text" name="externalLinkLabel"
+			                                style="width: inherit; background: var(--base-grey)"><br>
+			                        </div>
+			                    </div>
+			
+			                    <div class="row">
+			                        <div class="col-sm-4" style="padding-right: 0;">
+			                            <label>External Link
+			                            </label>
+			                        </div>
+			                        <div class="col-sm-8">
+			                            <input
+			                                class="form-control-sm externalLinkURLEdit"
+			                                type="text" name="url"
+			                                style="width: inherit; background: var(--base-grey)">
+			                        </div>
+			                    </div>
+			                    <p class="mt-5 text-center">
+			                        <button type="reset" class="btn btn-light cancelExternalLinkBtn btn-sm">Cancel</button>
+			                        <button id="editExternalLinkBtn" type="reset" class="btn primary-btn btn-sm">Save External Link</button>
+			                    </p>
+			                    
+			                </div>
+			            </form>
+			        </div>
+		        </div>		        
 		        <div id="main-space">
 	                <div th:each="contents: ${slideContents}">
 	                    <div th:attr="data-position=${contents.contentOrder}" th:id="${contents.id}" class="valueDiv tab row" th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}">
@@ -2191,7 +2181,7 @@ <h3><strong>[[${contents.video.title}]]</strong></h3>
             	</div>
             	<div th:if="${externalLinks}" id="Ext_Links_Module_Slide2">External Resources:
 		     		<div th:each="link: ${externalLinks}" th:id="${link.id}" style="margin-top: 15px;">
-		      			<div class="link_headers">Name: [[${link.name}]]</div>
+		      			<div class="link_headers">Name:  [[${link.label}]]</div>
 		      			<div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" th:href="@{${link.externalLink}}">[[${link.externalLink}]]</a></div>
                         <a class="btn deleteExternalLink col-md-1" th:attr="data-link-id=${link.id}" style="text-align: left; padding-left: 0;" href="javascript:;"> 
                         <span class="icon-trash error" style="text-align: left;"></span>

From fbb4f6e11675a07cb0c152a36367fc21ff57e4a1 Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Thu, 18 Jul 2024 14:11:26 -0700
Subject: [PATCH 61/64] made PR fixes; tried to restore some files to previous
 state

---
 .../core/model/impl/ExternalLinkSlide.java    |   1 +
 .../diging/vspace/core/model/impl/Slide.java  |   8 -
 .../services/ISlideExternalLinkManager.java   |   4 -
 .../vspace/core/services/ISlideManager.java   |   6 +-
 .../impl/SlideExternalLinkManager.java        |   8 +-
 .../core/services/impl/SlideManager.java      |   6 -
 .../staff/AddSlideExternalLinkController.java |   8 +-
 .../vspace/web/staff/SlideController.java     |  26 +--
 .../WEB-INF/views/exhibition/space.html       |   2 +
 .../views/staff/modules/slides/slide.html     | 177 +++++++++---------
 10 files changed, 102 insertions(+), 144 deletions(-)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
index 2944c5317..6c41bdc87 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java
@@ -11,6 +11,7 @@
 
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
+
 @Entity
 public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSlide {
     
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
index 746ff33fd..68cefbc7c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java
@@ -13,11 +13,8 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
 
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.annotations.Parameter;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -29,7 +26,6 @@
 import edu.asu.diging.vspace.core.model.ISequence;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ITextBlock;
-import edu.asu.diging.vspace.core.model.IVSImage;
 
 @Entity
 public class Slide extends VSpaceElement implements ISlide {
@@ -55,10 +51,6 @@ public class Slide extends VSpaceElement implements ISlide {
     @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class, cascade = CascadeType.ALL)
     private List<IExternalLinkSlide> externalLinks;
 
-    @OneToOne(targetEntity = VSImage.class)
-    @NotFound(action = NotFoundAction.IGNORE)
-    private IVSImage image;
-
     /*
      * (non-Javadoc)
      * 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
index 2bff26cc8..55ba8cf7c 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -1,7 +1,5 @@
 package edu.asu.diging.vspace.core.services;
 
-import java.util.List;
-
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.ISlide;
 
@@ -9,8 +7,6 @@ public interface ISlideExternalLinkManager {
 
     IExternalLinkSlide getLink(String externalLinkID);
     
-    List<IExternalLinkSlide> getLinks(String slideId);
-
     IExternalLinkSlide createExternalLink(String title, String url, String slideId);
 
     IExternalLinkSlide updateExternalLink(String title, String url, String id);
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
index fb9890819..04b33860b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java
@@ -9,7 +9,6 @@
 import edu.asu.diging.vspace.core.model.IChoice;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
 import edu.asu.diging.vspace.web.staff.forms.SlideForm;
@@ -32,8 +31,5 @@ public interface ISlideManager {
 
     List<Sequence> getSlideSequences(String slideId, String moduleId);
     
-    Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);
-
-    void storeSlideDisplay(ISlide slide, IVSImage image);
-    
+    Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);    
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index 69248e7b3..35b5aec75 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -1,6 +1,5 @@
 package edu.asu.diging.vspace.core.services.impl;
 
-import java.util.List;
 import java.util.Optional;
 
 import javax.transaction.Transactional;
@@ -26,11 +25,6 @@ public class SlideExternalLinkManager
     @Autowired
     private SlideExternalLinkRepository externalLinkRepo;
 
-    @Transactional
-    public List<IExternalLinkSlide> getLinks(String slideId) {
-        return externalLinkRepo.findBySlide_Id(slideId);
-    }
-
     @Override
     public IExternalLinkSlide getLink(String externalLinkID) {
         Optional<ExternalLinkSlide> externalLink = externalLinkRepo.findById(externalLinkID);
@@ -65,6 +59,8 @@ public IExternalLinkSlide createExternalLink(String label, String url, String sl
         externalLink.setLabel(label);
         externalLink.setSlide(slide);
         externalLinkRepo.save((ExternalLinkSlide) externalLink);
+        slide.getExternalLinks().add(externalLink);
+        slideManager.updateSlide(slide);
         return externalLink;
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
index 4629e58c3..106c457ba 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideManager.java
@@ -26,7 +26,6 @@
 import edu.asu.diging.vspace.core.model.IChoice;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.IVSImage;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.model.impl.Choice;
@@ -171,9 +170,4 @@ public Page<ISlide> findByNameOrDescription(Pageable requestedPage, String searc
 
         return slideRepo.findDistinctByNameContainingOrDescriptionContaining(requestedPage, searchText,searchText);
     }
-
-    @Override
-    public void storeSlideDisplay(ISlide slide, IVSImage image) {        
-    }
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index f4b04c693..e3b4fcf4b 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -30,19 +30,17 @@ public class AddSlideExternalLinkController {
     private ISlideExternalLinkManager slideExternalLinkManager;
         
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
-    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, 
+    public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String slideId, @PathVariable("moduleId") String moduleId, 
             @RequestParam("externalLinkLabel") String label, @RequestParam("url") String externalLink)
             throws NumberFormatException, SlideDoesNotExistException, IOException {
 
-        ISlide slide = slideManager.getSlide(id);
+        ISlide slide = slideManager.getSlide(slideId);
         
         if (slide == null) {
             return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
         }
 
-        IExternalLinkSlide externalLinkSlide = slideExternalLinkManager.createExternalLink(label, externalLink, id);
-        slide.getExternalLinks().add(externalLinkSlide);
-    	slideManager.updateSlide(slide);
+        IExternalLinkSlide externalLinkSlide = slideExternalLinkManager.createExternalLink(label, externalLink, slideId);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
         linkNode.put("label", externalLinkSlide.getLabel());
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
index 64ddcb522..d3df4f348 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SlideController.java
@@ -20,12 +20,10 @@
 
 import edu.asu.diging.vspace.core.model.IBranchingPoint;
 import edu.asu.diging.vspace.core.model.IContentBlock;
-import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.impl.BranchingPoint;
 import edu.asu.diging.vspace.core.services.IContentBlockManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
-import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.web.staff.forms.SequenceForm;
 
@@ -42,25 +40,18 @@ public class SlideController {
     @Autowired
     private IContentBlockManager contentBlockManager;
 
-    @Autowired
-    private ISlideExternalLinkManager externalLinkManager;
-
     @RequestMapping("/staff/module/{moduleId}/slide/{id}")
-    public String listSlides(@PathVariable("id") String id, @PathVariable("moduleId") String moduleId, Model model) {
-        ISlide slide = slideManager.getSlide(id);
+    public String listSlides(@PathVariable("id") String slideId, @PathVariable("moduleId") String moduleId, Model model) {
+        ISlide slide = slideManager.getSlide(slideId);
         model.addAttribute("module", moduleManager.getModule(moduleId));
         model.addAttribute("slide", slide);
-        model.addAttribute("externalLinks", externalLinkManager.getLinks(id));
-        model.addAttribute("slideSequences", slideManager.getSlideSequences(id, moduleId));
-        List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(id);
-        if (slideContents.size() > 0) {
-            IImageBlock imageblock = contentBlockManager.getImageBlock(slideContents.get(0).getId());
-            slideManager.storeSlideDisplay(slide, imageblock.getImage());
-        }
+        model.addAttribute("externalLinks", slide.getExternalLinks());
+        model.addAttribute("slideSequences", slideManager.getSlideSequences(slideId, moduleId));
+        List<IContentBlock> slideContents = contentBlockManager.getAllContentBlocks(slideId);
         model.addAttribute("slideContents", slideContents);
         model.addAttribute("contentCount",
                 slideContents.size() > 0 ? slideContents.get(slideContents.size() - 1).getContentOrder() : 0);
-        if (slideManager.getSlide(id) instanceof BranchingPoint) {
+        if (slideManager.getSlide(slideId) instanceof BranchingPoint) {
             model.addAttribute("choices", ((IBranchingPoint) slide).getChoices());
         }
         return "staff/modules/slides/slide";
@@ -76,9 +67,10 @@ public ResponseEntity<List<IContentBlock>> getAllContentBlocks(Model model,
     }
 
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/links", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<Map<String, Object>> showSlideLinks(@PathVariable String id, Model model) {
+    public ResponseEntity<Map<String, Object>> showSlideLinks(@PathVariable("id") String slideId, Model model) {
         Map<String, Object> responseData = new HashMap<String, Object>();
-        responseData.put("externalLinks", externalLinkManager.getLinks(id));
+        ISlide slide = slideManager.getSlide(slideId);
+        responseData.put("externalLinks", slide.getExternalLinks());
         return new ResponseEntity<>(responseData, HttpStatus.OK);
     }
 }
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
index 4eb2717c4..aca0dcb9f 100644
--- a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
+++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
@@ -211,6 +211,7 @@
 $(document).ready(function() {
 	const textBlock = document.getElementByClassName("textBlock");
 	const color = textBlock.style.borderColor;
+	console.log("color" + color);
 	textBlock.addEventListener('focus-visible', function(e) {
 		e.target.style.outline = "2px solid blue";
 	});
@@ -527,6 +528,7 @@
             Array.from(textBlockElements).forEach(function(textBlock, index){
             	if(textBlock != null) {
             	   	const color = textBlock.style.borderColor;
+                 	console.log("color" + color);
                  	textBlock.addEventListener('focus', function(e) {
                		e.target.style.outline = "2px solid "+ color;
                  	});
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 4a5304284..1b64f4b0b 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -526,72 +526,6 @@
 	            		}
             		});
         		}
-        	
-           	function hideLinkInfoTabs(){
-           	    $("#editExternalLinkInfo").hide();
-           	    $("#editSpaceLinkInfo").hide();
-           	    $("#editModuleLinkInfo").hide();
-           	    $("#editTextBlockInfo").hide();
-           	    $("#createExternalLinkAlert").hide();
-           	    $("#createSpaceLinkAlert").hide();
-           	    $("#createModuleLinkAlert").hide();
-           	    $("#errorMsg").text("");
-           	}
-           	
-           	function displayForms(formToShow){
-           	    $("#space").css("display", "-webkit-box");
-           	    $(formToShow).css("display", "flex");
-           	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
-           	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
-           	}
-           	
-           	function resetHighlighting() {
-           	    // reset icon links
-           	    $('[data-link-id]').css("color", "red");
-
-           	    // reset alert links
-           	    $('div[data-link-id]').removeClass("alert-warning");
-           	    $('div[data-link-id]').addClass("alert-primary");
-
-           	    // reset image links
-           	    $('img[data-link-id]').css("border-width", "0");
-           	}
-           	
-           	function getTextArea(x,y) {
-           	    var posX = $("#bgImage").position().left;
-           	    var posY = $("#bgImage").position().top;
-           	    var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
-           	    text.css('position', 'absolute');
-           	    text.css('left', x + posX);
-           	    text.css('top', y);
-           	    $("#space").append(text);
-           	    
-           	    var textB = $('#textB')[0],
-           	    tHeight = textB.clientHeight,
-           	    tWidth = textB.clientWidth;
-           	    
-           	    var height = modalBgImageHeight;
-           	    var width = modalBgImageWidth;
-           	    
-           	    $("#textBoxWidthID").val(tWidth);
-           	    $("#textBoxHeightID").val(tHeight);
-           	    textB.onmouseup = function (e) {
-           	        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
-           	            tHeight = textB.clientHeight;
-           	            tWidth = textB.clientWidth;
-           	            let percentileHeight = (tHeight*100)/height;
-           	            let percentileWidth = (tWidth*100)/width;
-           	            $("#textBoxWidthID").val(percentileWidth);
-           	            $("#textBoxHeightID").val(percentileHeight);
-           	            $("#textContentID").val(textB.value);
-           	        }
-           	    };
-           	    var percentileHeight = (tHeight*100)/height;
-           	    var percentileWidth = (tWidth*100)/width;
-           	    $("#textBoxWidthID").val(percentileWidth);
-           	    $("#textBoxHeightID").val(percentileHeight);
-           	    $("#textContentID").val(textB.value);
-           	}
            	
             [# th:if="${#strings.equals(slide['class'].simpleName,'BranchingPoint')}"]
         		$('#addChoice').show();
@@ -721,6 +655,84 @@
 		            	}
 	            	}
             	});
+            	
+            	function hideLinkInfoTabs(){
+               	    $("#editExternalLinkInfo").hide();
+               	    $("#editSpaceLinkInfo").hide();
+               	    $("#editModuleLinkInfo").hide();
+               	    $("#editTextBlockInfo").hide();
+               	    $("#createExternalLinkAlert").hide();
+               	    $("#createSpaceLinkAlert").hide();
+               	    $("#createModuleLinkAlert").hide();
+               	    $("#errorMsg").text("");
+               	}
+            	
+            	function showExternalLinks(externalLink) {
+           		   var externalLinkMainDiv = $('<div id="'+ externalLink["id"] +'" style="margin-top: 15px;"><div class="link_headers">Name:'+ externalLink["label"] +'</div><div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" href="'+ externalLink["url"] +'">'+ externalLink["url"]+ '</a></div><a class="btn deleteExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-trash error" style="text-align: left;"></span></a><a class="btn editExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-edit" style="text-align: left;"></span></a></div>');
+                	   var externalLinkFormDiv = $('<div id="'+ externalLink["id"] +'form"> - <a style="text-decoration: underline; color:blue;" href="'+ externalLink["url"] +'">'+ externalLink["label"] +'</a></div>');
+                    externalLinkMainDiv.find('.deleteExternalLink').attr("data-link-id", externalLink["id"]);
+                    externalLinkMainDiv.find('.editExternalLink').attr("data-link-id", externalLink["id"]);
+                    externalLinkMainDiv.find('.editExternalLink').attr("data-label", externalLink["label"]);
+                    externalLinkMainDiv.find('.editExternalLink').attr("data-url", externalLink["url"]);
+
+                    $('#Ext_Links_Module_Slide2').append(externalLinkMainDiv);
+                    $('#Ext_Links_Module_Slide1').append(externalLinkFormDiv);
+                }
+               	
+               	function displayForms(formToShow){
+               	    $("#space").css("display", "-webkit-box");
+               	    $(formToShow).css("display", "flex");
+               	    modalBgImageHeight = parseInt($("#bgImage").css("height"));
+               	    modalBgImageWidth = parseInt($("#bgImage").css("width"));
+               	}
+               	
+               	function resetHighlighting() {
+               	    // reset icon links
+               	    $('[data-link-id]').css("color", "red");
+
+               	    // reset alert links
+               	    $('div[data-link-id]').removeClass("alert-warning");
+               	    $('div[data-link-id]').addClass("alert-primary");
+
+               	    // reset image links
+               	    $('img[data-link-id]').css("border-width", "0");
+               	}
+               	
+                function getTextArea(x,y) {
+					var posX = $("#bgImage").position().left;
+					var posY = $("#bgImage").position().top;
+					var text = $('<span id="text"><textarea id="textB" name="textBlock" type="textarea" class="textBlock" style="resize:both; background: rgba(0, 0, 0, 0.4);"></textarea></span>');
+					text.css('position', 'absolute');
+					text.css('left', x + posX);
+					text.css('top', y);
+					$("#space").append(text);
+		       	    
+		       	    var textB = $('#textB')[0],
+		       	    tHeight = textB.clientHeight,
+		       	    tWidth = textB.clientWidth;
+		       	    
+		       	    var height = modalBgImageHeight;
+		       	    var width = modalBgImageWidth;
+		       	    
+		       	    $("#textBoxWidthID").val(tWidth);
+		       	    $("#textBoxHeightID").val(tHeight);
+		       	    textB.onmouseup = function (e) {
+		       	        if (tHeight !== textB.clientHeight || tWidth !== textB.clientWidth ) {
+		       	            tHeight = textB.clientHeight;
+		       	            tWidth = textB.clientWidth;
+		       	            let percentileHeight = (tHeight*100)/height;
+		       	            let percentileWidth = (tWidth*100)/width;
+		       	            $("#textBoxWidthID").val(percentileWidth);
+		       	            $("#textBoxHeightID").val(percentileHeight);
+		       	            $("#textContentID").val(textB.value);
+		       	        }
+		       	    };
+		       	    var percentileHeight = (tHeight*100)/height;
+		       	    var percentileWidth = (tWidth*100)/width;
+		       	    $("#textBoxWidthID").val(percentileWidth);
+		       	    $("#textBoxHeightID").val(percentileHeight);
+		       	    $("#textContentID").val(textB.value);
+			    }
            
                //-------- edit contentblock description --------
            
@@ -839,23 +851,20 @@
                   addVideoClk =1;
                   editVideoClk=0;
               });
+               
+              $("#addExternalLinkButton").click(function(e) {
+           	   $('#errorAlert')[0].style.display = "none";
+                  hideLinkInfoTabs();
+                  displayForms("#createExternalLinkAlert");
+              });
 
               $(document).on("click", ".editExternalLink", function(e) {
        			  externalLink = {};
        			  externalLink["id"] = $(this).attr("data-link-id");
                   externalLink["label"] = $(this).attr("data-label");
                   externalLink["url"] = $(this).attr("data-url");
-                  makeExternalLinksEditable(externalLink);
        		      displayForms("#editExternalLinkInfo");
          	  });
-	
-	          function makeExternalLinksEditable(externalLink) {
-	        	  $(".externalLinkIdEdit").attr('data-link-id', externalLink['id']);
-	        	  $(".externalLinkLabelEdit").val(externalLink['label']);
-	        	  $(".externalLinkURLEdit").val(externalLink['url']);
-	        	    
-	        	  hideLinkInfoTabs();
-	          }
                
               $("#editExternalLinkBtn").click(function(e) {
             	  e.preventDefault();
@@ -886,12 +895,6 @@
                           showExternalLinks(linkData);;
                       }
                   });
-              });
-               
-               $("#addExternalLinkButton").click(function(e) {
-            	   $('#errorAlert')[0].style.display = "none";
-                   hideLinkInfoTabs();
-                   displayForms("#createExternalLinkAlert");
                });
 				
                const closeButton = document.createElement('button');
@@ -941,18 +944,6 @@
                        }
                    });
                });
-         	   
-          	  function showExternalLinks(externalLink) {
-          		   var externalLinkMainDiv = $('<div id="'+ externalLink["id"] +'" style="margin-top: 15px;"><div class="link_headers">Name:'+ externalLink["label"] +'</div><div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" href="'+ externalLink["url"] +'">'+ externalLink["url"]+ '</a></div><a class="btn deleteExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-trash error" style="text-align: left;"></span></a><a class="btn editExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-edit" style="text-align: left;"></span></a></div>');
-               	   var externalLinkFormDiv = $('<div id="'+ externalLink["id"] +'form"> - <a style="text-decoration: underline; color:blue;" href="'+ externalLink["url"] +'">'+ externalLink["label"] +'</a></div>');
-                   externalLinkMainDiv.find('.deleteExternalLink').attr("data-link-id", externalLink["id"]);
-                   externalLinkMainDiv.find('.editExternalLink').attr("data-link-id", externalLink["id"]);
-                   externalLinkMainDiv.find('.editExternalLink').attr("data-label", externalLink["label"]);
-                   externalLinkMainDiv.find('.editExternalLink').attr("data-url", externalLink["url"]);
-
-                   $('#Ext_Links_Module_Slide2').append(externalLinkMainDiv);
-                   $('#Ext_Links_Module_Slide1').append(externalLinkFormDiv);
-               }
                
                $(document).on("click", ".deleteExternalLink", function(e) {
             	   $("#confirmDeleteLinkAlert").show();

From 5144ae0197bd207f45b58b0b716c4d3f948535dd Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Wed, 30 Oct 2024 16:38:36 -0700
Subject: [PATCH 62/64] Executed suggested PR changes except the changes for
 DeleteLinkController (see comment)

---
 .../data/SlideExternalLinkRepository.java     |   2 -
 .../core/services/IExternalLinkManager.java   |   1 -
 .../services/ISlideExternalLinkManager.java   |   5 -
 .../services/impl/ExternalLinkManager.java    |  69 +++---
 .../impl/SlideExternalLinkManager.java        |  16 --
 .../view/ExhibitionSlideController.java       |   6 +-
 .../web/staff/AddExternalLinkController.java  |   2 -
 .../staff/AddSlideExternalLinkController.java |   7 +-
 .../EditSlideExternalLinkController.java      |  16 +-
 .../vspace/web/staff/SpaceController.java     |   2 +
 .../WEB-INF/views/exhibition/module.html      |   3 +-
 .../views/staff/modules/slides/slide.html     |  17 +-
 .../SlideExternalLinkDisplayFactoryTest.java  |  38 ---
 .../impl/SlideExternalLinkManagerTest.java    | 221 ------------------
 14 files changed, 61 insertions(+), 344 deletions(-)
 delete mode 100644 vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java
 delete mode 100644 vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
index c6768a702..e20f959c3 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java
@@ -14,6 +14,4 @@
 public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String> {
 
     public List<IExternalLinkSlide> findBySlide_Id(String slideId);
-
-    public void deleteByExternalLink(IExternalLinkSlide link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
index ffde230c4..ceddbd672 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java
@@ -2,7 +2,6 @@
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
index 55ba8cf7c..1482a62ee 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java
@@ -1,7 +1,6 @@
 package edu.asu.diging.vspace.core.services;
 
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.ISlide;
 
 public interface ISlideExternalLinkManager {
 
@@ -12,8 +11,4 @@ public interface ISlideExternalLinkManager {
     IExternalLinkSlide updateExternalLink(String title, String url, String id);
     
     void deleteLink(String linkId);
-
-    void removeFromLinkList(ISlide slide, IExternalLinkSlide link);
-
-    void addToLinkList(ISlide slide, IExternalLinkSlide link);
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
index c6c414725..b9002df3f 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java
@@ -8,16 +8,19 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
+import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
 import edu.asu.diging.vspace.core.model.display.ExternalLinkDisplayMode;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
+import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
 import edu.asu.diging.vspace.core.model.impl.ExternalLink;
 import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
@@ -35,7 +38,18 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
     private ExternalLinkRepository externalLinkRepo;
 
     @Autowired
-    private IExternalLinkFactory externalLinkFactory;   
+    private ExternalLinkDisplayRepository externalLinkDisplayRepo;
+
+    @Autowired
+    private IExternalLinkFactory externalLinkFactory;
+
+    @Autowired
+    private IExternalLinkDisplayFactory externalLinkDisplayFactory;
+
+    @Override
+    public List<IExternalLinkDisplay> getLinkDisplays(String spaceId) {
+        return externalLinkDisplayRepo.findExternalLinkDisplaysForSpace(spaceId);
+    }
 
     @Override
     protected IExternalLink createLinkObject(String title, String id) {
@@ -43,12 +57,27 @@ protected IExternalLink createLinkObject(String title, String id) {
         IExternalLink link = externalLinkFactory.createExternalLink(title, source);
         return externalLinkRepo.save((ExternalLink) link);
     }
-    
+
     @Override
     protected ExternalLinkValue getTarget(String externalLink) {
         return new ExternalLinkValue(externalLink);
     }
 
+    @Override
+    protected IExternalLinkDisplay updateLinkAndDisplay(IExternalLink link, IExternalLinkDisplay displayLink) {
+        externalLinkRepo.save((ExternalLink) link);
+        return externalLinkDisplayRepo.save((ExternalLinkDisplay) displayLink);
+    }
+
+    @Override
+    protected IExternalLinkDisplay getDisplayLink(String externalLinkDisplayId) {
+        Optional<ExternalLinkDisplay> externalLinkDisplay = externalLinkDisplayRepo.findById(externalLinkDisplayId);
+        if (externalLinkDisplay.isPresent()) {
+            return externalLinkDisplay.get();
+        }
+        return null;
+    }
+
     @Override
     protected IExternalLink getLink(String externalLinkID) {
         Optional<ExternalLink> externalLink = externalLinkRepo.findById(externalLinkID);
@@ -58,6 +87,16 @@ protected IExternalLink getLink(String externalLinkID) {
         return null;
     }
 
+    @Override
+    protected IExternalLinkDisplay createDisplayLink(IExternalLink link) {
+        return externalLinkDisplayFactory.createExternalLinkDisplay(link);
+    }
+
+    @Override
+    protected void deleteLinkDisplayRepo(IExternalLink link) {
+        externalLinkDisplayRepo.deleteByExternalLink(link);
+    }
+
     @Override
     protected void removeFromLinkList(ISpace space, IExternalLink link) {
         space.getExternalLinks().remove(link);
@@ -107,28 +146,4 @@ public IExternalLinkDisplay updateLink(String title, String id, float positionX,
         return externalLinkDisplay;
     }
 
-    @Override
-    public List<IExternalLinkDisplay> getLinkDisplays(String spaceId) {
-        return null;
-    }
-
-    @Override
-    protected void deleteLinkDisplayRepo(IExternalLink link) {        
-    }
-
-    @Override
-    protected IExternalLinkDisplay updateLinkAndDisplay(IExternalLink link, IExternalLinkDisplay displayLink) {
-        return null;
-    }
-
-    @Override
-    protected IExternalLinkDisplay getDisplayLink(String linkDisplayId) throws LinkDoesNotExistsException {
-        return null;
-    }
-
-    @Override
-    protected IExternalLinkDisplay createDisplayLink(IExternalLink link) {
-        return null;
-    }
-
-}
+}
\ No newline at end of file
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
index 35b5aec75..351585aa8 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManager.java
@@ -33,21 +33,10 @@ public IExternalLinkSlide getLink(String externalLinkID) {
         }
         return null;
     }
-    
-    @Override
-    public void addToLinkList(ISlide slide, IExternalLinkSlide link) {
-        slide.getExternalLinks().add(link);
-    }
-
-    @Override
-    public void removeFromLinkList(ISlide slide, IExternalLinkSlide link) {
-        slide.getExternalLinks().remove(link);
-    }
 
     @Override
     public void deleteLink(String linkId) {
         IExternalLinkSlide link = getLink(linkId);
-        removeFromLinkList(link.getSlide(), link);
         externalLinkRepo.delete((ExternalLinkSlide) link);
     }
 
@@ -58,9 +47,6 @@ public IExternalLinkSlide createExternalLink(String label, String url, String sl
         externalLink.setExternalLink(url);
         externalLink.setLabel(label);
         externalLink.setSlide(slide);
-        externalLinkRepo.save((ExternalLinkSlide) externalLink);
-        slide.getExternalLinks().add(externalLink);
-        slideManager.updateSlide(slide);
         return externalLink;
     }
 
@@ -71,8 +57,6 @@ public IExternalLinkSlide updateExternalLink(String label, String url, String id
             externalLink.setExternalLink(url);
             externalLink.setLabel(label);
             externalLinkRepo.save((ExternalLinkSlide) externalLink);
-        } else {
-            externalLink = new ExternalLinkSlide();
         }
         return externalLink;
     }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
index d7df69821..e30fc8d43 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/exhibit/view/ExhibitionSlideController.java
@@ -26,7 +26,6 @@
 import edu.asu.diging.vspace.core.services.IExhibitionManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
 import edu.asu.diging.vspace.core.services.ISequenceManager;
-import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
@@ -51,9 +50,6 @@ public class ExhibitionSlideController {
     @Autowired
     private IExhibitionManager exhibitManager;
     
-    @Autowired
-    private ISlideExternalLinkManager slideExternalLinkManager;
-
     @RequestMapping(value = {
         "/exhibit/{spaceId}/module/{moduleId}/sequence/{sequenceId}/slide/{slideId}",
         "/preview/{"+ExhibitionConstants.PREVIEW_ID+"}/{spaceId}/module/{moduleId}/sequence/{sequenceId}/slide/{slideId}"
@@ -136,7 +132,7 @@ public String slide(Model model, @PathVariable("slideId") String slideId, @PathV
         model.addAttribute("currentNumOfSlide", slideIndex + 1);
         model.addAttribute("spaceId", spaceId);
         model.addAttribute("spaceName", spaceManager.getSpace(spaceId).getName());
-        model.addAttribute("slideExternalLinkList", slideExternalLinkManager.getLinks(slideId));
+        model.addAttribute("slideExternalLinkList", currentSlide.getExternalLinks());
         return "exhibition/module";
     }
 
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
index a04a78a46..660735218 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddExternalLinkController.java
@@ -16,7 +16,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -24,7 +23,6 @@
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
-import edu.asu.diging.vspace.core.services.impl.ExternalLinkManager;
 
 @Controller
 public class AddExternalLinkController {
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
index e3b4fcf4b..78f6c5d34 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/AddSlideExternalLinkController.java
@@ -28,7 +28,7 @@ public class AddSlideExternalLinkController {
 
     @Autowired
     private ISlideExternalLinkManager slideExternalLinkManager;
-        
+    
     @RequestMapping(value = "/staff/module/{moduleId}/slide/{id}/externallink", method = RequestMethod.POST)
     public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String slideId, @PathVariable("moduleId") String moduleId, 
             @RequestParam("externalLinkLabel") String label, @RequestParam("url") String externalLink)
@@ -41,13 +41,14 @@ public ResponseEntity<String> createSlideExternalLink(@PathVariable("id") String
         }
 
         IExternalLinkSlide externalLinkSlide = slideExternalLinkManager.createExternalLink(label, externalLink, slideId);
+        slide.getExternalLinks().add(externalLinkSlide);
+        slideManager.updateSlide(slide);
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode linkNode = mapper.createObjectNode();
         linkNode.put("label", externalLinkSlide.getLabel());
-        linkNode.put("id", externalLinkSlide.getId());
+        linkNode.put("id", slide.getExternalLinks().get(slide.getExternalLinks().size() - 1).getId());
         linkNode.put("url", externalLinkSlide.getExternalLink());
  
         return new ResponseEntity<>(mapper.writeValueAsString(linkNode), HttpStatus.OK);
     }
-
 }
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
index 2de4e9820..02daa8015 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/EditSlideExternalLinkController.java
@@ -17,7 +17,6 @@
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
 import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISlideManager;
 
@@ -36,22 +35,11 @@ public ResponseEntity<String> editExternalLink(@PathVariable("id") String id,
             @RequestParam("url") String externalLink)
             throws SlideDoesNotExistException, IOException, LinkDoesNotExistsException, NumberFormatException {
 
-        ResponseEntity<String> validation = checkIfSlideExists(slideManager, slideId);
-        if (validation != null) {
-            return validation;
+        if (slideManager.getSlide(slideId) == null) {
+            return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
         }
-
         IExternalLinkSlide link = externalLinkManager.updateExternalLink(title, externalLink, id);
         return success(link.getId(), link.getExternalLink(), title, null, null);
-
-    }
-    
-    public ResponseEntity<String> checkIfSlideExists(ISlideManager slideManager, String id) throws IOException{
-        ISlide source = slideManager.getSlide(id);
-        if (source == null) {
-            return new ResponseEntity<>("{'error': 'Slide could not be found.'}", HttpStatus.NOT_FOUND);
-        }
-        return null;
     }
     
     public ResponseEntity<String> success(String id, String url, String label, String linkedId, String linkedSlideStatus) throws IOException{
diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java
index e36571afb..c6e5afb19 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java
@@ -59,6 +59,7 @@ public String showSpace(@PathVariable String id, Model model) {
         model.addAttribute("space", space);
         model.addAttribute("spaceLinks", spaceLinkManager.getLinkDisplays(id));
         model.addAttribute("externalLinks", externalLinkManager.getLinkDisplays(id));
+        System.out.println("EXTERNAL LINKS 1: " + externalLinkManager.getLinkDisplays(id));
         model.addAttribute("moduleLinks", moduleLinkManager.getLinkDisplays(id));
         model.addAttribute("spaces", spaceManager.getAllSpaces());
         model.addAttribute("display", spaceDisplayManager.getBySpace(space));
@@ -78,6 +79,7 @@ public ResponseEntity<Map<String,Object>> showSpaceLinks(@PathVariable String id
         Map<String,Object> responseData = new HashMap<String,Object>();
         responseData.put("spaceLinks", spaceLinkManager.getLinkDisplays(id));
         responseData.put("externalLinks", externalLinkManager.getLinkDisplays(id));
+        System.out.println("EXTERNAL LINKS 2: " + externalLinkManager.getLinkDisplays(id));
         responseData.put("moduleLinks", moduleLinkManager.getLinkDisplays(id));
         responseData.put("textBlocks", spaceTextBlockManager.getSpaceTextBlockDisplays(id));
         return new ResponseEntity<>(responseData, HttpStatus.OK);
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html
index c09092d8b..6eaddc7b9 100644
--- a/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html
+++ b/vspace/src/main/webapp/WEB-INF/views/exhibition/module.html
@@ -45,7 +45,6 @@
         $( window ).on('load', function() {
            $("#blocks a").css('color','rgb(150, 45, 62)').css('font-weight','bold');
            $(".nav-bar").css('position','fixed').css('width','100%').css('z-index','125');
-           drawLinks();
         });
         
         function imageFullScreen(){
@@ -175,7 +174,7 @@ <h3 style="text-align:center;">[[${currentSlideCon.name}]]</h3>
             </div>
             <div class="External_Links_Class"> External Resources:
 	     		<div th:if="${slideExternalLinkList}" th:each="link: ${slideExternalLinkList}"> -
-	      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.externalLink.externalLink}}">[[${link.externalLink.name}]]</a>
+	      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.getExternalLink()}}">[[${link.getLabel()}]]</a>
 	     		</div>
      		</div>
         </div>
diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
index 1b64f4b0b..307a50500 100644
--- a/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
+++ b/vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html
@@ -668,7 +668,7 @@
                	}
             	
             	function showExternalLinks(externalLink) {
-           		   var externalLinkMainDiv = $('<div id="'+ externalLink["id"] +'" style="margin-top: 15px;"><div class="link_headers">Name:'+ externalLink["label"] +'</div><div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" href="'+ externalLink["url"] +'">'+ externalLink["url"]+ '</a></div><a class="btn deleteExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-trash error" style="text-align: left;"></span></a><a class="btn editExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-edit" style="text-align: left;"></span></a></div>');
+           		   var externalLinkMainDiv = $('<div id="'+ externalLink["id"] +'" style="margin-top: 15px;"><div class="link_headers">Name: '+ externalLink["label"] +'</div><div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" href="'+ externalLink["url"] +'">'+ externalLink["url"]+ '</a></div><a class="btn deleteExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-trash error" style="text-align: left;"></span></a><a class="btn editExternalLink col-md-1" style="text-align: left; padding-left: 0;" href="javascript:;"><span class="icon-edit" style="text-align: left;"></span></a></div>');
                 	   var externalLinkFormDiv = $('<div id="'+ externalLink["id"] +'form"> - <a style="text-decoration: underline; color:blue;" href="'+ externalLink["url"] +'">'+ externalLink["label"] +'</a></div>');
                     externalLinkMainDiv.find('.deleteExternalLink').attr("data-link-id", externalLink["id"]);
                     externalLinkMainDiv.find('.editExternalLink').attr("data-link-id", externalLink["id"]);
@@ -863,6 +863,7 @@
        			  externalLink["id"] = $(this).attr("data-link-id");
                   externalLink["label"] = $(this).attr("data-label");
                   externalLink["url"] = $(this).attr("data-url");
+                  $(".externalLinkIdEdit").attr('data-link-id', $(this).attr("data-link-id"));
        		      displayForms("#editExternalLinkInfo");
          	  });
                
@@ -2009,8 +2010,8 @@ <h5 class="modal-title">Select from the
             
            	<div id="space" style="max-width: 861px; display: -webkit-box;"  class="link-modal flex-spacing">
 	           	<div id="Ext_Links_Module_Slide1"> External Resources:
-		     		<div th:if="${externalLinks}" th:each="link: ${externalLinks}" th:id="${link.id}+'form'"> -
-		      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.externalLink}}">[[${link.label}]]</a>
+		     		<div th:if="${externalLinks}" th:each="link: ${externalLinks}" th:id="${link.getId()}+'form'"> -
+		      			<a style="text-decoration: underline; color:blue;" th:href="@{${link.getExternalLink()}}">[[${link.getLabel()}]]</a>
 		     		</div>
 	     		</div>     	
 	        	<div id="createExternalLinkAlert" class="custom_form_style" style="z-index: 1;display: flex;">
@@ -2171,13 +2172,13 @@ <h3><strong>[[${contents.video.title}]]</strong></h3>
 	                </div>
             	</div>
             	<div th:if="${externalLinks}" id="Ext_Links_Module_Slide2">External Resources:
-		     		<div th:each="link: ${externalLinks}" th:id="${link.id}" style="margin-top: 15px;">
-		      			<div class="link_headers">Name:  [[${link.label}]]</div>
-		      			<div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" th:href="@{${link.externalLink}}">[[${link.externalLink}]]</a></div>
-                        <a class="btn deleteExternalLink col-md-1" th:attr="data-link-id=${link.id}" style="text-align: left; padding-left: 0;" href="javascript:;"> 
+		     		<div th:each="link: ${externalLinks}" th:id="${link.getId()}" style="margin-top: 15px;">
+		      			<div class="link_headers">Name: [[${link.getLabel()}]]</div>
+		      			<div>Link:<br/><a style="text-decoration: underline; color:blue; overflow: hidden;text-overflow: ellipsis;max-width: 20%;display:inline-block;" th:href="@{${link.getExternalLink()}}">[[${link.getExternalLink()}]]</a></div>
+                        <a class="btn deleteExternalLink col-md-1" th:attr="data-link-id=${link.getId()}" style="text-align: left; padding-left: 0;" href="javascript:;"> 
                         <span class="icon-trash error" style="text-align: left;"></span>
                         </a>
-                        <a class="btn editExternalLink col-md-1" th:attr="data-link-id=${link.id}, data-label=${link.name}, data-url=${link.externalLink}" style="text-align: left; padding-left: 0;" href="javascript:;"> 
+                        <a class="btn editExternalLink col-md-1" th:attr="data-link-id=${link.getId()}, data-label=${link.getLabel()}, data-url=${link.getExternalLink()}" style="text-align: left; padding-left: 0;" href="javascript:;"> 
                         <span class="icon-edit" style="text-align: left;"></span>
                         </a>
 		     		</div>
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java
deleted file mode 100644
index 7f6a7b1e0..000000000
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideExternalLinkDisplayFactoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package edu.asu.diging.vspace.core.factory.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-
-@RunWith(MockitoJUnitRunner.class)
-public class SlideExternalLinkDisplayFactoryTest {
-    
-    @Mock
-    private IExternalLinkSlide mockExternalLink;
-
-    @InjectMocks
-    private SlideExternalLinkDisplayFactory externalLinkDisplayFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void test_createExternalLinkDisplay_success() {
-        ISlideExternalLinkDisplay externalLinkDisplay = externalLinkDisplayFactory.createExternalLinkDisplay(mockExternalLink);
-        assertNotNull(externalLinkDisplay);
-        assertEquals(mockExternalLink, externalLinkDisplay.getExternalLink());
-    }
-
-}
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
deleted file mode 100644
index 0253f45a0..000000000
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/SlideExternalLinkManagerTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package edu.asu.diging.vspace.core.services.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
-import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
-import edu.asu.diging.vspace.core.data.SlideExternalLinkDisplayRepository;
-import edu.asu.diging.vspace.core.data.SlideExternalLinkRepository;
-import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
-import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
-import edu.asu.diging.vspace.core.exception.SlideDoesNotExistException;
-import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
-import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
-import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
-import edu.asu.diging.vspace.core.factory.ISlideExternalLinkDisplayFactory;
-import edu.asu.diging.vspace.core.factory.ISlideExternalLinkFactory;
-import edu.asu.diging.vspace.core.model.IExternalLink;
-import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.ISlide;
-import edu.asu.diging.vspace.core.model.ISpace;
-import edu.asu.diging.vspace.core.model.IVSImage;
-import edu.asu.diging.vspace.core.model.display.DisplayType;
-import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.ISlideDisplay;
-import edu.asu.diging.vspace.core.model.display.ISlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.ExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SlideExternalLinkDisplay;
-import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
-import edu.asu.diging.vspace.core.model.impl.ExternalLink;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
-import edu.asu.diging.vspace.core.model.impl.ExternalLinkValue;
-import edu.asu.diging.vspace.core.model.impl.Slide;
-import edu.asu.diging.vspace.core.model.impl.Space;
-import edu.asu.diging.vspace.core.model.impl.VSImage;
-
-public class SlideExternalLinkManagerTest {
-    
-    @Mock
-    private SlideExternalLinkRepository externalLinkRepo;
-
-    @Mock
-    private SlideExternalLinkDisplayRepository externalLinkDisplayRepo;
-
-    @Mock
-    private SlideManager slideManager;
-
-    @Mock
-    private SlideDisplayManager slideDisplayManager;
-
-    @Mock
-    private ISlideExternalLinkFactory externalLinkFactory;
-
-    @Mock
-    private ISlideExternalLinkDisplayFactory externalLinkDisplayFactory;
-
-    @InjectMocks
-    private SlideExternalLinkManager managerToTest = new SlideExternalLinkManager();
-
-    private String slideId1;
-    private String externalLinkURL;
-
-    @Before
-    public void init() {
-        MockitoAnnotations.initMocks(this);
-        slideId1 = "SLA000000014";
-        externalLinkURL = "www.google.com";
-    }
-
-    @Test
-    public void test_createLink_success() throws SlideDoesNotExistException, ImageCouldNotBeStoredException {
-
-        Slide slide = new Slide();
-        slide.setId(slideId1);
-        IVSImage slideImage = new VSImage();
-        slideImage.setHeight(700);
-        slideImage.setWidth(1300);
-
-        ISlideDisplay displayAttributes = new SlideDisplay();
-        displayAttributes.setHeight(700);
-        displayAttributes.setWidth(1300);
-
-        Mockito.when(slideDisplayManager.getBySlide(slide, slideImage)).thenReturn(displayAttributes);
-        Mockito.when(slideManager.getSlide(slide.getId())).thenReturn(slide);
-
-        IExternalLinkSlide externalLink = new ExternalLinkSlide();
-        ExternalLinkValue externalLinkValue = new ExternalLinkValue(externalLinkURL);
-        externalLink.setId("EXLS001");
-        externalLink.setTarget(externalLinkValue);
-        Mockito.when(slideManager.getSlide(slideId1)).thenReturn(slide);
-        Mockito.when(externalLinkFactory.createExternalLink("New External Link", slide)).thenReturn(externalLink);
-
-        Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
-
-        ISlideExternalLinkDisplay externalDisplayLink = new SlideExternalLinkDisplay();
-        externalDisplayLink.setId("EXLDS001");
-
-        externalDisplayLink.setPositionX(10);
-        externalDisplayLink.setPositionY(30);
-        externalDisplayLink.setRotation(40);
-        externalDisplayLink.setType(DisplayType.ARROW);
-        externalDisplayLink.setExternalLink(externalLink);
-        Mockito.when(externalLinkDisplayFactory.createExternalLinkDisplay(externalLink)).thenReturn(externalDisplayLink);
-
-        Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
-        Mockito.when(externalLinkDisplayRepo.save((SlideExternalLinkDisplay)externalDisplayLink)).thenReturn((SlideExternalLinkDisplay)externalDisplayLink);
-
-        ISlideExternalLinkDisplay savedExternalLinkDisplay1 = managerToTest.createLink("New External Link", slideId1, 10, 30, 40, "EXLS001", "New External Link", DisplayType.ARROW, null, null,null);
-        Assert.assertEquals(externalDisplayLink.getId(), savedExternalLinkDisplay1.getId());
-        Assert.assertEquals(externalDisplayLink.getName(), savedExternalLinkDisplay1.getName());
-        Assert.assertEquals(new Double(externalDisplayLink.getPositionX()), new Double(savedExternalLinkDisplay1.getPositionX()));
-        Assert.assertEquals(new Double(externalDisplayLink.getPositionY()), new Double(savedExternalLinkDisplay1.getPositionY()));
-        Assert.assertEquals(externalDisplayLink.getRotation(), savedExternalLinkDisplay1.getRotation());
-        Assert.assertEquals(externalDisplayLink.getType(), savedExternalLinkDisplay1.getType());
-        Assert.assertEquals(externalDisplayLink.getExternalLink(), savedExternalLinkDisplay1.getExternalLink());
-        Assert.assertEquals(externalDisplayLink.getExternalLink().getTarget().getValue(), savedExternalLinkDisplay1.getExternalLink().getTarget().getValue());
-        Mockito.verify(externalLinkDisplayRepo).save((SlideExternalLinkDisplay)externalDisplayLink);
-    }
-    
-    @Test
-    public void test_updateLink_success() throws SlideDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException {
-        ISlide slide = new Slide();
-        slide.setId(slideId1);
-        IVSImage slideImage = new VSImage();
-        slideImage.setHeight(700);
-        slideImage.setWidth(1300);
-        slide.setImage(slideImage);
-
-        ISlideDisplay displayAttributes = new SlideDisplay();
-        displayAttributes.setHeight(700);
-        displayAttributes.setWidth(1300);
-
-        Mockito.when(slideDisplayManager.getBySlide(slide,slideImage)).thenReturn(displayAttributes);
-        SlideExternalLinkDisplay externalLinkDisplay = new SlideExternalLinkDisplay();
-        IExternalLinkSlide externalLink = new ExternalLinkSlide();
-        externalLink.setId("EXLS001");
-        externalLink.setSlide(slide);
-        externalLink.setTarget(new ExternalLinkValue("stackOverflow.com"));
-        externalLinkDisplay.setId("EXLDS001");
-
-        externalLinkDisplay.setExternalLink(externalLink);
-        
-        externalLinkDisplay.setName("TestExternalEdited");
-        externalLinkDisplay.setPositionX(100);
-        externalLinkDisplay.setPositionY(300);
-        externalLinkDisplay.setType(DisplayType.ALERT);
-
-        Mockito.when(slideManager.getSlide(slideId1)).thenReturn(slide);
-        ExternalLink newExternalLink = new ExternalLink(); 
-        newExternalLink.setId("externalLink1");
-        Optional<ExternalLinkSlide> mockExternalLink = Optional.of((ExternalLinkSlide)externalLink);
-        Mockito.when(externalLinkRepo.findById(externalLink.getId())).thenReturn(mockExternalLink);
-
-        Optional<SlideExternalLinkDisplay> mockExternalLinkDisplay = Optional.of((SlideExternalLinkDisplay)externalLinkDisplay);
-        Mockito.when(externalLinkDisplayRepo.findById(externalLinkDisplay.getId())).thenReturn(mockExternalLinkDisplay);
-
-        Mockito.when(externalLinkRepo.save((ExternalLinkSlide) externalLink)).thenReturn((ExternalLinkSlide)externalLink);
-        Mockito.when(externalLinkDisplayRepo.save((SlideExternalLinkDisplay)externalLinkDisplay)).thenReturn((SlideExternalLinkDisplay)externalLinkDisplay);
-
-        ISlideExternalLinkDisplay actualUpdatedLink = managerToTest.updateLink("TestExternalNew", slideId1, 20, 40, 0, "www.google.com", "TestExternalNew", "EXLS001", "EXLDS001", DisplayType.ARROW, null, null,null);
-        Assert.assertEquals(externalLinkDisplay.getId(), actualUpdatedLink.getId());
-        Assert.assertEquals(externalLinkDisplay.getName(), actualUpdatedLink.getName());
-        Assert.assertEquals(new Double(externalLinkDisplay.getPositionX()), new Double(actualUpdatedLink.getPositionX()));
-        Assert.assertEquals(new Double(externalLinkDisplay.getPositionY()), new Double(actualUpdatedLink.getPositionY()));
-        Assert.assertEquals(externalLinkDisplay.getExternalLink().getId(), actualUpdatedLink.getExternalLink().getId());
-        Assert.assertEquals(externalLinkDisplay.getExternalLink().getTarget().getValue(), actualUpdatedLink.getExternalLink().getTarget().getValue());
-        Assert.assertEquals(externalLinkDisplay.getType(), actualUpdatedLink.getType());
-    }
-    
-    @Test
-    public void test_deleteLink_linkPresent() {
-        ISlide slide = new Slide();
-        slide.setId(slideId1);
-        SlideExternalLinkDisplay externalLinkDisplay = new SlideExternalLinkDisplay();
-        IExternalLinkSlide externalLink = new ExternalLinkSlide();
-        externalLink.setId("EXLS001");
-        externalLink.setSlide(slide);
-
-        List<IExternalLinkSlide> externalLinks = new ArrayList<IExternalLinkSlide>();
-        externalLinks.add(externalLink);
-
-        slide.setExternalLinks(externalLinks);
-        ExternalLinkValue target = new ExternalLinkValue("www.google.com");
-        target.setId("EXTS001");
-        externalLink.setTarget(target);
-
-        externalLinkDisplay.setId("SPLD001");
-        externalLinkDisplay.setExternalLink(externalLink);
-
-        externalLinkDisplay.setName("TestExternal");
-        externalLinkDisplay.setPositionX(10);
-        externalLinkDisplay.setPositionY(30);
-        externalLinkDisplay.setPositionY(20);
-        externalLinkDisplay.setType(DisplayType.ARROW);
-
-        Optional<ExternalLinkSlide> mockExternalLink = Optional.of((ExternalLinkSlide)externalLink);
-        Mockito.when(externalLinkRepo.findById(externalLink.getId())).thenReturn(mockExternalLink);
-
-        Optional<SlideExternalLinkDisplay> mockExternalLinkDisplay = Optional.of((SlideExternalLinkDisplay)externalLinkDisplay);
-        Mockito.when(externalLinkDisplayRepo.findById(externalLinkDisplay.getId())).thenReturn(mockExternalLinkDisplay);
-
-        managerToTest.deleteLink("EXLS001");
-
-        Mockito.verify(externalLinkDisplayRepo).deleteByExternalLink(externalLink);
-        Mockito.verify(externalLinkRepo).delete((ExternalLinkSlide)externalLink);
-    }
-    
-    
-
-}

From 204c91b6680b2fac3e580a506bc166fa07b4f5ee Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Thu, 31 Oct 2024 12:08:09 -0700
Subject: [PATCH 63/64] [VSPC-242] implemented additional PR change like
 DeleteLinkController

---
 ...ontroller.java => DeleteSpaceLinkController.java} | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
 rename vspace/src/main/java/edu/asu/diging/vspace/web/staff/{DeleteLinkController.java => DeleteSpaceLinkController.java} (75%)

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSpaceLinkController.java
similarity index 75%
rename from vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
rename to vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSpaceLinkController.java
index e9903dc2d..2a07314f7 100644
--- a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteLinkController.java
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSpaceLinkController.java
@@ -10,11 +10,10 @@
 
 import edu.asu.diging.vspace.core.services.IExternalLinkManager;
 import edu.asu.diging.vspace.core.services.IModuleLinkManager;
-import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
 import edu.asu.diging.vspace.core.services.ISpaceLinkManager;
 
 @Controller
-public class DeleteLinkController {
+public class DeleteSpaceLinkController {
 
     @Autowired
     private IModuleLinkManager moduleLinkManager;
@@ -24,9 +23,6 @@ public class DeleteLinkController {
 
     @Autowired
     private IExternalLinkManager externalLinkManager;
-    
-    @Autowired
-    private ISlideExternalLinkManager slideExternalLinkManager;
 
     @RequestMapping(value = "/staff/space/{id}/modulelink/{linkId}", method = RequestMethod.DELETE)
     public ResponseEntity<String> deleteModuleLink(@PathVariable("id") String spaceId, @PathVariable("linkId") String linkId) {
@@ -45,10 +41,4 @@ public ResponseEntity<String> deleteExternalLink(@PathVariable("id") String spac
         externalLinkManager.deleteLink(linkId);
         return new ResponseEntity<String>(HttpStatus.OK);
     }
-    
-    @RequestMapping(value = "/staff/module/{id}/slide/{slideId}/externallink/{linkId}", method = RequestMethod.DELETE)
-    public ResponseEntity<String> deleteSlideExternalLink(@PathVariable("id") String moduleId, @PathVariable("slideId") String slideId, @PathVariable("linkId") String linkId) {
-        slideExternalLinkManager.deleteLink(linkId);
-        return new ResponseEntity<String>(HttpStatus.OK);
-    }
 }

From 23b575a26ff1608e75f8f8148ec0bd9bc7f3defa Mon Sep 17 00:00:00 2001
From: Julian Ophals <jophals@asu.edu>
Date: Thu, 31 Oct 2024 12:54:09 -0700
Subject: [PATCH 64/64] [VSPC-242] additional PR comment fixes

---
 .../web/staff/DeleteSlideLinkController.java  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSlideLinkController.java

diff --git a/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSlideLinkController.java b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSlideLinkController.java
new file mode 100644
index 000000000..6115af56b
--- /dev/null
+++ b/vspace/src/main/java/edu/asu/diging/vspace/web/staff/DeleteSlideLinkController.java
@@ -0,0 +1,25 @@
+package edu.asu.diging.vspace.web.staff;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import edu.asu.diging.vspace.core.services.ISlideExternalLinkManager;
+
+@Controller
+public class DeleteSlideLinkController {
+
+    @Autowired
+    private ISlideExternalLinkManager slideExternalLinkManager;
+    
+    @RequestMapping(value = "/staff/module/{id}/slide/{slideId}/externallink/{linkId}", method = RequestMethod.DELETE)
+    public ResponseEntity<String> deleteSlideExternalLink(@PathVariable("id") String moduleId, @PathVariable("slideId") String slideId, @PathVariable("linkId") String linkId) {
+        slideExternalLinkManager.deleteLink(linkId);
+        return new ResponseEntity<String>(HttpStatus.OK);
+    }
+
+}