Index: lams_central/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.8 -r1.1.2.9 --- lams_central/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:04:00 -0000 1.1.2.8 +++ lams_central/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:16:44 -0000 1.1.2.9 @@ -144,7 +144,6 @@ } } } else { // test for popup window - debugger; showControlBar = ( window.name.match("LearnerActivity") == null ); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v diff -u -r1.52.2.14 -r1.52.2.15 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 28 Jul 2016 03:45:26 -0000 1.52.2.14 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 29 Jul 2016 04:19:19 -0000 1.52.2.15 @@ -100,7 +100,8 @@ private static final String[] LEARNER_MESSAGE_KEYS = new String[] { "message.learner.progress.restart.confirm", "message.lesson.restart.button", - "label.learner.progress.notebook", "button.exit"}; + "label.learner.progress.notebook", "button.exit", + "label.learner.progress.support", "label.my.progress"}; // --------------------------------------------------------------------- Index: lams_learning/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_learning/web/WEB-INF/tags/Page.tag 29 Jul 2016 02:26:37 -0000 1.1.2.4 +++ lams_learning/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:19:19 -0000 1.1.2.5 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,26 +207,21 @@

<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • - + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_monitoring/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_monitoring/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:57:49 -0000 1.1.2.3 +++ lams_monitoring/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:31 -0000 1.1.2.4 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_assessment/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:57:48 -0000 1.1.2.5 +++ lams_tool_assessment/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:25 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_bbb/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:57:48 -0000 1.1.2.6 +++ lams_tool_bbb/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:27 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_chat/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_chat/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:57:50 -0000 1.1.2.6 +++ lams_tool_chat/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:32 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_daco/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_daco/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:57:47 -0000 1.1.2.5 +++ lams_tool_daco/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:23 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_forum/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_forum/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:43 -0000 1.1.2.6 +++ lams_tool_forum/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:30 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_gmap/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:57 -0000 1.1.2.6 +++ lams_tool_gmap/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:33 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_images/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_images/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:41 -0000 1.1.2.5 +++ lams_tool_images/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:28 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_imscc/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:51 -0000 1.1.2.5 +++ lams_tool_imscc/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:26 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_kaltura/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:42 -0000 1.1.2.5 +++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:29 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_lamc/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:39 -0000 1.1.2.6 +++ lams_tool_lamc/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:26 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.7 -r1.1.2.8 --- lams_tool_laqa/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:50 -0000 1.1.2.7 +++ lams_tool_laqa/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:20:24 -0000 1.1.2.8 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_larsrc/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:47 -0000 1.1.2.5 +++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:07 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_leader/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_leader/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:45 -0000 1.1.2.5 +++ lams_tool_leader/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:06 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_mindmap/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:37 -0000 1.1.2.5 +++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:03 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_nb/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_nb/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:48 -0000 1.1.2.6 +++ lams_tool_nb/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:09 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.8 -r1.1.2.9 --- lams_tool_notebook/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:52 -0000 1.1.2.8 +++ lams_tool_notebook/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:05 -0000 1.1.2.9 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_pixlr/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:36 -0000 1.1.2.5 +++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:01 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_preview/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_preview/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:53 -0000 1.1.2.5 +++ lams_tool_preview/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:04 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_sbmt/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:46 -0000 1.1.2.6 +++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:07 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_tool_scratchie/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:56 -0000 1.1.2.5 +++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:08 -0000 1.1.2.6 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_scribe/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:49 -0000 1.1.2.6 +++ lams_tool_scribe/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:22:02 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:55 -0000 1.1.2.6 +++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:23:36 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_survey/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_survey/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:38 -0000 1.1.2.6 +++ lams_tool_survey/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:23:34 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_task/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_task/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:54 -0000 1.1.2.6 +++ lams_tool_task/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:23:35 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_vote/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_vote/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:40 -0000 1.1.2.6 +++ lams_tool_vote/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:23:35 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +
    Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/Attic/Page.tag,v diff -u -r1.1.2.6 -r1.1.2.7 --- lams_tool_wiki/web/WEB-INF/tags/Page.tag 28 Jul 2016 23:51:44 -0000 1.1.2.6 +++ lams_tool_wiki/web/WEB-INF/tags/Page.tag 29 Jul 2016 04:23:37 -0000 1.1.2.7 @@ -38,9 +38,8 @@ - <%-- only have sidebar and presence in learner --%> - - + <%-- only have sidebar and presence in learner main window, not in popup windows --%> + <%-- Links placed in body instead of head. Ugly, but it works. --%> @@ -66,7 +65,7 @@ - + @@ -123,6 +122,8 @@ 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; @@ -133,7 +134,7 @@ $(document).ready(function() { var showControlBar = true; var showIM = true; - if ( window.frameElement ) { + if ( window.frameElement ) { // parallel var myId = window.frameElement.id; if ( myId ) { if ( myId == 'lamsDynamicFrame0' ) { @@ -142,6 +143,8 @@ showControlBar = false; } } + } else { // test for popup window + showControlBar = ( window.name.match("LearnerActivity") == null ); } if ( lessonId != "" || toolSessionId != "" ) { @@ -162,6 +165,7 @@ allowRestart = result.allowRestart; $('.lessonName').html(result.title); fillProgressBar('learnerMainBar'); + $('#navcontent').addClass('navcontent'); $('#sidebar').show(); } @@ -203,23 +207,21 @@

    <%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>

  • Exit
  • Notebook
    • - -
  • - +
    • +
  • + My Progress
    • -
    - - <%-- end of sidebar stuff - only used if in learner screen --%> - -
    - - - + <%-- end of sidebar stuff - only used if in learner screen --%> + +