Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7cc3bf0a1c503019da5c957de4803dcb54c431ee -r492756e493a6ee187673cd84e1fc901a6c129711
--- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7cc3bf0a1c503019da5c957de4803dcb54c431ee)
+++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 492756e493a6ee187673cd84e1fc901a6c129711)
@@ -137,4 +137,6 @@
 label.show.chat.tooltip = Enables the chat feature allowing students to exchange messages while working on the drawing simultaneously.
 label.monitoring.summary.time.limit.expired = Expired
 label.comment.textarea.tip = Type your comment here then click on the green tick
-warning.comment.blank = Comment text is missing.
\ No newline at end of file
+warning.comment.blank = Comment text is missing.
+label.fullscreen.open = Show on full screen
+label.fullscreen.close = Close full screen
\ No newline at end of file
Index: lams_tool_whiteboard/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rd1f3bf74f099d80552eecac477aa993d23389a37 -r492756e493a6ee187673cd84e1fc901a6c129711
--- lams_tool_whiteboard/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d1f3bf74f099d80552eecac477aa993d23389a37)
+++ lams_tool_whiteboard/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 492756e493a6ee187673cd84e1fc901a6c129711)
@@ -18,7 +18,30 @@
 			margin-bottom: 20px;
 			border: 1px solid #c1c1c1;
 		}
+		
+		.launch-fullscreen {
+			margin-bottom: 5px;
+		}
+		
+		.exit-fullscreen {
+			display: none;
+			margin-bottom: 5px;
+		}
+		
+		#fullPageContentDiv:fullscreen {
+			padding: 20px 0 70px 0;
+		}
+		
+		#fullPageContentDiv:fullscreen #flexDiv {
+			margin: 0 2%;
+		}
+		
+		#fullPageContentDiv:fullscreen #flexDiv, #fullPageContentDiv:fullscreen #mainDiv, #fullPageContentDiv:fullscreen #whiteboard-frame {
+			height: 100%;
+			width: 100%;
+		}
 	</style>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/fullscreen.js"></script>
 	<script type="text/javascript">
         function init(){
             var tag = document.getElementById("currentTab");
@@ -45,6 +68,8 @@
 					widget.val(0);
 				}
 			});
+			
+			setupFullScreenEvents();
         });
     </script>
 </lams:head>
Index: lams_tool_whiteboard/web/pages/authoring/basic.jsp
===================================================================
diff -u -rca0dfbeab89f5dc06f8de124ed208e57a968ee57 -r492756e493a6ee187673cd84e1fc901a6c129711
--- lams_tool_whiteboard/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ca0dfbeab89f5dc06f8de124ed208e57a968ee57)
+++ lams_tool_whiteboard/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 492756e493a6ee187673cd84e1fc901a6c129711)
@@ -16,12 +16,21 @@
     <lams:CKEditor id="whiteboard.instructions" value="${authoringForm.whiteboard.instructions}" contentFolderID="${authoringForm.contentFolderID}" />
 </div>
 <c:if test="${not empty whiteboardServerUrl}">
-	<iframe id="whiteboard-frame"
-	        src='${whiteboardServerUrl}/?whiteboardid=${authoringForm.whiteboard.contentId}&username=${authoringForm.authorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}'>
-	</iframe>
-	<script>
-		$('#whiteboard-frame').load(function(){
-			alert("loaded");
-		});
-	</script>
+	<div id="fullPageContentDiv">
+		<div id="flexDiv">
+			<a href="#" class="btn btn-default fixed-button-width pull-right launch-fullscreen" onclick="javascript:launchIntoFullscreen()"
+			   title="<fmt:message key='label.fullscreen.open' />">
+				<i class="fa fa-arrows-alt" aria-hidden="true"></i>
+			</a> 
+	       	<a href="#" class="btn btn-default fixed-button-width pull-right exit-fullscreen" onclick="javascript:exitFullscreen()"
+			   title="<fmt:message key='label.fullscreen.close' />">
+	       		<i class="fa fa-compress" aria-hidden="true"></i>
+	       	</a>
+	       	<div id="mainDiv">
+				<iframe id="whiteboard-frame"
+				          src='${whiteboardServerUrl}/?whiteboardid=${authoringForm.whiteboard.contentId}&username=${authoringForm.authorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}'>
+				</iframe>
+			</div>
+		</div>
+	</div>
 </c:if>
\ No newline at end of file
Index: lams_tool_whiteboard/web/pages/learning/learning.jsp
===================================================================
diff -u -r645056c136b15a368e557dd13ea7154b0eea48a2 -r492756e493a6ee187673cd84e1fc901a6c129711
--- lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
+++ lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 492756e493a6ee187673cd84e1fc901a6c129711)
@@ -36,17 +36,42 @@
 			margin-bottom: 20px;
 			border: 1px solid #c1c1c1;
 		}
+		
+		.launch-fullscreen {
+			margin-bottom: 5px;
+		}
+		
+		.exit-fullscreen {
+			display: none;
+			margin-bottom: 5px;
+		}
+		
+		#fullPageContentDiv:fullscreen {
+			padding: 20px 0 70px 0;
+		}
+		
+		#fullPageContentDiv:fullscreen #flexDiv {
+			margin: 0 2%;
+		}
+		
+		#fullPageContentDiv:fullscreen #flexDiv, #fullPageContentDiv:fullscreen #mainDiv, #fullPageContentDiv:fullscreen #whiteboard-frame {
+			height: 100%;
+			width: 100%;
+		}
 	</style>
 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
 	<script type="text/javascript">
 	    // avoid name clash between bootstrap and jQuery UI
 	    $.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
 	    
 		$(document).ready(function(){
 			$('[data-toggle="tooltip"]').bootstrapTooltip();
+
+			setupFullScreenEvents();
 		});
 		
 		if (${!hasEditRight && mode != "teacher" && !finishedLock}) {
@@ -214,11 +239,24 @@
 		
 		<p><c:out value="${whiteboard.instructions}" escapeXml="false" /></p>
 		
+		<div id="fullPageContentDiv">
+			<div id="flexDiv">
+				<a href="#" class="btn btn-default fixed-button-width pull-right launch-fullscreen" onclick="javascript:launchIntoFullscreen()"
+				   title="<fmt:message key='label.fullscreen.open' />">
+					<i class="fa fa-arrows-alt" aria-hidden="true"></i>
+				</a> 
+		       	<a href="#" class="btn btn-default fixed-button-width pull-right exit-fullscreen" onclick="javascript:exitFullscreen()"
+				   title="<fmt:message key='label.fullscreen.close' />">
+		       		<i class="fa fa-compress" aria-hidden="true"></i>
+		       	</a>
+		       	<div id="mainDiv">
+					<iframe id="whiteboard-frame"
+					        src='${whiteboardServerUrl}/?whiteboardid=${wid}&username=${whiteboardAuthorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(whiteboardCopyAccessToken)}'>
+					</iframe>
+				</div>
+			</div>
+		</div>
 
-		<iframe id="whiteboard-frame"
-		        src='${whiteboardServerUrl}/?whiteboardid=${wid}&username=${whiteboardAuthorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(whiteboardCopyAccessToken)}'>
-		</iframe>
-
 		<!-- Reflection -->
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="panel panel-default">
Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r645056c136b15a368e557dd13ea7154b0eea48a2 -r492756e493a6ee187673cd84e1fc901a6c129711
--- lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
+++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 492756e493a6ee187673cd84e1fc901a6c129711)
@@ -88,6 +88,28 @@
 		height: 700px;
 		border: 1px solid #c1c1c1;
 	}
+	
+	.launch-fullscreen {
+		margin-bottom: 5px;
+	}
+	
+	.exit-fullscreen {
+		display: none;
+		margin-bottom: 5px;
+	}
+	
+	#fullPageContentDiv:fullscreen {
+		padding: 20px 0 70px 0;
+	}
+	
+	#fullPageContentDiv:fullscreen #flexDiv {
+		margin: 0 2%;
+	}
+	
+	#fullPageContentDiv:fullscreen #flexDiv, #fullPageContentDiv:fullscreen #mainDiv, #fullPageContentDiv:fullscreen .whiteboard-frame {
+		height: 100%;
+		width: 100%;
+	}
 </style>
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>