story/VSPC-239

vspace/src/main/resources/exhibitionLanguages.properties

@@ -119,7 +119,7 @@
   { "code": "na", "label": "Nauru" },
   {
     "code": "nb",
-    "label": "Bokm�l, Norwegian; Norwegian Bokm�l"
+    "label": "Bokmål, Norwegian; Norwegian Bokmål"
   },
   { "code": "nd", "label": "Ndebele, North; North Ndebele" },
   { "code": "ne", "label": "Nepali" },
@@ -184,7 +184,7 @@
   { "code": "uz", "label": "Uzbek" },
   { "code": "ve", "label": "Venda" },
   { "code": "vi", "label": "Vietlabelse" },
-  { "code": "vo", "label": "Volap�k" },
+  { "code": "vo", "label": "Volapük" },
   { "code": "wa", "label": "Walloon" },
   { "code": "wo", "label": "Wolof" },
   { "code": "xh", "label": "Xhosa" },

vspace/src/main/webapp/WEB-INF/views/exhibition/module.html

@@ -212,7 +212,7 @@ <h3 class="textDiv">[[${module.name}]]</h3>
          <div style="position: relative;top: 6.5%;">
             <h3 style="text-align:center;">[[${currentSlideCon.name}]]</h3>
             <div th: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%">
+                <img th:if="${contents['class'].simpleName ==  'ImageBlock'}" th:id="${contents.id}" class="imgDiv" th:src="@{'/api/image/'+${contents.image.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" 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 ==  'BiblioBlock'}" th:id="${contents.id}" class="biblioDiv">
                 	<h4>Title: [(${contents.getBiblioTitle()})]</h4>

vspace/src/main/webapp/WEB-INF/views/exhibition/space.html

@@ -711,7 +711,7 @@ <h3 class="spaceName">
 
                             <img
                                 th:style="|max-width: ${space.image?.width}px; border-radius: 13px; width: 100%;|"
-                                id="bgImage" th:src="@{'/api/image/'+${space.image?.id}}"/>
+                                id="bgImage" th:src="@{'/api/image/'+${space.image?.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|"/>
                         </div>
                     </div>
                     <div id="rightContent" th:if="${space.description!=NULL}">

vspace/src/main/webapp/WEB-INF/views/staff/dashboard/dashboard.html

@@ -88,7 +88,7 @@ <h4>Spaces</h4>
 				<div th:each="space,iterStat: ${recentSpaces}" th:if="${iterStat.index}<5" style="width: 12rem;">
 					<div class="spaceImage">
                         <a th:href="@{'/staff/space/'+${space?.id}}">
-						  <img class="card-img-top" th:src="@{'/api/image/'+${space.image?.id}}" alt="Space image">
+						  <img class="card-img-top" th:src="@{'/api/image/'+${space.image?.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" alt="Space image">
                         </a>
 					</div>
 					<div class="btn-group dropdown">

vspace/src/main/webapp/WEB-INF/views/staff/images/image.html

@@ -28,7 +28,7 @@ <h1>
 
         <div id="image" style="margin-top:15px">
             <img id="bgImage" style="max-width:800px"
-                th:src="@{'/api/image/'+${image.id}}" />
+                th:src="@{'/api/image/'+${image.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" />
         </div>
     </div>
 </body>

vspace/src/main/webapp/WEB-INF/views/staff/images/imagelist.html

@@ -165,6 +165,7 @@ <h2>Images</h2>
                     <th scope="row"><a
                         th:href="@{'/staff/display/image/'+${image.id}}"><img
                             th:src="@{'/api/image/'+${image.id}}"
+                            th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|"
                             class="img-thumbnail">
                             [[${image.filename}]]</a></th>
                     <td>[[${image.name}]]</td>

vspace/src/main/webapp/WEB-INF/views/staff/modules/slides/slide.html

@@ -3533,7 +3533,7 @@ <h5 class="modal-title">Select from the
 				     th:if="${#strings.equals(contents['class'].simpleName,'ImageBlock')}">
 				    <img th:id="${contents.id}" 
 				         class="imgDiv" 
-				         th:src="@{'/api/image/'+${contents.image.id}}" />
+				         th:src="@{'/api/image/'+${contents.image.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" />
 				    <input type="hidden" 
 				           data-image-id="${contents.id}"
 				           th:attr="data-image-id=${contents.id}"

vspace/src/main/webapp/WEB-INF/views/staff/search/staffSearch.html

@@ -427,7 +427,7 @@ <h5>
 								class="textDivStaff tab  btn btn-light" style="width: 100%">
 								<span class="card-title"
 								style="white-space: pre-wrap; line-break: anywhere;"><img  class="searchImg"
-								th:src="@{'/api/image/'+${contents?.image?.id}}" alt="Space image" /><span 
+								th:src="@{'/api/image/'+${contents?.image?.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" alt="Space image" /><span 
 								style="color: var(--dark-grey)">Space:</span> [[${contents.name}]]<br><span 
                                 style="color: var(--dark-grey)">Description:</span> [[${contents.description}]]</span>
 							</a>
@@ -528,7 +528,7 @@ <h5>
 								<div th:if="${not #lists.isEmpty(contents.contents)}">
 									<div th:if="${contents?.firstImageBlock !=null}">
 										<img
-											th:onerror="if (this.src != '@{/resources/images/placeholder.png}') this.src = '@{/resources/images/placeholder.png}'"
+											th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|"
 											class="searchImg" th:src="@{'/api/image/'+${contents?.firstImageBlock?.image?.id}}"
 											alt="Slide image" />
 									</div>
@@ -579,7 +579,7 @@ <h5>
 								<div th:if="${not #lists.isEmpty(contents.contents)}">
 									<div th:if="${contents?.firstImageBlock !=null}">
 										<img
-											th:onerror="if (this.src != '@{/resources/images/placeholder.png}') this.src = '@{/resources/images/placeholder.png}'"
+											th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|"
 											class="searchImg" th:src="@{'/api/image/'+${contents?.firstImageBlock?.image?.id}}"
 											alt="Slide image" />
 									</div>

vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html

@@ -1983,7 +1983,7 @@ <h2>
             &nbsp;
         </div>
         <div id="space" th:style="|max-width: ${display.width+400}px;|" th:if="${space.image != null}" class="link-modal flex-spacing">
-        <img id="bgImage" th:style="|max-width: ${display.width}px;|" th:src="@{'/api/image/'+${space.image?.id}}" />
+        <img id="bgImage" th:style="|max-width: ${display.width}px;|" th:src="@{'/api/image/'+${space.image?.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" />
         <div id="errorAlert"
             class="alert alert-danger alert-dismissible fade show"
             role="alert"
@@ -2752,7 +2752,7 @@ <h5 class="modal-title" id="deleteModalTitle">Confirm
             <div id="loader" style="position: absolute; font-size: 30px;">
                 <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
             </div>
-            <img id="main-bgImage" th:style="|max-width: ${display.width}px;|"  th:src="@{'/api/image/'+${space.image?.id}}" />
+            <img id="main-bgImage" th:style="|max-width: ${display.width}px;|"  th:src="@{'/api/image/'+${space.image?.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" />
         </div>
         <p class="text-right" style="margin-top: 50px">
             <button type="button" id="deleteSpace"  class="btn primary-btn btn-sm"><i class="fa fa-trash"></i>&emsp;Delete Space</button>

vspace/src/main/webapp/WEB-INF/views/staff/spaces/spacelist.html

@@ -80,7 +80,7 @@ <h2>Spaces</h2>
 				</div>
 				<div class="spaceImage">
                     <a th:href="@{'/staff/space/'+${space.id}}">
-					<img class="card-img-top" th:src="@{'/api/image/'+${space?.image?.id}}" alt="Space image">
+					<img class="card-img-top" th:src="@{'/api/image/'+${space?.image?.id}}" th:onerror="|this.onerror=null; this.src='@{/resources/images/cannot_load_image_placeholder.png}'|" alt="Space image">
                     </a>
 				</div>
 				<div class="btn-group dropdown">