Index: lams_central/web/includes/javascript/portrait.js =================================================================== diff -u -r109770ef4799d23d87de1863a0c9f1d8e35dc457 -r9d9cc8919a083419104f0af2d0e6dae95b582146 --- lams_central/web/includes/javascript/portrait.js (.../portrait.js) (revision 109770ef4799d23d87de1863a0c9f1d8e35dc457) +++ lams_central/web/includes/javascript/portrait.js (.../portrait.js) (revision 9d9cc8919a083419104f0af2d0e6dae95b582146) @@ -55,7 +55,7 @@ html: true, trigger: 'hover focus', title: element.dataset.fullname, - delay: { "show": 700, "hide": 100 }, + delay: { "show": 400, "hide": 100 }, container: 'body' // ensures popovers are not clipped within jqgrid tables }); element.classList.remove('new-popover'); Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java =================================================================== diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r9d9cc8919a083419104f0af2d0e6dae95b582146 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java (.../ReflectDTO.java) (revision b15a3b889da23ac048a689fc2d661df42571b229) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/ReflectDTO.java (.../ReflectDTO.java) (revision 9d9cc8919a083419104f0af2d0e6dae95b582146) @@ -9,6 +9,7 @@ */ public class ReflectDTO { private Long userUid; + private Long userId; private String fullName; private String loginName; private String reflectInstrctions; @@ -20,6 +21,7 @@ this.setLoginName(user.getLoginName()); this.setFullName(user.getFirstName() + " " + user.getLastName()); this.setUserUid(user.getUid()); + this.setUserId(user.getUserId()); } public boolean isFinishReflection() { @@ -77,4 +79,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_doku/web/pages/monitoring/reflections.jsp =================================================================== diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r9d9cc8919a083419104f0af2d0e6dae95b582146 --- lams_tool_doku/web/pages/monitoring/reflections.jsp (.../reflections.jsp) (revision b15a3b889da23ac048a689fc2d661df42571b229) +++ lams_tool_doku/web/pages/monitoring/reflections.jsp (.../reflections.jsp) (revision 9d9cc8919a083419104f0af2d0e6dae95b582146) @@ -1,5 +1,11 @@ <%@ include file="/common/taglibs.jsp"%> + +
@@ -16,7 +22,8 @@ - - + + -
Index: lams_tool_doku/web/pages/monitoring/summary.jsp =================================================================== diff -u -ra2465202b849862100eb2b0f0eba1fd7b4e1aa7c -r9d9cc8919a083419104f0af2d0e6dae95b582146 --- lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision a2465202b849862100eb2b0f0eba1fd7b4e1aa7c) +++ lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 9d9cc8919a083419104f0af2d0e6dae95b582146) @@ -51,6 +51,7 @@ + + Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp =================================================================== diff -u -r3f6a314d2a87004bd18a5d5076cd9162dea82437 -r9d9cc8919a083419104f0af2d0e6dae95b582146 --- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp (.../wikiDisplay.jsp) (revision 3f6a314d2a87004bd18a5d5076cd9162dea82437) +++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp (.../wikiDisplay.jsp) (revision 9d9cc8919a083419104f0af2d0e6dae95b582146) @@ -1,6 +1,12 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%> + + @@ -261,7 +267,7 @@ - ${user.firstName} ${user.lastName} +