Index: win_installer/installer/src/build.xml
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/build.xml,v
diff -u -r1.3 -r1.4
--- win_installer/installer/src/build.xml	9 Apr 2012 20:58:34 -0000	1.3
+++ win_installer/installer/src/build.xml	13 Apr 2012 18:10:26 -0000	1.4
@@ -78,7 +78,7 @@
 				<filter token="INSTDIR" value="${INSTDIR}" />
 			</filterset>
 		</copy>
-		<copy overwrite="yes" todir="${INSTDIR}">
+		<copy overwrite="yes" todir="${INSTDIR}\slides">
 			<fileset dir="${TEMP}">
 				<include name="index.html" />
 			</fileset>
Index: win_installer/installer/src/installer.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/src/installer.nsi,v
diff -u -r1.8 -r1.9
--- win_installer/installer/src/installer.nsi	10 Apr 2012 21:00:31 -0000	1.8
+++ win_installer/installer/src/installer.nsi	13 Apr 2012 18:10:26 -0000	1.9
@@ -25,11 +25,12 @@
 !include "MUI.nsh"
 !include "LogicLib.nsh"
 !include "x64.nsh"
-!include "Ports.nsh"
+!include "includes\Ports.nsh"
 
 # functions from TextFunc.nsh
 !insertmacro FileJoin
 !insertmacro LineFind
+
 # constants
 !define VERSION "2.4.0"
 !define LANGUAGE_PACK_VERSION "2012-04-09"
@@ -46,6 +47,7 @@
 !define BUILD "..\..\build\"
 !define DATABASE "..\..\database\"
 !define DEFAULT_REPOSITORY "..\..\repository\"
+
 # installer settings
 !define MUI_ICON "..\graphics\lams2.ico"
 !define MUI_UNICON "..\graphics\lams2.ico"
@@ -81,13 +83,15 @@
 # set instfiles page to wait when done
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
 # display finish page stuff
 !define MUI_FINISHPAGE_RUN $INSTDIR\lams-start.exe
 !define MUI_FINISHPAGE_RUN_TEXT "Start LAMS now"
 !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
 !define MUI_FINISHPAGE_SHOWREADME_TEXT "Open the readme file"
 !define MUI_FINISHPAGE_LINK "Visit LAMS Community"
 !define MUI_FINISHPAGE_LINK_LOCATION "http://lamscommunity.org"
+
 # installer screen progression
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "..\documents\license.txt"
@@ -98,13 +102,16 @@
 Page custom PreFinal PostFinal
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
+
 # uninstaller screens
 !insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 !insertmacro MUI_UNPAGE_FINISH
+
 # supported translations
 !insertmacro MUI_LANGUAGE "English" # first language is the default language
+
 # reserve files
 #
 ReserveFile "lams.ini"
@@ -122,6 +129,7 @@
 Var LAMS_PASS           ; password for lams system administrator
 Var WINTEMP             ; temp dir
 Var TIMESTAMP           ; timestamp
+
 ##############################
 SectionGroup /e "LAMS ${VERSION} Full Install" fullInstall
     Section "LAMS ${VERSION}" lams
@@ -161,6 +169,7 @@
 	SectionEnd
 */	
 SectionGroupEnd
+
 # functions
 #
 Function .onInit
@@ -181,6 +190,8 @@
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "final.ini"
     
 FunctionEnd
+
+
 ################################################################################
 # USER INTERFACE CODE                                                          #
 ################################################################################
@@ -274,6 +285,8 @@
 ################################################################################
 # END USER INTERFACE CODE                                                      #
 ################################################################################
+
+
 ################################################################################
 # CODE USED FOR INSTALLER                                                      #
 ################################################################################    
@@ -307,6 +320,7 @@
     SetOutPath $INSTDIR
     File /r "${BASE_DEV_DIR}\apache-ant-1.6.5"
     File /r "${BASE_DEV_DIR}\zip"
+	File /r "${BASE_DEV_DIR}\slides"
 		
     SetOutPath $TEMP
     File "build.xml"
@@ -467,11 +481,9 @@
     Delete "$TEMP\mysql-ds.xml"
     Delete "$TEMP\server.xml"
     Delete "$TEMP\run.bat"
-    Delete "$TEMP\wrapper.conf"
     Delete "$TEMP\dump.sql"
     Delete "$TEMP\build.xml"
     Delete "$TEMP\installer.properties"
-    Delete "$INSTDIR\wrapper.conf"
     Delete "$TEMP\index.html"
     RMDIR /r "$WINTEMP\lams"
 FunctionEnd
@@ -495,6 +507,8 @@
 ################################################################################
 # END CODE USED FOR INSTALLER                                                  #
 ################################################################################
+
+
 ################################################################################
 # CODE USED FOR UNINSTALLER                                                    #
 ################################################################################
@@ -635,8 +649,10 @@
 ################################################################################
 # END CODE USED FOR UNINSTALLER                                                #
 ################################################################################
+
+
 ################################################################################
-# UTIL Functions                                              #
+# UTIL Functions                                                               #
 ################################################################################
 ; Push $filenamestring (e.g. 'c:\this\and\that\filename.htm')
 ; Push "\"
Index: win_installer/installer/templates/index.html
===================================================================
RCS file: /usr/local/cvsroot/win_installer/installer/templates/index.html,v
diff -u -r1.4 -r1.5
--- win_installer/installer/templates/index.html	9 Apr 2012 20:51:57 -0000	1.4
+++ win_installer/installer/templates/index.html	13 Apr 2012 18:08:11 -0000	1.5
@@ -1,66 +1,132 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en_au-">
-
+<!DOCTYPE html>
+<html lang="en">
 <head>
+	<meta charset="utf-8">
+	
 	<title>LAMS :: Learning Activity Management System</title>
-	<meta http-equiv="refresh" content="80; url=@URL@" />
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta http-equiv="pragma" content="no-cache" />
-	<meta http-equiv="cache-control" content="no-cache" />
-	<link href="jboss-5.1/server/default/deploy/lams.ear/lams-central.war/css/defaultHTML.css" rel="stylesheet" type="text/css" />
-	<link rel="icon" href="jboss-5.1/server/default/deploy/lams.ear/lams-central.war/favicon.ico" type="image/x-icon" />
 
-	<link rel="shortcut icon" href="jboss-5.1/server/default/deploy/lams.ear/lams-central.war/favicon.ico" type="image/x-icon" />
-</head>
-
-<body class="stripes">
-	<div id="login-page"><!--main box 'page'-->
+	<meta http-equiv="refresh" content="80; url=@URL@" />
 	
-		<h1 class="no-tabs-below">&nbsp;</h1>
-		
-		<div id="login-header">
-		
-		</div><!--closes header-->
+	<link rel="stylesheet" href="css/global.css">
+	<link href="../jboss-5.1/server/default/deploy/lams.ear/lams-central.war/css/defaultHTML.css" rel="stylesheet" type="text/css" />
+	<link rel="icon" href="../jboss-5.1/server/default/deploy/lams.ear/lams-central.war/favicon.ico" type="image/x-icon" />
 	
-	
-	  <div id="login-content">	
-	  
-	  	<div style="padding-left:40px">
-		<h1><img src="jboss-5.1/server/default/deploy/lams.ear/lams-central.war/images/css/lams_login.gif" alt="LAMS - Learning Activity Management System" width="186" height="90" /></h1>
+	<script src="js/jquery.min.js"></script>
+	<script src="js/slides.min.jquery.js"></script>
+	<script>
+		$(function(){
+			$('#slides').slides({
+				preload: true,
+				preloadImage: 'img/loading.gif',
+				play: 5000,
+				pause: 2500,
+				hoverPause: true,
+				animationStart: function(current){
+					$('.caption').animate({
+						bottom:-35
+					},100);
+					if (window.console && console.log) {
+						// example return of current slide number
+						console.log('animationStart on slide: ', current);
+					};
+				},
+				animationComplete: function(current){
+					$('.caption').animate({
+						bottom:0
+					},200);
+					if (window.console && console.log) {
+						// example return of current slide number
+						console.log('animationComplete on slide: ', current);
+					};
+				},
+				slidesLoaded: function() {
+					$('.caption').animate({
+						bottom:0
+					},200);
+				}
+			});
+		});
+	</script>
+</head>
+<body style="padding: 1px;">
+	<div id="container">
 
-<br />		
-<h1>Waiting for LAMS to start completely...</h1>
-<br />
-<p>You will be redirected about a minute.&nbsp;&nbsp;</p>
+<center>
+		<img src="../jboss-5.1/server/default/deploy/lams.ear/lams-central.war/images/css/lams_login.gif" alt="LAMS - Learning Activity Management System" width="186" height="90" />
 
-<p>Click <a href="@URL@">here</a> to go to the login page in 60 seconds.</p>
 
-<p></p>
+<br />		
 
+<h1>Waiting for LAMS to start completely...</h1>
 
+<br />
 
-
-</div>
-	  <div class="clear"></div><!-- forces the CSS to display the columns-->
-
-	
-	  </div>  <!--closes content-->
-	   
-		
-		
-		
-		
+<p>You will be redirected in about a minute. While you wait, have a look at some of the new LAMS 2.4 features:</p>
+&nbsp;
+</center>
+		<div id="example">
+			<img src="img/new-ribbon.png" width="112" height="112" alt="New Ribbon" id="ribbon">
+			<div id="slides">
+				<div class="slides_container">
+					<div class="slide">
+						<a href="http://wiki.lamsfoundation.org/display/lams/Conditional+lesson+release" title="" target="_blank"><img src="img/slide-1.jpg" width="570" height="270" alt="Slide 1"></a>
+						<div class="caption" style="bottom:0">
+							<div>Conditional lesson release: set lessons to be completed before others can be seen.</div>
+						</div>
+					</div>
+					<div class="slide">
+						<a href="http://wiki.lamsfoundation.org/display/lams/Notifications" title="" target="_blank"><img src="img/slide-2.jpg" width="570" height="270" alt="Slide 2"></a>
+						<div class="caption">
+							<div>Scheduled and instant notifications: to enhance tracking and communication.</div>
+						</div>
+					</div>
+					<div class="slide">
+						<a href="http://wiki.lamsfoundation.org/display/lams/Lesson+introductions" title="" target="_blank"><img src="img/slide-3.jpg" width="570" height="270" alt="Slide 3"></a>
+						<div class="caption">
+							<div>Lesson introductions: create single pages to introduce a lesson</div>
+						</div>
+					</div>
+					<div class="slide">
+						<a href="http://wiki.lamsfoundation.org/display/lams/Mobile+devices+support+for+learners" title="" target="_blank"><img src="img/slide-4.jpg" width="570" height="270" alt="Slide 4"></a>
+						<div class="caption">
+							<div>Mobile devices support for learners for most common tools</div>
+						</div>
+					</div>
+					<div class="slide">
+						<a href="http://wiki.lamsfoundation.org/display/lams/Mobile+devices+support+for+learners" title="" target="_blank"><img src="img/slide-5.jpg" width="570" height="270" alt="Slide 5"></a>
+						<div class="caption">
+							<div>Mobile interfaces for iPad, iPhone, Android, etc.</div>
+						</div>
+					</div>
+					<div class="slide">
+						<a href="http://wiki.lamsfoundation.org/display/lams/Date+Restrictions" title="Date restrictions for lessons" target="_blank"><img src="img/slide-6.jpg" width="570" height="270" alt="Slide 6"></a>
+						<div class="caption">
+							<div>Date restrictions for lessons: set deadlines for lessons</div>
+						</div>
+					</div>
+					<div class="slide">
+						<a href="http://wiki.lamsfoundation.org/pages/viewpage.action?pageId=31588429" title="Ratings for Q&A and Forum" target="_blank"><img src="img/slide-7.jpg" width="570" height="270" alt="Slide 7"></a>
+						<div class="caption">
+							<div>Ratings for Q&A and Forum: let student peer assess eachother</div>
+						</div>
+					</div>
+					<div class="slide">
+						<a href="http://lamscommunity.org" title="LAMS Community" target="_blank"><img src="img/slide-8.jpg" width="570" height="270" alt="Slide 8"></a>
+						<div class="caption">
+							<div>LAMS Community: where you can get thousands of designs, ideas and help!</div>
+						</div>
+					</div>
+				</div>
+				<a href="#" class="prev"><img src="img/arrow-prev.png" width="24" height="43" alt="Arrow Prev"></a>
+				<a href="#" class="next"><img src="img/arrow-next.png" width="24" height="43" alt="Arrow Next"></a>
+			</div>
+			<img src="img/example-frame.png" width="739" height="341" alt="Example Frame" id="frame">
+		</div>
 		<div id="footer">
-		
-		<p>&copy; 2002-2012 LAMS Foundation.</p>
-		
-	  </div><!--closes footer-->
-
-		
-	</div><!--closes page-->
-
-
+			<p><small>Click <a href="@URL@">here</a> to go to the login page in 60 seconds.</small></p>
+			<p>&nbsp;</p>
+			<p>&copy; 2002-2012 <a href="http://lamsfoundation.org">LAMS Foundation</a></p>
+		</div>
+	</div>
 </body>
-
 </html>
-
Index: win_installer/utils/src/lams-start.nsi
===================================================================
RCS file: /usr/local/cvsroot/win_installer/utils/src/lams-start.nsi,v
diff -u -r1.5 -r1.6
Binary files differ