Merge branch '10.0' of https://github.com/muk-it/muk_web.git into 10.0

muk_web_preview_image/static/description/index.html

@@ -11,7 +11,7 @@
 </section>
 
 <section class="oe_container" style="padding-top: 25px;">
-	<div class="oe_row oe_spaced">
+	<div class="oe_row oe_spaced" style="height: 550px;">
 		<div class="oe_picture">
 			<h3 class="oe_slogan">Overview</h3>
 			<p class="oe_mt32">Extendes the Preview Dialog to support images.
@@ -64,4 +64,4 @@
 	</div>
 	<img src="logo.png" style="width: 200px; margin-bottom: 20px;"
 		class="center-block">
-</section>
+</section>

muk_web_preview_image/static/src/js/preview_generator.js

@@ -32,7 +32,9 @@ var ImageHandler = PreviewHandler.extend({
 	checkExtension: function(extension) {
 		return ['.cod', '.ras', '.fif', '.gif', '.ief', '.jpeg', '.jpg', '.jpe', '.png', '.tiff',
 	        '.tif', '.mcf', '.wbmp', '.fh4', '.fh5', '.fhc', '.ico', '.pnm', '.pbm', '.pgm',
-	        '.ppm', '.rgb', '.xwd', '.xbm', '.xpm'].includes(extension);
+	        '.ppm', '.rgb', '.xwd', '.xbm', '.xpm', 'cod', 'ras', 'fif', 'gif', 'ief', 'jpeg',
+	        'jpg', 'jpe', 'png', 'tiff', '.tif', 'mcf', 'wbmp', 'fh4', 'fh5', 'fhc', 'ico',
+	        'pnm', 'pbm', 'pgm', '.ppm', 'rgb', 'xwd', 'xbm', 'xpm'].includes(extension);
     },
     checkType: function(mimetype) {
 		return ['image/cis-cod', 'image/cmu-raster', 'image/fif', 'image/gif', 'image/ief', 'image/jpeg',
@@ -61,4 +63,4 @@ PreviewGenerator.include({
 	},
 });
 
-});
+});