Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java =================================================================== diff -u -r5a2704204eda443d4fb54e97babed70b9d71ee60 -r6e6834a96c084fdf27df2dc93d0243fbd5d02cea --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java (.../DokumaranConstants.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java (.../DokumaranConstants.java) (revision 6e6834a96c084fdf27df2dc93d0243fbd5d02cea) @@ -32,13 +32,6 @@ public static final int COMPLETED = 1; - // for action forward name - public static final String SUCCESS = "success"; - - public static final String ERROR = "error"; - - public static final String DEFINE_LATER = "definelater"; - // for parameters' name public static final String PARAM_TOOL_CONTENT_ID = "toolContentID"; Index: lams_tool_doku/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -r6e6834a96c084fdf27df2dc93d0243fbd5d02cea --- lams_tool_doku/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 955865d255f86a5447f729ec1ce573b2b6f94b27) +++ lams_tool_doku/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 6e6834a96c084fdf27df2dc93d0243fbd5d02cea) @@ -6,6 +6,7 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -55,7 +56,9 @@ decoderDiv = $('
'); $(document).ready(function (){ - initLearnerPage(${toolSessionID}); + const toolSessionID = ${empty lessonID ? toolSessionID : 'null'}, + lessonID = ${empty lessonID ? 'null' : lessonID}; + initLearnerPage(toolSessionID, lessonID); }); function preventLearnerAutosaveFromMultipleTabs(autosaveInterval) { @@ -75,56 +78,75 @@
- - -
+
Skip to main content Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp =================================================================== diff -u -rc27659274965610a7fba1206a679ba04e6adc9a2 -r6e6834a96c084fdf27df2dc93d0243fbd5d02cea --- lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision c27659274965610a7fba1206a679ba04e6adc9a2) +++ lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision 6e6834a96c084fdf27df2dc93d0243fbd5d02cea) @@ -1,20 +1,15 @@ <%@ include file="/common/taglibs.jsp"%> - + - - - <fmt:message key="label.learning.title" /> - - <%@ include file="/common/header.jsp"%> + - - - <%@ include file="websocket.jsp"%> - - - - +
-

- - -

- -

-

- +
+ + +
+ +
+
+ +
+ +
+ -

+
-

- - - - - - - - + + + - - - + + - +
-

+
-

+
-
- - -
- -
- <%-- Do not show rating to own group before Gallery Walk is finished --%> - - - +
+ +
+ <%-- Do not show rating to own group before Gallery Walk is finished --%> + + + - -
+
- -
+
+ -
+
- + - + - - - - - - - - - - - - +
- - - \ No newline at end of file +
+ \ No newline at end of file Index: lams_tool_doku/web/pages/learning/learning.jsp =================================================================== diff -u -rc27659274965610a7fba1206a679ba04e6adc9a2 -r6e6834a96c084fdf27df2dc93d0243fbd5d02cea --- lams_tool_doku/web/pages/learning/learning.jsp (.../learning.jsp) (revision c27659274965610a7fba1206a679ba04e6adc9a2) +++ lams_tool_doku/web/pages/learning/learning.jsp (.../learning.jsp) (revision 6e6834a96c084fdf27df2dc93d0243fbd5d02cea) @@ -1,5 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> + <%-- param has higher level for request attribute --%> @@ -12,10 +13,7 @@ - - - <fmt:message key="label.learning.title" /> - <%@ include file="/common/header.jsp"%> +