Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u -r500ae45f4243aa718eac7436bc903b4f137a3aa7 -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision 500ae45f4243aa718eac7436bc903b4f137a3aa7)
+++ lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -1172,3 +1172,70 @@
     margin-left: 0px; 
 }
 
+// Full screen sizing - expects the div to be fullscreened to be called fullPageContentDiv, which contains a flexDiv and a mainDiv
+// You may need to tweak complicated structures within the div (e.g. see Mindmap's height control)
+@mixin fullPageContentDivDefn() {
+	width: 100%;
+	height: 100vh;
+	background-color: $body-bg;
+	display: flex;
+	align-items: center;
+}
+
+@mixin flexDivDefn() {
+    margin-left: 5%;
+    margin-right: 5%;
+    display: block;
+}
+
+@mixin mainDivDefn() {
+	width: 90vw;
+}
+
+#fullPageContentDiv:-webkit-full-screen {
+  @include fullPageContentDivDefn;
+}
+
+#fullPageContentDiv:-webkit-full-screen #flexDiv {
+  @include flexDivDefn;
+}
+
+#fullPageContentDiv:-webkit-full-screen #mainDiv {
+  @include mainDivDefn;
+}
+
+#fullPageContentDiv:-moz-full-screen {
+  @include fullPageContentDivDefn;
+}
+
+#fullPageContentDiv:-moz-full-screen  #flexDiv {
+  @include flexDivDefn;
+}
+
+#fullPageContentDiv:-moz-full-screen #mainDiv {
+  @include mainDivDefn;
+}
+
+#fullPageContentDiv:-ms-fullscreen {
+  @include fullPageContentDivDefn;
+}
+
+#fullPageContentDiv:-ms-fullscreen  #flexDiv {
+  @include flexDivDefn;
+}
+
+#fullPageContentDiv:-ms-full-screen #mainDiv {
+  @include mainDivDefn;
+}
+
+#fullPageContentDiv:fullscreen {
+  @include fullPageContentDivDefn;
+}
+
+#fullPageContentDiv:fullscreen #flexDiv {
+  @include flexDivDefn;
+}
+
+#fullPageContentDiv:fullscreen #mainDiv {
+  @include mainDivDefn;
+}
Index: lams_central/web/includes/javascript/fullscreen.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/fullscreen.js	(revision 0)
+++ lams_central/web/includes/javascript/fullscreen.js	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -0,0 +1,54 @@
+	// The DIV to be made full screen must have id="fullPageContentDiv" and call setupFullScreenEvents(); in the document.ready() method
+	// The button that triggers full screen must have the class "launch-fullscreen"
+	// The button that exits full screen must have the class "exit-fullscreen"
+
+	// Increase to full screen - find the right method, call on correct element
+	function launchIntoFullscreen() {
+		var element = document.getElementById("fullPageContentDiv");		
+		if(element.requestFullscreen) {
+			element.requestFullscreen();
+		} else if(element.mozRequestFullScreen) {
+			element.mozRequestFullScreen();
+		} else if(element.webkitRequestFullscreen) {
+			element.webkitRequestFullscreen();
+		} else if(element.msRequestFullscreen) {
+			element.msRequestFullscreen();
+		}
+	}
+
+	// Reduce full screen back to normal screen
+	function exitFullscreen() {
+	  if(document.exitFullscreen) {
+	    document.exitFullscreen();
+	  } else if(document.mozCancelFullScreen) {
+	    document.mozCancelFullScreen();
+	  } else if(document.webkitExitFullscreen) {
+	    document.webkitExitFullscreen();
+	  }
+	}
+	
+	
+	// Detect when screen changes and update buttons
+	function setupFullScreenEvents() {
+		fullscreenEnabled = document.fullscreenEnabled || document.mozFullScreenEnabled || document.webkitFullscreenEnabled;
+		if ( fullscreenEnabled ) {
+			document.addEventListener("fullscreenchange", fullScreenChanged);
+			document.addEventListener("mozfullscreenchange", fullScreenChanged);
+			document.addEventListener("webkitfullscreenchange", fullScreenChanged);
+			document.addEventListener("msfullscreenchange", fullScreenChanged);
+		} else {
+ 			$(".exit-fullscreen").hide();
+			$(".launch-fullscreen").hide();
+ 		}
+	}
+	
+	function fullScreenChanged( event ) {
+		var fullscreenElement = document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement;
+		if ( fullscreenElement && fullscreenElement != null ) {
+			$(".launch-fullscreen").hide();
+			$(".exit-fullscreen").show();
+	    } else {
+			$(".exit-fullscreen").hide();
+			$(".launch-fullscreen").show();
+	    }
+	}
\ No newline at end of file
Index: lams_monitoring/web/css/timer.scss
===================================================================
diff -u -rfda3ec8df53318805f4ca0fae87d9a6d6fdd8453 -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_monitoring/web/css/timer.scss	(.../timer.scss)	(revision fda3ec8df53318805f4ca0fae87d9a6d6fdd8453)
+++ lams_monitoring/web/css/timer.scss	(.../timer.scss)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -56,69 +56,4 @@
 	height:10px;
 }
 
-@mixin fullPageContentDivDefn() {
-	width: 100%;
-	height: 100vh;
-	background-color: $body-bg;
-	display: flex;
-	align-items: center;
-}
 
-@mixin flexDivDefn() {
-    margin-left: 5%;
-    margin-right: 5%;
-    display: block;
-}
-
-@mixin mainDivDefn() {
-	width: 90vw;
-}
-
-#fullPageContentDiv:-webkit-full-screen {
-  @include fullPageContentDivDefn;
-}
-
-#fullPageContentDiv:-webkit-full-screen #flexDiv {
-  @include flexDivDefn;
-}
-
-#fullPageContentDiv:-webkit-full-screen #mainDiv {
-  @include mainDivDefn;
-}
-
-#fullPageContentDiv:-moz-full-screen {
-  @include fullPageContentDivDefn;
-}
-
-#fullPageContentDiv:-moz-full-screen  #flexDiv {
-  @include flexDivDefn;
-}
-
-#fullPageContentDiv:-moz-full-screen #mainDiv {
-  @include mainDivDefn;
-}
-
-#fullPageContentDiv:-ms-fullscreen {
-  @include fullPageContentDivDefn;
-}
-
-#fullPageContentDiv:-ms-fullscreen  #flexDiv {
-  @include flexDivDefn;
-}
-
-#fullPageContentDiv:-ms-full-screen #mainDiv {
-  @include mainDivDefn;
-}
-
-#fullPageContentDiv:fullscreen {
-  @include fullPageContentDivDefn;
-}
-
-#fullPageContentDiv:fullscreen #flexDiv {
-  @include flexDivDefn;
-}
-
-#fullPageContentDiv:fullscreen #mainDiv {
-  @include mainDivDefn;
-}
-
Index: lams_monitoring/web/timer.jsp
===================================================================
diff -u -rfda3ec8df53318805f4ca0fae87d9a6d6fdd8453 -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_monitoring/web/timer.jsp	(.../timer.jsp)	(revision fda3ec8df53318805f4ca0fae87d9a6d6fdd8453)
+++ lams_monitoring/web/timer.jsp	(.../timer.jsp)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -19,7 +19,7 @@
 <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/nprogress.js"></script>
-
+<script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
 <script>
 	
 	var playSound = true;
@@ -178,57 +178,6 @@
 	    $('#countdownTarget').countdown('destroy'); 
 	}
 	 
-	// Increase to full screen - find the right method, call on correct element
-	function launchIntoFullscreen() {
-		var element = document.getElementById("fullPageContentDiv");		
-		if(element.requestFullscreen) {
-			element.requestFullscreen();
-		} else if(element.mozRequestFullScreen) {
-			element.mozRequestFullScreen();
-		} else if(element.webkitRequestFullscreen) {
-			element.webkitRequestFullscreen();
-		} else if(element.msRequestFullscreen) {
-			element.msRequestFullscreen();
-		}
-	}
-
-	// Reduce full screen back to normal screen
-	function exitFullscreen() {
-	  if(document.exitFullscreen) {
-	    document.exitFullscreen();
-	  } else if(document.mozCancelFullScreen) {
-	    document.mozCancelFullScreen();
-	  } else if(document.webkitExitFullscreen) {
-	    document.webkitExitFullscreen();
-	  }
-	}
-	
-	
-	// Detect when screen changes and update buttons
-	function setupFullScreenEvents() {
-		fullscreenEnabled = document.fullscreenEnabled || document.mozFullScreenEnabled || document.webkitFullscreenEnabled;
-		if ( fullscreenEnabled ) {
-			document.addEventListener("fullscreenchange", fullScreenChanged);
-			document.addEventListener("mozfullscreenchange", fullScreenChanged);
-			document.addEventListener("webkitfullscreenchange", fullScreenChanged);
-			document.addEventListener("msfullscreenchange", fullScreenChanged);
-		} else {
- 			$("#shrink").hide();
-			$("#expand").hide();
- 		}
-	}
-	
-	function fullScreenChanged( event ) {
-		var fullscreenElement = document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement;
-		console.log("fullscreenElement: "+fullscreenElement);
-		if ( fullscreenElement && fullscreenElement != null ) {
-			$("#expand").hide();
-			$("#shrink").show();
-	    } else {
-			$("#shrink").hide();
-			$("#expand").show();
-	    }
-	}
 </script>
 						
 </lams:head>
@@ -275,8 +224,8 @@
 		<a href="#" class="btn btn-default btn-primary fixed-button-width timer" id="resume" onclick="javascript:resume()" ><fmt:message key="label.resume"/></a>
 		<a href="#" class="btn btn-default loffset10 fixed-button-width timer" id="reset" onclick="javascript:reset()"><fmt:message key="label.reset"/></a>
 
-        <a href="#" class="btn btn-default loffset10 fixed-button-width pull-right" id="expand" onclick="javascript:launchIntoFullscreen()"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a> 
-        <a href="#" class="btn btn-default loffset10 fixed-button-width pull-right" id="shrink" onclick="javascript:exitFullscreen()" style="display: none;"><i class="fa fa-compress" aria-hidden="true"></i></a> 
+        <a href="#" class="btn btn-default loffset10 fixed-button-width pull-right launch-fullscreen" id="expand" onclick="javascript:launchIntoFullscreen()"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a> 
+        <a href="#" class="btn btn-default loffset10 fixed-button-width pull-right exit-fullscreen" id="shrink" onclick="javascript:exitFullscreen()" style="display: none;"><i class="fa fa-compress" aria-hidden="true"></i></a> 
 		<a href="#" class="btn btn-default loffset10 fixed-button-width pull-right" id="bellOn" onclick="javascript:toggleBell()"><i class="fa fa-volume-up" aria-hidden="true"></i></a>
 		<a href="#" class="btn btn-default loffset10 fixed-button-width pull-right" id="bellOff" onclick="javascript:toggleBell()" style="padding-top: 0px; padding-bottom: 0px; display: none;">
         <span class="fa fa-stack"><i class="fa fa-volume-up" aria-hidden="true"></i><i class="fa fa-ban fa-stack-2x text-danger" aria-hidden="true"></i>
Index: lams_tool_mindmap/web/common/mapjs.jsp
===================================================================
diff -u -r960e6b751430fc4832cf844b878fc470d99ad118 -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 960e6b751430fc4832cf844b878fc470d99ad118)
+++ lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -7,6 +7,7 @@
 <%-- <script src="${tool}includes/javascript/jquery.timer.js"></script> --%>
 <%-- <script src="${tool}includes/javascript/mapjs/main.js"></script> --%>
 <%-- <script src="${tool}includes/javascript/mapjs/underscore-min.js"></script> --%>
+<%-- <script src="${tool}includes/javascript/fullscreen.js"></script> --%>
 
 <script type="text/javascript">
 
@@ -19,8 +20,11 @@
 		requestsProcessed = new Array(), 
 		contentAggregate = null,	// mindmup variable - dummy root idea that has all visible ideas
 		mindMupContent = null; // mindmup content processor - used for reloading map.
-		
 
+	$(document).ready(function(){
+		setupFullScreenEvents();
+	});
+
 	// *** getMindmapContainerId() and  loadRootIdea(content) called by customised mapjs code ***
 	// window.mapModel is set up by mapjs in main.js. 
 	// returns the jquery selector for the mindmap container
@@ -410,6 +414,10 @@
 	
 </script>	
 
+	<div id="fullPageContentDiv">
+	<div id="flexDiv">
+	<div id="mainDiv">
+	
 	<c:if test="${contentEditable and (mode == 'learner' || mode == 'author')}">
 		<div>
 		<c:if test="${not multiMode}">
@@ -420,9 +428,13 @@
 
 	<div id="mindmap-controls">
 	
-		<!-- Color picker must be outside the next div or it can't float on top of the mindmap. The float is done in javascript. -->
+		<!-- Color picker & expand buttons must be outside the next div or it can't float on top of the mindmap. The float is done in javascript. -->
+		<div style="display:inline" role="group">
+        <a href="#" class="btn btn-default btn-sm launch-fullscreen pull-right loffset5" id="expand" onclick="javascript:launchIntoFullscreen()"><i class="fa fa-arrows-alt" aria-hidden="true"></i></a> 
+        <a href="#" class="btn btn-default btn-sm exit-fullscreen pull-right loffset5" id="shrink" onclick="javascript:exitFullscreen()" style="display: none;"><i class="fa fa-compress" aria-hidden="true"></i></a> 
 		<input type="text" id="background-color" class='updateStyle form-control input-sm' data-mm-target-property='background' size="7" width="180px"></input>
- 
+		</div>
+		 
 		<div>
 			<div class="btn-group btn-group-sm" role="group">
 			<a href="#" class="resetView btn btn-default btn-sm"><fmt:message key='label.zoom'/>:</a>
@@ -449,4 +461,7 @@
  	<div id="mindmap-container"></div>
  	<style id="themecss">
 	</style>
-
+	
+	</div>
+	</div>
+	</div>
Index: lams_tool_mindmap/web/includes/css/mindmap.scss
===================================================================
diff -u -r960e6b751430fc4832cf844b878fc470d99ad118 -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_tool_mindmap/web/includes/css/mindmap.scss	(.../mindmap.scss)	(revision 960e6b751430fc4832cf844b878fc470d99ad118)
+++ lams_tool_mindmap/web/includes/css/mindmap.scss	(.../mindmap.scss)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -7,11 +7,24 @@
 
 #mindmap-container {
 	background-color: $body-bg;
-	height: calc(100vh - 400px);
+	height: calc(100vh - 240px);
 	width: 100%;
 	border: $border-thin-solid;
 }	
 
+#fullPageContentDiv:-webkit-full-screen #mindmap-container {
+ 	height: calc(100vh - 150px);
+}
+#fullPageContentDiv:-moz-full-screen  #mindmap-container {
+ 	height: calc(100vh - 150px);
+}
+#fullPageContentDiv:-ms-fullscreen  #mindmap-container {
+ 	height: calc(100vh - 150px);
+}
+#fullPageContentDiv:fullscreen #mindmap-container {
+ 	height: calc(100vh - 150px);
+}
+
 // Override the default mapjs styles
 .mapjs-node .mapjs-label {
 	background: white;
@@ -24,3 +37,4 @@
 .mapjs-node:hover .mapjs-label {
 	color: black;
 }
+
Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rfbba41ca7139d9e3cfb25defb4daa15dabe93f2e -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision fbba41ca7139d9e3cfb25defb4daa15dabe93f2e)
+++ lams_tool_mindmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -6,6 +6,7 @@
 <link rel="stylesheet" type="text/css" href="${tool}includes/css/mindmap.css"></link>
 
 <script src="<lams:LAMSURL/>includes/javascript/jquery.minicolors.min.js"></script>
+<script src="<lams:LAMSURL/>includes/javascript/fullscreen.js"></script>
 <script src="${tool}includes/javascript/mapjs/main.js"></script>
 <script src="${tool}includes/javascript/mapjs/underscore-min.js"></script>
 
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -rfbba41ca7139d9e3cfb25defb4daa15dabe93f2e -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision fbba41ca7139d9e3cfb25defb4daa15dabe93f2e)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -6,6 +6,7 @@
 <link rel="stylesheet" type="text/css" href="${tool}includes/css/mindmap.css"></link>
 
 <script src="${lams}includes/javascript/jquery.minicolors.min.js"></script>
+<script src="${lams}includes/javascript/fullscreen.js"></script>
 <script src="${tool}includes/javascript/jquery.timer.js"></script>
 <script src="${tool}includes/javascript/mapjs/main.js"></script>
 <script src="${tool}includes/javascript/mapjs/underscore-min.js"></script>
Index: lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
===================================================================
diff -u -rfbba41ca7139d9e3cfb25defb4daa15dabe93f2e -r6904f3515317ff2162766f1beee8a2bc88f38235
--- lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision fbba41ca7139d9e3cfb25defb4daa15dabe93f2e)
+++ lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision 6904f3515317ff2162766f1beee8a2bc88f38235)
@@ -6,6 +6,7 @@
 
 <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 <script src="<lams:LAMSURL/>includes/javascript/jquery.minicolors.min.js"></script>
+<script src="<lams:LAMSURL/>includes/javascript/fullscreen.js"></script>
 <script src="${tool}includes/javascript/mapjs/main.js"></script>
 <script src="${tool}includes/javascript/mapjs/underscore-min.js"></script>