Skip to content
Snippets Groups Projects
Commit 1bb7df96 authored by srosse's avatar srosse
Browse files

OO-4129: overwrite CSS rule for portrait in member list

parent 226cb89a
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@
<div class="clearfix">
<div class="o_portrait">
#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') !important;" alt="$r.escapeHtml("$member.getFullName()")" />
#else
<img src="$r.staticLink("images/transparent.gif")" class="$member.getPortraitCssClass()" alt="$r.escapeHtml("$member.getFullName()")" />
#end
......
......@@ -49,7 +49,7 @@ public class UserAvatarMapper implements Mapper {
@Override
public MediaResource handle(String relPath, HttpServletRequest request) {
MediaResource rsrc = null;
if(relPath != null && relPath.endsWith(POSTFIX_LARGE) || relPath.endsWith(POSTFIX_SMALL)) {
if(relPath != null && (relPath.endsWith(POSTFIX_LARGE) || relPath.endsWith(POSTFIX_SMALL))) {
if(relPath.startsWith("/")) {
relPath = relPath.substring(1, relPath.length());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment