From 9d78e7bac8b5adc5cefb15f3b32f05ac6eafb66f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 7 Sep 2017 13:51:39 +0200
Subject: [PATCH] OO-2997: don't set margin of image with size like 28x30
(default by IE), give a real name to images...
---
.../commons/memberlist/ui/MembersPrintController.java | 8 +++-----
.../commons/memberlist/ui/_content/memberList.html | 2 +-
.../olat/commons/memberlist/ui/_content/print.html | 11 ++++++++---
.../commons/memberlist/ui/_content/printList.html | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java b/src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java
index 6571af4de64..031f9d8dce0 100644
--- a/src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java
+++ b/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);
}
}
}
diff --git a/src/main/java/org/olat/commons/memberlist/ui/_content/memberList.html b/src/main/java/org/olat/commons/memberlist/ui/_content/memberList.html
index 876fefcae29..136b987a49a 100644
--- a/src/main/java/org/olat/commons/memberlist/ui/_content/memberList.html
+++ b/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
diff --git a/src/main/java/org/olat/commons/memberlist/ui/_content/print.html b/src/main/java/org/olat/commons/memberlist/ui/_content/print.html
index 01691912801..6b3bd1d97a8 100644
--- a/src/main/java/org/olat/commons/memberlist/ui/_content/print.html
+++ b/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
diff --git a/src/main/java/org/olat/commons/memberlist/ui/_content/printList.html b/src/main/java/org/olat/commons/memberlist/ui/_content/printList.html
index c77a8e35aa2..3c1f51ecad9 100644
--- a/src/main/java/org/olat/commons/memberlist/ui/_content/printList.html
+++ b/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")})
--
GitLab