Index: lams_central/build.xml
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r2f5473044ec01bd94a2ea8e5262b2a200f1e6da6
--- lams_central/build.xml	(.../build.xml)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_central/build.xml	(.../build.xml)	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
@@ -186,10 +186,6 @@
 		<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>
 
 
@@ -299,6 +295,10 @@
 				<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 -->
@@ -311,9 +311,9 @@
 			</fileset>
 		</copy>
 	</target>
-
-	<target name="copy-planner" if="planner_available">
-		<ant antfile="../${lams_planner}/build.xml" target="copy-to-central" />
+	
+	<target name="deploy-planner" if="planner_available">
+		<ant antfile="../${lams_planner}/build.xml" target="deploy" />
 	</target>
 	
 	<!-- ================================= -->
Index: lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java
===================================================================
diff -u
--- lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	(revision 0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
@@ -0,0 +1,173 @@
+/****************************************************************
+ * 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.0
+ * 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
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.actions.DispatchAction;
+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.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;
+
+/**
+ * Manages tutorial videos - the ones displayed on top of pages, explaining how to use certain features of LAMS.
+ * 
+ * @struts:action path="/tutorial" parameter="method"
+ */
+public class TutorialAction extends DispatchAction {
+    private static Logger log = Logger.getLogger(TutorialAction.class);
+
+    private static IUserManagementService service;
+
+    /**
+     * Invoked when an user chose not to show a certain video again.
+     * 
+     * @param mapping
+     * @param form
+     * @param req
+     * @param res
+     * @return
+     */
+    public ActionForward disableSingleTutorialVideo(ActionMapping mapping, ActionForm form, HttpServletRequest req,
+	    HttpServletResponse res) {
+
+	String pageString = WebUtil.readStrParam(req, AttributeNames.ATTR_PAGE_STR);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	User user = getService().getUserByLogin(userDTO.getLogin());
+
+	user.getPagesWithDisabledTutorials().add(pageString);
+	getService().save(user);
+
+	ss.removeAttribute(AttributeNames.USER);
+	ss.setAttribute(AttributeNames.USER, user.getUserDTO());
+
+	return null;
+    }
+
+    /**
+     * Invoked when an user asked to show a certain video again.
+     * 
+     * @param mapping
+     * @param form
+     * @param req
+     * @param res
+     * @return
+     */
+    public ActionForward enableSingleTutorialVideo(ActionMapping mapping, ActionForm form, HttpServletRequest req,
+	    HttpServletResponse res) {
+
+	String pageString = WebUtil.readStrParam(req, AttributeNames.ATTR_PAGE_STR);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	User user = getService().getUserByLogin(userDTO.getLogin());
+
+	user.getPagesWithDisabledTutorials().remove(pageString);
+	getService().save(user);
+
+	ss.removeAttribute(AttributeNames.USER);
+	ss.setAttribute(AttributeNames.USER, user.getUserDTO());
+
+	return null;
+    }
+
+    /**
+     * Gets the value for "Do not show again" checkbox for a cerain video.
+     * 
+     * @param mapping
+     * @param form
+     * @param req
+     * @param res
+     * @return
+     * @throws IOException
+     */
+    public ActionForward getDoNotShowAgainValue(ActionMapping mapping, ActionForm form, HttpServletRequest req,
+	    HttpServletResponse res) throws IOException {
+
+	String pageString = WebUtil.readStrParam(req, AttributeNames.ATTR_PAGE_STR);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	Boolean doNotShowAgain = userDTO.getPagesWithDisabledTutorials() != null
+		&& userDTO.getPagesWithDisabledTutorials().contains(pageString);
+	res.setContentType("text/plain");
+	PrintWriter writer = res.getWriter();
+	writer.println(doNotShowAgain.toString());
+
+	return null;
+    }
+
+    /**
+     * Turns off tutorials. Same as going to user profile and turning them off. Used for dialog displayed after user's
+     * first login.
+     * 
+     * @param mapping
+     * @param form
+     * @param req
+     * @param res
+     * @return
+     * @throws IOException
+     */
+    public ActionForward disableAllTutorialVideos(ActionMapping mapping, ActionForm form, HttpServletRequest req,
+	    HttpServletResponse res) throws IOException {
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	User user = getService().getUserByLogin(userDTO.getLogin());
+
+	user.setTutorialsDisabled(true);
+	getService().save(user);
+
+	ss.removeAttribute(AttributeNames.USER);
+	ss.setAttribute(AttributeNames.USER, user.getUserDTO());
+
+	return null;
+    }
+
+    private IUserManagementService getService() {
+	if (TutorialAction.service == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
+		    .getServletContext());
+	    TutorialAction.service = (IUserManagementService) ctx.getBean("userManagementService");
+	}
+	return TutorialAction.service;
+    }
+}
\ No newline at end of file
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r4f33380083bd35fd6d0851de9def290c62ffc3c9 -r2f5473044ec01bd94a2ea8e5262b2a200f1e6da6
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 4f33380083bd35fd6d0851de9def290c62ffc3c9)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
@@ -113,7 +113,6 @@
 			<html:hidden property="enableFlash" />
 		</c:otherwise>
 	</c:choose>
-	</tr>
 		
 	<tr>
 		<td class="align-right"><fmt:message key="label.language"/>:</td>
@@ -275,7 +274,7 @@
 			</c:forEach>
 		</td>
 	</tr>
-		</tr>
+
 		<tr>
 		<td class="align-right"><fmt:message key="label.timezone.title"/>:</td>
 		<td>
Index: lams_central/web/includes/javascript/thickbox.patched.js
===================================================================
diff -u -r4f33380083bd35fd6d0851de9def290c62ffc3c9 -r2f5473044ec01bd94a2ea8e5262b2a200f1e6da6
--- lams_central/web/includes/javascript/thickbox.patched.js	(.../thickbox.patched.js)	(revision 4f33380083bd35fd6d0851de9def290c62ffc3c9)
+++ lams_central/web/includes/javascript/thickbox.patched.js	(.../thickbox.patched.js)	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
@@ -5,7 +5,7 @@
  * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
 */
 		  
-var tb_pathToImage = pathToImageFolder + "loadingAnimation.gif";
+var tb_pathToImage = "images/loadingAnimation.gif";
 
 // fixed according to: http://jamazon.co.uk/web/2008/03/14/jquerybrowserversion-doesnt-recognise-ie7/
 $.browser.msie6 =
@@ -72,12 +72,8 @@
 	   var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
 	   var urlType = baseURL.toLowerCase().match(urlString);
 
-	var queryString = url.replace(/^[^\?]+\??/,'');
-	var params = tb_parseQuery( queryString );
-
-
-		if((!params['TB_iframe'])){//code to show images
-
+		if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images
+				
 			TB_PrevCaption = "";
 			TB_PrevURL = "";
 			TB_PrevHTML = "";
@@ -115,10 +111,8 @@
 			var pagesize = tb_getPageSize();
 			var x = pagesize[0] - 150;
 			var y = pagesize[1] - 150;
-			var imageWidth = (jQuery.browser.msie) ? parseInt(params['dbWidth']) : imgPreloader.width;
-			var initialImageWidth = imageWidth;
-			var imageHeight = (jQuery.browser.msie) ? parseInt(params['dbHeight']) : imgPreloader.height;
-			var initialImageHeight = imageHeight;
+			var imageWidth = imgPreloader.width;
+			var imageHeight = imgPreloader.height;
 			if (imageWidth > x) {
 				imageHeight = imageHeight * (x / imageWidth); 
 				imageWidth = x; 
@@ -138,13 +132,8 @@
 			
 			TB_WIDTH = imageWidth + 30;
 			TB_HEIGHT = imageHeight + 60;
-
-			if ((initialImageWidth > x) ||(initialImageHeight > y)) {
-				$("#TB_window").append("<iframe id='TB_Image' style='border:0px;' frameborder='no' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"'/></iframe>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>");
-			} else {
-				$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+initialImageWidth+"px' height='"+initialImageHeight+"px' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>");				
-			}
-		
+			$("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div>"); 		
+			
 			$("#TB_closeWindowButton").click(tb_remove);
 			
 			if (!(TB_PrevHTML === "")) {
@@ -198,6 +187,9 @@
 			
 			imgPreloader.src = url;
 		}else{//code to show html
+			
+			var queryString = url.replace(/^[^\?]+\??/,'');
+			var params = tb_parseQuery( queryString );
 
 			TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL
 			TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
@@ -207,16 +199,11 @@
 			if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window		
 					urlNoQuery = url.split('TB_');
 					$("#TB_iframeContent").remove();
-					
-					var resize = "";
-					if(params['resizeIframe']){
-						resize = "resizeIframe();"
-					}
 					if(params['modal'] != "true"){//iframe no modal
-						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='resizeIframe();tb_showIframe();' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
+						$("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='Close'>close</a> or Esc Key</div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' > </iframe>");
 					}else{//iframe modal
 					$("#TB_overlay").unbind();
-						$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='"+resize+"tb_showIframe();' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
+						$("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'> </iframe>");
 					}
 			}else{// not an iframe, ajax
 					if($("#TB_window").css("display") != "block"){
@@ -337,6 +324,4 @@
   if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) {
     return true;
   }
-}
-
-
+}
\ No newline at end of file
Index: lams_central/web/tutorialVideo.jsp
===================================================================
diff -u
--- lams_central/web/tutorialVideo.jsp	(revision 0)
+++ lams_central/web/tutorialVideo.jsp	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
@@ -0,0 +1,102 @@
+<%@ 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>
+	<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" />
+       <param name="allowfullscreen" value="false" />
+       <param name="scale" value="showall" />
+       <param name="allowscriptaccess" value="always" />
+       <param name="flashvars" value="autostart=true&color=0x000000,0x000000" />
+       <!--[if !IE]>-->
+       <object type="application/x-shockwave-flash" data="${param.videoUrl}" width="${param.videoWidth}" height="${param.videoHeight}">
+           <param name="quality" value="best" />
+           <param name="bgcolor" value="#1a1a1a" />
+           <param name="allowfullscreen" value="false" />
+           <param name="scale" value="showall" />
+           <param name="allowscriptaccess" value="always" />
+           <param name="flashvars" value="autostart=true&color=0x000000,0x000000" />
+       <!--<![endif]-->
+           <div id="noUpdate">
+               <p>The Camtasia Studio video content presented here requires a more recent version of the Adobe Flash Player. If you are you using a browser with JavaScript disabled please enable it now. Otherwise, please update your version of the free Flash Player by <a href="http://www.adobe.com/go/getflashplayer">downloading here</a>.</p>
+           </div>
+       <!--[if !IE]>-->
+       </object>
+       <!--<![endif]-->
+    </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_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r2f5473044ec01bd94a2ea8e5262b2a200f1e6da6
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql	(.../patch0017_updateFrom23-231.sql)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql	(.../patch0017_updateFrom23-231.sql)	(revision 2f5473044ec01bd94a2ea8e5262b2a200f1e6da6)
@@ -22,6 +22,17 @@
   CONSTRAINT lams_ext_server_tool_map_fk2 FOREIGN KEY (tool_id) REFERENCES lams_tool (tool_id) ON DELETE CASCADE ON UPDATE CASCADE
 ) TYPE=InnoDB;
 
+-- 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