Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r953f62a7fc515e2dc5c4ad983df233070cf7a82c -r60d9a173d5590295376322fc3e857ae2dca37717
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
===================================================================
diff -u -r16a3de6463b235e8b8f91ebada6aac7db8172436 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java	(.../PortraitTag.java)	(revision 16a3de6463b235e8b8f91ebada6aac7db8172436)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java	(.../PortraitTag.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -26,8 +26,8 @@
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.TagSupport;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -40,7 +40,7 @@
 /**
  * Output a URL to display a user's portrait. If you modify the logic here, change portrait.js too!
  */
-public class PortraitTag extends TagSupport {
+public class PortraitTag extends BodyTagSupport {
     private static final long serialVersionUID = -3143529984657965761L;
     private static final Logger log = Logger.getLogger(PortraitTag.class);
     private static final int NUM_COLORS = 7;
@@ -66,6 +66,7 @@
     private String userId = null;
     private String size = null;
     private String round = null;
+    private String hover = null;
 
     public PortraitTag() {
 	super();
@@ -74,47 +75,37 @@
     @Override
     public int doStartTag() throws JspException {
 
+	return super.doStartTag();
+    }
+
+    @Override
+    public int doEndTag() throws JspException {
+
 	String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL);
 	serverURL = serverURL == null ? null : serverURL.trim();
 
 	try {
-	    String code = null;
-	    boolean isRound = (getRound() != null ? Boolean.getBoolean(getRound()) : true);
 	    if (userId != null && userId.length() > 0) {
+		String code = null;
 		HashMap<String, String> cache = getPortraitCache();
 		code = cache.get(userId);
+
 		if (code == null) {
-		    Integer userIdLong = Integer.decode(userId);
-		    User user = (User) getUserManagementService().findById(User.class, userIdLong);
-		    Long portraitId = user != null ? user.getPortraitUuid() : null;
-		    if (portraitId != null) {
-			String[] sizes = getSizeClass();
-			StringBuilder bldr = new StringBuilder("<img class=\"").append(sizes[0]);
-			if ( isRound ) {
-			    bldr.append(CSS_ROUND);
-			}
-			bldr.append("\" src='").append(serverURL);
-			if (!serverURL.endsWith("/")) {
-			    bldr.append("/");
-			}
-			bldr.append("download?preferDownload=false&uuid=").append(portraitId)
-				.append(sizes[1])
-				.append("'></img>");
-			code = bldr.toString();
+		    Integer userIdInt = Integer.decode(userId);
+		    User user = (User) getUserManagementService().findById(User.class, userIdInt);
+		    boolean isHover = (hover != null ? Boolean.valueOf(hover) : false);
+		    if ( isHover ) {
+			code = buildHoverUrl(user);
 		    } else {
-			code = new StringBuilder("<div class=\"").append(getGenericSizeClass())
-				.append(PORTRAIT_VERSION_SUFFIX).append(userIdLong % NUM_COLORS).append("\"></div>")
-				.toString();
+			code = buildDivUrl(user);
 		    }
 		    cache.put(userId, code);
 		}
-	    } else {
-		code = "<div class=\"portrait-generic-small\"></div>";
+
+		JspWriter writer = pageContext.getOut();
+		writer.println(code);
 	    }
 
-	    JspWriter writer = pageContext.getOut();
-	    writer.println(code);
-
 	} catch (NumberFormatException nfe) {
 	    PortraitTag.log.error("PortraitId unable to write out portrait details as userId is invalid. " + userId,
 		    nfe);
@@ -128,6 +119,45 @@
 	return Tag.SKIP_BODY;
     }
 
+    private String buildDivUrl(User user) {
+	Long portraitId = user != null ? user.getPortraitUuid() : null;
+	if (portraitId != null) {
+	    boolean isRound = (round != null ? Boolean.valueOf(round) : true);
+	    String[] sizes = getSizeClass();
+	    StringBuilder bldr = new StringBuilder("<img class=\"").append(sizes[0]);
+	    if (isRound) {
+		bldr.append(CSS_ROUND);
+	    }
+	    String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL);
+	    bldr.append("\" src='").append(serverURL);
+	    if (!serverURL.endsWith("/")) {
+		bldr.append("/");
+	    }
+	    bldr.append("download?preferDownload=false&uuid=").append(portraitId).append(sizes[1]).append("'></img>");
+	    return bldr.toString();
+	} else {
+	    return new StringBuilder("<div class=\"").append(getGenericSizeClass()).append(PORTRAIT_VERSION_SUFFIX)
+		    .append(user.getUserId() % NUM_COLORS).append("\"></div>").toString();
+	}
+    }
+
+    private String buildHoverUrl(User user) {
+	Long portraitId = user != null ? user.getPortraitUuid() : null;
+	String linkText = getBodyContent() != null ? getBodyContent().getString() : null;
+	if (portraitId != null) {
+	    String fullName = user.getFullName();
+	    if ( linkText == null || linkText.length() == 0)
+		linkText = fullName;
+	    return new StringBuilder(
+		    "<a tabindex=\"0\" class=\"popover-link new-popover\" role=\"button\" data-toggle=\"popover\" data-id=\"popover-")
+			    .append(userId).append("\" data-portrait=\"").append(portraitId)
+			    .append("\" data-fullname=\"").append(fullName).append("\">")
+			    .append(linkText).append("</a>").toString();
+	} else {
+	    return linkText != null ? linkText : "";
+	}
+    }
+    
     private IUserManagementService getUserManagementService() {
 	if (userManagementService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
@@ -137,7 +167,6 @@
 	return userManagementService;
     }
 
-    @SuppressWarnings("unchecked")
     private HashMap<String, String> getPortraitCache() {
 	HashMap<String, String> cache = (HashMap<String, String>) pageContext.getAttribute("portraitCache");
 	if (cache == null) {
@@ -195,4 +224,12 @@
     public void setRound(String round) {
 	this.round = round;
     }
+
+    public String getHover() {
+	return hover;
+    }
+
+    public void setHover(String hover) {
+	this.hover = hover;
+    }
 }
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u -r803ad5cf3ae124a5dc6615238a401847094679af -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision 803ad5cf3ae124a5dc6615238a401847094679af)
+++ lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -71,7 +71,6 @@
     color: $a-link-default;
 }
 
-
 a:hover {
     color: $a-link-default-hover;
 }
@@ -80,6 +79,20 @@
     color: $a-link-default-focus;
 }
 
+// popover links forced to be the usual link color or jqgrid interferes
+.popover-link {
+    color: $a-link-default !important;
+}
+
+.popover-link:hover {
+    color: $a-link-default-hover !important;
+}
+
+.popover-link:focus {
+    color: $a-link-default-focus !important;
+}
+
+
 @if variable-exists(panel-default-heading-background) {
     .panel-default>.panel-heading {
 	    background-color: $panel-default-heading-background;
Index: lams_central/web/includes/javascript/portrait.js
===================================================================
diff -u -r16a3de6463b235e8b8f91ebada6aac7db8172436 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_central/web/includes/javascript/portrait.js	(.../portrait.js)	(revision 16a3de6463b235e8b8f91ebada6aac7db8172436)
+++ lams_central/web/includes/javascript/portrait.js	(.../portrait.js)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -20,21 +20,64 @@
    STYLE_LARGE = 'large',
    STYLE_XLARGE = 'xlarge';
 
+// Add a portrait to an existing div as specified by selector
 function addPortrait( selector, portraitId, userId, size, round, LAMS_URL ) {
     var isRound = round == null ? true : round;
     if ( portraitId  && portraitId > 0) {
-    		selector.css('background-image', 'url(' + LAMS_URL + 'download?preferDownload=false&uuid=' + portraitId + getSizeVersion(size) + ')');
-    		selector.addClass(getSizeCSS(size));
+    		selector.css('background-image', 'url(' + LAMS_URL + 'download?preferDownload=false&uuid=' + portraitId + _getSizeVersion(size) + ')');
+    		selector.addClass(_getSizeCSS(size));
     		if ( isRound ) {
 	    		selector.addClass(CSS_ROUND);
     		}
     } else {
-    		selector.addClass(getGenericSizeClass( size ));
-    		selector.addClass(PORTRAIT_VERSION_SUFFIX + userId % NUM_COLORS );
+    		selector.addClass(_getGenericSizeClass( size ));
+    		selector.addClass(getPortraitColourClass(userId));
     }
 }
 
-function getSizeCSS(size) {
+// Get the colour that would be used for the generic portrait. Useful when you need a consistent colour for a user. 
+function getPortraitColourClass(userId) {
+	return PORTRAIT_VERSION_SUFFIX + userId % NUM_COLORS;
+}
+
+// Create a popover/tooltip to display the learner's portrait. Put it in bind('pagerInitialized pagerComplete', function(event, options){})
+// (tablesorter) or within loadComplete (jqgrid). Elements to be processed should have class new-popover and dataset values for 'portrait' 
+// and 'fullname'. Use with definePortraitPopover. Size is optional. 
+function initializePortraitPopover(LAMS_URL, size) {
+	if ( ! size ) 
+		size = STYLE_LARGE;
+	
+	$('.new-popover').each(function( index, element ) {
+		var idString = element.dataset.id;
+		var url = LAMS_URL + '/download?preferDownload=false&uuid='+element.dataset.portrait+_getSizeVersion(size);
+			$(element).popover({
+				content: '<img src="'+url+'"/>',  
+				html: true,
+		        trigger: 'hover focus',
+		        title: element.dataset.fullname,
+		        container: 'body' // ensures popovers are not clipped within jqgrid tables
+		});
+			element.classList.remove('new-popover');
+	});
+	}
+
+
+// Define the element to have a popover/tooltip to display the learner's portrait. Call in the ajaxProcessing (tablesorter) or 
+// in a formatter function (jqgrid). Use with initializePortraitPopover. Displays the fullName and portrait in the popover when the 
+// user hovers on linkText. Usually linkText === fullName
+function definePortraitPopover(portraitId, userId, fullName, linkText) {
+	if ( ! linkText )
+		linkText = fullName;
+	
+	if ( portraitId ) {
+		return '<a tabindex="0" class="popover-link new-popover" role="button" data-toggle="popover" data-id="popover-'+userId
+			+'" data-portrait="'+portraitId+'" data-fullname="'+fullName+'">'+linkText+'</a>';
+	} else {
+		return linkText;
+	}
+}
+
+function _getSizeCSS(size) {
     	if ( size ) {
     	    if (size == STYLE_MEDIUM)
 	    	    	return CSS_MEDIUM;
@@ -46,7 +89,7 @@
     	return CSS_SMALL;
 }
 
-function getSizeVersion(size) {
+function _getSizeVersion(size) {
     	if ( size ) {
     	    if (size == STYLE_MEDIUM)
 	    	    	return VERSION_MEDIUM;
@@ -58,7 +101,7 @@
     	return VERSION_SMALL;
 }
 
-function getGenericSizeClass(size) {
+function _getGenericSizeClass(size) {
   	if ( size ) {
     	    if (size == STYLE_MEDIUM)
 	    	    	return CSS_GENERIC_MEDIUM;
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -r5bf2d3b201efb46864182d72901e497d0acb253f -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 5bf2d3b201efb46864182d72901e497d0acb253f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -518,4 +518,10 @@
      * Stores organisation (course) groups and removes the unnecessary ones.
      */
     void saveOrganisationGrouping(OrganisationGrouping grouping, Collection<OrganisationGroup> newGroups);
+    
+    /**
+     * Returns the SQL needed to look up portrait details for a given user. This is an efficient way to get the entries 
+     * at the same time as retrieving the tool data, rather than making a separate lookup. 
+     */
+    String[] getPortraitSQL(String userIdString);
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r5bf2d3b201efb46864182d72901e497d0acb253f -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 5bf2d3b201efb46864182d72901e497d0acb253f)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -39,8 +39,10 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.hibernate.type.IntegerType;
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.usermanagement.FavoriteOrganisation;
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
@@ -1006,7 +1008,31 @@
 	List<User> results = baseDAO.findByProperty(User.class, "openidURL", openidURL);
 	return results.isEmpty() ? null : (User) results.get(0);
     }
+    
+    /**
+     * Returns the SQL needed to look up portrait details for a given user. This is an efficient way to get the entries 
+     * at the same time as retrieving the tool data, rather than making a separate lookup. 
+     *
+     * The return values are the entry for the select clause (will always have a leading space but no trailing comma and an
+     * alias of luser) and the sql join clause, which should go with any other join clauses.
+     *
+     * To convert the portrait id set up the sql -> java object translation using 
+     * addScalar("portraitId", IntegerType.INSTANCE)
+     *
+     * @param userIdString
+     *            User identifier field string e.g. user.user_id
+     * @return String[] { partial select string, join clause }
+     *
+     */
+    @Override
+    public String[] getPortraitSQL(String userIdString) {
+	String[] retValue = new String[2];
+	retValue[0] = ", luser.portrait_uuid portraitId ";
+	retValue[1] = " JOIN lams_user luser ON luser.user_id = " + userIdString;
+	return retValue;
+    }
 
+
     // ---------------------------------------------------------------------
     // Inversion of Control Methods - Method injection
     // ---------------------------------------------------------------------
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r90136820195d7768c6dbd79b3716d595476ecb31 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 90136820195d7768c6dbd79b3716d595476ecb31)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -314,5 +314,9 @@
 label.number.groups.in.mark.range  =Number of groups in mark range
 label.average.mark  =Average mark
 
+label.error  =Error
+error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
+label.ok  =OK
 
+
 #======= End labels: Exported 307 labels for en AU =====
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
===================================================================
diff -u -r7cacaf3ab86dd7b0e794e7b4c710fb73ecb61344 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision 7cacaf3ab86dd7b0e794e7b4c710fb73ecb61344)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -27,6 +27,7 @@
 
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 
 public interface AssessmentUserDAO extends DAO {
 
@@ -37,7 +38,7 @@
     List<AssessmentUser> getBySessionID(Long sessionId);
 
     List<AssessmentUserDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder,
-	    String searchString);
+	    String searchString, IUserManagementService userManagementService);
 
     int getCountUsersBySession(Long sessionId, String searchString);
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
===================================================================
diff -u -r7cacaf3ab86dd7b0e794e7b4c710fb73ecb61344 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision 7cacaf3ab86dd7b0e794e7b4c710fb73ecb61344)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -34,6 +34,7 @@
 import org.lamsfoundation.lams.tool.assessment.dao.AssessmentUserDAO;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -89,8 +90,9 @@
 	return (List<AssessmentUser>) this.doFind(FIND_BY_SESSION_ID, sessionId);
     }
 
-    private static String LOAD_USERS_ORDERED_BY_SESSION = "SELECT DISTINCT user.user_id, user.last_name, user.first_name, user.login_name, result.grade"
-		+ " FROM tl_laasse10_user user  INNER JOIN tl_laasse10_session session"
+    private static String LOAD_USERS_ORDERED_BY_SESSION_SELECT = "SELECT DISTINCT user.user_id, user.last_name, user.first_name, user.login_name, result.grade ";
+    private static String LOAD_USERS_ORDERED_BY_SESSION_FROM = " FROM tl_laasse10_user user  ";
+    private static String LOAD_USERS_ORDERED_BY_SESSION_JOIN = " INNER JOIN tl_laasse10_session session"
 		+ " ON user.session_uid=session.uid  LEFT OUTER JOIN tl_laasse10_assessment_result result "
 		+ " ON result.user_uid = user.uid  	AND result.finish_date IS NOT NULL"
 		+ " 	AND result.latest = 1  WHERE session.session_id = :sessionId "
@@ -101,9 +103,15 @@
     @SuppressWarnings("unchecked")
     @Override
     public List<AssessmentUserDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy,
-	    String sortOrder, String searchString) {
+	    String sortOrder, String searchString, IUserManagementService userManagementService) {
 
-	StringBuilder bldr = new StringBuilder(LOAD_USERS_ORDERED_BY_SESSION);
+	String[] portraitStrings = userManagementService.getPortraitSQL("user.user_id");
+	
+	StringBuilder bldr = new StringBuilder(LOAD_USERS_ORDERED_BY_SESSION_SELECT)
+		.append(portraitStrings[0])
+		.append(LOAD_USERS_ORDERED_BY_SESSION_FROM)
+		.append(portraitStrings[1])
+		.append(LOAD_USERS_ORDERED_BY_SESSION_JOIN);
 	if ( "total".equalsIgnoreCase(sortBy) )
 	    bldr.append(LOAD_USERS_ORDERED_ORDER_BY_TOTAL);
 	else
@@ -128,13 +136,15 @@
 		String lastName = (String) element[2];
 		String login = (String) element[3];
 		float grade = element[4] == null ? 0 : ((Number) element[4]).floatValue();
+		Long portraitId = element[5] == null ? null : ((Number) element[5]).longValue();
 
 		AssessmentUserDTO userDto = new AssessmentUserDTO();
 		userDto.setUserId(userId);
 		userDto.setFirstName(firstName);
 		userDto.setLastName(lastName);
 		userDto.setLogin(login);
 		userDto.setGrade(grade);
+		userDto.setPortraitId(portraitId);
 		userDtos.add(userDto);
 	    }
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
===================================================================
diff -u -re8b8331273b3d6dd4456138dbd45f9dba3b63148 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java	(.../AssessmentUserDTO.java)	(revision e8b8331273b3d6dd4456138dbd45f9dba3b63148)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java	(.../AssessmentUserDTO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -31,6 +31,7 @@
     private float grade;
 
     private Long questionResultUid;
+    private Long portraitId;
 
     public String getFirstName() {
 	return firstName;
@@ -80,4 +81,12 @@
 	this.questionResultUid = questionResultUid;
     }
 
+    public Long getPortraitId() {
+	return portraitId;
+    }
+
+    public void setPortraitId(Long portraitId) {
+	this.portraitId = portraitId;
+    }
+
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java	(.../ReflectDTO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -29,6 +29,7 @@
 
 public class ReflectDTO {
     private Long userUid;
+    private Long userId;
     private String fullName;
     private String loginName;
     private String reflect;
@@ -38,6 +39,7 @@
 	this.setLoginName(user.getLoginName());
 	this.setFullName(user.getFirstName() + " " + user.getLastName());
 	this.setUserUid(user.getUid());
+	this.setUserId(user.getUserId());
     }
 
     public String getFullName() {
@@ -79,4 +81,12 @@
     public void setDate(Date date) {
 	this.date = date;
     }
+
+    public Long getUserId() {
+	return userId;
+    }
+
+    public void setUserId(Long userId) {
+	this.userId = userId;
+    }
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -re34e0b7a8ed604692164d998b9a7d6944adfc487 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision e34e0b7a8ed604692164d998b9a7d6944adfc487)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -331,7 +331,8 @@
     @Override
     public List<AssessmentUserDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy,
 	    String sortOrder, String searchString) {
-	return assessmentUserDao.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, searchString);
+	return assessmentUserDao.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, 
+		searchString, userManagementService);
     }
 
     @Override
@@ -347,6 +348,15 @@
     }
 
     @Override
+    public Long getPortraitId(Long userId) {
+	if ( userId != null ) {
+	    User user = (User) userManagementService.findById(User.class, userId.intValue());
+	    return user != null ? user.getPortraitUuid() : null;
+	}
+	return null;
+    }
+    
+    @Override
     public Assessment getAssessmentByContentId(Long contentId) {
 	Assessment rs = assessmentDao.getByContentId(contentId);
 	return rs;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -r06bf1c491a054104ea4e5cc55fc867af5519c200 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 06bf1c491a054104ea4e5cc55fc867af5519c200)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -46,6 +46,7 @@
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
 import org.lamsfoundation.lams.tool.assessment.model.QuestionReference;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.ExcelCell;
 
 /**
@@ -496,4 +497,6 @@
 	    List<QuestionReference> deletedReferences);
 
     void releaseFromCache(Object object);
+    
+    Long getPortraitId(Long userId);
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -r06bf1c491a054104ea4e5cc55fc867af5519c200 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 06bf1c491a054104ea4e5cc55fc867af5519c200)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -365,12 +365,14 @@
 	    if (groupLeader != null) {
 
 		float assessmentResult = service.getLastTotalScoreByUser(assessment.getUid(), groupLeader.getUserId());
+		Long portraitId = service.getPortraitId(groupLeader.getUserId());
 
 		AssessmentUserDTO userDto = new AssessmentUserDTO();
 		userDto.setUserId(groupLeader.getUserId());
 		userDto.setFirstName(groupLeader.getFirstName());
 		userDto.setLastName(groupLeader.getLastName());
 		userDto.setGrade(assessmentResult);
+		userDto.setPortraitId(portraitId);
 		userDtos.add(userDto);
 		countSessionUsers = 1;
 	    }
@@ -395,6 +397,8 @@
 	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFirstName() + " " + userDto.getLastName());
 	    userData.put(fullName);
 	    userData.put(userDto.getGrade());
+	    if (userDto.getPortraitId() != null ) 
+		userData.put(userDto.getPortraitId());
 
 	    JSONObject userRow = new JSONObject();
 	    userRow.put("id", i++);
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 4583983b64efe1d91fbb47cdde6a759a6a30e859)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -10,8 +10,10 @@
 		<link href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet" type="text/css" >
 		<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
 		<link href="${lams}css/thickbox.css" rel="stylesheet" rel="stylesheet" type="text/css">
-		<link href="${lams}css/jquery.jqGrid.css" rel="stylesheet" type="text/css"/>
-		<lams:css suffix="main"/>
+		<link href="${lams}css/jquery.jqGrid.css" rel="stylesheet" type="text/css"/>		
+ 		<lams:css suffix="chart"/>
+ 		
+		<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 		
 		<style type="text/css">
 			.ui-jqgrid tr.jqgrow td {
@@ -47,6 +49,7 @@
  		
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/download.js"></script>
+ 		<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
  		
 		<script>        
 		    function doSelectTab(tabId) {
Index: lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp	(.../reflections.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp	(.../reflections.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -15,7 +15,7 @@
 				<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
 					<tr>
 						<td>
-							<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/>
+							<lams:Portrait userId="${reflectDTO.userId}" hover="true"><strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/></lams:Portrait>
 							<br>
 							<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
 						</td>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rf65830a22af6173e909f8e62ea4832b683ba12ee -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f65830a22af6173e909f8e62ea4832b683ba12ee)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -7,6 +7,8 @@
 <script type="text/javascript">
 	$(document).ready(function(){
 		
+		initializePortraitPopover("<lams:LAMSURL />");
+		
 		<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 		
 			jQuery("#list${sessionDto.sessionId}").jqGrid({
@@ -23,13 +25,15 @@
 			   	colNames:['userId',
 						'sessionId',
 						"<fmt:message key="label.monitoring.summary.user.name" />",
-					    "<fmt:message key="label.monitoring.summary.total" />"],
-					    
+					    "<fmt:message key="label.monitoring.summary.total" />",
+					    'portraitId'
+				],
 			   	colModel:[
 			   		{name:'userId', index:'userId', width:0, hidden: true},
 			   		{name:'sessionId', index:'sessionId', width:0, hidden: true},
-			   		{name:'userName', index:'userName', width:570, searchoptions: { clearSearch: false }},
-			   		{name:'total', index:'total', width:174, align:"right", formatter:'number', search:false}		
+			   		{name:'userName', index:'userName', width:570, searchoptions: { clearSearch: false }, formatter:userNameFormatter},
+			   		{name:'total', index:'total', width:174, align:"right", formatter:'number', search:false},
+			   		{name:'portraitId', index:'portraitId', width:0, hidden: true},
 			   	],
 			   	ondblClickRow: function(rowid) {
 			   		var userId = jQuery("#list${sessionDto.sessionId}").getCell(rowid, 'userId');
@@ -56,9 +60,12 @@
 		  	       	);    
 	  	  		},
 			    loadError: function(xhr,st,err) {
-			    	jQuery("#list${sessionDto.sessionId}").clearGridData();
-			    	$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
-			    }
+			    		jQuery("#list${sessionDto.sessionId}").clearGridData();
+			    		$.jgrid.info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="error.loaderror"/>", "<fmt:message key="label.ok"/>");
+			    },
+			    loadComplete: function () {
+			   	 	initializePortraitPopover('<lams:LAMSURL/>');
+			    	},
 
 			})
 			<c:if test="${!sessionMap.assessment.useSelectLeaderToolOuput}">
@@ -162,7 +169,12 @@
 	    	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
 	    });
 	};
+
+	function userNameFormatter (cellvalue, options, rowObject) {
+		return definePortraitPopover(rowObject[4], rowObject[0],  rowObject[2]);
+	}
 	
+
 	function exportSummary() {
 		var url = "<c:url value='/monitoring/exportSummary.do'/>";
 	    var reqIDVar = new Date();
Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatMessageDTO.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatMessageDTO.java	(.../ChatMessageDTO.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatMessageDTO.java	(.../ChatMessageDTO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -34,6 +34,7 @@
     public Long uid;
 
     public String from;
+    public Long fromUserId;
 
     public String body;
 
@@ -45,6 +46,7 @@
 
     public ChatMessageDTO(ChatMessage chatMessage) {
 	this.from = chatMessage.getFromUser().getNickname();
+	this.fromUserId = chatMessage.getFromUser().getUserId();
 	this.body = chatMessage.getBody();
 	this.type = chatMessage.getType();
 	this.sendDate = chatMessage.getSendDate();
@@ -110,4 +112,12 @@
     public void setHidden(Boolean hidden) {
 	this.hidden = hidden;
     }
+
+    public Long getFromUserId() {
+        return fromUserId;
+    }
+
+    public void setFromUserId(Long fromUserId) {
+        this.fromUserId = fromUserId;
+    }
 }
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java
===================================================================
diff -u -ra8239ea3712e6f344d646ef625ef228d49f266c9 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision a8239ea3712e6f344d646ef625ef228d49f266c9)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -29,6 +29,8 @@
 import org.lamsfoundation.lams.tool.chat.model.ChatUser;
 import org.lamsfoundation.lams.tool.chat.service.IChatService;
 import org.lamsfoundation.lams.tool.chat.util.ChatConstants;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.HashUtil;
 import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -52,12 +54,16 @@
 	private Session session;
 	private String userName;
 	private String nickName;
+	private Long lamsUserId;
+	private Long portraitId;
 	private String hash;
 
-	private Websocket(Session session, String nickName) {
+	private Websocket(Session session, String nickName, Long lamsUserId, Long portraitId) {
 	    this.session = session;
 	    this.userName = session.getUserPrincipal().getName();
 	    this.nickName = nickName;
+	    this.lamsUserId = lamsUserId;
+	    this.portraitId = portraitId;
 	}
     }
 
@@ -175,7 +181,7 @@
 	private long lastDBCheckTime = 0;
 
 	// Learners who are currently active
-	private final Set<String> activeUsers = new TreeSet<>();
+	private final  TreeMap<String, Long[]> activeUsers = new TreeMap<String, Long[]>();
 
 	private Roster(Long toolSessionId) {
 	    this.toolSessionId = toolSessionId;
@@ -185,41 +191,53 @@
 	 * Checks which Learners
 	 */
 	private JSONArray getRosterJSON() {
-	    Set<String> localActiveUsers = new TreeSet<>();
+	    TreeMap<String, Long[]> localActiveUsers = new TreeMap<String, Long[]>();
 	    Set<Websocket> sessionWebsockets = LearningWebsocketServer.websockets.get(toolSessionId);
 	    // find out who is active locally
 	    for (Websocket websocket : sessionWebsockets) {
-		localActiveUsers.add(websocket.nickName);
+		localActiveUsers.put(websocket.nickName, new Long[] {websocket.lamsUserId, websocket.portraitId} );
 	    }
 
 	    // is it time to sync with the DB yet?
 	    long currentTime = System.currentTimeMillis();
 	    if ((currentTime - lastDBCheckTime) > ChatConstants.PRESENCE_IDLE_TIMEOUT) {
 		// store Learners active on this node
-		LearningWebsocketServer.getChatService().updateUserPresence(toolSessionId, localActiveUsers);
+		LearningWebsocketServer.getChatService().updateUserPresence(toolSessionId, localActiveUsers.keySet());
 
 		// read active Learners from all nodes
 		List<ChatUser> storedActiveUsers = LearningWebsocketServer.getChatService()
 			.getUsersActiveBySessionId(toolSessionId);
 		// refresh current collection
 		activeUsers.clear();
 		for (ChatUser activeUser : storedActiveUsers) {
-		    activeUsers.add(activeUser.getNickname());
+		    activeUsers.put(activeUser.getNickname(), new Long[] {activeUser.getUserId(), getPortraitId(activeUser.getUserId())});
 		}
 
 		lastDBCheckTime = currentTime;
 	    } else {
 		// add users active on this node; no duplicates - it is a set, not a list
-		activeUsers.addAll(localActiveUsers);
+		activeUsers.putAll(localActiveUsers);
 	    }
 
-	    return new JSONArray(activeUsers);
+	    JSONArray rosterJSON = new JSONArray();
+	    for ( Map.Entry<String, Long[]> entry : activeUsers.entrySet() ) {
+		Long[] ids = entry.getValue();
+		try {
+		    JSONObject userJSON = new JSONObject().put("nickName", entry.getKey()).put("lamsUserId", ids[0]).put("portraitId", ids[1]);
+		    rosterJSON.put(userJSON);
+		} catch (JSONException e) {
+		    log.error("Unable to add user to Chat roster. User details "+entry.getKey()+": "+ids);
+		    e.printStackTrace();
+		}
+	    }
+	    return rosterJSON;
 	}
     }
 
     private static Logger log = Logger.getLogger(LearningWebsocketServer.class);
 
     private static IChatService chatService;
+    private static IUserManagementService userManagmentService;
 
     private static final SendWorker sendWorker = new SendWorker();
     private static final Map<Long, Roster> rosters = new ConcurrentHashMap<>();
@@ -251,7 +269,7 @@
 		HibernateSessionManager.openSession();
 		ChatUser chatUser = LearningWebsocketServer.getChatService().getUserByLoginNameAndSessionId(userName,
 			toolSessionId);
-		Websocket websocket = new Websocket(session, chatUser.getNickname());
+		Websocket websocket = new Websocket(session, chatUser.getNickname(), chatUser.getUserId(), getPortraitId(chatUser.getUserId()));
 		finalSessionWebsockets.add(websocket);
 
 		// update the chat window immediatelly
@@ -371,6 +389,7 @@
 		JSONObject messageJSON = new JSONObject();
 		messageJSON.put("body", filteredMessage);
 		messageJSON.put("from", message.getFromUser().getNickname());
+		messageJSON.put("lamsUserId", message.getFromUser().getUserId());
 		messageJSON.put("type", message.getType());
 		messagesJSON.put(messageJSON);
 	    }
@@ -379,6 +398,15 @@
 	return messagesJSON;
     }
 
+    private static Long getPortraitId(Long userId) {
+	if ( userId != null ) {
+	    User user = (User) getUserManagementService().findById(User.class, userId.intValue());
+	    if ( user != null )
+		return user.getPortraitUuid();
+	} 
+	return null;
+    }
+    
     private static IChatService getChatService() {
 	if (LearningWebsocketServer.chatService == null) {
 	    WebApplicationContext wac = WebApplicationContextUtils
@@ -387,4 +415,14 @@
 	}
 	return LearningWebsocketServer.chatService;
     }
+
+    private static IUserManagementService getUserManagementService() {
+	if (LearningWebsocketServer.userManagmentService == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(SessionManager.getServletContext());
+	    LearningWebsocketServer.userManagmentService = (IUserManagementService) wac.getBean("userManagementService");
+	}
+	return LearningWebsocketServer.userManagmentService;
+    }
+
 }
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_chat/web/includes/css/chat.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/web/includes/css/chat.scss	(.../chat.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_chat/web/includes/css/chat.scss	(.../chat.scss)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -56,10 +56,17 @@
 	height: 200px;
 	overflow: auto;
 	border: $border-thin-default;
-	font-size: 12px;
-	font-weight: bold;
 	padding: 2px;
 }
+
+#roster span {
+    display: inline-block;
+	margin-left: 5px;
+	font-weight: bold;
+	font-size: 14px;
+    padding-top: 7px;
+    vertical-align: top;
+}
 	
 #sendMessageArea {
 	border: $border-thin-default;
@@ -73,7 +80,7 @@
 #sendMessageButton {
 	width: 100%;
 }
-
+    
 .selected {
 	background-color: $gray-lightest;
 	padding: 2px;
Index: lams_tool_chat/web/includes/css/chat_rtl.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/web/includes/css/chat_rtl.scss	(.../chat_rtl.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_tool_chat/web/includes/css/chat_rtl.scss	(.../chat_rtl.scss)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -26,18 +26,27 @@
 	height: 260px;
 	overflow: auto;
 	border: $border-thin-default;
+	font-size: 14px;
 	padding: 2px;
 	padding-right:5px;
 }
 
 #roster {
-	height: 260px;
+	height: 200px;
 	overflow: auto;
 	border: $border-thin-default;
-	font-weight: bold;
 	padding: 2px;
 }
 
+#roster span {
+    display: inline-block;
+	margin-left: 5px;
+	font-weight: bold;
+	font-size: 14px;
+    padding-top: 7px;
+    vertical-align: top;
+}
+
 #sendMessageArea {
 	border: $border-thin-default;
 	width: 99%;
Index: lams_tool_chat/web/includes/javascript/learning.js
===================================================================
diff -u -ra7abd606c1cbadff976b75ab062f1466358f8c96 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision a7abd606c1cbadff976b75ab062f1466358f8c96)
+++ lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -1,7 +1,4 @@
-// for chat users to be indetified by different colours
-var PALETTE = ["#008CD2", "#DF7C08", "#83B532", "#E0BE40", "#AE8124", "#5F0704", "#004272", "#CD322B", "#254806"],
-	// to be accessible from learning.jsp
-	sendChatToolMessage;
+var sendChatToolMessage; // to be accessible from learning.jsp
 
 $(document).ready(function() {
 	messageDiv = $("#messages");
@@ -70,27 +67,38 @@
 				'class' : 'message ' + (this.type == 'chat' ? 'private_message' : '')
 			});
 			$('<div />',{
-				'class' : 'messageFrom',
+				'class' : 'messageFrom '+getPortraitColourClass(this.lamsUserId),
 				'text'  : this.from
-			}).css('color' , getColour(this.from)).appendTo(container);
+			}).appendTo(container);
 			$('<span />',{
 				'text'  : this.body
 			}).appendTo(container);
 				
 			container.appendTo(messageDiv);
 		});
-	  
+	  		
 		// move to the bottom
 		messageDiv.scrollTop(messageDiv.prop('scrollHeight'));
 		rosterDiv.html('');
 		jQuery.each(input.roster, function(index, value){
 			var userDiv = $('<div />', {
-				'class' : (value == selectedUser ? 'selected' : 'unselected'),
-				'text'  : value
-			}).css('color', getColour(value))
+				'class' : (value.nickName == selectedUser ? 'selected' : 'unselected'),
+			})
 			  .appendTo(rosterDiv);
+
+			var pictureDivId = 'roster-'+value.lamsUserId;
+			$('<div />', {
+				'id'    : pictureDivId
+			}).appendTo(userDiv);
+			addPortrait(jQuery('#'+pictureDivId), value.portraitId, value.lamsUserId, 'small', true, LAMS_URL);
+
+			$('<span />', {
+				'class' : getPortraitColourClass(value.lamsUserId),
+				'text'  : value.nickName
+			}).appendTo(userDiv);			
+
 				
-				// only Monitor can send a personal message
+			// only Monitor can send a personal message
 			if (MODE == 'teacher') {
 				userDiv.click(function(){
 					userSelected($(this));
@@ -101,13 +109,12 @@
 	}
 	
 	function userSelected(userDiv) {
-		var userDivContent = userDiv.html();
+		var userDivContent = userDiv.children().last().html().trim();
 		// is Monitor clicked the already selectedd user, desect him and make message go to everyone
 		selectedUser = userDivContent == selectedUser ? null : userDivContent;
 
 		if (selectedUser) {
-			sendToUserSpan.html(selectedUser)
-			              .css('color', getColour(selectedUser));
+			sendToUserSpan.html(selectedUser);
 		}
 		sendToEveryoneSpan.css('display', selectedUser ? 'none' : 'inline');
 		sendToUserSpan.css('display', selectedUser ? 'inline' : 'none');
@@ -138,12 +145,3 @@
 		chatWebsocketPingFunc(true);
 	}
 });
-
-function getColour(nick) {
-	// same nick should give same colour
-	var charSum = 0;
-	for ( var i = 0; i < nick.length; i++) {
-		charSum += nick.charCodeAt(i);
-	}
-	return PALETTE[charSum % (PALETTE.length)];
-}
\ No newline at end of file
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -r4aed4a87f8fd3c2bf8ccef5405a24d4eed492505 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4aed4a87f8fd3c2bf8ccef5405a24d4eed492505)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -2,8 +2,9 @@
 
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script type="text/javascript">
-	var MODE = "${MODE}", TOOL_SESSION_ID = '${param.toolSessionID}', APP_URL = '<lams:WebAppURL />', LEARNING_ACTION = "<c:url value='/learning.do'/>";
+	var MODE = "${MODE}", TOOL_SESSION_ID = '${param.toolSessionID}', APP_URL = '<lams:WebAppURL />', LEARNING_ACTION = "<c:url value='/learning.do'/>", LAMS_URL = '<lams:LAMSURL/>';
 </script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
 <script type="text/javascript" src="includes/javascript/learning.js"></script>
 
 
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -19,11 +19,17 @@
 		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
 		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
 	};
+	
+	$(document).ready(function(){
+		initializePortraitPopover("${lams}");
+	});
+
 </script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
 
 <div class="panel">
 	<h4>
@@ -93,7 +99,7 @@
 					<c:forEach var="message" items="${session.messageDTOs}">
 						<div class="message">
 							<div class="messageFrom">
-								${message.from}
+								<lams:Portrait userId="${message.fromUserId}" hover="true">${message.from}</lams:Portrait>
 							</div>
 							<lams:out escapeHtml="true" value="${message.body}"></lams:out>
 						</div>
@@ -121,7 +127,7 @@
 				<c:forEach var="user" items="${session.userDTOs}">
 					<tr>
 						<td>
-							<c:out value="${user.nickname}" escapeXml="true"/>
+							<lams:Portrait userId="${user.userID}" hover="true"><c:out value="${user.nickname}" escapeXml="true"/></lams:Portrait>
 						</td>
 						<td class="text-center">
 							${user.postCount}
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
===================================================================
diff -u -rc16348669cdf01b5a29fd42018513fe3076f2390 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	(.../DacoConstants.java)	(revision c16348669cdf01b5a29fd42018513fe3076f2390)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	(.../DacoConstants.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -125,6 +125,8 @@
 
     public static final String RECORD_COUNT = "recordCount";
 
+    public static final String PORTRAIT_ID = "portraitId";
+
     // for parameters' name
 
     public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java	(.../DacoUserDAO.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java	(.../DacoUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -27,6 +27,7 @@
 
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.daco.model.DacoUser;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 
 public interface DacoUserDAO extends DAO {
 
@@ -39,7 +40,8 @@
     List<DacoUser> getBySessionId(Long sessionId, int sorting);
 
     List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString,
-	    boolean getNotebookEntries, ICoreNotebookService coreNotebookService);
+	    boolean getNotebookEntries, ICoreNotebookService coreNotebookService, 
+	    IUserManagementService userManagementService);
 
     int getCountUsersBySession(final Long sessionId, String searchString);
 }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java	(.../DacoUserDAOHibernate.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java	(.../DacoUserDAOHibernate.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -35,6 +35,7 @@
 import org.lamsfoundation.lams.tool.daco.DacoConstants;
 import org.lamsfoundation.lams.tool.daco.dao.DacoUserDAO;
 import org.lamsfoundation.lams.tool.daco.model.DacoUser;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -100,7 +101,8 @@
      * where the String is the notebook entry. No notebook entries needed? Will return "null" in their place.
      */
     public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting,
-	    String searchString, boolean getNotebookEntries, ICoreNotebookService coreNotebookService) {
+	    String searchString, boolean getNotebookEntries, ICoreNotebookService coreNotebookService,
+	    IUserManagementService userManagementService) {
 
 	String sortingOrder;
 	switch (sorting) {
@@ -128,15 +130,18 @@
 		    DacoConstants.TOOL_SIGNATURE, "user.user_id");
 	}
 
+	String[] portraitStrings = userManagementService.getPortraitSQL("user.user_id");
+	
 	// Basic select for the user records
 	StringBuilder queryText = new StringBuilder();
 
-	queryText.append("SELECT user.* ");
-	queryText.append(notebookEntryStrings != null ? notebookEntryStrings[0] : ", NULL notebookEntry");
-	queryText.append(", COUNT(DISTINCT(record_id)) record_count");
-	queryText.append(" FROM tl_ladaco10_users user ");
-	queryText.append(
-		" JOIN tl_ladaco10_sessions sess on user.session_uid = sess.uid and sess.session_id = :sessionId");
+	queryText.append("SELECT user.* ")
+		.append(notebookEntryStrings != null ? notebookEntryStrings[0] : ", NULL notebookEntry")
+		.append(", COUNT(DISTINCT(record_id)) record_count ")
+		.append(portraitStrings[0])
+		.append(" FROM tl_ladaco10_users user ")
+		.append(portraitStrings[1])
+		.append(	" JOIN tl_ladaco10_sessions sess on user.session_uid = sess.uid and sess.session_id = :sessionId");
 
 	// If filtering by name add a name based where clause
 	buildNameSearch(queryText, searchString);
@@ -155,7 +160,9 @@
 
 	SQLQuery query = getSession().createSQLQuery(queryText.toString());
 	query.addEntity("user", DacoUser.class).addScalar("record_count", IntegerType.INSTANCE)
-		.addScalar("notebookEntry", StringType.INSTANCE).setLong("sessionId", sessionId.longValue())
+		.addScalar("notebookEntry", StringType.INSTANCE)
+		.addScalar("portraitId", IntegerType.INSTANCE)
+		.setLong("sessionId", sessionId.longValue())
 		.setFirstResult(page * size).setMaxResults(size);
 	return query.list();
 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
diff -u -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision b67c428939ed96f08f56192d54b8ee55d8ab89d2)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -462,7 +462,7 @@
     public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting,
 	    String searchString, boolean getNotebookEntries) {
 	return dacoUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries,
-		coreNotebookService);
+		coreNotebookService, userManagementService);
     }
 
     @Override
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -262,6 +262,9 @@
 		responseRow.put(DacoConstants.NOTEBOOK_ENTRY,
 			StringEscapeUtils.escapeHtml((String) userAndReflection[2]));
 	    }
+	    if (userAndReflection.length > 3 && userAndReflection[3] != null) {
+		responseRow.put(DacoConstants.PORTRAIT_ID, userAndReflection[3]);
+	    }
 	    rows.put(responseRow);
 	}
 	responsedata.put("rows", rows);
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_daco/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r98b4429925d6b35e6cffd0c16847f805cfa58f2d -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 98b4429925d6b35e6cffd0c16847f805cfa58f2d)
+++ lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -3,8 +3,11 @@
 <c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
 <c:set var="anyRecordsAvailable" value="false" />	
 <c:set var="daco" value="${sessionMap.daco}"/>
+<c:set var="lams"><lams:LAMSURL/></c:set>
 				
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js"></script>
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js"></script>
+<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
+
 <script type="text/javascript">
 	function exportSummary(){
 		location.href = "<c:url value='/monitoring/exportToSpreadsheet.do'/>?sessionMapID=${sessionMapID}&reqID=" + (new Date()).getTime();
@@ -43,13 +46,13 @@
 			            json = {};
 			    		
 						for (i = 0; i < data.rows.length; i++){
-							var userData = data.rows[i];
+							var userData = data.rows[i],
+								userId = userData["userId"],
+								fullName = userData["userFullName"];;
 							
 							rows += '<tr>';
 							
-							rows += '<td>';
-							rows += 	userData["userFullName"];
-							rows += '</td>';
+							rows += '<td>'+ definePortraitPopover(userData["portraitId"], userId, fullName, fullName) +'</td>';
 							
 							rows += '<td align="center">';
 							rows += userData["recordCount"];
@@ -83,7 +86,9 @@
 						return json;
 			            
 			    	}				
-				}})
+				}}).bind('pagerInitialized pagerComplete', function(event, options){
+					initializePortraitPopover('${lams}');
+	            })
 			});
 	  	})
 </script>
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2fc3c196b706f247820267da4439c301a1a77805 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IForumUserDAO.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IForumUserDAO.java	(.../IForumUserDAO.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IForumUserDAO.java	(.../IForumUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -4,6 +4,7 @@
 
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 
 public interface IForumUserDAO extends IBaseDAO {
 
@@ -22,6 +23,7 @@
     int getCountUsersBySession(Long sessionId, String searchString);
 
     List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString,
-	    boolean getNotebookEntries, ICoreNotebookService coreNotebookService);
+	    boolean getNotebookEntries, ICoreNotebookService coreNotebookService, 
+	    IUserManagementService userManagementService);
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java	(.../ForumUserDao.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java	(.../ForumUserDao.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -30,12 +30,14 @@
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.SQLQuery;
+import org.hibernate.type.IntegerType;
 import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 import org.lamsfoundation.lams.tool.forum.persistence.IForumUserDAO;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -94,7 +96,8 @@
      * where the String is the notebook entry. No notebook entries needed? Will return "null" in their place.
      */
     public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting,
-	    String searchString, boolean getNotebookEntries, ICoreNotebookService coreNotebookService) {
+	    String searchString, boolean getNotebookEntries, ICoreNotebookService coreNotebookService,
+	    IUserManagementService userManagementService) {
 	String sortingOrder;
 	boolean sortOnMessage;
 	switch (sorting) {
@@ -143,12 +146,16 @@
 		    ForumConstants.TOOL_SIGNATURE, "user.user_id");
 	}
 
+	String[] portraitStrings = userManagementService.getPortraitSQL("user.user_id");
+
 	// Basic select for the user records
 	StringBuilder queryText = new StringBuilder();
 
 	queryText.append("SELECT user.* ");
 	queryText.append(notebookEntryStrings != null ? notebookEntryStrings[0] : ", NULL notebookEntry");
+	queryText.append(portraitStrings[0]);
 	queryText.append(" FROM tl_lafrum11_forum_user user ");
+	queryText.append(portraitStrings[1]);
 	queryText.append(
 		" JOIN tl_lafrum11_tool_session session ON user.session_id = session.uid and session.session_id = :sessionId");
 
@@ -176,6 +183,7 @@
 
 	SQLQuery query = getSession().createSQLQuery(queryText.toString());
 	query.addEntity("user", ForumUser.class).addScalar("notebookEntry", StringType.INSTANCE)
+		.addScalar("portraitId", IntegerType.INSTANCE)
 		.setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size);
 	return query.list();
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision b67c428939ed96f08f56192d54b8ee55d8ab89d2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -525,7 +525,7 @@
     public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting,
 	    String searchString, boolean getNotebookEntries) {
 	return forumUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries,
-		coreNotebookService);
+		coreNotebookService, userManagementService);
     }
 
     @Override
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -rb47369533cc464d433b2a4306e8cc0bd3f8ecaa1 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision b47369533cc464d433b2a4306e8cc0bd3f8ecaa1)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -142,6 +142,10 @@
 
     public static final String ATTR_USER_UID = "userUid";
 
+    public static final String ATTR_USER_ID = "userId";
+
+    public static final String ATTR_PORTRAIT_ID = "portraitId";
+
     public static final String ATTR_MESSAGES = "messages";
 
     public static final String PARAM_UPDATE_MODE = "updateMode";
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
diff -u -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -307,6 +307,7 @@
 	    ForumUser user = (ForumUser) userAndReflection[0];
 
 	    responseRow.put(ForumConstants.ATTR_USER_UID, user.getUid());
+	    responseRow.put(ForumConstants.ATTR_USER_ID, user.getUserId());
 	    responseRow.put("userName", StringEscapeUtils.escapeHtml(user.getLastName() + " " + user.getFirstName()));
 
 	    int numberOfPosts = 0;
@@ -338,6 +339,11 @@
 	    if (userAndReflection.length > 1 && userAndReflection[1] != null) {
 		responseRow.put("notebookEntry", StringEscapeUtils.escapeHtml((String) userAndReflection[1]));
 	    }
+	    
+	    if (userAndReflection.length > 2 && userAndReflection[2] != null) {
+		responseRow.put(ForumConstants.ATTR_PORTRAIT_ID, userAndReflection[2]);
+	    }
+
 	    rows.put(responseRow);
 	}
 	responcedata.put("rows", rows);
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
diff -u -r28c1edeb0c0a2c65e829deeeaa0ad4e8c7226a58 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision 28c1edeb0c0a2c65e829deeeaa0ad4e8c7226a58)
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	(.../summary.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -29,6 +29,8 @@
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 <script src="${lams}includes/javascript/jquery.timeago.js" type="text/javascript"></script>
 <script src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js" type="text/javascript"></script>
+<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
+
 <script type="text/javascript">
 
 	function releaseMarks(sessionId){
@@ -86,7 +88,7 @@
 							rows += '<tr>';
 							
 							rows += '<td>';
-							rows += 	userData["userName"];
+							rows += 	definePortraitPopover(userData["portraitId"], userData["userId"], userData["userName"], userData["userName"]);
 							rows += '</td>';
 							
 							rows += '<td align="right">';
@@ -135,6 +137,7 @@
 			    	}
 				}})
 			  .bind('pagerInitialized pagerComplete', function(event, options){
+					initializePortraitPopover('${lams}');
 					$("time.timeago").timeago();
 				})
 			 
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java
===================================================================
diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision f98151f6d4d6f66f3d8e482481aa198076133e71)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtConstants.java	(.../SbmtConstants.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -53,6 +53,8 @@
 
     public static final String ATTR_USER_FILE_MARKED = "marked";
 
+    public static final String ATTR_PORTRAIT_ID = "portraitId";
+
     public static final String SUCCESS = "success";
 
     public static final String ATTR_FINISH_LOCK = "finishLock";
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java	(.../ISubmitUserDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/ISubmitUserDAO.java	(.../ISubmitUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -31,6 +31,7 @@
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 
 public interface ISubmitUserDAO extends IBaseDAO {
 
@@ -50,7 +51,8 @@
     public void saveOrUpdateUser(SubmitUser user);
 
     List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString,
-	    boolean getNotebookEntries, ICoreNotebookService coreNotebookService);
+	    boolean getNotebookEntries, ICoreNotebookService coreNotebookService, 
+	    IUserManagementService userManagementService);
 
     int getCountUsersBySession(final Long sessionId, String searchString);
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
===================================================================
diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	(.../SubmitUserDAO.java)	(revision f98151f6d4d6f66f3d8e482481aa198076133e71)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java	(.../SubmitUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.tool.sbmt.SubmitUser;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitUserDAO;
 import org.lamsfoundation.lams.tool.sbmt.dto.StatisticDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -96,7 +97,8 @@
      * and String is the notebook entry. No notebook entries needed? Will return null in their place.
      */
     public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting,
-	    String searchString, boolean getNotebookEntries, ICoreNotebookService coreNotebookService) {
+	    String searchString, boolean getNotebookEntries, ICoreNotebookService coreNotebookService,
+	    IUserManagementService userManagementService) {
 	String sortingOrder;
 	switch (sorting) {
 	    case SbmtConstants.SORT_BY_USERNAME_ASC:
@@ -129,13 +131,18 @@
 		    SbmtConstants.TOOL_SIGNATURE, "user.user_id");
 	}
 
+	String[] portraitStrings = userManagementService.getPortraitSQL("user.user_id");
+	
 	// Basic select for the user records
 	StringBuilder queryText = new StringBuilder();
-	queryText.append("SELECT user.*, COUNT(details.submission_id) numFiles, COALESCE(SUM(details.removed),0) numFilesRemoved, count(report.marks) numFilesMarked ");
-	queryText.append(notebookEntryStrings != null ? notebookEntryStrings[0] : ", NULL notebookEntry");
-	queryText.append(" FROM tl_lasbmt11_user user ");
-	queryText.append(" LEFT JOIN tl_lasbmt11_submission_details details ON user.uid = details.learner_id ");
-	queryText.append(" LEFT JOIN tl_lasbmt11_report report ON details.submission_id = report.report_id ");
+	queryText.append("SELECT user.* ")
+		.append(portraitStrings[0])
+		.append(", COUNT(details.submission_id) numFiles, COALESCE(SUM(details.removed),0) numFilesRemoved, count(report.marks) numFilesMarked ")
+		.append(notebookEntryStrings != null ? notebookEntryStrings[0] : ", NULL notebookEntry")
+		.append(" FROM tl_lasbmt11_user user ")
+		.append(portraitStrings[1])
+		.append(" LEFT JOIN tl_lasbmt11_submission_details details ON user.uid = details.learner_id ")
+		.append(" LEFT JOIN tl_lasbmt11_report report ON details.submission_id = report.report_id ");
 
 	// If using notebook, add the notebook join
 	if (notebookEntryStrings != null) {
@@ -155,6 +162,7 @@
 
 	SQLQuery query = getSession().createSQLQuery(queryText.toString());
 	query.addEntity("user", SubmitUser.class)
+		.addScalar("portraitId", IntegerType.INSTANCE)
 		.addScalar("numFiles", IntegerType.INSTANCE).addScalar("numFilesRemoved", IntegerType.INSTANCE)
 		.addScalar("numFilesMarked", IntegerType.INSTANCE).addScalar("notebookEntry", StringType.INSTANCE)
 		.setLong("sessionId", sessionId.longValue()).setFirstResult(page * size).setMaxResults(size);
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rb67c428939ed96f08f56192d54b8ee55d8ab89d2 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision b67c428939ed96f08f56192d54b8ee55d8ab89d2)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -1013,7 +1013,7 @@
     public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting,
 	    String searchString, boolean getNotebookEntries) {
 	return submitUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries,
-		coreNotebookService);
+		coreNotebookService, userManagementService);
     }
 
     @Override
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
===================================================================
diff -u -rf98151f6d4d6f66f3d8e482481aa198076133e71 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision f98151f6d4d6f66f3d8e482481aa198076133e71)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -197,18 +197,22 @@
 	    responseRow.put(SbmtConstants.ATTR_USER_FULLNAME, StringEscapeUtils.escapeHtml(user.getFullName()));
 
 	    if (userAndReflection.length > 2) {
-		responseRow.put(SbmtConstants.ATTR_USER_NUM_FILE, 
-			(Integer)userAndReflection[1] - (Integer)userAndReflection[2]);
+		responseRow.put(SbmtConstants.ATTR_PORTRAIT_ID, (Integer)userAndReflection[1]);
 	    }
 
 	    if (userAndReflection.length > 3) {
-		responseRow.put(SbmtConstants.ATTR_USER_FILE_MARKED, (Integer) userAndReflection[3] > 0);
+		responseRow.put(SbmtConstants.ATTR_USER_NUM_FILE, 
+			(Integer)userAndReflection[2] - (Integer)userAndReflection[3]);
 	    }
 
 	    if (userAndReflection.length > 4) {
-		responseRow.put(SbmtConstants.ATTR_USER_REFLECTION, userAndReflection[4]);
+		responseRow.put(SbmtConstants.ATTR_USER_FILE_MARKED, (Integer) userAndReflection[4] > 0);
 	    }
 
+	    if (userAndReflection.length > 5) {
+		responseRow.put(SbmtConstants.ATTR_USER_REFLECTION, userAndReflection[5]);
+	    }
+
 	    rows.put(responseRow);
 	}
 
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r07ace0e41d113321756cbe1d75ab04d8c9cb5841 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 07ace0e41d113321756cbe1d75ab04d8c9cb5841)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -22,6 +22,7 @@
 	};
 </script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
 
 <script type="text/javascript">
 	$(document).ready(function(){
@@ -56,13 +57,13 @@
 			            json = {};
 			    		
 						for (i = 0; i < data.rows.length; i++){
-							var userData = data.rows[i];
-
+							var userData = data.rows[i],
+								userId = userData["userID"],
+								fullName = userData["fullName"];
+							
 							rows += '<tr>';
-							rows += '<td>'
-							rows += userData["fullName"];
-							rows += '</td>';
-							rows += '<td align="center">'
+ 							rows += '<td>'+ definePortraitPopover(userData["portraitId"], userId, fullName, fullName) +'</td>';
+ 							rows += '<td align="center">'
 							rows += userData["numFiles"];
 							rows += '</td>';
 							
@@ -72,7 +73,7 @@
 							} else {
 								rows += '<fmt:message key="label.no"/>';
 							}
-							rows += ' [<a href=\"javascript:viewMark('+userData["userID"]+','+$(table).attr("data-session-id")+');\"><fmt:message key="label.view.files" /></a>]';
+							rows += ' [<a href=\"javascript:viewMark('+userId+','+$(table).attr("data-session-id")+');\"><fmt:message key="label.view.files" /></a>]';
 							rows += '</td>';
 
 							<c:if test="${reflectOn}">
@@ -93,10 +94,12 @@
 						return json;
 			            
 			    	}
-				}
-			})
+			}
+			}).bind('pagerInitialized pagerComplete', function(event, options){
+				initializePortraitPopover('${lams}');
+            })
 		});
-  	})
+  	});
 
   	
   	function launchPopup(url, title) {
@@ -136,6 +139,7 @@
 			}
 		);
 	}
+
 </script>
 
 <div class="panel">
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r60d9a173d5590295376322fc3e857ae2dca37717
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 839af8b148458fd7202f178fb52274dca01fc090)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
@@ -404,7 +404,7 @@
       <icon></icon>
       <name>Portrait</name>
       <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
-      <body-content>empty</body-content>
+      <body-content>JSP</body-content>
       <attribute>
          <name>userId</name>
          <required>true</required>
@@ -421,6 +421,12 @@
          <rtexprvalue>true</rtexprvalue>
          <description>If true shows the portrait as a round dot. Defaults to true.</description>
       </attribute>
+      <attribute>
+         <name>hover</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true then display as a hover box. Uses the body of the tag as the link text.</description>
+      </attribute>
    </tag>
 	
 	<tag-file>