Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java,v diff -u -r1.9.2.3 -r1.9.2.4 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java 11 May 2016 07:37:22 -0000 1.9.2.3 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java 26 Jul 2016 01:29:59 -0000 1.9.2.4 @@ -63,6 +63,7 @@ public static final String PARAM_ENTRY = "entry"; public static final String PARAM_NAME = "userName"; public static final String PARAM_MODIFIED_DATE = "lastEdited"; + public static final String PARAM_MODIFIED_DATE_TIMEAGO = "lastEditedTimeago"; public static final String PARAM_COMMENT = "comment"; public static final String PARAM_COMMENT_SORT = "commentsort"; // used to trigger sorting on comments Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java,v diff -u -r1.13.2.6 -r1.13.2.7 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java 11 May 2016 07:37:22 -0000 1.13.2.6 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java 26 Jul 2016 01:30:00 -0000 1.13.2.7 @@ -167,6 +167,8 @@ Date modifiedDate = (Date) userAndReflection[2]; responseRow.put(NotebookConstants.PARAM_MODIFIED_DATE, DateUtil.convertToStringForJSON(modifiedDate, request.getLocale())); + responseRow.put(NotebookConstants.PARAM_MODIFIED_DATE_TIMEAGO, + DateUtil.convertToStringForTimeagoJSON(modifiedDate)); } else { responseRow.put(NotebookConstants.PARAM_MODIFIED_DATE, noEntry); } Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_tool_notebook/web/WEB-INF/tags/Page.tag 1 Jul 2016 00:58:09 -0000 1.1.2.4 +++ lams_tool_notebook/web/WEB-INF/tags/Page.tag 26 Jul 2016 01:29:59 -0000 1.1.2.5 @@ -1,49 +1,261 @@ <%@ tag body-content="scriptless"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> <%@ attribute name="type" required="true" rtexprvalue="true"%> <%@ attribute name="style" required="false" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%> <%@ attribute name="headingContent" required="false" rtexprvalue="true"%> + + - -
-
+ + <%-- Combined tab and navigation bar used in authoring and monitoring --%> +
+
+ +
+
+
+ + + + <%-- Learner --%> + + <%-- Links placed in body instead of head. Ugly, but it works. --%> + + + - - - - - -
- -
-
- - - ${titleHelpURL} - -
- - + + <%-- Desperately try to get tool session ID from the tool activity --%> + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+
+ +
+
+ + + ${titleHelpURL} + +
+ + + +
+ +
+ +
- -
- + +
+ +
- - - -
-
-
+ + + +
+
+
+
+ +
+
+ + + ${titleHelpURL} + +
+ + + +
+ +
+ +
+
+
+
+
+ + + + + + \ No newline at end of file Index: lams_tool_notebook/web/pages/monitoring/headItems.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/headItems.jsp,v diff -u -r1.3.14.2 -r1.3.14.3 --- lams_tool_notebook/web/pages/monitoring/headItems.jsp 18 May 2016 10:29:29 -0000 1.3.14.2 +++ lams_tool_notebook/web/pages/monitoring/headItems.jsp 26 Jul 2016 01:29:59 -0000 1.3.14.3 @@ -17,4 +17,6 @@ + + \ No newline at end of file Index: lams_tool_notebook/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/monitoring/summary.jsp,v diff -u -r1.15.2.9 -r1.15.2.10 --- lams_tool_notebook/web/pages/monitoring/summary.jsp 3 Jun 2016 01:35:08 -0000 1.15.2.9 +++ lams_tool_notebook/web/pages/monitoring/summary.jsp 26 Jul 2016 01:29:59 -0000 1.15.2.10 @@ -72,11 +72,18 @@ } else { jQuery("#group${sessionId}").setCell(rowId, 'commentsort',''); } + var lastEdited = jQuery("#group${sessionId}").getCell(rowId, 'lastEdited'); + var lastEditedTimeagoFormat = jQuery("#group${sessionId}").getCell(rowId, 'lastEditedTimeago'); + if ( lastEditedTimeagoFormat && lastEditedTimeagoFormat.length > 0) { + jQuery("#group${sessionId}").setCell(rowId, 'lastEditedTimeagoOutput', + ''); + } var entry = jQuery("#group${sessionId}").getCell(rowId, 'entry'); if (entry && entry.length > 0) { $("#group${sessionId}").expandSubGridRow(rowId); } }); + $("time.timeago").timeago(); }, subGridRowExpanded: function(subgridDivId, rowId) { var subgrid = jQuery("#"+subgridDivId); @@ -129,6 +136,8 @@ 'userUid', "", "", + "", + "", 'entry', "", // comment summary for sorting 'actualComment'], @@ -137,7 +146,9 @@ {name:'id',index:'id', width:10, hidden: true, search: false}, {name:'userUid',index:'userUid', width:0, hidden: true, search: false}, {name:'userName',index:'userName', width:200}, - {name:'lastEdited',index:'lastEdited', width:120, search: false}, + {name:'lastEdited',index:'lastEdited', hidden: true, width:0, search: false}, + {name:'lastEditedTimeago',index:'lastEditedTimeago', hidden: true, width:0, search: false}, + {name:'lastEditedTimeagoOutput',index:'lastEditedTimeagoOutput', width:120, search: false}, {name:'entry',index:'entry', hidden: true, width:0, search: false}, {name:'commentsort',index:'commentsort', width:40, search: false }, {name:'comment',index:'comment', hidden: true, width:0, search: false} @@ -166,6 +177,7 @@ }); }; setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300); + });