Index: lams_central/web/css/_learner_base.scss =================================================================== diff -u -re1d56ce578db63b4a5c6533ff99e1fe53cf46ad8 -rc834a3c9964666b01df4eef7b31b6d12564c80dd --- lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision e1d56ce578db63b4a5c6533ff99e1fe53cf46ad8) +++ lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision c834a3c9964666b01df4eef7b31b6d12564c80dd) @@ -1183,73 +1183,26 @@ margin-left: 0px; } -// Full screen sizing - expects the div to be fullscreened to be called fullPageContentDiv, which contains a flexDiv and a mainDiv +// Full screen sizing - expects the div to be fullscreened to have class full-screen-content-div, which contains a full-screen-flex-div and a full-screen-main-div // You may need to tweak complicated structures within the div (e.g. see Mindmap's height control) -@mixin fullPageContentDivDefn() { - width: 100%; + +.full-screen-content-div:fullscreen { + width: 100%; height: 100vh; background-color: $body-bg; display: flex; align-items: center; } -@mixin flexDivDefn() { +.full-screen-content-div:fullscreen .full-screen-flex-div { margin-left: 5%; margin-right: 5%; display: block; } -@mixin mainDivDefn() { +.full-screen-content-div:fullscreen .full-screen-main-div { 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; -} /* jqGrid text wrapping */ .ui-jqgrid tr.jqgrow td, .ui-jqgrid tr.ui-subgrid td { Index: lams_central/web/includes/javascript/fullscreen.js =================================================================== diff -u -r6904f3515317ff2162766f1beee8a2bc88f38235 -rc834a3c9964666b01df4eef7b31b6d12564c80dd --- lams_central/web/includes/javascript/fullscreen.js (.../fullscreen.js) (revision 6904f3515317ff2162766f1beee8a2bc88f38235) +++ lams_central/web/includes/javascript/fullscreen.js (.../fullscreen.js) (revision c834a3c9964666b01df4eef7b31b6d12564c80dd) @@ -1,54 +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" +// The DIV to be made full screen must have class="full-screen-content-div" and call setupFullScreenEvents() in the document.ready() method +// The button that triggers full screen must have the class "full-screen-launch-button" and be in "full-screen-content-div" +// The button that exits full screen must have the class "full-screen-exit-button" and be in "full-screen-content-div" - // 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(); - } +// Increase to full screen - find the right method, call on correct element +function launchIntoFullscreen(button) { + let element = $(button).closest('.full-screen-content-div')[0]; + 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(); - } +// 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(); - } +} + + +// Detect when screen changes and update buttons +function setupFullScreenEvents() { + let 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 { + $(".full-screen-exit-button").hide(); + $(".full-screen-launch-button").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 +} + +function fullScreenChanged() { + var fullscreenElement = document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement; + if (fullscreenElement && fullscreenElement != null) { + $(".full-screen-launch-button", fullscreenElement).hide(); + $(".full-screen-exit-button", fullscreenElement).show(); + } else { + $(".full-screen-exit-button").hide(); + $(".full-screen-launch-button").show(); + } +} \ No newline at end of file Index: lams_monitoring/web/timer.jsp =================================================================== diff -u -r40de3afab4e8d589660daffb6efd6e568e87f8fa -rc834a3c9964666b01df4eef7b31b6d12564c80dd --- lams_monitoring/web/timer.jsp (.../timer.jsp) (revision 40de3afab4e8d589660daffb6efd6e568e87f8fa) +++ lams_monitoring/web/timer.jsp (.../timer.jsp) (revision c834a3c9964666b01df4eef7b31b6d12564c80dd) @@ -181,10 +181,10 @@ -
-
+
+
-
+
@@ -220,8 +220,8 @@ - - + +
+ +
Index: lams_tool_mindmap/web/includes/css/mindmap.scss =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc834a3c9964666b01df4eef7b31b6d12564c80dd --- lams_tool_mindmap/web/includes/css/mindmap.scss (.../mindmap.scss) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_mindmap/web/includes/css/mindmap.scss (.../mindmap.scss) (revision c834a3c9964666b01df4eef7b31b6d12564c80dd) @@ -12,18 +12,9 @@ border: $border-thin-solid; } -#fullPageContentDiv:-webkit-full-screen #mindmap-container { - height: calc(100vh - 150px); +.full-screen-content-div:fullscreen #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 { Index: lams_tool_whiteboard/web/pages/authoring/authoring.jsp =================================================================== diff -u -r492756e493a6ee187673cd84e1fc901a6c129711 -rc834a3c9964666b01df4eef7b31b6d12564c80dd --- lams_tool_whiteboard/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 492756e493a6ee187673cd84e1fc901a6c129711) +++ lams_tool_whiteboard/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision c834a3c9964666b01df4eef7b31b6d12564c80dd) @@ -19,24 +19,26 @@ border: 1px solid #c1c1c1; } - .launch-fullscreen { + .full-screen-launch-button { margin-bottom: 5px; } - .exit-fullscreen { + .full-screen-exit-button { display: none; margin-bottom: 5px; } - #fullPageContentDiv:fullscreen { + .full-screen-content-div:fullscreen { padding: 20px 0 70px 0; } - #fullPageContentDiv:fullscreen #flexDiv { + .full-screen-content-div:fullscreen .full-screen-flex-div { margin: 0 2%; } - #fullPageContentDiv:fullscreen #flexDiv, #fullPageContentDiv:fullscreen #mainDiv, #fullPageContentDiv:fullscreen #whiteboard-frame { + .full-screen-content-div:fullscreen .full-screen-flex-div, + .full-screen-content-div:fullscreen .full-screen-main-div, + .full-screen-content-div:fullscreen #whiteboard-frame { height: 100%; width: 100%; } Index: lams_tool_whiteboard/web/pages/authoring/basic.jsp =================================================================== diff -u -r492756e493a6ee187673cd84e1fc901a6c129711 -rc834a3c9964666b01df4eef7b31b6d12564c80dd --- lams_tool_whiteboard/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 492756e493a6ee187673cd84e1fc901a6c129711) +++ lams_tool_whiteboard/web/pages/authoring/basic.jsp (.../basic.jsp) (revision c834a3c9964666b01df4eef7b31b6d12564c80dd) @@ -16,17 +16,17 @@
-
-
- +
+ - -
+
Index: lams_tool_whiteboard/web/pages/learning/learning.jsp =================================================================== diff -u -r492756e493a6ee187673cd84e1fc901a6c129711 -rc834a3c9964666b01df4eef7b31b6d12564c80dd --- lams_tool_whiteboard/web/pages/learning/learning.jsp (.../learning.jsp) (revision 492756e493a6ee187673cd84e1fc901a6c129711) +++ lams_tool_whiteboard/web/pages/learning/learning.jsp (.../learning.jsp) (revision c834a3c9964666b01df4eef7b31b6d12564c80dd) @@ -37,24 +37,27 @@ border: 1px solid #c1c1c1; } - .launch-fullscreen { + .full-screen-launch-button { margin-bottom: 5px; } - .exit-fullscreen { + .full-screen-exit-button { display: none; margin-bottom: 5px; } + - #fullPageContentDiv:fullscreen { + .full-screen-content-div:fullscreen { padding: 20px 0 70px 0; } - #fullPageContentDiv:fullscreen #flexDiv { + .full-screen-content-div:fullscreen .full-screen-flex-div { margin: 0 2%; } - #fullPageContentDiv:fullscreen #flexDiv, #fullPageContentDiv:fullscreen #mainDiv, #fullPageContentDiv:fullscreen #whiteboard-frame { + .full-screen-content-div:fullscreen .full-screen-flex-div, + .full-screen-content-div:fullscreen .full-screen-main-div, + .full-screen-content-div:fullscreen #whiteboard-frame { height: 100%; width: 100%; } @@ -239,17 +242,17 @@

-
-