Index: lams_central/web/WEB-INF/tags/Page.tag =================================================================== diff -u -r1ab316c8f51d340b2e702dea7c3e55f76df61126 -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_central/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1ab316c8f51d340b2e702dea7c3e55f76df61126) +++ lams_central/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -re27d5ecdab649eab65bec7460d22928bb972a722 -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_learning/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision e27d5ecdab649eab65bec7460d22928bb972a722) +++ lams_learning/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r5660949c6c27cabcb931fa4df1470642b0aaa4e0 -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_monitoring/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 5660949c6c27cabcb931fa4df1470642b0aaa4e0) +++ lams_monitoring/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r5660949c6c27cabcb931fa4df1470642b0aaa4e0 -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_assessment/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 5660949c6c27cabcb931fa4df1470642b0aaa4e0) +++ lams_tool_assessment/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r5660949c6c27cabcb931fa4df1470642b0aaa4e0 -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_bbb/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 5660949c6c27cabcb931fa4df1470642b0aaa4e0) +++ lams_tool_bbb/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r5660949c6c27cabcb931fa4df1470642b0aaa4e0 -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_chat/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 5660949c6c27cabcb931fa4df1470642b0aaa4e0) +++ lams_tool_chat/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r5660949c6c27cabcb931fa4df1470642b0aaa4e0 -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_daco/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 5660949c6c27cabcb931fa4df1470642b0aaa4e0) +++ lams_tool_daco/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_forum/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_forum/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_gmap/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_gmap/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_images/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_images/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_imscc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_imscc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_kaltura/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_lamc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_lamc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_laqa/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_laqa/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_larsrc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_leader/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_leader/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_mindmap/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_nb/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_nb/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_notebook/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_notebook/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_pixlr/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_preview/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_preview/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_sbmt/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_scratchie/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_scribe/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_scribe/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_survey/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_survey/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_task/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_task/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_vote/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_vote/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 =================================================================== diff -u -r7c92a102d3fed2407e0437fc50ed7c8b9f2937bd -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 --- lams_tool_wiki/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7c92a102d3fed2407e0437fc50ed7c8b9f2937bd) +++ lams_tool_wiki/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3) @@ -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 --%> + +