Skip to content
Snippets Groups Projects
Commit 9d8a1206 authored by gnaegi's avatar gnaegi
Browse files

OO-1068 fix invalid html code

parent c7e07398
No related branches found
No related tags found
No related merge requests found
......@@ -148,7 +148,7 @@
$r.formatBytes($attachment.getSize())
</div>
#if ($attachment.getMetaInfo() && $attachment.getMetaInfo().isThumbnailAvailable())
<img src="${thumbMapper}/$message.get("id")/$attachment.getMetaInfo().getUUID()/$fname" class="img-thumbnail" title="$r.escapeHtml("$fname")" class=""/>
<img src="${thumbMapper}/$message.get("id")/$attachment.getMetaInfo().getUUID()/$fname" class="img-thumbnail" alt="$r.escapeHtml("$fname")" title="$r.escapeHtml("$fname")"/>
<i class="o_icon o_icon-lg o_icon_enlarge"></i>
#end
</a>
......
......@@ -27,6 +27,7 @@ package org.olat.user;
import java.io.File;
import org.apache.commons.lang.StringEscapeUtils;
import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
......@@ -40,7 +41,6 @@ import org.olat.core.gui.control.generic.popup.PopupBrowserWindow;
import org.olat.core.id.Identity;
import org.olat.core.id.UserConstants;
import org.olat.core.logging.AssertException;
import org.olat.core.util.StringHelper;
import org.olat.user.propertyhandlers.GenderPropertyHandler;
/**
......@@ -147,9 +147,10 @@ public class DisplayPortraitController extends BasicController {
myContent.contextPut("hasPortrait", (portrait != null) ? Boolean.TRUE : Boolean.FALSE);
myContent.contextPut("identityKey", portraitIdent.getKey().toString());
myContent.contextPut("displayUserFullName", displayUserFullName);
myContent.contextPut("firstname", StringHelper.escapeHtml(portraitIdent.getUser().getProperty(UserConstants.FIRSTNAME, null)));
myContent.contextPut("lastname",StringHelper.escapeHtml(portraitIdent.getUser().getProperty(UserConstants.LASTNAME, null)));
String fullName = UserManager.getInstance().getUserDisplayName(portraitIdent);
myContent.contextPut("fullName", fullName);
String altText = translate("title.homepage") + ": " + fullName;
myContent.contextPut("altText", StringEscapeUtils.escapeHtml(altText));
putInitialPanel(myContent);
}
......
......@@ -3,18 +3,18 @@
#if ($hasPortrait)
#if ($canLinkToHomePage)
<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
<img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
</a>
#else
<img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass" style="background-image : url('$mapperUrl');"/>
#end
#else
#if ($canLinkToHomePage)
<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
<img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass"/>
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass"/>
</a>
#else
<img src="$r.staticLink("images/transparent.gif")" title="$r.escapeHtml("$displayUserFullName")" class="$portraitCssClass"/>
<img src="$r.staticLink("images/transparent.gif")" alt="$altText" title="$altText" class="$portraitCssClass"/>
#end
#end
</div>
......@@ -22,10 +22,10 @@
<div class="o_portrait_name">
#if ($canLinkToHomePage)
<a href="javascript:void(o_openPopUp('$r.commandURI("showuserinfo")', '${identityKey}', '900', '600', false))">
$firstname $lastname
$fullName
</a>
#else
$firstname $lastname
$fullName
#end
</div>
#end
......
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