Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
Binary files differ
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040066.sql
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040066.sql	(.../patch2040066.sql)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040066.sql	(.../patch2040066.sql)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -11,7 +11,10 @@
 	user_name VARCHAR(191),
 	create_date DATETIME NOT NULL,
 	command_text TEXT,
-	PRIMARY KEY (uid)
+	PRIMARY KEY (uid),
+	INDEX idx_lesson_id (lesson_id),
+	INDEX idx_user_name (user_name),
+	INDEX idx_create_date (create_date)
 )ENGINE=InnoDB;
 
 COMMIT;
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml	(.../Command.hbm.xml)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/command/Command.hbm.xml	(.../Command.hbm.xml)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -7,7 +7,7 @@
 <hibernate-mapping>
 
     <class
-        name="org.lamsfoundation.lams.learning.command.Command"
+        name="org.lamsfoundation.lams.learning.command.model.Command"
         table="lams_learning_command"
     >
 
Fisheye: Tag d19a95db673b7cf90351de4d567299c5fa86b450 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/command/Command.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java	(.../CommandWebsocketServer.java)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java	(.../CommandWebsocketServer.java)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -16,6 +16,7 @@
 import javax.websocket.server.ServerEndpoint;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learning.command.model.Command;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -39,7 +40,7 @@
     private static class SendWorker extends Thread {
 	private boolean stopFlag = false;
 	// how ofter the thread runs
-	private static final long CHECK_INTERVAL = 2000;
+	private static final long CHECK_INTERVAL = 5000;
 	// mapping lessonId -> timestamp when the check was last performed, so the thread does not run too often
 	private final Map<Long, Long> lastSendTimes = new TreeMap<Long, Long>();
 
@@ -95,10 +96,13 @@
 	}
 
 	/**
-	 * Feeds opened websockets with messages.
+	 * Feeds opened websockets with commands.
 	 */
 	private void send(Long lessonId) throws IOException {
 	    Long lastSendTime = lastSendTimes.get(lessonId);
+	    if (lastSendTime == null) {
+		lastSendTime = System.currentTimeMillis() - CHECK_INTERVAL;
+	    }
 	    lastSendTimes.put(lessonId, System.currentTimeMillis());
 
 	    List<Command> commands = CommandWebsocketServer.getLearnerService().getCommandsForLesson(lessonId,
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/ICommandDAO.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/ICommandDAO.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/ICommandDAO.java	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -0,0 +1,11 @@
+package org.lamsfoundation.lams.learning.command.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.learning.command.model.Command;
+
+public interface ICommandDAO extends IBaseDAO {
+    List<Command> getNewCommands(Long lessonId, Date lastCheck);
+}
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/hibernate/CommandDAO.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/hibernate/CommandDAO.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/dao/hibernate/CommandDAO.java	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -0,0 +1,44 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.learning.command.dao.hibernate;
+
+import java.util.Date;
+import java.util.List;
+
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.learning.command.dao.ICommandDAO;
+import org.lamsfoundation.lams.learning.command.model.Command;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class CommandDAO extends LAMSBaseDAO implements ICommandDAO {
+    private static final String COMMAND_BY_LESSON_AND_DATE = "FROM Command WHERE lessonId = :lessonId AND createDate >= :lastCheck";
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<Command> getNewCommands(Long lessonId, Date lastCheck) {
+	return (List<Command>) (doFindByNamedParam(CommandDAO.COMMAND_BY_LESSON_AND_DATE,
+		new String[] { "lessonId", "lastCheck" }, new Object[] { lessonId, lastCheck }));
+    }
+}
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/command/model/Command.java
===================================================================
diff -u
--- lams_learning/src/java/org/lamsfoundation/lams/learning/command/model/Command.java	(revision 0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/command/model/Command.java	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -0,0 +1,93 @@
+/****************************************************************
+ * 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
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.learning.command.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Stores a command to be sent to a learner via websocket.
+ */
+public class Command implements Serializable {
+
+    private Long uid;
+
+    private Long lessonId;
+
+    private String userName;
+
+    private Date createDate;
+
+    private String commandText;
+
+    public Command() {
+    }
+
+    public Command(Long lessonId, String userName, String jsonCommand) {
+	this.lessonId = lessonId;
+	this.userName = userName;
+	this.createDate = new Date();
+	this.commandText = jsonCommand;
+    }
+
+    public Long getUid() {
+	return uid;
+    }
+
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
+
+    public Long getLessonId() {
+	return lessonId;
+    }
+
+    public void setLessonId(Long lessonId) {
+	this.lessonId = lessonId;
+    }
+
+    public String getUserName() {
+	return userName;
+    }
+
+    public void setUserName(String userName) {
+	this.userName = userName;
+    }
+
+    public Date getCreateDate() {
+	return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+	this.createDate = createDate;
+    }
+
+    public String getCommandText() {
+	return commandText;
+    }
+
+    public void setCommandText(String commandText) {
+	this.commandText = commandText;
+    }
+}
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -54,6 +54,7 @@
 				<property name="gradebookService"><ref bean="gradebookService"/></property>
 				<property name="logEventService"><ref bean="logEventService"/></property>
 				<property name="dataFlowDAO"><ref bean="dataFlowDAO"/></property>
+				<property name="commandDAO"><ref bean="commandDAO"/></property>
 			</bean>
 		</property>
 		<property name="transactionAttributes">
@@ -97,11 +98,13 @@
 		</property>
 	</bean>
 	
-	<!-- Presence Chat related beans -->
 	<bean id="presenceChatDAO" class="org.lamsfoundation.lams.learning.presence.dao.hibernate.PresenceChatDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>	
 	
+	<bean id="commandDAO" class="org.lamsfoundation.lams.learning.command.dao.hibernate.CommandDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
 	
 	<!-- bean id="toolService" class="org.lamsfoundation.lams.tool.service.DummyToolService" singleton="false">
 	</bean-->
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(.../ILearnerService.java)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -26,7 +26,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.lamsfoundation.lams.learning.command.Command;
+import org.lamsfoundation.lams.learning.command.model.Command;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.tool.ToolOutput;
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -37,7 +37,8 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
-import org.lamsfoundation.lams.learning.command.Command;
+import org.lamsfoundation.lams.learning.command.dao.ICommandDAO;
+import org.lamsfoundation.lams.learning.command.model.Command;
 import org.lamsfoundation.lams.learning.progress.ProgressBuilder;
 import org.lamsfoundation.lams.learning.progress.ProgressEngine;
 import org.lamsfoundation.lams.learning.progress.ProgressException;
@@ -104,6 +105,7 @@
     private IGroupUserDAO groupUserDAO;
     private ProgressEngine progressEngine;
     private IDataFlowDAO dataFlowDAO;
+    private ICommandDAO commandDAO;
     private ILamsCoreToolService lamsCoreToolService;
     private ActivityMapping activityMapping;
     private IUserManagementService userManagementService;
@@ -1308,6 +1310,14 @@
 	this.dataFlowDAO = dataFlowDAO;
     }
 
+    public ICommandDAO getCommandDAO() {
+	return commandDAO;
+    }
+
+    public void setCommandDAO(ICommandDAO commandDAO) {
+	this.commandDAO = commandDAO;
+    }
+
     /**
      * Gets the concreted tool output (not the definition) from a tool. This method is called by target tool in order to
      * get data from source tool.
@@ -1400,14 +1410,12 @@
     @Override
     public void createCommandForLearner(Long lessonId, String userName, String jsonCommand) {
 	Command command = new Command(lessonId, userName, jsonCommand);
-	activityDAO.insert(command);
+	commandDAO.insert(command);
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public List<Command> getCommandsForLesson(Long lessonId, Date laterThan) {
-	String query = "FROM Command WHERE lessonId=? AND createDate >= ?";
-	return activityDAO.find(query, new Object[] { lessonId, laterThan });
+	return commandDAO.getNewCommands(lessonId, laterThan);
     }
 
     @Override
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2e52631e8d9ec49424ba74b3a003226e2d4302fb -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2e52631e8d9ec49424ba74b3a003226e2d4302fb)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -270,6 +270,7 @@
 force.complete.activity.confirm  =Are you sure you want to move learner "[0]" to activity "[1]"?
 force.complete.drop.fail  =You have dropped the learner "[0]" on either its current or on its completed activity "[1]".
 force.complete.end.lesson.tooltip  =To move a learner to the end of lesson, drag the learner icon over to this bar.
+force.complete.learner.command.message =Teacher moved you to another activity.
 learner.group.list.title  =Learners:
 learner.group.count  =learners in total.
 learner.group.show  =Double-click to see the full list.
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -134,6 +134,8 @@
 
     private static ILearnerService learnerService;
 
+    private static MessageService messageService;
+
     private Integer getUserId() {
 	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -636,7 +638,7 @@
 	MonitoringAction.auditService.log(MonitoringConstants.MONITORING_MODULE_NAME, auditMessage + " " + message);
 
 	JSONObject jsonCommand = new JSONObject();
-	jsonCommand.put("message", "Teacher moved you to another activity.");
+	jsonCommand.put("message", getMessageService().getMessage("force.complete.learner.command.message"));
 	jsonCommand.put("redirectURL", "/lams/learning/learner.do?method=joinLesson&lessonID=" + lessonId);
 	User learner = (User) getUserManagementService().findById(User.class, learnerId);
 	getLearnerService().createCommandForLearner(lessonId, learner.getLogin(), jsonCommand.toString());
@@ -1404,6 +1406,15 @@
 	return MonitoringAction.learnerService;
     }
 
+    private MessageService getMessageService() {
+	if (MonitoringAction.messageService == null) {
+	    WebApplicationContext ctx = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    MonitoringAction.messageService = (MessageService) ctx.getBean("monitoringMessageService");
+	}
+	return MonitoringAction.messageService;
+    }
+
     /**
      * Set whether or not the presence available button is available in learner. Expects parameters lessonID and
      * presenceAvailable.
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re463b64cccfefc6efb39c891fb496bfed47feb4a -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e463b64cccfefc6efb39c891fb496bfed47feb4a)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,8 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-				
+
+				// it gets initialised along with progress bar
 				commandWebsocket = null,
 
 				bars = {
@@ -199,8 +200,9 @@
 								});
 							}
 
+							// it is not an obvious place to init the websocket, but we need lesson ID
 							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
-							//when the server pushes new commands
+							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
 								var command = JSON.parse(e.data);
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r60ab803bf843562083cfb66764ddfcb3b0a83841 -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 60ab803bf843562083cfb66764ddfcb3b0a83841)
+++ lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -reb57b4fcf440743783106f853d6d23e4591bbcab -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision eb57b4fcf440743783106f853d6d23e4591bbcab)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -93,7 +93,10 @@
 				
 				LAMS_URL = '<lams:LAMSURL/>',
 				APP_URL = LAMS_URL + 'learning/',
-						
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
 				bars = {
 					'learnerMainBar' : {
 						'containerId' : 'progressBarDiv'
@@ -196,9 +199,25 @@
 									} 
 								});
 							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
 						}
 					});
 				}
+
+
 			});
 			
 		</script>
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra86e7d7663a6093c0369048074e955ba9762ba77 -rd19a95db673b7cf90351de4d567299c5fa86b450
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a86e7d7663a6093c0369048074e955ba9762ba77)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d19a95db673b7cf90351de4d567299c5fa86b450)
@@ -1,49 +1,343 @@
 <%@ tag body-content="scriptless"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+<%@ attribute name="usePanel" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideProgressBar" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty usePanel}">				
+	<c:set var="usePanel">true</c:set>
+</c:if>
 
+<c:choose>
 
-<div class="row no-gutter">
-	<div class="col-xs-12">
+	<c:when test='${type == "navbar"}'>
+	<%-- Combined tab and navigation bar used in authoring and monitoring --%>
+		<div class="row no-gutter no-margin">
+		<div class="col-xs-12">
 		<div class="container" id="content">
+		<jsp:doBody />
+		</div>
+		</div>
+		</div>
+	</c:when> 
+
+	<c:when test='${type == "learner"}'>
+	<%-- Learner --%>
+
+	<%-- Try to get authoring preview/learning/monitoring from the tool activity so we don't show the progress bar in monitoring --%>
+	<c:if test="${empty mode}">
+		<c:set var="mode" value="${param.mode}" />
+	</c:if>
+	<c:if test="${empty mode}">
+		<c:if test="${empty sessionMapID}">
+			<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+		</c:if>
+		<c:set var="mode" value="${sessionScope[sessionMapID].mode}" />
+	</c:if>
+
+	<%--  only have sidebar and presence in learner main window, not in popup windows --%>
+	<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+	
+		<%-- Links placed in body instead of head. Ugly, but it works. --%>
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/progressBar.css" type="text/css" />
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
 		
-		<c:choose>
-		<c:when test='${type == "navbar"}'>
-			<jsp:doBody />
-		</c:when> 
-		<c:otherwise>
-			<div class="panel panel-default panel-${type}-page">
-				<c:if test="${not empty title}">
-					<div class="panel-heading">
-						<div class="panel-title panel-${type}-title">
-							<c:out value="${title}" escapeXml="true" />
-							<c:if test="${not empty titleHelpURL}">
-								<span class="pull-right">${titleHelpURL}</span>
-							</c:if>
-						</div>
-						<c:if test="${not empty headingContent}">
-							<c:out value="${headingContent}" escapeXml="true" />
+		<c:if test="${empty lessonID}">
+			<c:set var="lessonID" value="${param.lessonID}" />
+		</c:if>
+
+		<c:if test="${empty lessonID}">
+			<%-- Desperately try to get tool session ID from the tool activity --%>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${toolSessionID}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionId}" />
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolSessionId" value="${param.toolSessionID}" />
+			</c:if>
+ 			<c:if test="${empty toolSessionId}">
+				<c:if test="${empty sessionMapID}">
+					<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+				</c:if>
+ 				<c:if test="${not empty sessionMapID}">
+					<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionID}" />
+					<c:if test="${empty toolSessionId}">
+						<c:set var="toolSessionId" value="${sessionScope[sessionMapID].toolSessionId}" />
+					</c:if>
+				</c:if>
+			</c:if>
+			<c:if test="${empty toolSessionId}">
+				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
+			</c:if>
+		</c:if>
+		
+		<script type="text/javascript">
+			var allowRestart = false,
+				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
+				toolSessionId = '${toolSessionId}',
+				lessonId = '${lessonID}',
+				mode = '${mode}',
+				
+				LAMS_URL = '<lams:LAMSURL/>',
+				APP_URL = LAMS_URL + 'learning/',
+
+				// it gets initialised along with progress bar
+				commandWebsocket = null,
+
+				bars = {
+					'learnerMainBar' : {
+						'containerId' : 'progressBarDiv'
+					}
+				};
+
+			function restartLesson(){
+				if (confirm(restartLessonConfirmation)) {
+					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+				}
+			}
+
+			function viewNotebookEntries(){
+				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+						"Notebook",
+						570,796,
+						"no");
+				hideSlideMenu(); /* For touch screen */
+			}
+		
+			function closeWindow() {
+	 			top.window.close();
+			}
+
+			function toggleSlideMenu() {	
+				if ( $("nav.sidebar").hasClass("expandmenu") ) {
+					hideSlideMenu();
+				}
+				else 
+					$("nav.sidebar").addClass("expandmenu");
+			}
+
+			function hideSlideMenu() {	
+				hideProgressBars();
+				$("nav.sidebar").removeClass("expandmenu");
+			}
+			
+			function onProgressBarLoaded() {
+				$('#exitlabel').html(LABELS.EXIT);
+				$('#notebooklabel').html(LABELS.NOTEBOOK);
+				$('#supportlabel').html(LABELS.SUPPORT_ACTIVITIES);
+				$('#progresslabel').html(LABELS.PROGRESS_BAR);
+				if ( allowRestart ) {
+					$('#restartlabel').html(LABELS.RESTART);
+					restartLessonConfirmation = LABELS.CONFIRM_RESTART;
+					$('#restartitem').show();
+				}
+				$('#sidebar').show();
+			}
+			
+			$(document).ready(function() {
+				var showControlBar = 1; // 0/1/2 none/full/keep space
+				var showIM = true;
+				if ( window.name.match("LearnerActivity") || window.parent.name.match("LearnerActivity")) { 
+					// popup window
+					showControlBar = 0;
+					showIM = false;
+				} else 	if ( window.frameElement ) { // parallel
+					var myId = window.frameElement.id;
+					if ( myId ) {
+						if ( myId == 'lamsDynamicFrame0' ) {
+							showIM = false;
+						} else if ( myId == 'lamsDynamicFrame1') {
+							showControlBar = 2;
+						}
+					}
+				}
+
+				if ( lessonId != "" || toolSessionId != "" ) {
+					$.ajax({
+						url : APP_URL + 'learner.do',
+						data : {
+							'method'   : 'getLessonDetails',
+							'lessonID' : lessonId,
+							'toolSessionID' : toolSessionId,
+						},
+						cache : false,
+						dataType : 'json',
+						success : function(result) {
+							
+							lessonId = result.lessonID;
+							
+							if ( showControlBar == 1  ) {
+								allowRestart = result.allowRestart;
+								$('.lessonName').html(result.title);
+								fillProgressBar('learnerMainBar');
+								$('#navcontent').addClass('navcontent');
+							} else if ( showControlBar == 2 ) {
+								$('#navcontent').addClass('navcontent');
+							}
+							
+							var presenceEnabledPatch = result.presenceEnabledPatch;
+							var presenceImEnabled = result.presenceImEnabled;
+							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
+								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
+								$('#presenceEnabledPatchDiv').load(presenceURL, function( response, status, xhr ) {
+									if ( status == "error" ) {
+										alert("Unable to load IM: " + xhr.status);
+									} 
+								});
+							}
+
+							// it is not an obvious place to init the websocket, but we need lesson ID
+							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							// when the server pushes new commands
+							commandWebsocket.onmessage = function(e){
+								// read JSON object
+								var command = JSON.parse(e.data);
+								if (command.message) {
+									alert(command.message);
+								}
+								if (command.redirectURL) {
+									window.location.href = command.redirectURL;
+								}
+							};
+						}
+					});
+				}
+
+
+			});
+			
+		</script>
+	
+		<nav class="navbar navbar-default sidebar" id="sidebar" role="navigation" onMouseEnter="javascript:toggleSlideMenu()" onMouseLeave="javascript:hideSlideMenu()" style="display:none" >
+		    <div class="container-fluid">
+				<!-- Brand and toggle get grouped for better mobile display -->
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+						<span class="sr-only">Toggle navigation</span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</button>
+					<a class="navbar-brand visible-xs hidden-sm hidden-md hidden-lg" href="#"><span class="lessonName"></span></a>
+				</div>
+				<!-- Collect the nav links, forms, and other content for toggling -->
+				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
+					<ul class="nav navbar-nav">
+						<li><a href="#" class="hidden-xs visible-sm visible-md visible-lg slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+							<i class="pull-right fa fa-bars" style="color:#337ab7"></i>
+							<p class="lessonName"></p></a></li>
+						<li><a href="#" onClick="javascript:closeWindow()" ><span id="exitlabel">Exit</span><i class="pull-right fa fa-times"></i></a></li>
+						<li><a href="#" onClick="javascript:viewNotebookEntries(); return false;" ><span id="notebooklabel">Notebook</span><i class="pull-right fa fa-book"></i></a></li>
+						<li id="restartitem" style="display:none"><a href="#" onClick="javascript:restartLesson()"><span id="restartlabel">Restart</span><i class="pull-right fa fa-recycle"></i></a></li>
+						<li id="supportitem" style="display:none"><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+							<span id="supportlabel">Support Activities</span><i class="pull-right fa fa-th-large"></i></a>
+							<div id="supportPart" class="progressBarContainer"></div>
+						<li><a href="#" class="slidesidemenu" onClick="javascript:toggleSlideMenu(); return false;">
+							<span id="progresslabel">My Progress</span><i class="pull-right fa fa-map"></i></a>
+							<div id="progressBarDiv" class="progressBarContainer"></div></li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+
+	</c:if> <%--  end of sidebar stuff - only used if in learner screen --%>
+
+		<div id="navcontent" class="content">
+			<div class="row no-gutter no-margin">
+			<div class="col-xs-12">
+			<div class="container">
+				<c:choose>
+				<c:when test="${usePanel}">
+					<div class="panel panel-default panel-${type}-page">
+						<c:if test="${not empty title}">
+							<div class="panel-heading">
+								<div class="panel-title panel-${type}-title">
+									<c:out value="${title}" escapeXml="true" />
+									<c:if test="${not empty titleHelpURL}">
+										<span class="pull-right">${titleHelpURL}</span>
+									</c:if>
+								</div>
+								<c:if test="${not empty headingContent}">
+									<c:out value="${headingContent}" escapeXml="true" />
+								</c:if>
+							</div>
 						</c:if>
+						
+						<div class="panel-body panel-${type}-body">
+							<jsp:doBody />
+						</div>
 					</div>
-				</c:if>
-				<div class="panel-body panel-${type}-body">
+					
+					<%--  only have sidebar and presence in learner --%>
+					<c:if test="${ not hideProgressBar && ( empty mode || mode == 'author' || mode == 'learner') }">
+					<div id="presenceEnabledPatchDiv"></div>
+					</c:if>
+				</c:when>
+				<c:otherwise>
 					<jsp:doBody />
+				</c:otherwise>
+				</c:choose>						
+			</div>
 				</div>
 			</div>
-		</c:otherwise>
-		</c:choose>
+		</div>
+
+	</c:when>
+
+	<c:otherwise>
+	<!-- Standard Screens  --> 
+		<div class="row no-gutter no-margin">
+		<div class="col-xs-12">
+		<div class="container" id="content">
+
+		<c:choose>
+		<c:when test="${usePanel}">
+		<div class="panel panel-default panel-${type}-page">
+			<c:if test="${not empty title}">
+				<div class="panel-heading">
+					<div class="panel-title panel-${type}-title">
+						<c:out value="${title}" escapeXml="true" />
+						<c:if test="${not empty titleHelpURL}">
+							<span class="pull-right">${titleHelpURL}</span>
+						</c:if>
+					</div>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+			</c:if>
 			
+			<div class="panel-body panel-${type}-body">
+				<jsp:doBody />
+			</div>
 		</div>
-		<!-- End content container -->
-	</div>
-</div>
+		</c:when>
 
+		<c:otherwise>
+		<jsp:doBody />
+		</c:otherwise>
+		</c:choose>						
+		
+		</div>
+		</div>
+		</div>
+	</c:otherwise>
+</c:choose>
 
+
 		
-			
+			
\ No newline at end of file