Index: lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml	(.../Wookie.hbm.xml)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml	(.../Wookie.hbm.xml)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -43,7 +43,7 @@
 
         <property
             name="createBy"
-            type="java.lang.Long"
+            type="java.lang.Integer"
             update="true"
             insert="true"
             column="create_by"
Index: lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieSession.hbm.xml
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieSession.hbm.xml	(.../WookieSession.hbm.xml)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieSession.hbm.xml	(.../WookieSession.hbm.xml)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -100,6 +100,48 @@
 
         </set>
 
+        <property
+            name="widgetSharedDataKey"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="widget_shared_data_key"
+            length="63"
+        />
+
+        <property
+            name="widgetHeight"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="widget_height"
+        />
+
+        <property
+            name="widgetWidth"
+            type="java.lang.Integer"
+            update="true"
+            insert="true"
+            column="widget_width"
+        />
+
+        <property
+            name="widgetMaximise"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="widget_maximise"
+        />
+
+        <property
+            name="widgetIdentifier"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="widget_identifier"
+            length="511"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-WookieSession.xml
Index: lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml	(.../WookieUser.hbm.xml)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml	(.../WookieUser.hbm.xml)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -90,6 +90,15 @@
             column="entry_uid"
         />
 
+        <property
+            name="userWidgetURL"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="user_widget_url"
+            length="511"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-WookieUser.xml
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java
===================================================================
diff -u -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -47,6 +47,7 @@
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.wookie.dto.WidgetData;
 import org.lamsfoundation.lams.tool.wookie.dto.WookieDTO;
 import org.lamsfoundation.lams.tool.wookie.dto.WookieUserDTO;
 import org.lamsfoundation.lams.tool.wookie.model.Wookie;
@@ -56,6 +57,7 @@
 import org.lamsfoundation.lams.tool.wookie.service.WookieServiceProxy;
 import org.lamsfoundation.lams.tool.wookie.util.WookieConstants;
 import org.lamsfoundation.lams.tool.wookie.util.WookieException;
+import org.lamsfoundation.lams.tool.wookie.util.WookieUtil;
 import org.lamsfoundation.lams.tool.wookie.web.forms.LearningForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
@@ -65,6 +67,8 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
+import com.thoughtworks.xstream.XStream;
+
 /**
  * @author
  * @version
@@ -96,12 +100,6 @@
 
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	String redoQuestion = request.getParameter("redoQuestion");
-	boolean isRedo = false;
-	if (redoQuestion != null && redoQuestion.equals("true")) {
-	    isRedo = true;
-	}
-
 	// set up wookieService
 	if (wookieService == null) {
 	    wookieService = WookieServiceProxy.getWookieService(this.getServlet().getServletContext());
@@ -147,6 +145,13 @@
 	} else {
 	    wookieUser = getCurrentUser(toolSessionID);
 	}
+	
+	// Create a new widget instance for the user if required.
+	if (wookieUser.getUserWidgetURL() == null || wookieUser.getUserWidgetURL().equals("")) {
+	    String userWidgetURL = initiateWidget(wookieSession.getWidgetIdentifier(), wookieSession.getWidgetSharedDataKey());
+	    wookieUser.setUserWidgetURL(userWidgetURL);
+	    wookieService.saveOrUpdateWookieUser(wookieUser);
+	}
 
 	// set up the user dto
 	WookieUserDTO wookieUserDTO = new WookieUserDTO(wookieUser);
@@ -178,14 +183,35 @@
 	} else {
 	    request.setAttribute("contentEditable", true);
 	}
+	request.setAttribute("userWidgetURL", wookieUser.getUserWidgetURL());
+	request.setAttribute("widgetHeight", wookieSession.getWidgetHeight());
+	request.setAttribute("widgetWidth", wookieSession.getWidgetWidth());
+	request.setAttribute("widgetMaximise", wookieSession.getWidgetMaximise());
 	request.setAttribute("finishedActivity", wookieUser.isFinishedActivity());
 	return mapping.findForward("wookie");
     }
+    
+    private String initiateWidget(String wookieIdentifier, String sharedDataKey) throws WookieException {
+	try {
 
+	    String wookieUrl = wookieService.getWookieURL();
+	    String wookieKey = wookieService.getWookieAPIKey();
+
+	    wookieUrl += WookieConstants.RELATIVE_URL_WIDGET_SERVICE;
+
+	    String returnXML = WookieUtil.getWidget(wookieUrl, wookieKey, wookieIdentifier, getUser(), sharedDataKey, false);
+	    return  WookieUtil.getWidgetUrlFromXML(returnXML);
+
+	} catch (Exception e) {
+	    log.error("Problem intitating widget for learner" + e);
+	    throw new WookieException(e);
+	}
+    }
+
     
 
     private WookieUser getCurrentUser(Long toolSessionId) {
-	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	UserDTO user = getUser();
 
 	// attempt to retrieve user using userId and toolSessionId
 	WookieUser wookieUser = wookieService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()),
@@ -198,6 +224,10 @@
 
 	return wookieUser;
     }
+    
+    private UserDTO getUser() {
+	return (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+    }
 
     public ActionForward finishActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
Index: lams_tool_wookie/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -85,20 +85,10 @@
         redirect="false"
       />
       <forward
-        name="success"
-        path="/pages/learning/success.jsp"
-        redirect="false"
-      />
-      <forward
         name="notebook"
         path="/pages/learning/notebook.jsp"
         redirect="false"
       />
-      <forward
-        name="viewAll"
-        path="/pages/learning/viewAll.jsp"
-        redirect="false"
-      />
     </action>
     <action
       path="/monitoring"
Index: lams_tool_wookie/web/includes/javascript/authoring.js
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -6,29 +6,7 @@
 		selectTab(tag.value);
 	} else {
 		selectTab(1);
-	}
-	
-	image = document.getElementById("image");
-	if (image != null)
-	{
-		origImageHeight = image.height;
-		origImageWidth =  image.width;
-	
-		if (image.height >= image.width)
-		{
-			if (image.height > 300)
-			{
-				image.height = 300;
-			}
-		}
-		else
-		{
-			if (image.width > 300)
-			{
-				image.width = 300;
-			}
-		}		
-	}		
+	}	
 }
 function doSelectTab(tabId) {
 	var tag = document.getElementById("currentTab");
Index: lams_tool_wookie/web/includes/javascript/learning.js
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/web/includes/javascript/learning.js	(.../learning.js)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/includes/javascript/learning.js	(.../learning.js)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -1,32 +1,7 @@
 
-var origImageHeight;
-var origImageWidth;
-
 function init()
 {
-	//resizing image to thumbnail size
-	var image = document.getElementById("image");
-	origImageHeight = image.height;
-	origImageWidth =  image.width;
-	if (image.height >= image.width)
-	{
-		if (image.height > 300)
-		{
-			image.height = 300;
-		}
-	}
-	else
-	{
-		if (image.width > 300)
-		{
-			image.width = 300;
-		}
-	}
-}
 
-function openImage(url)
-{
-	openPopup(url, origImageHeight, origImageWidth)
 }
 
 function disableFinishButton() 
Index: lams_tool_wookie/web/pages/authoring/basic.jsp
===================================================================
diff -u -r1b9cc5f77d2ca9a23335fd5dcfc7ee44b87f91b3 -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1b9cc5f77d2ca9a23335fd5dcfc7ee44b87f91b3)
+++ lams_tool_wookie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -6,9 +6,6 @@
 
 <script type="text/javascript">
 <!--
-	var image;
-	var origImageHeight;
-	var origImageWidth;
 	var pageCount = ${widgetPages};
 	var browseAreaLoaded = false;
 	
Index: lams_tool_wookie/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e)
+++ lams_tool_wookie/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -11,8 +11,6 @@
 	<script type="text/javascript">
 		<!--
 			var popupWindow = null;
-			var origImageHeight;
-			var origImageWidth;
 			
 			function openPopup(url, height, width)
 			{	
@@ -25,27 +23,6 @@
 			
 			function init()
 			{
-				image = document.getElementById("originalImage");
-				if (image != null)
-				{
-					origImageHeight = image.height;
-					origImageWidth =  image.width;
-				
-					if (image.height >= image.width)
-					{
-						if (image.height > 300)
-						{
-							image.height = 300;
-						}
-					}
-					else
-					{
-						if (image.width > 300)
-						{
-							image.width = 300;
-						}
-					}		
-				}
 			}
 		//-->
 		</script>
@@ -62,16 +39,7 @@
 
 <br />
 
-<h2><fmt:message key="title.originalImage" /></h2>
 
-<br />
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <img
-	src="tool_images/${wookieDTO.imageFileName}" id="originalImage"
-	title='<fmt:message key="tooltip.openfullsize" />'
-	onclick="openPopup('tool_images/${wookieDTO.imageFileName}', origImageHeight, origImageWidth);" />
-
-<br />
-
 <c:choose>
 	<c:when test='${mode == "teacher"}'>
 
@@ -93,47 +61,10 @@
 			<div id="sid-${session.sessionID}">
 			<h3>${session.sessionName}</h3>
 
-			<table cellpadding="0" class="alternative-color">
-				<tr>
-					<th><fmt:message key="monitoring.th.learner" /></th>
-					<th><fmt:message key="monitoring.th.image" /></th>
-					<c:if test="${wookieDTO.reflectOnActivity}">
-						<th><fmt:message key="monitoring.th.reflection" /></th>
-					</c:if>
-				</tr>
 
 				<c:forEach var="user" items="${session.userDTOs}">
-					<tr>
-						<td><a
-							href="javascript:openPopup('${wookieImageFolderURL}/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})">
-						${user.firstName} ${user.lastName} </a></td>
-						<td align="center"><c:choose>
-							<c:when
-								test="${user.imageFileName != null && user.imageFileName != wookieDTO.imageFileName}">
-								<img src="tool_images/${user.imageFileName}"
-									height="${user.imageThumbnailHeight}"
-									width="${user.imageThumbnailWidth}"
-									title='<fmt:message key="tooltip.openfullsize" />'
-									onclick="openPopup('tool_images/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="label.notAvailable" />
-							</c:otherwise>
-						</c:choose></td>
-
-						<c:if test="${wookieDTO.reflectOnActivity}">
-							<td><c:choose>
-								<c:when test="${user.finishedReflection}">
-															${user.notebookEntry}
-														</c:when>
-								<c:otherwise>
-									<fmt:message key="label.notAvailable" />
-								</c:otherwise>
-							</c:choose></td>
-						</c:if>
-					</tr>
+					
 				</c:forEach>
-			</table>
 			</div>
 		</c:forEach>
 
Fisheye: Tag 857f9a4afbdb784f3cd9508d1eeec864e368f221 refers to a dead (removed) revision in file `lams_tool_wookie/web/pages/learning/image.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/web/pages/learning/wookie.jsp
===================================================================
diff -u -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/web/pages/learning/wookie.jsp	(.../wookie.jsp)	(revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e)
+++ lams_tool_wookie/web/pages/learning/wookie.jsp	(.../wookie.jsp)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -8,8 +8,6 @@
 	{
 		window.location.href = "<lams:WebAppURL/>/learning.do?mode=${mode}&toolSessionID=${toolSessionID}&redoQuestion=true";
 	}
-	
-	
 
 //-->
 </script>
@@ -40,6 +38,22 @@
 	</c:if>
 
 	&nbsp;
+	
+	<table width="100%">
+		<tr align="center">
+			<td>
+				<iframe
+						id="widgetIframe"
+						src="${userWidgetURL}" 
+						name="widgetIframe"
+						style="width:${widgetWidth}px;height:${widgetHeight}px;border:0px;" 
+						frameborder="no"
+						scrolling="no"
+						>
+				</iframe>
+			</td>
+		</tr>
+	</table>
 
 	<c:set var="lrnForm"
 		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
Fisheye: Tag 857f9a4afbdb784f3cd9508d1eeec864e368f221 refers to a dead (removed) revision in file `lams_tool_wookie/web/pages/monitoring/image.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wookie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -refb1dfc1149cd22eb0b47ff1d1fe35f6af95086e -r857f9a4afbdb784f3cd9508d1eeec864e368f221
--- lams_tool_wookie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision efb1dfc1149cd22eb0b47ff1d1fe35f6af95086e)
+++ lams_tool_wookie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 857f9a4afbdb784f3cd9508d1eeec864e368f221)
@@ -6,7 +6,6 @@
 <script type="text/javascript">
 	function submitForm(method, uid) {
 		document.getElementById("dispatch").value = method;
-		document.getElementById("hideUserImageUid").value = uid;
 		document.getElementById("monitoringForm").submit();
 	}
 </script>
@@ -74,10 +73,9 @@
 
 <html:form action="/monitoring" method="post" styleId="monitoringForm">
 	
-	<html:hidden property="dispatch" styleId="dispatch" value="toggleHideImage" />
+	<html:hidden property="dispatch" styleId="dispatch" />
 	<html:hidden property="contentFolderID" value="${contentFolderID}" />	
 	<html:hidden property="toolContentID" value="${toolContentID}"/>
-	<html:hidden property="hideUserImageUid" styleId="hideUserImageUid"/>
 	
 	<c:forEach var="session" items="${dto.sessionDTOs}">
 	
@@ -99,7 +97,6 @@
 		<table cellpadding="0" class="alternative-color">
 			<tr>
 				<th><fmt:message key="monitoring.th.learner" /></th>
-				<th><fmt:message key="monitoring.th.image" /></th>
 				<c:if test="${wookieDTO.reflectOnActivity}">
 					<th><fmt:message key="monitoring.th.reflection" /></th>
 				</c:if>