Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java	(.../EditOnFlyProcessor.java)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java	(.../EditOnFlyProcessor.java)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -55,11 +55,11 @@
 	}
 
 	/** Prepares to process children */
-	public void startComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException {
+	public boolean startComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException {
 		// Create a new current activity list, putting the old current one on the stack. 
 		activityListStack.push(currentActivityList);
 		currentActivityList = new ArrayList<Activity>();
-		
+		return true;
 	}
 
 	/** Creates an ActivityPortfolio and sets up the list of its children. Doesn't create an entry if there are no children. */
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -158,7 +158,9 @@
 				
 				if(mode != null)
 					req.setAttribute(AttributeNames.PARAM_MODE, mode);
-
+				
+				req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, lesson.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable(): Boolean.TRUE);
+				req.setAttribute(AttributeNames.PARAM_TITLE, lesson.getLessonName());
 				String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL);
 				req.setAttribute("serverUrl", serverUrl);
 				req.setAttribute(AttributeNames.PARAM_LESSON_ID,lessonId);
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java
===================================================================
diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java	(.../HelpTag.java)	(revision 870373d635bc769aee2dc271e6ff12818fcfcea6)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java	(.../HelpTag.java)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -73,9 +73,15 @@
 	public int doStartTag() throws JspException {
 		try {
 		    
+			int imgHeight = 25;
+			boolean div = true;
+			
         	JspWriter writer = pageContext.getOut();
         	if (StringUtils.equals(style, "no-tabs")) {
         		writer.println("<div class='help-no-tabs'>");
+        	} else if (StringUtils.equals(style, "small")) {
+           		imgHeight = 18;
+           		div = false;
         	} else {
         		writer.println("<div class='help'>");
         	}
@@ -96,26 +102,30 @@
 					if(fullURL == null)
 						return SKIP_BODY;
 					
-					writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/help.jpg\" border=\"0\" width=\"25\" height=\"25\" onclick=\"window.open('" + fullURL + "', 'help')\"/>");
+					writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/help.jpg\" border=\"0\" width=\""+
+							imgHeight+"\" height=\""+imgHeight+"\" onclick=\"window.open('" + fullURL + "', 'help')\"/>");
 
 	        	
 	        	} else if(page != null){
 	        		
 	        		String fullURL = HelpUtil.constructPageURL(page, languageCode);
 
-	        		writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/help.jpg\" border=\"0\" width=\"25\" height=\"25\" onclick=\"window.open('" + fullURL + "', 'help')\"/>");
+	        		writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/help.jpg\" border=\"0\" width=\""+
+	        				imgHeight+"\" height=\""+imgHeight+"\" onclick=\"window.open('" + fullURL + "', 'help')\"/>");
 
 	        	} else {
 	        		log.error("HelpTag unable to write out due to unspecified values.");
-	        		writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/css/warning.gif\" border=\"0\" width=\"20\" height=\"20\"/>");
+	        		writer.println("<img src=\"" + Configuration.get(ConfigurationKeys.SERVER_URL) + "images/css/warning.gif\" border=\"0\" width=\""+
+	        				imgHeight+"\" height=\""+imgHeight+"\"/>");
 	        	}
         	} catch (NullPointerException npe) {
     			log.error("HelpTag unable to write out due to NullPointerException. Most likely a required paramater was unspecified or incorrect.", npe);
     			// don't throw a JSPException as we want the system to still function.
 
     		}
         	
-        	writer.println("</div>");
+        	if ( div )
+        		writer.println("</div>");
         	
 		} catch (IOException e) {
 			log.error("HelpTag unable to write out due to IOException.", e);
Index: lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -38,7 +38,7 @@
 <c:set var="userEnableFlash"><lams:user property="enableFlash"/></c:set>
 
 <c:choose>
-	<c:when test="${param.mode=='preview' or (serverEnableFlash and userEnableFlash)}">true</c:when>
+	<c:when test="${serverEnableFlash and userEnableFlash}">true</c:when>
 	<c:otherwise>false</c:otherwise>
 </c:choose>
 	
Index: lams_central/web/WEB-INF/tags/ProgressOutput.tag
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/WEB-INF/tags/ProgressOutput.tag	(.../ProgressOutput.tag)	(revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_central/web/WEB-INF/tags/ProgressOutput.tag	(.../ProgressOutput.tag)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -38,6 +38,10 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <LI><c:choose>
+		<c:when test="${activity.activityId==currentActivityID}">
+			<c:set var="image" value="progress_current.gif"/>
+			<c:set var="colour" value="990000"/>
+		</c:when>
 		<c:when test="${activity.status==1}">
 			<c:set var="image" value="progress_completed.gif"/>
 			<c:set var="colour" value="003399"/>
@@ -53,7 +57,7 @@
 	</c:choose>
 	
 	<c:choose>
-	<c:when test="${activity.status<3 and not empty activity.url}">
+	<c:when test="${not empty activity.url}">
 		<img src="<lams:LAMSURL/>/images/${image}" width="10"/> <a href="#" onclick="javascript:loadFrame('${activity.url}');"><font color="#${colour}"><c:out value="${activity.title}"/></font></a>
 	</c:when>
 	<c:otherwise>
@@ -63,7 +67,7 @@
 
 	<c:forEach var="childActivity" items="${activity.childActivities}" varStatus="childstatus">
 		<c:if test="${childstatus.first}">
-			<BR><UL>
+			<BR><UL style="margin-right:0">
 		</c:if>
 		<lams:ProgressOutput activity="${childActivity}"/>
 		<c:if test="${childstatus.last}">
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -17,6 +17,7 @@
 				classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/integrationContext.xml
+				classpath:/org/lamsfoundation/lams/usermanagement/ldapContext.xml
 				<!--  Needed to communicate with the tools -->
 				classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
@@ -153,26 +154,11 @@
 </listener>
 
    <servlet>
-      <servlet-name>editLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.EditOnFlyServlet</servlet-class>
-
-   </servlet>
-   <servlet>
-      <servlet-name>storeLD</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>dumpWDDX</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.ReportWddxStructureServlet</servlet-class>
 
    </servlet>
    <servlet>
-      <servlet-name>storeTheme</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
-
-   </servlet>
-   <servlet>
       <servlet-name>SimpleUploader</servlet-name>
       <servlet-class>org.lamsfoundation.lams.web.LAMSUploadServlet</servlet-class>
 
@@ -217,8 +203,8 @@
 
    </servlet>
    <servlet>
-      <servlet-name>storeNotebookEntry</servlet-name>
-      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
+      <servlet-name>updateCollapsedGroup</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.UpdateCollapsedGroupServlet</servlet-class>
 
    </servlet>
    <servlet>
@@ -242,7 +228,42 @@
       <servlet-class>org.lamsfoundation.lams.web.FlashCrashDumpServlet</servlet-class>
 
    </servlet>
+   <servlet>
+      <servlet-name>editLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.EditOnFlyServlet</servlet-class>
 
+   </servlet>
+   <servlet>
+      <servlet-name>LessonJoinServlet</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.webservice.xml.LessonJoinServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>storeLD</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.StoreLDServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>saveLessonOrder</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.web.LessonOrderServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>storeTheme</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.themes.web.StoreThemeServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.authoring.web.InsertLDServlet</servlet-class>
+
+   </servlet>
+   <servlet>
+      <servlet-name>storeNotebookEntry</servlet-name>
+      <servlet-class>org.lamsfoundation.lams.notebook.web.StoreNBEntryServlet</servlet-class>
+
+   </servlet>
+
  <servlet>
 	<servlet-name>action</servlet-name>
 	<servlet-class>
@@ -363,37 +384,53 @@
 </servlet-mapping>
 
    <servlet-mapping>
+      <servlet-name>dumpWDDX</servlet-name>
+      <url-pattern>/servlet/dumpWDDX</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>SimpleUploader</servlet-name>
+      <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>updateCollapsedGroup</servlet-name>
+      <url-pattern>/servlet/updateCollapsedGroup</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>Connector</servlet-name>
+      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
+      <servlet-name>flashCrashDump</servlet-name>
+      <url-pattern>/servlet/flashCrashDump</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>editLD</servlet-name>
       <url-pattern>/eof/authoring/editLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
+      <servlet-name>LessonJoinServlet</servlet-name>
+      <url-pattern>/services/xml/LessonJoin/*</url-pattern>
+   </servlet-mapping>
+   <servlet-mapping>
       <servlet-name>storeLD</servlet-name>
       <url-pattern>/servlet/authoring/storeLearningDesignDetails</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>dumpWDDX</servlet-name>
-      <url-pattern>/servlet/dumpWDDX</url-pattern>
+      <servlet-name>saveLessonOrder</servlet-name>
+      <url-pattern>/servlet/saveLessonOrder</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>storeTheme</servlet-name>
       <url-pattern>/themes/servlet/storeTheme</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
-      <servlet-name>SimpleUploader</servlet-name>
-      <url-pattern>/fckeditor/editor/filemanager/upload/simpleuploader</url-pattern>
+      <servlet-name>insertLearningDesign</servlet-name>
+      <url-pattern>/servlet/authoring/insertLearningDesign</url-pattern>
    </servlet-mapping>
    <servlet-mapping>
       <servlet-name>storeNotebookEntry</servlet-name>
       <url-pattern>/servlet/notebook/storeNotebookEntry</url-pattern>
    </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>Connector</servlet-name>
-      <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
-   </servlet-mapping>
-   <servlet-mapping>
-      <servlet-name>flashCrashDump</servlet-name>
-      <url-pattern>/servlet/flashCrashDump</url-pattern>
-   </servlet-mapping>
 
    <session-config>
       <session-timeout>120</session-timeout>
@@ -540,6 +577,7 @@
 		    <url-pattern>/download/</url-pattern>
     	</web-resource-collection>
     	<auth-constraint>
+    		<role-name>LEARNER</role-name>
     		<role-name>AUTHOR</role-name>
     		<role-name>MONITOR</role-name>
     	    <role-name>GROUP MANAGER</role-name>
Index: lams_central/web/css/defaultHTML.css
===================================================================
diff -u -rf62ebb19d6e1fe11371b58e2933d49772b86ab49 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision f62ebb19d6e1fe11371b58e2933d49772b86ab49)
+++ lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -78,6 +78,9 @@
 	margin-left:25px;
 }
 
+span.h2font {color:#47bc23;  
+	font-size:12px; } 
+
 h3 {color:#47bc23; 
 	font-size:12px; 
 	margin-left:10px; 
Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -rf62ebb19d6e1fe11371b58e2933d49772b86ab49 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision f62ebb19d6e1fe11371b58e2933d49772b86ab49)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -55,6 +55,8 @@
 	padding-top:10px;
 	margin-bottom:5px; } 
 
+span.h2font {color:#47bc23;  
+	font-size:14px; } 
 
 h3 {color:#47bc23; 
 	font-size:13px; 
Index: lams_central/web/css/defaultHTML_rtl.css
===================================================================
diff -u -rf62ebb19d6e1fe11371b58e2933d49772b86ab49 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision f62ebb19d6e1fe11371b58e2933d49772b86ab49)
+++ lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -76,6 +76,10 @@
 	margin-right:25px;
 }
 
+span.h2font {color:#47bc23;  
+	font-size:12px; } 
+
+
 h3 {color:#47bc23; 
 	font-size:12px; 
 	margin-right:10px; 
Index: lams_central/web/css/defaultHTML_rtl_learner.css
===================================================================
diff -u -rf62ebb19d6e1fe11371b58e2933d49772b86ab49 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/css/defaultHTML_rtl_learner.css	(.../defaultHTML_rtl_learner.css)	(revision f62ebb19d6e1fe11371b58e2933d49772b86ab49)
+++ lams_central/web/css/defaultHTML_rtl_learner.css	(.../defaultHTML_rtl_learner.css)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -55,7 +55,10 @@
 	padding-top:10px;
 	margin-bottom:5px; } 
 
+span.h2font {color:#47bc23;  
+	font-size:14px; } 
 
+
 h3 {color:#47bc23; 
 	font-size:13px; 
 	margin-top:10px;
Index: lams_central/web/css/ramsthemeHTML.css
===================================================================
diff -u -r28eb076bec96d3a7d508b4e05ae13508aa40fcd0 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/css/ramsthemeHTML.css	(.../ramsthemeHTML.css)	(revision 28eb076bec96d3a7d508b4e05ae13508aa40fcd0)
+++ lams_central/web/css/ramsthemeHTML.css	(.../ramsthemeHTML.css)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -23,6 +23,8 @@
 
 h2 {color:#b9313d; 
 	}
+	
+span.h2font {color:#b9313d; font-size:14px;	} 
 	
 h3 {color:#f88431; 
 	 }
Index: lams_central/web/css/ramsthemeHTML_learner.css
===================================================================
diff -u -r84eade4bc2b169cbb96bac19cf21f53ae246975d -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/css/ramsthemeHTML_learner.css	(.../ramsthemeHTML_learner.css)	(revision 84eade4bc2b169cbb96bac19cf21f53ae246975d)
+++ lams_central/web/css/ramsthemeHTML_learner.css	(.../ramsthemeHTML_learner.css)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -96,7 +96,9 @@
 color:#b9313d; 
 }
 
-h2 {color:#f88431; }
+h2 {color:#f88431; }
+
+span.h2font {color:#f88431; font-size:14px;} 
 
 table.alternative-color th {
 	background: url('../images/ramsthemecss/green_bg.jpg') repeat-x;
Index: lams_central/web/learner.jsp
===================================================================
diff -u -r64938df458cbab9999f9a826ef2902d061648d7d -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_central/web/learner.jsp	(.../learner.jsp)	(revision 64938df458cbab9999f9a826ef2902d061648d7d)
+++ lams_central/web/learner.jsp	(.../learner.jsp)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -8,7 +8,18 @@
 
 <lams:html>
 <lams:head>
-	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/main.jsp?lessonID=<c:out value="${lessonID}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
+
+<c:set var="enableFlash"><lams:LearnerFlashEnabled/></c:set>
+	
+<c:choose>
+	<c:when test="${enableFlash}">
+		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
+	</c:when>
+	<c:otherwise>
+		<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/mainnoflash.jsp?lessonID=<c:out value="${lessonID}"/>&portfolioEnabled=<c:out value="${portfolioEnabled}"/>&title=<c:out value="${title}"/><c:if test="${mode != null}">&mode=<c:out value="${mode}"/></c:if>">
+	</c:otherwise>
+</c:choose>
+
 	<TITLE><fmt:message key="title.learner.window"/></TITLE>
 	<lams:css/>
 </lams:head>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
===================================================================
diff -u -rd66ffc2bf657d1fe25183aa727b110ed42048d59 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java	(.../LearningDesignProcessor.java)	(revision d66ffc2bf657d1fe25183aa727b110ed42048d59)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java	(.../LearningDesignProcessor.java)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -56,7 +56,7 @@
 	}
 
 	/** A complex activity has been found. Do any processing needed at the start of the activity */
-	public abstract void startComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException ;
+	public abstract boolean startComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException ;
 	
 	/** Do any processing needed at the end of a complex activity */
 	public abstract void endComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException ;
@@ -97,26 +97,28 @@
 	protected void handleComplexActivity( Activity activity ) throws LearningDesignProcessorException {
 		// ensure it is a real activity not a CGLIB proxy
 		ComplexActivity complex = (ComplexActivity) activityDAO.getActivityByActivityId(activity.getActivityId(),SimpleActivity.class);
-		startComplexActivity(complex);
+		boolean processChildren = startComplexActivity(complex);
 
-		if ( activity.isSequenceActivity() ) {
-			// sequence is a funny one - the child activities are linked by transitions rather
-	        // than ordered by order id
-			SequenceActivity sequenceActivity = (SequenceActivity) complex;
-			Activity child = sequenceActivity.getNextActivityByParent(new NullActivity());
-			while ( ! child.isNull() ) {
-				handleActivity(child);
-				child = sequenceActivity.getNextActivityByParent(child);
+		if ( processChildren ) {
+			if ( activity.isSequenceActivity() ) {
+				// sequence is a funny one - the child activities are linked by transitions rather
+		        // than ordered by order id
+				SequenceActivity sequenceActivity = (SequenceActivity) complex;
+				Activity child = sequenceActivity.getNextActivityByParent(new NullActivity());
+				while ( ! child.isNull() ) {
+					handleActivity(child);
+					child = sequenceActivity.getNextActivityByParent(child);
+				}
+				
+			} else {
+				// work through all the child activities for this activity, in order id
+				Set children = new TreeSet(new ActivityOrderComparator());
+		        children.addAll(complex.getActivities());
+		        Iterator i=children.iterator();
+		        while ( i.hasNext() ) {
+					handleActivity((Activity)i.next());
+		        }
 			}
-			
-		} else {
-			// work through all the child activities for this activity, in order id
-			Set children = new TreeSet(new ActivityOrderComparator());
-	        children.addAll(complex.getActivities());
-	        Iterator i=children.iterator();
-	        while ( i.hasNext() ) {
-				handleActivity((Activity)i.next());
-	        }
 		}
 		
 		endComplexActivity(complex);
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
diff -u -re7046600ee8bfa53d053e0aee33a16b52ad0e8e2 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision e7046600ee8bfa53d053e0aee33a16b52ad0e8e2)
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -63,6 +63,7 @@
     public static final String PARAM_LESSON_ID = "lessonID";
     public static final String PARAM_DIRECTORY_NAME = "directoryName";
     public static final String PARAM_FILENAME = "filename";
+    public static final String PARAM_EXPORT_PORTFOLIO_ENABLED = "portfolioEnabled";
     
     public static final String PARAM_LIB = "library";
     
Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -129,6 +129,11 @@
         path="/DisplayActivity.do"
         redirect="false"
       />
+      <forward
+        name="displayProgress"
+        path="/progress.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/CompleteActivity"
@@ -307,11 +312,6 @@
       unknown="false"
       validate="false"
     >
-      <forward
-        name="empty"
-        path=".sequenceActivityEmpty"
-        redirect="false"
-      />
     </action>
     <action
       path="/DisplayActivity"
Index: lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag	(.../LearnerFlashEnabled.tag)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -38,7 +38,7 @@
 <c:set var="userEnableFlash"><lams:user property="enableFlash"/></c:set>
 
 <c:choose>
-	<c:when test="${param.mode=='preview' or (serverEnableFlash and userEnableFlash)}">true</c:when>
+	<c:when test="${serverEnableFlash and userEnableFlash}">true</c:when>
 	<c:otherwise>false</c:otherwise>
 </c:choose>
 	
Index: lams_learning/web/WEB-INF/tags/ProgressOutput.tag
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_learning/web/WEB-INF/tags/ProgressOutput.tag	(.../ProgressOutput.tag)	(revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_learning/web/WEB-INF/tags/ProgressOutput.tag	(.../ProgressOutput.tag)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -38,6 +38,10 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <LI><c:choose>
+		<c:when test="${activity.activityId==currentActivityID}">
+			<c:set var="image" value="progress_current.gif"/>
+			<c:set var="colour" value="990000"/>
+		</c:when>
 		<c:when test="${activity.status==1}">
 			<c:set var="image" value="progress_completed.gif"/>
 			<c:set var="colour" value="003399"/>
@@ -53,7 +57,7 @@
 	</c:choose>
 	
 	<c:choose>
-	<c:when test="${activity.status<3 and not empty activity.url}">
+	<c:when test="${not empty activity.url}">
 		<img src="<lams:LAMSURL/>/images/${image}" width="10"/> <a href="#" onclick="javascript:loadFrame('${activity.url}');"><font color="#${colour}"><c:out value="${activity.title}"/></font></a>
 	</c:when>
 	<c:otherwise>
@@ -63,7 +67,7 @@
 
 	<c:forEach var="childActivity" items="${activity.childActivities}" varStatus="childstatus">
 		<c:if test="${childstatus.first}">
-			<BR><UL>
+			<BR><UL style="margin-right:0">
 		</c:if>
 		<lams:ProgressOutput activity="${childActivity}"/>
 		<c:if test="${childstatus.last}">
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -237,5 +237,38 @@
     		<form-error-page>/login.jsp</form-error-page>
    		</form-login-config>
    	</login-config>
+	<!-- ======================================================== -->
+	<!--  Security Roles -->
+    <!-- ======================================================== -->
+	<security-role>
+		<description>Student</description>
+		<role-name>LEARNER</role-name>
+	</security-role>
 
+	<security-role>
+		<description>Can create/modify a learning design</description>
+		<role-name>AUTHOR</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can running and monitoring a learning session</description>
+		<role-name>MONITOR</role-name>
+	</security-role>
+
+    <security-role>
+		<role-name>GROUP MANAGER</role-name>
+	</security-role>
+   	<security-role>
+		<role-name>GROUP ADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<description>Can add/remove users to the system, set up classes of users for sessions</description>
+		<role-name>SYSADMIN</role-name>
+	</security-role>
+
+	<security-role>
+		<role-name>AUTHOR ADMIN</role-name>
+	</security-role>
+
 </web-app>
Fisheye: Tag 4f68a533e24967e0185132c5e361a8a054f43941 refers to a dead (removed) revision in file `lams_learning/web/main.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/mainflash.jsp
===================================================================
diff -u
--- lams_learning/web/mainflash.jsp	(revision 0)
+++ lams_learning/web/mainflash.jsp	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -0,0 +1,58 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<lams:html>
+	
+	<lams:head>
+		<lams:css/>
+		<title><fmt:message key="learner.title"/></title>
+	</lams:head>
+
+	<c:choose>
+		<c:when test="${page_direction == 'RTL'}">
+			<frameset rows="*" cols="*,160">
+				<frame src="content.do?lessonID=<c:out value="${param.lessonID}"/>" name="contentFrame" scrolling="YES">
+				<frame src="controlFrame.jsp?lessonID=<c:out value="${param.lessonID}"/><c:if test="${param.mode != null}">&mode=<c:out value="${param.mode}"/></c:if>" name="controlFrame" scrolling="NO">
+			</frameset>	
+		</c:when>
+		<c:otherwise>
+			<frameset rows="*" cols="160,*">
+				<frame src="controlFrame.jsp?lessonID=<c:out value="${param.lessonID}"/><c:if test="${param.mode != null}">&mode=<c:out value="${param.mode}"/></c:if>" name="controlFrame" scrolling="NO">
+				<frame src="content.do?lessonID=<c:out value="${param.lessonID}"/>" name="contentFrame" scrolling="YES">
+			</frameset>
+		</c:otherwise>
+	</c:choose>
+	
+	<noframes>
+		<body>
+			<fmt:message key="message.activity.parallel.noFrames" />
+		</body>
+	</noframes>
+
+</lams:html>
Index: lams_learning/web/mainnoflash.jsp
===================================================================
diff -u
--- lams_learning/web/mainnoflash.jsp	(revision 0)
+++ lams_learning/web/mainnoflash.jsp	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -0,0 +1,72 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<lams:html>
+	
+	<lams:head>
+		<lams:css/>
+        <link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen">
+		
+		<title><fmt:message key="learner.title"/></title>
+
+        <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>
+        <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox-compressed.js"></script>
+        
+	</lams:head>
+
+	<body>
+		<c:set var="joinLessonURL"></c:set>
+		<div style="float:top">
+		<span class="h2font"><c:out value="${param.title}"/></span>&nbsp;&nbsp; &nbsp;&nbsp;
+		<a target='_new' href="learner.do?method=displayProgress&lessonID=<c:out value="${param.lessonID}"/>&keepThis=true&TB_iframe=true&height=300&width=400" title="<c:out value="${param.title}"/> - <fmt:message key="label.my.progress"/>" class="thickbox"><fmt:message key="label.my.progress"/></a> &nbsp;&nbsp;
+		<a href="#" onclick="location.reload()"/><fmt:message key="label.resume"/></a> &nbsp;&nbsp;
+		<c:if test="${param.portfolioEnabled}"><a target='_new' href="exportWaitingPage.jsp?mode=learner&lessonID=<c:out value="${param.lessonID}"/>&hideClose=true&keepThis=true&TB_iframe=true&height=300&width=400" title="<fmt:message key="label.export.portfolio"/>" class="thickbox"><fmt:message key="label.export.portfolio"/></a> &nbsp;&nbsp;</c:if>
+		<a href="#" onclick="javascript:window.open('notebook.do?method=viewAll&lessonID=<c:out value="${param.lessonID}"/>')"><fmt:message key="mynotes.title"/></a> &nbsp;&nbsp;
+		<lams:help style="small" page="learner"/>
+		</div> 
+		
+		<iframe onload="javascript:resizeIframe()" id="contentFrame" name="contentFrame"  frameborder="no" scrolling="yes"  src="learner.do?method=joinLesson&lessonID=<c:out value="${param.lessonID}"/>" width="100%" ></iframe>
+		<script type="text/javascript">
+		function resizeIframe() {
+		    var height = top.window.innerHeight;
+		    if ( height == undefined || height == 0 ) {
+		    	// IE doesn't use window.innerHeight.
+		    	height = document.documentElement.clientHeight;
+		    	// alert("using clientHeight");
+		    }
+			// alert("doc height "+height);
+		    height -= document.getElementById('contentFrame').offsetTop;
+		    document.getElementById('contentFrame').style.height = height +"px";
+		};
+		window.onresize = resizeIframe;
+		</script>
+	</body>
+
+</lams:html>
Index: lams_learning/web/progress.jsp
===================================================================
diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_learning/web/progress.jsp	(.../progress.jsp)	(revision 472bcb813040efc160e074021be5c71c15455f00)
+++ lams_learning/web/progress.jsp	(.../progress.jsp)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -42,7 +42,7 @@
 
 <c:forEach var="activity" items="${progressList}" varStatus="status">
 	<c:if test="${status.first}">
-		<UL>
+		<UL style="margin-right:0">
 	</c:if>
 
 	<lams:ProgressOutput activity="${activity}"/>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
===================================================================
diff -u -r7651b7a24448e75a74e89ed815d8f9f1d7328636 -r4f68a533e24967e0185132c5e361a8a054f43941
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java	(.../ContributeActivitiesProcessor.java)	(revision 7651b7a24448e75a74e89ed815d8f9f1d7328636)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java	(.../ContributeActivitiesProcessor.java)	(revision 4f68a533e24967e0185132c5e361a8a054f43941)
@@ -87,12 +87,12 @@
 		return mainActivityList;
 	}
 
-	public void startComplexActivity(ComplexActivity activity) {
+	public boolean startComplexActivity(ComplexActivity activity) {
 		
 		// Create a new current activity list, putting the old current one on the stack. 
 		activityListStack.push(currentActivityList);
 		currentActivityList = new Vector<ContributeActivityDTO>();
-		
+		return true;
 	}
 
 	public void endComplexActivity(ComplexActivity activity) {