Fix presentation when there is no image thumbnail

stcarrez · Dec 31, 2018 · f42e36b · f42e36b
1 parent 54aedc3
commit f42e36b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/awa/plugins/awa-images/web/storages/lists/image-list.xhtml b/awa/plugins/awa-images/web/storages/lists/image-list.xhtml
@@ -28,8 +28,16 @@
         <div class='wiki-image-grid' id="i_#{image.id}">
             <div class='wiki-image-grid-info'>
                 <a href="#{contextPath}/storages/image-info/#{image.id}">
-                <img src="#{contextPath}/storages/images/#{image.thumbnail_id}" width="64" height="64"
-                     alt="#{image.name}"/>
+                <h:panelGroup rendered="#{image.thumbnail_id ge 0}">
+                  <img src="#{contextPath}/storages/images/#{image.thumbnail_id}"
+                       width="64" height="64"
+                       alt="#{image.name}"/>
+                </h:panelGroup>
+                <h:panelGroup rendered="#{image.thumbnail_id lt 0}">
+                  <img src="#{contextPath}/images/storages/icon-gallery-64.png"
+                       width="64" height="64"
+                       alt="#{image.name}"/>
+                </h:panelGroup>
                 <span class="wiki-image-name">#{image.name}</span>
                 </a>
             </div>

diff --git a/awa/plugins/awa-images/web/storages/views/image-info.xhtml b/awa/plugins/awa-images/web/storages/views/image-info.xhtml
@@ -100,8 +100,8 @@
             </h:form>
         </div>
         <util:script>
-            init_upload('#document-upload', #{imageInfo.folder_id}, #{imageInfo.id},
-                        "#{contextPath}/storages/forms/upload-image.html");
+            /* init_upload('#document-upload', #{imageInfo.folder_id}, #{imageInfo.id},
+                        "#{contextPath}/storages/forms/upload-image.html"); */
         </util:script>
     </div>
     <h:panelGroup rendered="#{imageInfo.id ne 0}">