Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -r4e1b8dc9d2b7895783a8d17465d080e342ad2247 -r4523deca1760ed41f945862418e72f18a6f68700 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 4523deca1760ed41f945862418e72f18a6f68700) @@ -81,6 +81,8 @@ public static final String ATTR_IS_DOWNLOAD = "isDownload"; public static final String ATTR_IS_DISPLAYABLE_IMAGE = "isDisplayableImage"; + + public static final String ATTR_IS_DISPLAYABLE_MEDIA = "isDisplayableMedia"; public static final String ATTR_IS_DISPLAYABLE_EMBED = "isDisplayableEmbed"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java =================================================================== diff -u -r4e1b8dc9d2b7895783a8d17465d080e342ad2247 -r4523deca1760ed41f945862418e72f18a6f68700 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java (.../ViewItemController.java) (revision 4523deca1760ed41f945862418e72f18a6f68700) @@ -56,7 +56,8 @@ @Autowired private IResourceService resourceService; - private static final Set DISPLAYABLE_IMAGE_EXTENSIONS = Set.of(".jpg", ".jpeg", ".png", ".gif", ".bmp"); + private static final Set DISPLAYABLE_IMAGE_EXTENSIONS = Set.of(".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp", ".svg"); + private static final Set DISPLAYABLE_MEDIA_EXTENSIONS = Set.of(".mov", ".mp4", ".webm", ".ogg", ".mp3", ".wav"); private static final Set DISPLAYABLE_EMBED_EXTENSIONS = Set.of(".pdf"); /** @@ -142,6 +143,11 @@ boolean isDisplayableImage = lowercaseFileName != null && DISPLAYABLE_IMAGE_EXTENSIONS.stream().anyMatch(ext -> lowercaseFileName.endsWith(ext)); request.setAttribute(ResourceConstants.ATTR_IS_DISPLAYABLE_IMAGE, isDisplayableImage); + + boolean isDisplayableMedia = lowercaseFileName != null + && DISPLAYABLE_MEDIA_EXTENSIONS.stream().anyMatch(ext -> lowercaseFileName.endsWith(ext)); + request.setAttribute(ResourceConstants.ATTR_IS_DISPLAYABLE_MEDIA, isDisplayableMedia); + boolean isDisplayableEmbed = lowercaseFileName != null && DISPLAYABLE_EMBED_EXTENSIONS.stream().anyMatch(ext -> lowercaseFileName.endsWith(ext)); request.setAttribute(ResourceConstants.ATTR_IS_DISPLAYABLE_EMBED, isDisplayableEmbed); @@ -259,4 +265,4 @@ } return list; } -} \ No newline at end of file +} Index: lams_tool_larsrc/web/pages/itemreview/itemContent.jsp =================================================================== diff -u -r4e1b8dc9d2b7895783a8d17465d080e342ad2247 -r4523deca1760ed41f945862418e72f18a6f68700 --- lams_tool_larsrc/web/pages/itemreview/itemContent.jsp (.../itemContent.jsp) (revision 4e1b8dc9d2b7895783a8d17465d080e342ad2247) +++ lams_tool_larsrc/web/pages/itemreview/itemContent.jsp (.../itemContent.jsp) (revision 4523deca1760ed41f945862418e72f18a6f68700) @@ -59,6 +59,7 @@ function iframelyCallback${itemUid}(response) { iframelyCallback(${itemUid}, response); } +
@@ -69,6 +70,7 @@
+ - +   
-
+
- - - - - - + + + + + + + +