Story/VSPC-88 (#120)

* [VSPC-88] Space image size issue fix * [VSPC-88] adding minimum width for space images. * [VSPC-88] Fix for space image on staff screen. * [VSPC-88] Fix for links positions with respect to image size * [VSPC-88] Space description position * [VSPC-88]Using saved display hght and wdth for both staff & public site * [VSPC-88] Removing console logs
diging · Jun 5, 2020 · e021007 · e021007
1 parent 0c7b2e5
commit e021007
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
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
@@ -9,6 +9,7 @@
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.services.ILinkManager;
 import edu.asu.diging.vspace.core.services.IModuleManager;
+import edu.asu.diging.vspace.core.services.ISpaceDisplayManager;
 import edu.asu.diging.vspace.core.services.ISpaceManager;
 
 @Controller
@@ -20,6 +21,9 @@ public class SpaceController {
     @Autowired
     private IModuleManager moduleManager;
 
+    @Autowired
+    private ISpaceDisplayManager spaceDisplayManager;
+
     @Autowired
     private ILinkManager linkManager;
 
@@ -31,8 +35,8 @@ public String showSpace(@PathVariable String id, Model model) {
         model.addAttribute("externalLinks", linkManager.getExternalLinkDisplays(id));
         model.addAttribute("moduleLinks", linkManager.getModuleLinkDisplays(id));
         model.addAttribute("spaces", spaceManager.getAllSpaces());
+        model.addAttribute("display", spaceDisplayManager.getBySpace(space));
         model.addAttribute("moduleList", moduleManager.getAllModules());
-
         return "staff/space";
     }
 }
diff --git a/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp b/vspace/src/main/webapp/WEB-INF/views/exhibition/space.jsp
@@ -122,7 +122,6 @@ function drawLinks() {
         if ("${link.type}" == 'IMAGE' && "${link.image}" != '') {
             var linkDisplay = $('<img id="${link.image.id}" src="<c:url value="/api/image/${link.image.id}" />" />');
         } else {
-            console.log("In else block");
             var linkDisplay = $('<div class="Info Info_cz_Class"><svg class="Ellipse_8_c"><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 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 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><i class="fas fa-external-link-alt fa-lg Icon_awesome_info_e"></i><span class="tooltiptext">${link.name}</span></div>');
         }
         
@@ -188,8 +187,8 @@ function drawLinks() {
             </div>
             <i class="fas fa-bars fa-lg barPosition" onclick="openNav()"></i>
         </div>
-        <div class="spaceClass"
-            style="width: ${display.width}px; height: ${display.height}px; margin: auto; background-size: cover; border-radius: 13px;">
+        <div class="spaceClass" style="width: ${display.width}px; margin: auto; display: flex;">
+        <div>
             <c:if test="${not empty moduleList}">
                 <div class=dropdown>
                     <div id="mySideModulenav" class="sideModulenav">
@@ -245,9 +244,9 @@ function drawLinks() {
                     </c:if>
                 </h3>
             </div>
-
-            <div id="space"
-                style="width: ${display.width}px; height: ${display.height}px; margin: auto; background-size: cover; border-radius: 13px; background-image:url('<c:url value="/api/image/${space.image.id}" />')">
+            <div id="space">
+            <img style="height: ${display.height}px; width:${display.width}px; border-radius:13px;" id="bgImage" width="${display.width}px" src="<c:url value="/api/image/${space.image.id}" />" />
+            </div>
             </div>
             <c:if test="${not empty space.description}">
                 <div id="rightContent">

diff --git a/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp b/vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.jsp
@@ -1051,7 +1051,7 @@ Delete Space
 
 <c:if test="${not empty space.image}">
 	<div id="space">
-		<img id="bgImage" width="800px" src="<c:url value="/api/image/${space.image.id}" />" />
+		<img style="height: ${display.height}px; width:${display.width}px;" id="bgImage" width="${display.width}px" src="<c:url value="/api/image/${space.image.id}" />" />
 	</div>
 </c:if>
 <jsp:include page="../../deleteModal.jsp" >