Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.340 -r1.341
Binary files differ
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml,v
diff -u -r1.7 -r1.8
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	15 Mar 2012 14:33:30 -0000	1.7
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	19 Mar 2012 20:38:54 -0000	1.8
@@ -210,6 +210,12 @@
 				if(scheduleDateTimePicker.selectedDate < now)
 					scheduleDateTimePicker.selectedDate = now;
 			}
+			
+			public function enableLessonIntroOption():void {
+				if(!enableLessonIntro.selected) {
+					displayDesignImage.selected = false;
+				}
+			}
 		]]>
 	</mx:Script>
 	
@@ -226,11 +232,14 @@
 		
 	<mx:Form id="advancedOptionsForm"  width="100%" height="100%">
 		<mx:VBox width="100%" height="100%" paddingLeft="10" paddingRight="10" paddingTop="10" paddingBottom="10">
+			
 			<!-- Advanced details -->
 			<mx:FormHeading label="{dictionary.getLabel('advanced.tab.form.details.label')}" />
-			<mx:FormItem id="description_fItm" label="{dictionary.getLabel('summery.desc.lbl')}" width="80%" paddingRight="20">
+			<mx:CheckBox id="enableLessonIntro" name="enableLessonIntro" selected="false" label="{dictionary.getLabel('advanced.tab.enable.lesson.intro')}" labelPlacement="right" change="enableLessonIntroOption()" />
+			<mx:FormItem id="description_fItm" label="{dictionary.getLabel('summery.desc.lbl')}" enabled="{enableLessonIntro.selected}" width="80%" paddingRight="20" paddingLeft="15">
 				<mx:TextArea id="description_txi" text="{(lesson.selectedNode.isValidDesign()) ? lesson.selectedNode.description : ''}" width="100%" height="50" fontWeight="normal"/>
 			</mx:FormItem>
+			<mx:CheckBox id="displayDesignImage" name="displayDesignImage" selected="false" enabled="{enableLessonIntro.selected}" label="{dictionary.getLabel('advanced.tab.display.design.image')}" labelPlacement="right" paddingLeft="17"/>
 			
 			<!-- Advanced general options -->
 			<mx:FormHeading label="{dictionary.getLabel('advanced.tab.form.advanced.options.label')}" paddingTop="5" />
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml,v
diff -u -r1.2 -r1.3
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml	15 Mar 2012 14:33:30 -0000	1.2
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Conditions.mxml	19 Mar 2012 20:38:54 -0000	1.3
@@ -81,10 +81,10 @@
 			</mx:VBox>
 			
 			<!-- Time limits -->
-			<mx:FormHeading id="timeLimits_fH" label="{dictionary.getLabel('advanced.tab.form.time.limits.label')}"  paddingTop="8"/>
+			<mx:FormHeading id="timeLimits_fH" label="{dictionary.getLabel('advanced.tab.form.time.limits.label')}"  paddingTop="10"/>
 			<mx:Text width="100%" textAlign="left" selectable="false" text="{dictionary.getLabel('advanced.tab.form.time.limits.info.label')}" truncateToFit="true" paddingLeft="6"/>
 			<mx:CheckBox id="enableTimeLimits" name="enableTimeLimits" selected="false" label="{dictionary.getLabel('advanced.tab.form.enable.label')}" labelPlacement="right" />
-			<mx:VBox width="100%">
+			<mx:VBox width="100%" paddingLeft="14">
 				<mx:FormItem id="enableTimeLimits_fItm" label="{dictionary.getLabel('advanced.tab.form.enter.number.days.label')}" enabled="{enableTimeLimits.selected}" focusEnabled="true">
 					<mx:NumericStepper id="noDaysToLessonFinish" value="30" minimum="1" maximum="999"/>
 				</mx:FormItem>
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml,v
diff -u -r1.6 -r1.7
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	14 Mar 2012 19:20:36 -0000	1.6
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	19 Mar 2012 20:38:54 -0000	1.7
@@ -269,9 +269,11 @@
 	<vos:Lesson id="newLesson">
 		<vos:lessonID>{lessonID}</vos:lessonID>
 		<vos:lessonName>{resourceName_txi.text}</vos:lessonName>
-		<vos:lessonDescription>{advanced.description_txi.text}</vos:lessonDescription>
 		<vos:organisationID>{organisationID}</vos:organisationID>
 		<vos:learningDesignID>{selectedNode.resourceID}</vos:learningDesignID>
+		<vos:enableLessonIntro>{advanced.enableLessonIntro.selected}</vos:enableLessonIntro>
+		<vos:lessonDescription>{advanced.description_txi.text}</vos:lessonDescription>
+		<vos:displayDesignImage>{advanced.displayDesignImage.selected}</vos:displayDesignImage>
 		<vos:learnerExportPortfolio>{advanced.enabledExportPortfolio.selected}</vos:learnerExportPortfolio>
 		<vos:enablePresence>{advanced.enablePresence.selected}</vos:enablePresence>
 		<vos:enableLiveEdit>{advanced.enabledLiveEdit.selected}</vos:enableLiveEdit>
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as,v
diff -u -r1.4 -r1.5
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as	14 Mar 2012 19:20:37 -0000	1.4
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/vos/Lesson.as	19 Mar 2012 20:38:54 -0000	1.5
@@ -7,11 +7,14 @@
 	{
 		public var lessonID:uint;
 		public var lessonName:String;
-		public var lessonDescription:String;
 		public var organisationID:uint;
 		public var learningDesignID:uint;
 		
 		// Advanced options
+		public var enableLessonIntro:Boolean;
+		public var lessonDescription:String;
+		public var displayDesignImage:Boolean;
+		
 		public var learnerExportPortfolio:Boolean;
 		public var enablePresence:Boolean;
 		public var enableLiveEdit:Boolean;
@@ -47,11 +50,16 @@
 			var data:Object = new Object();
 			data.lessonID = this.lessonID;
 			data.lessonName = this.lessonName;
-			data.lessonDescription = WDDXUtil.toWDDXNull(this.lessonDescription);
 			data.organisationID = this.organisationID;
 			data.learningDesignID = this.learningDesignID;
 			data.learnerExportPortfolio = this.learnerExportPortfolio;
 			
+			data.enableLessonIntro = this.enableLessonIntro;
+			if (this.enableLessonIntro) {
+				data.lessonDescription = WDDXUtil.toWDDXNull(this.lessonDescription);
+			}
+			data.displayDesignImage = this.displayDesignImage;
+			
 			data.enablePresence = this.enablePresence;
 			data.enableLiveEdit = this.enableLiveEdit;
 			data.enableLessonNotifications = this.enableLessonNotifications;