Index: win_installer/installer/src/build.xml =================================================================== diff -u -r6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149 -r0b2b4d036b66e462485810c8e56aa57a424a212b --- win_installer/installer/src/build.xml (.../build.xml) (revision 6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149) +++ win_installer/installer/src/build.xml (.../build.xml) (revision 0b2b4d036b66e462485810c8e56aa57a424a212b) @@ -78,7 +78,7 @@ - + Index: win_installer/installer/src/installer.nsi =================================================================== diff -u -r373004ca450c6c4cc3952edd88e4ce9df9a764a9 -r0b2b4d036b66e462485810c8e56aa57a424a212b --- win_installer/installer/src/installer.nsi (.../installer.nsi) (revision 373004ca450c6c4cc3952edd88e4ce9df9a764a9) +++ win_installer/installer/src/installer.nsi (.../installer.nsi) (revision 0b2b4d036b66e462485810c8e56aa57a424a212b) @@ -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 =================================================================== diff -u -r6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149 -r0b2b4d036b66e462485810c8e56aa57a424a212b --- win_installer/installer/templates/index.html (.../index.html) (revision 6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149) +++ win_installer/installer/templates/index.html (.../index.html) (revision 0b2b4d036b66e462485810c8e56aa57a424a212b) @@ -1,66 +1,132 @@ - - - + + + + LAMS :: Learning Activity Management System - - - - - - - - - - -
+ -

 

- -
- -
+ + + - -
- -
-

LAMS - Learning Activity Management System

+ + + + + +
-
-

Waiting for LAMS to start completely...

-
-

You will be redirected about a minute.  

+
+ LAMS - Learning Activity Management System -

Click here to go to the login page in 60 seconds.

-

+
+

Waiting for LAMS to start completely...

+
- -
-
- - -
- - - - - +

You will be redirected in about a minute. While you wait, have a look at some of the new LAMS 2.4 features:

+  + +
+ New Ribbon +
+
+
+ Slide 1 +
+
Conditional lesson release: set lessons to be completed before others can be seen.
+
+
+
+ Slide 2 +
+
Scheduled and instant notifications: to enhance tracking and communication.
+
+
+
+ Slide 3 +
+
Lesson introductions: create single pages to introduce a lesson
+
+
+
+ Slide 4 +
+
Mobile devices support for learners for most common tools
+
+
+
+ Slide 5 +
+
Mobile interfaces for iPad, iPhone, Android, etc.
+
+
+
+ Slide 6 +
+
Date restrictions for lessons: set deadlines for lessons
+
+
+
+ Slide 7 +
+
Ratings for Q&A and Forum: let student peer assess eachother
+
+
+
+ Slide 8 +
+
LAMS Community: where you can get thousands of designs, ideas and help!
+
+
+
+ + +
+ Example Frame +
- - -
- - +

Click here to go to the login page in 60 seconds.

+

 

+

© 2002-2012 LAMS Foundation

+
+ - - Fisheye: Tag 0b2b4d036b66e462485810c8e56aa57a424a212b refers to a dead (removed) revision in file `win_installer/installer/templates/wrapper.conf'. Fisheye: No comparison available. Pass `N' to diff? Index: win_installer/utils/src/lams-start.nsi =================================================================== diff -u -r6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149 -r0b2b4d036b66e462485810c8e56aa57a424a212b --- win_installer/utils/src/lams-start.nsi (.../lams-start.nsi) (revision 6bea96a2ac932bc49e6f7dfa37b890d8dc1ce149) +++ win_installer/utils/src/lams-start.nsi (.../lams-start.nsi) (revision 0b2b4d036b66e462485810c8e56aa57a424a212b) @@ -81,13 +81,13 @@ MessageBox MB_OK|MB_ICONSTOP "Could not start LAMSv2 service: $\r$\n$1" ${Else} MessageBox MB_OK "Started LAMSv2 service. Please wait a minute or two while it starts up." - ExecShell "open" '$LAMSDIR\index.html' + ExecShell "open" '$LAMSDIR\slides\index.html' ${EndIf} goto quit ${Else} # We start LAMS Manually MessageBox MB_OK "The LAMS Server is being started. Please wait a minute or two while it starts up." - ExecShell "open" '$LAMSDIR\index.html' + ExecShell "open" '$LAMSDIR\slides\index.html' ${If} ${RunningX64} nsExec::ExecToStack '"$JBOSSDIR\bin\service64.bat" start' ${Else} @@ -97,7 +97,7 @@ Abort openbrowser: - ExecShell "open" '$LAMSDIR\index.html' + ExecShell "open" '$LAMSDIR\slides\index.html' Quit quit: SectionEnd