OO-2997: don't set margin of image with size like 28x30 (default by IE), give...

OO-2997: don't set margin of image with size like 28x30 (default by IE), give a real name to images...

src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java

@@ -118,7 +118,6 @@ public class MembersPrintController extends BasicController {
 	private class UserAvatarHQMapper implements Mapper {
 		@Override
 		public MediaResource handle(String relPath, HttpServletRequest request) {
-			MediaResource rsrc = null;
 			if(relPath != null) {
 				if(relPath.startsWith("/")) {
 					relPath = relPath.substring(1, relPath.length());
@@ -135,13 +134,12 @@ public class MembersPrintController extends BasicController {
 						portrait = meta.getThumbnail(300, 300, false);
 					}
 					
-					if(portrait == null) {
-						return new NotFoundMediaResource(relPath);
+					if(portrait != null) {
+						return new VFSMediaResource(portrait);
 					}
-					return new VFSMediaResource(portrait);
 				}
 			}
-			return rsrc;
+			return new NotFoundMediaResource(relPath);
 		}
 	}
 }

src/main/java/org/olat/commons/memberlist/ui/_content/memberList.html

@@ -3,7 +3,7 @@
 		<div class="clearfix">
 			<div class="o_portrait pull-left">
 				#if($member.isPortraitAvailable())
-					<img src="$r.staticLink("images/transparent.gif")" class="$member.getPortraitCssClass()" style="background-image: url('$avatarBaseURL/$member.getKey()/portrait.jpg')" alt="$r.escapeHtml("$member.getFullName()")" />
+					<img src="$r.staticLink("images/transparent.gif")" class="$member.getPortraitCssClass()" style="background-image: url('$avatarBaseURL/${member.getKey()}/portrait.jpg')" alt="$r.escapeHtml("$member.getFullName()")" />
 				#else
 					<img src="$r.staticLink("images/transparent.gif")" class="$member.getPortraitCssClass()" alt="$r.escapeHtml("$member.getFullName()")" />
 				#end

src/main/java/org/olat/commons/memberlist/ui/_content/print.html

@@ -30,14 +30,16 @@
 		} else {
 			jQuery("#o_print_brand").empty();
 		}
-		
+
 		jQuery(".o_cmembers_print .o_portrait img").each(function(index, el) {
 			//workaround caching of images
 			var imgEl = jQuery(el).get(0);
-			if(imgEl.height > 2) {
+			//28x30 is the default size of images by IE
+			if(imgEl.width >= 100 && imgEl.height > 2 && imgEl.height < 100 && imgEl.height != 30 && imgEl.width != 28) {
 				var margin = 100 - imgEl.height;
 				jQuery(el).css("margin-top", (margin / 2) + "px");
 			}
+			
 			jQuery(el).load(function() {
 				var imgEl = jQuery(el).get(0);
 				var margin = 100 - imgEl.height;
@@ -46,7 +48,10 @@
 				}
 			});
 		});
+		
+		setTimeout(function() {
+			window.print();
+		}, 300)
 	})
-	window.print();
 /* ]]> */
 </script>
\ No newline at end of file

src/main/java/org/olat/commons/memberlist/ui/_content/printList.html

@@ -5,7 +5,7 @@
 		<div class="clearfix">
 			<div class="o_portrait">
 				#if(${member.isPortraitAvailable()})
-					<img src="$avatarBaseURL/$member.getKey()/portrait.jpg">
+					<img src="$avatarBaseURL/${member.getKey()}/portrait_hq_${member.getKey()}.jpg">
 				#elseif(${member.getGender().equals("female")})
 					<img src='$r.staticLink("themes/light/images/portrait/dummy_female_big.png")'>
 				#elseif(${member.getGender().equals("male")})