Index: lams_tool_task/web/pages/learning/learning.jsp =================================================================== diff -u -rbe42ba5063335619d4e04832ea235f96b82f0e53 -r341a816804f6b2b61a5f180479b56d8fd0d1ea29 --- lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision be42ba5063335619d4e04832ea235f96b82f0e53) +++ lams_tool_task/web/pages/learning/learning.jsp (.../learning.jsp) (revision 341a816804f6b2b61a5f180479b56d8fd0d1ea29) @@ -26,15 +26,18 @@ document.location.href = "?mode=${mode}&toolSessionID=${toolSessionID}"; return false; } - function viewItem(itemUid){ - var myUrl = "?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid; - launchPopup(myUrl,"LearnerView"); + + function completeItem(itemUid){ + document.location.href = "?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=" + itemUid; + return false; } + function finishSession(){ document.getElementById("finishButton").disabled = true; document.location.href =''; return false; } + function continueReflect(){ document.location.href=''; } @@ -65,16 +68,17 @@ if (elem != null) { elem.style.display="block"; } - } + } --> -
+ +

${taskList.title}

@@ -98,70 +102,12 @@ ${taskList.instructions}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - ${item.title} - - - - ${item.title} - - - - - [${item.createBy.loginName}] - - - - * - - - - - - - - - - -
+ + <%@ include file="/pages/learning/parts/itemlist.jsp"%> + + + * -

@@ -173,6 +119,8 @@



+ + @@ -193,6 +141,7 @@ +
@@ -220,10 +169,11 @@
+ - - + + @@ -252,9 +202,6 @@
- - -