Index: lams_central/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/build.xml,v
diff -u -r1.44.4.1 -r1.44.4.2
--- lams_central/build.xml	21 Apr 2009 10:29:52 -0000	1.44.4.1
+++ lams_central/build.xml	18 Jun 2009 19:43:36 -0000	1.44.4.2
@@ -186,6 +186,10 @@
 		<move file="${build.lib}/lams-central.war" tofile="${build.lib}/temp.war"/>
 		<unjar src="${build.lib}/temp.war" dest="${build.lib}/lams-central.war"/>
 		<antcall target="update-logo-for-RAMS"/>
+		
+		<!-- Add Pedagogical Planner, if available -->
+		<available file="../${lams_planner}/build.xml" property="planner_available" />
+		<antcall target="copy-planner" />
 	</target>
 
 
@@ -295,10 +299,6 @@
 				<include name="**/*.properties"/>
 			</fileset>
 		</copy>
-		
-		<!-- Add Pedagogical Planner, if available -->
-		<available file="../${lams_planner}/build.xml" property="planner_available" />
-		<antcall target="deploy-planner" />
 	</target>
 	
 	<!-- deploy-war : for convenience during development. Should be deployed via the master build -->
@@ -312,8 +312,8 @@
 		</copy>
 	</target>
 	
-	<target name="deploy-planner" if="planner_available">
-		<ant antfile="../${lams_planner}/build.xml" target="deploy" />
+	<target name="copy-planner" if="planner_available">
+		<ant antfile="../${lams_planner}/build.xml" target="copy-to-central" />
 	</target>
 	
 	<!-- ================================= -->
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.71.2.14 -r1.71.2.15
--- lams_central/conf/language/lams/ApplicationResources.properties	16 Jun 2009 13:13:10 -0000	1.71.2.14
+++ lams_central/conf/language/lams/ApplicationResources.properties	18 Jun 2009 19:43:37 -0000	1.71.2.15
@@ -360,4 +360,8 @@
 label.planner.tutorial.video=Introduction to Pedagogical Planner
 label.tutorial.video.never.show.again=Do not show this again
 
+label.planner.tutorial.video.show=Show tutorial video: Introduction to Pedagogical Planner
+label.tutorial.enabled=Automatically open help assistants. If this option is No, then no online help assistants will be opened.
+label.tutorial.disable.single=You have chosen not to show this video again. You can always play it using the video icon in the right upper corner of the page.
+label.tutorial.disable.all=Welcome to LAMS! As a new user, you might want to spend a few minutes looking at the new online assistant animations and videos to help you get the most out of LAMS. You can turn this option off if you are an experience LAMS user. If you are new to LAMS, we recommend that you leave this on to get contextual help. Do you want to to leave this option on?
 #======= End labels: Exported 266 labels for en AU =====
Index: lams_central/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/struts-forms.xml,v
diff -u -r1.8.4.1 -r1.8.4.2
--- lams_central/conf/xdoclet/struts-forms.xml	27 Apr 2009 22:24:00 -0000	1.8.4.1
+++ lams_central/conf/xdoclet/struts-forms.xml	18 Jun 2009 19:43:37 -0000	1.8.4.2
@@ -37,6 +37,7 @@
 	<form-property name="lamsCommunityToken" type="java.lang.String" />
 	<form-property name="lamsCommunityUsername" type="java.lang.String" />
 	<form-property name="disableLamsCommunityUsername" type="java.lang.Boolean" />
+	<form-property name="tutorialsDisabled" type="java.lang.Boolean" />
 </form-bean>
 
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.49.4.1 -r1.49.4.2
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	23 Apr 2009 06:41:42 -0000	1.49.4.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	18 Jun 2009 19:43:36 -0000	1.49.4.2
@@ -28,6 +28,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -41,10 +42,13 @@
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -92,6 +96,19 @@
 	setHeaderLinks(request);
 	setAdminLinks(request);
 
+	// check if this is user's first login; some action (like displaying a dialog for disabling tutorials) can be
+	// taken based on that parameter; immediatelly, the value in DB is updated
+	HttpSession ss = SessionManager.getSession();
+	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	if (userDTO.isFirstLogin()) {
+	    request.setAttribute("firstLogin", true);
+	    User user = getUserManagementService().getUserByLogin(userDTO.getLogin());
+	    user.setFirstLogin(false);
+	    getUserManagementService().save(user);
+	    ss.removeAttribute(AttributeNames.USER);
+	    ss.setAttribute(AttributeNames.USER, user.getUserDTO());
+	}
+
 	// check if user is flagged as needing to change their password
 	User loggedInUser = getUserManagementService().getUserByLogin(request.getRemoteUser());
 	if (loggedInUser.getChangePassword() != null) {
@@ -118,7 +135,7 @@
 	} else if (StringUtils.equals(tab, "lessons")) {
 	    return mapping.findForward("lessons");
 	} else if (StringUtils.equals(tab, "community")) {
-	    
+
 	    String comLoginUrl = Configuration.get(ConfigurationKeys.SERVER_URL) + "/lamsCommunityLogin.do";
 	    request.setAttribute("comLoginUrl", comLoginUrl);
 	    request.setAttribute("tab", tab);
@@ -155,10 +172,9 @@
 	    headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
 	}
 	headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?tab=profile"));
-	
-	
+
 	Registration reg = Configuration.getRegistration();
-	if (reg != null) {	    
+	if (reg != null) {
 	    if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN)
 		    || request.isUserInRole(Role.GROUP_MANAGER) || request.isUserInRole(Role.AUTHOR)
 		    || request.isUserInRole(Role.AUTHOR_ADMIN) || request.isUserInRole(Role.MONITOR)) {
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java,v
diff -u -r1.18.2.1 -r1.18.2.2
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	13 May 2009 05:44:52 -0000	1.18.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	18 Jun 2009 19:43:37 -0000	1.18.2.2
@@ -220,6 +220,9 @@
     private static final Map<String, String> filterLanguageMap = new TreeMap<String, String>();
     private static final Map<String, String[]> filterStopWordsMap = new TreeMap<String, String[]>();
 
+    // Tutorial video page string for recognising which page the video was started from
+    private static final String PAGE_STRING_START_PLANNER = "StPed";
+
     static {
 	PedagogicalPlannerAction.filterLanguageMap.put("en", "English");
 	PedagogicalPlannerAction.filterLanguageMap.put("nl", "Dutch");
@@ -246,6 +249,19 @@
      */
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
+
+	// First we check if a tutorial video should be displayed
+	HttpSession session = SessionManager.getSession();
+	UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
+
+	boolean doNotShowAgain = userDto.getPagesWithDisabledTutorials() != null
+		&& userDto.getPagesWithDisabledTutorials().contains(PedagogicalPlannerAction.PAGE_STRING_START_PLANNER);
+	boolean showTutorial = !(userDto.getTutorialsDisabled() || doNotShowAgain);
+
+	request.setAttribute(AttributeNames.ATTR_PAGE_STR, PedagogicalPlannerAction.PAGE_STRING_START_PLANNER);
+	request.setAttribute(AttributeNames.ATTR_SHOW_TUTORIAL, showTutorial);
+	request.setAttribute(AttributeNames.ATTR_DO_NOT_SHOW_AGAIN, doNotShowAgain);
+
 	return openSequenceNode(mapping, form, request, response);
     }
 
@@ -561,9 +577,8 @@
 	getMonitoringService().startLesson(lesson.getLessonId(), userDto.getUserID());
 	String newPath = mapping.findForward(PedagogicalPlannerAction.FORWARD_PREVIEW).getPath();
 	newPath = newPath + PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_LESSON_ID
-		+ PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId() 
-		+ PedagogicalPlannerAction.CHAR_AMPERSAND + AttributeNames.PARAM_MODE 
-		+ PedagogicalPlannerAction.CHAR_EQUALS + "preview";
+		+ PedagogicalPlannerAction.CHAR_EQUALS + lesson.getLessonId() + PedagogicalPlannerAction.CHAR_AMPERSAND
+		+ AttributeNames.PARAM_MODE + PedagogicalPlannerAction.CHAR_EQUALS + "preview";
 	return new ActionForward(newPath, true);
     }
 
Index: lams_central/web/editprofile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v
diff -u -r1.14.4.1 -r1.14.4.2
--- lams_central/web/editprofile.jsp	27 Apr 2009 22:24:00 -0000	1.14.4.1
+++ lams_central/web/editprofile.jsp	18 Jun 2009 19:43:36 -0000	1.14.4.2
@@ -139,6 +139,20 @@
 			</html:select>
 		</td>
 	</tr>
+	<tr>
+		<td class="align-right"><fmt:message key="label.tutorial.enabled"/>:</td>
+		<!-- For users' comfort we write it as a positive sentece - "should the tutorials be enabled"?
+			 But for simplicity of coding, we keep it as a negative value - "should the tutorials be disabled?"
+			 This is the reason to mix true/false and yes/no answers.
+		-->
+		<td><html:select property="tutorialsDisabled">
+			<html:option value="false"><fmt:message key="label.yes"/></html:option>
+			<html:option value="true"><fmt:message key="label.no"/></html:option>
+			</html:select>
+		</td>
+	</tr>
+	
+	
 	<c:if test="${not empty lamsCommunityToken}">
 		<tr>
 			<td class="align-right">
@@ -269,6 +283,18 @@
 			<fmt:message key="label.timezone.${timeZone}"/>
 		</td>
 	</tr>
+	<tr>
+		<td class="align-right"><fmt:message key="label.tutorial.enabled"/>:<bean:write name="UserForm" property="tutorialsDisabled" /></td>
+		<!-- For users' comfort we write it as a positive sentece - "should the tutorials be enabled"?
+			 But for simplicity of coding, we keep it as a negative value - "should the tutorials be disabled?"
+			 This is the reason to mix true/false and yes/no answers.
+		-->
+		<td><html:select property="tutorialsDisabled">
+			<html:option value="false"><fmt:message key="label.yes"/></html:option>
+			<html:option value="true"><fmt:message key="label.no"/></html:option>
+			</html:select>
+		</td>
+	</tr>
 </c:if>
 	
 	
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.40 -r1.40.2.1
--- lams_central/web/main.jsp	31 Mar 2009 03:18:12 -0000	1.40
+++ lams_central/web/main.jsp	18 Jun 2009 19:43:36 -0000	1.40.2.1
@@ -49,6 +49,15 @@
 					initLoadGroup(this, <c:if test="${empty tab}">1</c:if><c:if test="${tab eq 'profile'}">3</c:if>, display);
 				});
 				</c:if>
+				<%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%>
+				<c:if test="${firstLogin}">
+					<c:url var="disableAllTutorialVideosUrl" value="tutorial.do">
+						<c:param name="method" value="disableAllTutorialVideos" />
+					</c:url>
+					if (!confirm("<fmt:message key='label.tutorial.disable.all' />")){
+				 		$.get("${disableAllTutorialVideosUrl}");
+					}
+				</c:if>
 			});
 		
 			function getEnableSortingText() {
Index: lams_central/web/tutorialVideo.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/tutorialVideo.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_central/web/tutorialVideo.jsp	16 Jun 2009 13:13:10 -0000	1.1.2.1
+++ lams_central/web/tutorialVideo.jsp	18 Jun 2009 19:43:36 -0000	1.1.2.2
@@ -1,9 +1,75 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
+<head>
+	<!-- This page is used to display a tutorial video. Content and other parameters are passed in request. -->
+	
+	<c:url var="tutorialActionUrl" value="tutorial.do" />
+	
+   	<lams:css style="main" />
+   	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-latest.pack.js"></script>
+	<script type="text/javascript">
+		var doNotShowAgainInitialValue = ${param.doNotShowAgain};
+		
+		function closeTutorial(){
+			//If the user changed the checkbox value,
+			// we either add the video to user's disabled list or remove it from there.
+			if (doNotShowAgainInitialValue){
+			 		if (! $("#doNotShowAgain").attr("checked")){
+				 		$.ajax({		
+							type: "GET",
+							url: "${tutorialActionUrl}",
+							data: {method : "enableSingleTutorialVideo", pageString : "${param.pageString}"},
+							cache: false
+						});
+			 		}
+			 	}
+			 	else {
+			 		if ($("#doNotShowAgain").attr("checked")){
+			 			alert('<fmt:message key="label.tutorial.disable.single" />');
+			 			
+				 		$.ajax({		
+							type: "GET",
+							url: "${tutorialActionUrl}",
+							data: {method : "disableSingleTutorialVideo", pageString : "${param.pageString}"},
+							cache: false
+						});
+			 		}
+			 	}
+			 	
+			 self.parent.tb_remove();
+		}
+			
+		$(document).ready(function(){
+				/* 
+				   This call is needed to update the checkbox state.
+				   First attempt was to mark the checkbox checked/unchecked statically, based on parameters passed in request.
+				   It didn't work out, since parent page parameters stay the same
+				   (after closing thickbox, parent page is not updated)
+				   and state might have been changed by the user.
+				   That's why we need to check it each time we enter this thickbox.
+				*/
+	 			$.get(
+	 				"${tutorialActionUrl}",
+					{method : "getDoNotShowAgainValue", pageString : "${param.pageString}"},
+					function (data, textStatus) {
+						// Comparing with "==" did not work
+						doNotShowAgainInitialValue = data.indexOf("true")>-1;
+						$("#doNotShowAgain").attr("checked",doNotShowAgainInitialValue);
+ 					},
+					"text"
+				);
+		});
+	</script>
+</head>
 <body>
-   <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="${param.videoWidth}" height="${param.videoHeight}">
+	<h2 style="text-align: center">${param.title}</h2>
+   <div style="text-align: center">
+    <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="${param.videoWidth}" height="${param.videoHeight}">
        <param name="movie" value="${param.videoUrl}" />
        <param name="quality" value="best" />
        <param name="bgcolor" value="#1a1a1a" />
@@ -26,8 +92,11 @@
        <!--[if !IE]>-->
        </object>
        <!--<![endif]-->
-   </object>
-   
-   <input style="margin-top: 10px;" type="checkbox" name="doNotShowAgain" value="checked"><fmt:message key="label.tutorial.video.never.show.again" /></input>
+    </object>
+   </div>
+   <div style="float: left;">
+	   <input id="doNotShowAgain" style="margin: 12px 0px 0px 15px;" type="checkbox"><fmt:message key="label.tutorial.video.never.show.again" /></input>
+   </div>
+   <a class="button" style="margin: 8px 10px 0px 0px; float: right;" href="javascript:closeTutorial();"><fmt:message key="button.close" /></a>
 </body>
 <html>
\ No newline at end of file
Index: lams_central/web/css/pedagogicalPlanner.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/pedagogicalPlanner.css,v
diff -u -r1.10.2.1 -r1.10.2.2
--- lams_central/web/css/pedagogicalPlanner.css	16 Jun 2009 13:13:10 -0000	1.10.2.1
+++ lams_central/web/css/pedagogicalPlanner.css	18 Jun 2009 19:43:37 -0000	1.10.2.2
@@ -177,6 +177,12 @@
 	float: right;
 }
 
+a#tutorialVideoHref:hover {
+	border: none;
+	color: inherit;
+	cursor: pointer;
+}
+
 img#tutorialVideoImg {
 	border: none;
 }
\ No newline at end of file
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v
diff -u -r1.27.4.1 -r1.27.4.2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	27 Apr 2009 21:38:07 -0000	1.27.4.1
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	18 Jun 2009 19:43:10 -0000	1.27.4.2
@@ -543,7 +543,37 @@
             not-null="false"
         </meta>    
     </property>
+    <property
+        name="tutorialsDisabled"
+        type="java.lang.Boolean"
+        column="tutorials_disabled"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="tutorials_disabled"
+            length="1"
+        </meta>    
+    </property>
     
+   <property
+        name="firstLogin"
+        type="java.lang.Boolean"
+        column="first_login"
+        length="1"
+    >
+        <meta attribute="field-description">
+           @hibernate.property
+            column="first_login"
+            length="1"
+        </meta>    
+    </property>
+    
+    <set name="pagesWithDisabledTutorials" lazy="false" table="lams_user_disabled_tutorials" cascade="all-delete-orphan">
+        <key><column name="user_id" /></key>
+        <element  column="page_str" type="string" length="5" not-null="true" />
+    </set>
+
 </class>
 
    <sql-query name="usersAttemptedActivity">
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v
diff -u -r1.138.2.4 -r1.138.2.5
--- lams_common/db/sql/create_lams_11_tables.sql	1 May 2009 06:13:56 -0000	1.138.2.4
+++ lams_common/db/sql/create_lams_11_tables.sql	18 Jun 2009 19:43:10 -0000	1.138.2.5
@@ -322,6 +322,8 @@
 	 , lams_community_token VARCHAR(255)
  	 , lams_community_username VARCHAR(255)
  	 , timezone TINYINT
+	 , tutorials_disabled TINYINT(1) DEFAULT 0
+	 , first_login TINYINT(1) DEFAULT 1
      , PRIMARY KEY (user_id)
      , INDEX (authentication_method_id)
      , CONSTRAINT FK_lams_user_1 FOREIGN KEY (authentication_method_id)
@@ -1135,3 +1137,10 @@
 	, PRIMARY KEY (uid)
 )TYPE=InnoDB;
 
+CREATE TABLE lams_user_disabled_tutorials (
+     user_id BIGINT(20) NOT NULL
+   , page_str CHAR(5) NOT NULL
+   , CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id)
+                  REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
+   , PRIMARY KEY (user_id,page_str)
+)TYPE=InnoDB;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/Patch0017_updateFrom23-231.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql	3 Jun 2009 06:36:29 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql	18 Jun 2009 19:43:10 -0000	1.1.2.2
@@ -1,4 +1,4 @@
--- SQL statements to update from LAMS 2.2
+-- SQL statements to update from LAMS 2.3
 
 -- Turn off autocommit, so nothing is committed if there is an error
 SET AUTOCOMMIT = 0;
@@ -8,6 +8,18 @@
 -- Adding new column to external organisation table for tool adapters
 ALTER TABLE lams_ext_server_org_map ADD COLUMN server_url varchar(255);
 
+-- LDEV-2369 Add tutorial video support
+ALTER TABLE lams_user ADD COLUMN tutorials_disabled TINYINT(1) DEFAULT 0,
+				 	  ADD COLUMN first_login TINYINT(1) DEFAULT 1;
+
+CREATE TABLE lams_user_disabled_tutorials (
+     user_id BIGINT(20) NOT NULL
+   , page_str CHAR(5) NOT NULL
+   , CONSTRAINT FK_lams_user_disabled_tutorials_1 FOREIGN KEY (user_id)
+                  REFERENCES lams_user (user_id) ON DELETE CASCADE ON UPDATE CASCADE
+   , PRIMARY KEY (user_id,page_str)
+)TYPE=InnoDB;
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.36.4.3 -r1.36.4.4
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	13 May 2009 01:02:00 -0000	1.36.4.3
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	18 Jun 2009 19:43:10 -0000	1.36.4.4
@@ -162,12 +162,21 @@
     /** persistent field */
     private String lamsCommunityUsername;
 
+    /** persistent field */
+    private Boolean tutorialsDisabled;
+
+    /** persistent field */
+    private Set<String> pagesWithDisabledTutorials = new HashSet<String>();
+
+    /** persistent field - latch */
+    private Boolean firstLogin;
+
     // ------- TIMEZONES (hardcoded, there is no need to put them into database --------------
 
     public static String[] timezoneList = new String[] { "GMT-12", "GMT-11", "GMT-10", "GMT-9", "GMT-8", "GMT-7",
-	    "GMT-6", "GMT-5", "GMT-4", "GMT-3:30", "GMT-3", "GMT-2", "GMT-1", "GMT", "GMT+1", "GMT+2",
-	    "GMT+3", "GMT+3:30", "GMT+4", "GMT+4:30", "GMT+5", "GMT+5:30", "GMT+5:45", "GMT+6", "GMT+7",
-	    "GMT+8", "GMT+9", "GMT+9:30", "GMT+10", "GMT+11", "GMT+12" };
+	    "GMT-6", "GMT-5", "GMT-4", "GMT-3:30", "GMT-3", "GMT-2", "GMT-1", "GMT", "GMT+1", "GMT+2", "GMT+3",
+	    "GMT+3:30", "GMT+4", "GMT+4:30", "GMT+5", "GMT+5:30", "GMT+5:45", "GMT+6", "GMT+7", "GMT+8", "GMT+9",
+	    "GMT+9:30", "GMT+10", "GMT+11", "GMT+12" };
 
     /** full constructor */
     public User(String login, String password, String title, String firstName, String lastName, String addressLine1,
@@ -671,11 +680,14 @@
 
 	TimeZone tz = TimeZone.getTimeZone(User.timezoneList[getTimeZone()]);
 
+	Set<String> tutorialPages = pagesWithDisabledTutorials == null || pagesWithDisabledTutorials.isEmpty() ? null
+		: pagesWithDisabledTutorials;
+
 	return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email,
 		new CSSThemeBriefDTO(flashTheme), new CSSThemeBriefDTO(htmlTheme),
 		// TimeZone.getTimeZone("Australia/Sydney"),
 		tz, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, enableFlash,
-		lamsCommunityToken, lamsCommunityUsername);
+		lamsCommunityToken, lamsCommunityUsername, tutorialsDisabled, tutorialPages, firstLogin);
     }
 
     public UserFlashDTO getUserFlashDTO() {
@@ -848,4 +860,40 @@
 	this.timeZone = timeZone;
     }
 
+    /**
+     * @hibernate.property column="tutorials_disabled" length="1"
+     * 
+     */
+    public Boolean getTutorialsDisabled() {
+	return tutorialsDisabled;
+    }
+
+    public void setTutorialsDisabled(Boolean tutorialsDisabled) {
+	this.tutorialsDisabled = tutorialsDisabled;
+    }
+
+    /**
+     * @hibernate.set lazy="false" cascade="all-delete-orphan"
+     * @hibernate.collection-key column="user_id"
+     * @hibernate.collection-element column="page_str" type="string" length="5" not-null="true"
+     */
+    public Set<String> getPagesWithDisabledTutorials() {
+	return pagesWithDisabledTutorials;
+    }
+
+    public void setPagesWithDisabledTutorials(Set<String> pagesWithDisabledTutorials) {
+	this.pagesWithDisabledTutorials = pagesWithDisabledTutorials;
+    }
+
+    /**
+     * @hibernate.property column="first_login" length="1"
+     * 
+     */
+    public Boolean isFirstLogin() {
+	return firstLogin;
+    }
+
+    public void setFirstLogin(Boolean firstLogin) {
+	this.firstLogin = firstLogin;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java,v
diff -u -r1.19.4.1 -r1.19.4.2
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	27 Apr 2009 21:38:08 -0000	1.19.4.1
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	18 Jun 2009 19:43:10 -0000	1.19.4.2
@@ -23,6 +23,7 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.usermanagement.dto;
 
+import java.util.Set;
 import java.util.TimeZone;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -51,21 +52,25 @@
     private String lamsCommunityToken;
     private String lamsCommunityUsername;
     private Boolean loggedIntoLamsCommunity;
+    private Boolean tutorialsDisabled;
+    private Set<String> pagesWithDisabledTutorials;
+    private Boolean firstLogin;
 
-    //	public UserDTO(Integer userID, String firstName, String lastName,
-    //			String login, String email, CSSThemeVisualElement theme) {		
-    //		this.userID = userID;
-    //		this.firstName = firstName;
-    //		this.lastName = lastName;
-    //		this.login = login;
-    //		this.email = email;
-    //		this.theme = theme;
-    //	}
+    // public UserDTO(Integer userID, String firstName, String lastName,
+    // String login, String email, CSSThemeVisualElement theme) {
+    // this.userID = userID;
+    // this.firstName = firstName;
+    // this.lastName = lastName;
+    // this.login = login;
+    // this.email = email;
+    // this.theme = theme;
+    // }
 
     public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage,
 	    String localeCountry, String direction, String email, CSSThemeBriefDTO flashTheme,
 	    CSSThemeBriefDTO htmlTheme, TimeZone timezone, Integer authenticationMethodId, String fckLanguageMapping,
-	    Boolean enableFlash, String lamsCommunityToken, String lamsCommunityUsername) {
+	    Boolean enableFlash, String lamsCommunityToken, String lamsCommunityUsername, Boolean tutorialsDisabled,
+	    Set<String> pagesWithDisabledTutorials, Boolean firstLogin) {
 	this.userID = userID;
 	this.firstName = firstName;
 	this.lastName = lastName;
@@ -76,20 +81,24 @@
 	this.email = email;
 	this.flashTheme = flashTheme;
 	this.htmlTheme = htmlTheme;
-	this.timeZone = timezone;
+	timeZone = timezone;
 	this.authenticationMethodId = authenticationMethodId;
 	this.fckLanguageMapping = fckLanguageMapping;
 	this.enableFlash = enableFlash;
 	this.lamsCommunityToken = lamsCommunityToken;
 	this.lamsCommunityUsername = lamsCommunityUsername;
+	this.tutorialsDisabled = tutorialsDisabled;
+	this.pagesWithDisabledTutorials = pagesWithDisabledTutorials;
+	this.firstLogin = firstLogin;
     }
 
     /**
      * Equality test of UserDTO objects
      */
+    @Override
     public boolean equals(Object o) {
-	if ((o != null) && (o.getClass() == this.getClass())) {
-	    return ((UserDTO) o).userID == this.userID;
+	if (o != null && o.getClass() == this.getClass()) {
+	    return ((UserDTO) o).userID == userID;
 	} else {
 	    return false;
 	}
@@ -98,8 +107,9 @@
     /**
      * Returns the hash code value for this object.
      */
+    @Override
     public int hashCode() {
-	// TODO this might be an ineffcient implementation since userIDs are likely to be sequential, 
+	// TODO this might be an ineffcient implementation since userIDs are likely to be sequential,
 	// hence we dont get a good spread of values
 	return userID.intValue();
     }
@@ -174,6 +184,7 @@
 	return authenticationMethodId;
     }
 
+    @Override
     public String toString() {
 	return new ToStringBuilder(this).append("userID", getUserID()).append("firstName", getFirstName()).append(
 		"lastName", getLastName()).append("login", getLogin()).append("localeLanguage", getLocaleLanguage())
@@ -183,7 +194,8 @@
 		.append("fckLanguageMapping", getFckLanguageMapping()).append("enableFlash", getEnableFlash()).append(
 			"lamsCommunityUser", this.getLamsCommunityUsername()).append("lamsCommunityToken",
 			this.getLamsCommunityToken()).append("loggedIntoLamsCommunity",
-			"" + this.getLoggedIntoLamsCommunity()).toString();
+			"" + this.getLoggedIntoLamsCommunity())
+		.append("tutorialsDisabled", "" + getTutorialsDisabled()).toString();
     }
 
     public String getFckLanguageMapping() {
@@ -222,12 +234,32 @@
 	this.loggedIntoLamsCommunity = loggedIntoLamsCommunity;
     }
 
-    //	public CSSThemeVisualElement getTheme() {
-    //		return theme;
-    //	}
+    public Boolean getTutorialsDisabled() {
+	return tutorialsDisabled;
+    }
+
+    public void setTutorialsDisabled(Boolean tutorialsDisabled) {
+	this.tutorialsDisabled = tutorialsDisabled;
+    }
+
+    public Set<String> getPagesWithDisabledTutorials() {
+	return pagesWithDisabledTutorials;
+    }
+
+    public void setPagesWithDisabledTutorials(Set<String> pagesWithDisabledTutorials) {
+	this.pagesWithDisabledTutorials = pagesWithDisabledTutorials;
+    }
+
+    public Boolean isFirstLogin() {
+	return firstLogin;
+    }
+
+    // public CSSThemeVisualElement getTheme() {
+    // return theme;
+    // }
     //	
-    //	public void setTheme(CSSThemeVisualElement theme) {
-    //		this.theme = theme;
-    //	}
+    // public void setTheme(CSSThemeVisualElement theme) {
+    // this.theme = theme;
+    // }
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java,v
diff -u -r1.28 -r1.28.2.1
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	31 Mar 2009 03:32:50 -0000	1.28
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	18 Jun 2009 19:43:09 -0000	1.28.2.1
@@ -88,4 +88,9 @@
     public static final String COMMAND_GET_EDITING_ADVICE = "getEditingAdvice";
     public static final String COMMAND_CHECK_EDITING_ADVICE = "checkEditingAdvice";
     public static final String PARAM_ACTIVITY_INDEX = "activityIndex";
-}
+
+    // for tutorial videos
+    public static final String ATTR_PAGE_STR = "pageString";
+    public static final String ATTR_DO_NOT_SHOW_AGAIN = "doNotShowAgain";
+    public static final String ATTR_SHOW_TUTORIAL = "showTutorial";
+}
\ No newline at end of file