Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v
diff -u -r1.18 -r1.19
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml	27 Mar 2014 07:46:05 -0000	1.18
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml	6 May 2014 13:26:33 -0000	1.19
@@ -14,7 +14,6 @@
 			scope="request" 
 			parameter="definelater" 
 			validate="false">
-			<forward name="forbidden" path="/pages/authoring/definelaterforbid.jsp" />
 			<forward name="success" path="/pages/authoring/start.jsp" />
 		</action>
 		<action path="/authoring/init"
@@ -24,7 +23,6 @@
 			parameter="initPage" 
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
-			<forward name="definelater" path="/pages/authoring/definelater.jsp" />
 		</action>
 		
 		<action path="/authoring/update"
@@ -34,7 +32,6 @@
 			parameter="updateContent" 
 			validate="false">
 			<forward name="author" path="/pages/authoring/authoring.jsp" />
-			<forward name="monitor" path="/pages/authoring/definelater.jsp" />
 		</action>
 		<!-- ==========  Scratchie Item : URL ========== -->
 		<action path="/authoring/addItem"
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java,v
diff -u -r1.19 -r1.20
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	17 Jan 2014 22:12:29 -0000	1.19
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	6 May 2014 13:26:33 -0000	1.20
@@ -86,6 +86,8 @@
     public static final String ATTR_ANSWER_DESCRIPTION_PREFIX = "answerDescription";
     
     public static final String ATTR_ANSWER_ORDER_ID_PREFIX = "answerOrderId";
+    
+    public static final String ATTR_ANSWER_UID_PREFIX = "answerUid";
 
     public static final String ATTR_DELETED_ITEM_LIST = "deleteItemList";
     
@@ -129,8 +131,6 @@
 
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
 
-    public static final String PAGE_EDITABLE = "isPageEditable";
-
     public static final String ATTR_REFLECTION_ON = "reflectOn";
 
     public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml,v
diff -u -r1.13 -r1.14
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	17 Jan 2014 22:12:29 -0000	1.13
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	6 May 2014 13:26:33 -0000	1.14
@@ -101,7 +101,7 @@
         </property>
         <property name="transactionAttributes">
             <props>
-            	<prop key="recalculateMarkForSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+            	<prop key="recalculate*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java	19 Jul 2012 19:20:08 -0000	1.1
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java	6 May 2014 13:26:33 -0000	1.2
@@ -35,8 +35,10 @@
      * @param scratchieUid
      * @return
      */
-    List getAuthoringItems(Long scratchieUid);
+    List<ScratchieItem> getAuthoringItems(Long scratchieUid);
 
     ScratchieItem getByUid(Long scratchieItemUid);
+    
+    void releaseItemFromCache(ScratchieItem item);
 
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java	24 Sep 2013 16:49:12 -0000	1.2
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java	6 May 2014 13:26:33 -0000	1.3
@@ -33,13 +33,19 @@
     private static final String FIND_AUTHORING_ITEMS = "from " + ScratchieItem.class.getName()
 	    + " where scratchie_uid = ? order by create_date asc";
 
-    public List getAuthoringItems(Long scratchieUid) {
-
+    @Override
+    public List<ScratchieItem> getAuthoringItems(Long scratchieUid) {
 	return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS, scratchieUid);
     }
 
+    @Override
     public ScratchieItem getByUid(Long scratchieItemUid) {
 	return (ScratchieItem) this.getObject(ScratchieItem.class, scratchieItemUid);
     }
 
+    @Override
+    public void releaseItemFromCache(ScratchieItem item) {
+	getHibernateTemplate().evict(item);
+    }
+
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140505.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140505.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20140505.sql	6 May 2014 13:26:33 -0000	1.1
@@ -0,0 +1,16 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3224 Ability to change, add, remove questions even after student have reached it
+ALTER TABLE tl_lascrt11_scratchie DROP COLUMN content_in_use;
+
+UPDATE lams_tool SET tool_version='20140505' WHERE tool_signature='lascrt11';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java,v
diff -u -r1.8 -r1.9
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	17 Jan 2014 22:12:29 -0000	1.8
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	6 May 2014 13:26:33 -0000	1.9
@@ -58,8 +58,6 @@
 
     private boolean defineLater;
 
-    private boolean contentInUse;
-
     // general infomation
     private Date created;
 
@@ -273,18 +271,6 @@
     }
 
     /**
-     * @hibernate.property column="content_in_use"
-     * @return
-     */
-    public boolean isContentInUse() {
-	return contentInUse;
-    }
-
-    public void setContentInUse(boolean contentInUse) {
-	this.contentInUse = contentInUse;
-    }
-
-    /**
      * @hibernate.property column="define_later"
      * @return
      */
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java,v
diff -u -r1.27 -r1.28
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	15 Apr 2014 13:46:01 -0000	1.27
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	6 May 2014 13:26:33 -0000	1.28
@@ -281,4 +281,16 @@
     Set<ScratchieUser> getAllLeaders(Long contentId);
     
     void changeUserMark(Long userId, Long userUid, Integer newMark);
+    
+    /**
+     * Recalculate marks after editing content from monitoring.
+     * 
+     * @param scratchie
+     * @param oldItems
+     * @param newItems
+     */
+    void recalculateUserAnswers(Scratchie scratchie, Set<ScratchieItem> oldItems, Set<ScratchieItem> newItems,
+	    List<ScratchieItem> deletedItems);
+    
+    void releaseItemsFromCache(Scratchie scratchie);
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	17 Jan 2014 22:12:28 -0000	1.2
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	6 May 2014 13:26:33 -0000	1.3
@@ -60,4 +60,11 @@
 	this.removeField(Scratchie.class, "offlineInstructions");
 	this.removeField(Scratchie.class, "attachments");
     }
+    
+    /**
+     * Import 20131212 version content to 20140102 version tool server.
+     */
+    public void up20140102To20140505() {
+	this.removeField(Scratchie.class, "contentInUse");
+    }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v
diff -u -r1.46 -r1.47
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	28 Apr 2014 12:05:33 -0000	1.46
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	6 May 2014 13:26:33 -0000	1.47
@@ -23,8 +23,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.scratchie.service;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -42,26 +40,14 @@
 import java.util.SortedMap;
 import java.util.TreeSet;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.hibernate.Hibernate;
-import org.hibernate.proxy.HibernateProxy;
-import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
-import org.lamsfoundation.lams.contentrepository.ICredentials;
-import org.lamsfoundation.lams.contentrepository.ITicket;
-import org.lamsfoundation.lams.contentrepository.LoginException;
-import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
-import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
-import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
-import org.lamsfoundation.lams.learningdesign.Activity;
-import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.learningdesign.Transition;
-import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -72,7 +58,6 @@
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
-import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -95,7 +80,6 @@
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieAnswerComparator;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieToolContentHandler;
-import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -105,7 +89,6 @@
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
- * 
  * @author Andrey Balan
  */
 public class ScratchieServiceImpl implements IScratchieService, ToolContentManager, ToolSessionManager,
@@ -178,8 +161,8 @@
     }
 
     @Override
-    public List getAuthoredItems(Long scratchieUid) {
-	List res = scratchieItemDao.getAuthoringItems(scratchieUid);
+    public List<ScratchieItem> getAuthoredItems(Long scratchieUid) {
+	List<ScratchieItem> res = scratchieItemDao.getAuthoringItems(scratchieUid);
 	return res;
     }
 
@@ -198,6 +181,13 @@
     public void saveOrUpdateScratchie(Scratchie scratchie) {
 	scratchieDao.saveObject(scratchie);
     }
+    
+    @Override
+    public void releaseItemsFromCache(Scratchie scratchie) {
+	for (ScratchieItem item : (Set<ScratchieItem>)scratchie.getScratchieItems()) {
+	    scratchieItemDao.releaseItemFromCache(item);
+	}
+    }
 
     @Override
     public void deleteScratchieItem(Long uid) {
@@ -331,7 +321,88 @@
 	    }
 	}
     }
+    
+    @Override
+    public void recalculateUserAnswers(Scratchie scratchie, Set<ScratchieItem> oldItems, Set<ScratchieItem> newItems,
+	    List<ScratchieItem> deletedItems) {
 
+	//create list of modified questions
+	List<ScratchieItem> modifiedItems = new ArrayList<ScratchieItem>();
+	for (ScratchieItem oldItem : oldItems) {
+	    for (ScratchieItem newItem : newItems) {
+		if (oldItem.getUid().equals(newItem.getUid())) {
+		    
+		    boolean isItemModified = false;
+
+		    //title or description is different
+		    if (!oldItem.getTitle().equals(newItem.getTitle())
+			    || !oldItem.getDescription().equals(newItem.getDescription())) {
+			isItemModified = true;
+		    }
+		    
+		    //options are different
+		    Set<ScratchieAnswer> oldAnswers = oldItem.getAnswers();
+		    Set<ScratchieAnswer> newAnswers = newItem.getAnswers();
+		    for (ScratchieAnswer oldAnswer : oldAnswers) {
+			for (ScratchieAnswer newAnswer : newAnswers) {
+			    if (oldAnswer.getUid().equals(newAnswer.getUid())) {
+				
+				if (!StringUtils.equals(oldAnswer.getDescription(), newAnswer.getDescription())
+					|| (oldAnswer.isCorrect() != newAnswer.isCorrect())) {
+				    isItemModified = true;
+				}			
+			    }
+			}
+		    }
+		    
+		    if (isItemModified) {
+			modifiedItems.add(newItem);
+		    }
+		}
+	    }    
+	}
+	
+	List<ScratchieSession> sessionList = scratchieSessionDao.getByContentId(scratchie.getContentId());
+	for (ScratchieSession session : sessionList) {
+	    Long toolSessionId = session.getSessionId();
+	    List<ScratchieAnswerVisitLog> visitLogsToDelete = new ArrayList<ScratchieAnswerVisitLog>();
+	    boolean isRecalculateMarks = false;
+
+	    // remove all scratches for modified and removed items
+
+	    // [+] if the item was removed
+	    for (ScratchieItem deletedItem : deletedItems) {
+		List<ScratchieAnswerVisitLog> visitLogs = scratchieAnswerVisitDao.getLogsBySessionAndItem(
+			toolSessionId, deletedItem.getUid());
+		visitLogsToDelete.addAll(visitLogs);
+	    }
+
+	    // [+] if the question is modified
+	    for (ScratchieItem modifiedItem : modifiedItems) {
+		List<ScratchieAnswerVisitLog> visitLogs = scratchieAnswerVisitDao.getLogsBySessionAndItem(
+			toolSessionId, modifiedItem.getUid());
+		visitLogsToDelete.addAll(visitLogs);
+	    }
+	    
+	    //remove all visit logs marked for deletion
+	    Iterator<ScratchieAnswerVisitLog> iter = visitLogsToDelete.iterator();
+	    while (iter.hasNext()) {
+		ScratchieAnswerVisitLog visitLogToDelete = iter.next();
+		iter.remove();
+		scratchieAnswerVisitDao.removeObject(ScratchieAnswerVisitLog.class, visitLogToDelete.getUid());
+		isRecalculateMarks = true;
+	    }
+
+	    // [+] doing nothing if the new question was added
+
+	    // recalculate marks if it's required
+	    if (isRecalculateMarks) {
+		recalculateMarkForSession(toolSessionId, true);
+	    }
+	}
+
+    }
+
     @Override
     public ScratchieAnswer getScratchieAnswerByUid(Long answerUid) {
 	ScratchieAnswer res = (ScratchieAnswer) userManagementService.findById(ScratchieAnswer.class, answerUid);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	27 Mar 2014 12:36:29 -0000	1.17
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java	6 May 2014 13:26:33 -0000	1.18
@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -42,7 +43,6 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
@@ -70,9 +70,7 @@
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchieForm;
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchieItemForm;
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchiePedagogicalPlannerForm;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
@@ -192,7 +190,7 @@
 	ScratchieForm scratchieForm = (ScratchieForm) form;
 
 	// initial Session Map
-	SessionMap sessionMap = new SessionMap();
+	SessionMap<String, Object> sessionMap = new SessionMap<String, Object>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	scratchieForm.setSessionMapID(sessionMap.getSessionID());
 
@@ -225,9 +223,6 @@
 	if (items == null) {
 	    items = new ArrayList<ScratchieItem>();
 	} else {
-	    ScratchieUser scratchieUser = null;
-	    // handle system default question: createBy is null, now set it to
-	    // current user
 	    for (ScratchieItem item : items) {
 
 		// sort answers by order id. it's needed only for the default answers. rest could be skipped
@@ -260,7 +255,7 @@
     private ActionForward initPage(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	ScratchieForm existForm = (ScratchieForm) sessionMap.get(ScratchieConstants.ATTR_RESOURCE_FORM);
 
 	ScratchieForm scratchieForm = (ScratchieForm) form;
@@ -271,11 +266,9 @@
 	}
 
 	ToolAccessMode mode = getAccessMode(request);
-	if (mode.isAuthor()) {
-	    return mapping.findForward(ScratchieConstants.SUCCESS);
-	} else {
-	    return mapping.findForward(ScratchieConstants.DEFINE_LATER);
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	
+	return mapping.findForward(ScratchieConstants.SUCCESS);
     }
 
     /**
@@ -286,55 +279,72 @@
 	ScratchieForm scratchieForm = (ScratchieForm) form;
 
 	// get back sessionMAP
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(scratchieForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(scratchieForm.getSessionMapID());
 
 	ToolAccessMode mode = getAccessMode(request);
 
 	Scratchie scratchie = scratchieForm.getScratchie();
 	IScratchieService service = getScratchieService();
 
-	// **********************************Get Scratchie
-	// PO*********************
+	// **********************************Get Scratchie PO*********************
 	Scratchie scratchiePO = service.getScratchieByContentId(scratchieForm.getScratchie().getContentId());
+
+	Set<ScratchieItem> oldItems = (scratchiePO == null) ? new HashSet<ScratchieItem>() : scratchiePO
+		.getScratchieItems();
+	//initialize oldItems' answers
+	for (ScratchieItem oldItem: oldItems) {
+	    for (ScratchieAnswer answer : (Set<ScratchieAnswer>)oldItem.getAnswers()) {
+	    }
+	}
+	
+	//allow using old and modified questions and references altogether
+	if (mode.isTeacher()) {
+	    service.releaseItemsFromCache(scratchiePO);
+	}
+	
 	if (scratchiePO == null) {
 	    // new Scratchie, create it.
 	    scratchiePO = scratchie;
 	    scratchiePO.setCreated(new Timestamp(new Date().getTime()));
 	    scratchiePO.setUpdated(new Timestamp(new Date().getTime()));
+	    
 	} else {
-	    if (mode.isAuthor()) {
-		Long uid = scratchiePO.getUid();
-		PropertyUtils.copyProperties(scratchiePO, scratchie);
-		// get back UID
-		scratchiePO.setUid(uid);
-	    } else { // if it is Teacher, then just update basic tab content
-		     // (definelater)
-		scratchiePO.setInstructions(scratchie.getInstructions());
-		scratchiePO.setTitle(scratchie.getTitle());
-		// change define later status
+	    Long uid = scratchiePO.getUid();
+	    PropertyUtils.copyProperties(scratchiePO, scratchie);
+	    // set back UID
+	    scratchiePO.setUid(uid);
+
+	    // if it is Teacher (from monitor) - change define later status
+	    if (mode.isTeacher()) {
 		scratchiePO.setDefineLater(false);
 	    }
+	    
 	    scratchiePO.setUpdated(new Timestamp(new Date().getTime()));
 	}
 
 	// ************************* Handle scratchie items *******************
-	// Handle scratchie items
-	Set itemList = new LinkedHashSet();
-	SortedSet topics = getItemList(sessionMap);
-	Iterator iter = topics.iterator();
+	Set<ScratchieItem> items = new LinkedHashSet<ScratchieItem>();
+	SortedSet<ScratchieItem> newItems = getItemList(sessionMap);
+	Iterator<ScratchieItem> iter = newItems.iterator();
 	while (iter.hasNext()) {
-	    ScratchieItem item = (ScratchieItem) iter.next();
+	    ScratchieItem item = iter.next();
 	    if (item != null) {
 		removeNewLineCharacters(item);
-		itemList.add(item);
+		items.add(item);
 	    }
 	}
-	scratchiePO.setScratchieItems(itemList);
-	// delete instructino file from database.
-	List delScratchieItemList = getDeletedItemList(sessionMap);
-	iter = delScratchieItemList.iterator();
+	scratchiePO.setScratchieItems(items);
+	
+	//recalculate results in case content is edited from monitoring
+	List<ScratchieItem> deletedItems = getDeletedItemList(sessionMap);
+	 if (mode.isTeacher()) {
+	    service.recalculateUserAnswers(scratchiePO, oldItems, newItems, deletedItems);
+	}
+	
+	// delete items from database.
+	iter = deletedItems.iterator();
 	while (iter.hasNext()) {
-	    ScratchieItem item = (ScratchieItem) iter.next();
+	    ScratchieItem item = iter.next();
 	    iter.remove();
 	    if (item.getUid() != null) {
 		service.deleteScratchieItem(item.getUid());
@@ -348,11 +358,9 @@
 	scratchieForm.setScratchie(scratchiePO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
-	if (mode.isAuthor()) {
-	    return mapping.findForward("author");
-	} else {
-	    return mapping.findForward("monitor");
-	}
+	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
+	
+	return mapping.findForward("author");
     }
 
     /**
@@ -362,7 +370,7 @@
 	    HttpServletResponse response) {
 
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	ScratchieItemForm itemForm = (ScratchieItemForm) form;
 	itemForm.setSessionMapID(sessionMapID);
@@ -388,10 +396,10 @@
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
-	int itemIdx = NumberUtils.stringToInt(request.getParameter(ScratchieConstants.PARAM_ITEM_INDEX), -1);
+	int itemIdx = NumberUtils.toInt(request.getParameter(ScratchieConstants.PARAM_ITEM_INDEX), -1);
 	ScratchieItem item = null;
 	if (itemIdx != -1) {
 	    SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
@@ -425,10 +433,10 @@
 	    HttpServletResponse response) {
 
 	ScratchieItemForm itemForm = (ScratchieItemForm) form;
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(itemForm.getSessionMapID());
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(itemForm.getSessionMapID());
 	// check whether it is "edit(old Question)" or "add(new Question)"
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
-	int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(), -1);
+	int itemIdx = NumberUtils.toInt(itemForm.getItemIndex(), -1);
 	ScratchieItem item = null;
 
 	if (itemIdx == -1) { // add
@@ -472,7 +480,7 @@
 	    HttpServletResponse response) throws UnsupportedEncodingException {
 	// big part of code was taken from saveItem() method
 	String sessionMapId = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapId);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapId);
 	String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 
@@ -544,7 +552,7 @@
     private ActionForward exportQTI(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws UnsupportedEncodingException {
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 	List<Question> questions = new LinkedList<Question>();
 
@@ -592,18 +600,18 @@
 
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 
-	int itemIndex = NumberUtils.stringToInt(request.getParameter(ScratchieConstants.PARAM_ITEM_INDEX), -1);
+	int itemIndex = NumberUtils.toInt(request.getParameter(ScratchieConstants.PARAM_ITEM_INDEX), -1);
 	if (itemIndex != -1) {
 	    List<ScratchieItem> rList = new ArrayList<ScratchieItem>(itemList);
 	    ScratchieItem item = rList.remove(itemIndex);
 	    itemList.clear();
 	    itemList.addAll(rList);
 
 	    // add to delList
-	    List delList = getDeletedItemList(sessionMap);
+	    List<ScratchieItem> delList = getDeletedItemList(sessionMap);
 	    delList.add(item);
 	}
 
@@ -642,10 +650,10 @@
     private ActionForward switchItem(ActionMapping mapping, HttpServletRequest request, boolean up) {
 	String sessionMapID = WebUtil.readStrParam(request, ScratchieConstants.ATTR_SESSION_MAP_ID);
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 
-	int itemIndex = NumberUtils.stringToInt(request.getParameter(ScratchieConstants.PARAM_ITEM_INDEX), -1);
+	int itemIndex = NumberUtils.toInt(request.getParameter(ScratchieConstants.PARAM_ITEM_INDEX), -1);
 	if (itemIndex != -1) {
 	    List<ScratchieItem> rList = new ArrayList<ScratchieItem>(itemList);
 
@@ -716,7 +724,7 @@
 
 	SortedSet<ScratchieAnswer> answerList = getAnswersFromRequest(request, false);
 
-	int answerIndex = NumberUtils.stringToInt(request.getParameter(ScratchieConstants.PARAM_ANSWER_INDEX), -1);
+	int answerIndex = NumberUtils.toInt(request.getParameter(ScratchieConstants.PARAM_ANSWER_INDEX), -1);
 	if (answerIndex != -1) {
 	    List<ScratchieAnswer> rList = new ArrayList<ScratchieAnswer>(answerList);
 	    rList.remove(answerIndex);
@@ -761,7 +769,7 @@
     private ActionForward switchAnswer(ActionMapping mapping, HttpServletRequest request, boolean up) {
 	SortedSet<ScratchieAnswer> answerList = getAnswersFromRequest(request, false);
 
-	int answerIndex = NumberUtils.stringToInt(request.getParameter(ScratchieConstants.PARAM_ANSWER_INDEX), -1);
+	int answerIndex = NumberUtils.toInt(request.getParameter(ScratchieConstants.PARAM_ANSWER_INDEX), -1);
 	if (answerIndex != -1) {
 	    List<ScratchieAnswer> rList = new ArrayList<ScratchieAnswer>(answerList);
 
@@ -832,7 +840,7 @@
      * @param request
      * @return
      */
-    private SortedSet<ScratchieItem> getItemList(SessionMap sessionMap) {
+    private SortedSet<ScratchieItem> getItemList(SessionMap<String, Object> sessionMap) {
 	SortedSet<ScratchieItem> list = (SortedSet<ScratchieItem>) sessionMap.get(ScratchieConstants.ATTR_ITEM_LIST);
 	if (list == null) {
 	    list = new TreeSet<ScratchieItem>(new ScratchieItemComparator());
@@ -847,7 +855,7 @@
      * @param request
      * @return
      */
-    private List getDeletedItemList(SessionMap sessionMap) {
+    private List<ScratchieItem> getDeletedItemList(SessionMap<String, Object> sessionMap) {
 	return getListFromSession(sessionMap, ScratchieConstants.ATTR_DELETED_ITEM_LIST);
     }
 
@@ -858,7 +866,7 @@
      * @param name
      * @return
      */
-    private List getListFromSession(SessionMap sessionMap, String name) {
+    private List getListFromSession(SessionMap<String, Object> sessionMap, String name) {
 	List list = (List) sessionMap.get(name);
 	if (list == null) {
 	    list = new ArrayList();
@@ -878,9 +886,9 @@
     private TreeSet<ScratchieAnswer> getAnswersFromRequest(HttpServletRequest request, boolean isForSaving) {
 	Map<String, String> paramMap = splitRequestParameter(request, ScratchieConstants.ATTR_ANSWER_LIST);
 	Integer correctAnswerIndex = (paramMap.get(ScratchieConstants.ATTR_ANSWER_CORRECT) == null) ? null
-		: NumberUtils.stringToInt(paramMap.get(ScratchieConstants.ATTR_ANSWER_CORRECT));
+		: NumberUtils.toInt(paramMap.get(ScratchieConstants.ATTR_ANSWER_CORRECT));
 
-	int count = NumberUtils.stringToInt(paramMap.get(ScratchieConstants.ATTR_ANSWER_COUNT));
+	int count = NumberUtils.toInt(paramMap.get(ScratchieConstants.ATTR_ANSWER_COUNT));
 	TreeSet<ScratchieAnswer> answerList = new TreeSet<ScratchieAnswer>(new ScratchieAnswerComparator());
 	for (int i = 0; i < count; i++) {
 
@@ -890,8 +898,13 @@
 	    }
 
 	    ScratchieAnswer answer = new ScratchieAnswer();
+	    String uidStr = paramMap.get(ScratchieConstants.ATTR_ANSWER_UID_PREFIX + i);
+	    if (uidStr != null) {
+		Long uid = NumberUtils.toLong(uidStr);
+		answer.setUid(uid);
+	    }
 	    String orderIdStr = paramMap.get(ScratchieConstants.ATTR_ANSWER_ORDER_ID_PREFIX + i);
-	    Integer orderId = NumberUtils.stringToInt(orderIdStr);
+	    Integer orderId = NumberUtils.toInt(orderIdStr);
 	    answer.setOrderId(orderId);
 	    answer.setDescription(answerDescription);
 	    if ((correctAnswerIndex != null) && correctAnswerIndex.equals(orderId)) {
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.42 -r1.43
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	15 Apr 2014 23:02:46 -0000	1.42
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	6 May 2014 13:26:33 -0000	1.43
@@ -214,17 +214,6 @@
 	    return mapping.findForward("defineLater");
 	}
 
-	// set contentInUse flag to true!
-	scratchie.setContentInUse(true);
-	scratchie.setDefineLater(false);
-	tryExecute(new Callable<Object>() {
-	    @Override
-	    public Object call() throws ScratchieApplicationException {
-		LearningAction.service.saveOrUpdateScratchie(scratchie);
-		return null;
-	    }
-	});
-
 	ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(
 		toolSessionId, request, getServlet().getServletContext());
 	sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
@@ -370,7 +359,7 @@
 	Long answerUid = NumberUtils.createLong(request.getParameter(ScratchieConstants.PARAM_ANSWER_UID));
 	ScratchieAnswer answer = LearningAction.service.getScratchieAnswerByUid(answerUid);
 	if (answer == null) {
-	    return mapping.findForward(ScratchieConstants.ERROR);
+	    return null;
 	}
 
 	JSONObject JSONObject = new JSONObject();
@@ -396,7 +385,7 @@
 	ScratchieSession toolSession = LearningAction.service.getScratchieSessionBySessionId(toolSessionId);
 
 	ScratchieUser leader = this.getCurrentUser(toolSessionId);
-	// only leaders are allowed to scratch answers
+	// only leader is allowed to scratch answers
 	if (!toolSession.isUserGroupLeader(leader.getUid())) {
 	    return null;
 	}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	15 Apr 2014 13:46:01 -0000	1.20
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	6 May 2014 13:26:33 -0000	1.21
@@ -124,7 +124,6 @@
 	boolean isGroupedActivity = service.isGroupedActivity(contentId);
 	sessionMap.put(ScratchieConstants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity);
 	sessionMap.put(ScratchieConstants.ATTR_SUMMARY_LIST, summaryList);
-	sessionMap.put(ScratchieConstants.PAGE_EDITABLE, scratchie.isContentInUse());
 	sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, scratchie);
 	sessionMap.put(ScratchieConstants.ATTR_LEARNERS, learners);
 	sessionMap.put(ScratchieConstants.ATTR_TOOL_CONTENT_ID, contentId);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java,v
diff -u -r1.8 -r1.9
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java	17 Jan 2014 22:12:29 -0000	1.8
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java	6 May 2014 13:26:33 -0000	1.9
@@ -166,7 +166,6 @@
 	boolean isGroupedActivity = service.isGroupedActivity(toolContentID);
 	sessionMap.put(ScratchieConstants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity);
 	sessionMap.put(ScratchieConstants.ATTR_SUMMARY_LIST, summaryList);
-	sessionMap.put(ScratchieConstants.PAGE_EDITABLE, content.isContentInUse());
 	sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, content);
 	sessionMap.put(ScratchieConstants.ATTR_TOOL_CONTENT_ID, toolContentID);
     }
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/authoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	17 Jan 2014 22:12:28 -0000	1.5
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	6 May 2014 13:26:33 -0000	1.6
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.scratchie.ScratchieConstants"%>
@@ -35,58 +34,61 @@
  
 </lams:head>
 <body class="stripes" onLoad="init()">
-<div id="page">
+	<div id="page">
 		<h1>
 			<fmt:message key="label.authoring.heading" />
 		</h1>
-<div id="header">
-		<lams:Tabs useKey="true" control="true">
-			<lams:Tab id="1" key="label.authoring.heading.basic" />
-			<lams:Tab id="2" key="label.authoring.heading.advance" />
-		</lams:Tabs></div>
-		<!-- start tabs -->
-<div id="content">
-		<!-- end tab buttons -->
 		
-		<%@ include file="/common/messages.jsp"%>
+		<div id="header">
+			<lams:Tabs useKey="true" control="true">
+				<lams:Tab id="1" key="label.authoring.heading.basic" />
+				<lams:Tab id="2" key="label.authoring.heading.advance" />
+			</lams:Tabs>
+		</div>
+		
+		<!-- start tabs -->
+		<div id="content">
+			<!-- end tab buttons -->
+			
+			<%@ include file="/common/messages.jsp"%>
+	
+			<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" >
+				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+				<html:hidden property="scratchie.contentId" />
+				<html:hidden property="mode" value="${mode}"/>
+				<html:hidden property="sessionMapID" />
+				<html:hidden property="contentFolderID" />
+				<html:hidden property="currentTab" styleId="currentTab" />
+				<input type="hidden" name="itemList" id="itemList" />
+	
+				<lams:help toolSignature="<%= ScratchieConstants.TOOL_SIGNATURE %>" module="authoring"/>
+	
+				<!-- tab content 1 (Basic) -->
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<!-- end of content (Basic) -->
+	
+				<!-- tab content 2 (Advanced) -->
+				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+				<!-- end of content (Advanced) -->
+	
+	
+				<!-- Button Row -->
+				<%--  Default value 
+					cancelButtonLabelKey="label.authoring.cancel.button"
+					saveButtonLabelKey="label.authoring.save.button"
+					cancelConfirmMsgKey="authoring.msg.cancel.save"
+					accessMode="author"
+				--%>
+				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ScratchieConstants.TOOL_SIGNATURE%>" 
+					toolContentID="${formBean.scratchie.contentId}" accessMode="${mode}" defineLater="${mode=='teacher'}"
+					customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}" />
+			</html:form>
+	
+		</div>
 
-		<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" >
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="scratchie.contentId" />
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-		<input type="hidden" name="itemList" id="itemList" />
+	<div id="footer"></div>
 
-		<lams:help toolSignature="<%= ScratchieConstants.TOOL_SIGNATURE %>" module="authoring"/>
-
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<!-- end of content (Basic) -->
-
-			<!-- tab content 2 (Advanced) -->
-			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-			<!-- end of content (Advanced) -->
-
-
-			<!-- Button Row -->
-			<%--  Default value 
-				cancelButtonLabelKey="label.authoring.cancel.button"
-				saveButtonLabelKey="label.authoring.save.button"
-				cancelConfirmMsgKey="authoring.msg.cancel.save"
-				accessMode="author"
-			--%>
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-				toolSignature="<%=ScratchieConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.scratchie.contentId}" 
-				 customiseSessionID="${formBean.sessionMapID}"
-				 contentFolderID="${formBean.contentFolderID}" />
-	</html:form>
-
 </div>
 
-<div id="footer"></div>
-<!-- end page div -->
-</div>
-
 </body>
 </lams:html>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/authoring/definelater.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_scratchie/web/pages/authoring/definelaterforbid.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/web/pages/authoring/start.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/start.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/authoring/start.jsp	19 Jul 2012 19:20:12 -0000	1.1
+++ lams_tool_scratchie/web/pages/authoring/start.jsp	6 May 2014 13:26:33 -0000	1.2
@@ -1,16 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-		"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp" %>
 <html>
-<body class="stripes">
-<html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
-	<html:hidden property="scratchie.contentId"/>
-	<html:hidden property="sessionMapID"/>
-</html:form>
-
-<script type="text/javascript">
-document.getElementById("startForm").submit();
-</script>
-<body class="stripes">
+	<body class="stripes">
+	
+		<html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
+			<html:hidden property="scratchie.contentId"/>
+			<html:hidden property="sessionMapID"/>
+		</html:form>
+		
+		<script type="text/javascript">
+			document.getElementById("startForm").submit();
+		</script>
+		
+	</body>
 </html>
Index: lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp	27 Aug 2012 13:52:03 -0000	1.2
+++ lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp	6 May 2014 13:26:33 -0000	1.3
@@ -11,6 +11,7 @@
 						<tr>
 							<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
 								<input type="hidden" name="answerOrderId${status.index}" id="answerOrderId${status.index}" value="${answer.orderId}">
+								<input type="hidden" name="answerUid${status.index}" id="answerUid${status.index}" value="${answer.uid}">
 								<span class="field-name">
 									&#${status.index + 65};)
 								</span>
Index: lams_tool_scratchie/web/pages/learning/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/definelater.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scratchie/web/pages/learning/definelater.jsp	19 Jul 2012 19:20:09 -0000	1.1
+++ lams_tool_scratchie/web/pages/learning/definelater.jsp	6 May 2014 13:26:33 -0000	1.2
@@ -1,21 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@include file="/common/taglibs.jsp"%>
 
 <lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
-
-<body class="stripes">
-	<div id="content">
-		<h1>
-			<fmt:message key="activity.title" />
-		</h1>
-		<lams:DefineLater />
-	</div>
-	<div id="footer"></div>
-</body>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>
+		<meta http-equiv="refresh" content="60">
+	</lams:head>
+	
+	<body class="stripes">
+		<div id="content">
+			<h1>
+				<fmt:message key="activity.title" />
+			</h1>
+			<lams:DefineLater />
+		</div>
+		<div id="footer"></div>
+	</body>
 </lams:html>
Index: lams_tool_scratchie/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	8 Apr 2014 01:02:02 -0000	1.4
+++ lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	6 May 2014 13:26:33 -0000	1.5
@@ -2,12 +2,6 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="scratchie" value="${sessionMap.scratchie}"/>
 
-<c:if test="${sessionMap.isPageEditable}">
-	<p class="warning">
-		<fmt:message key="message.alertContentEdit" />
-	</p>
-</c:if>
-
 <table cellpadding="0">
 	<tr>
 		<td width="10%" nowrap>
@@ -29,17 +23,15 @@
 		</td>
 	</tr>
 
-	<c:if test="${! sessionMap.isPageEditable}">
-		<tr>
-			<td colspan="2">
-				<c:url  var="authoringUrl" value="/definelater.do">
-					<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
-					<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
-				</c:url>
-				<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
-					<fmt:message key="label.monitoring.edit.activity.edit" />
-				</html:link>
-			</td>
-		</tr>
-	</c:if>
+	<tr>
+		<td colspan="2">
+			<c:url  var="authoringUrl" value="/definelater.do">
+				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
+				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
+			</c:url>
+			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
+				<fmt:message key="label.monitoring.edit.activity.edit" />
+			</html:link>
+		</td>
+	</tr>
 </table>