Index: lams_central/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -rb6e8dca20bffba9ce751b917ab4af7b252115f67 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_central/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision b6e8dca20bffba9ce751b917ab4af7b252115f67) +++ lams_central/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -6,6 +6,10 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%> +${empty hideHeader ? true : false } +<%@ attribute name="hideTitle" required="false" rtexprvalue="true"%> +${empty hideTitle ? false : true } <%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -49,143 +53,151 @@ - + + + -
-
-
- - - +
+ +
+
+ + + + +
+
+ Support activities +
+
    +
+
-
-
- Support activities -
-
    -
-
+
+
+ My progress +
+
    +
+
+
+
+ -
-
- My progress +
+ Skip to main content + + + + + +
+ + <${showHeader ? 'h2' : 'h1'} class="mb-3"> + + + + + + + +
+
+
+ + + -
+
+
+ +
+
+ + + -
- Skip to main content - - - -
- -

- - - -

- - - -
-
-
- - - -
-
- - - Index: lams_central/web/index.jsp =================================================================== diff -u -rae4e7fd3d6b21cb7f41a733565442950cdd9d232 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_central/web/index.jsp (.../index.jsp) (revision ae4e7fd3d6b21cb7f41a733565442950cdd9d232) +++ lams_central/web/index.jsp (.../index.jsp) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -1,27 +1,24 @@ <%@ include file="/common/taglibs.jsp"%> + - - - - <fmt:message key="index.welcome" /> - - + - - - -
- -

+
+
+

+
- - - - - - \ No newline at end of file + +
+ + + + +
+
+ \ No newline at end of file Index: lams_central/web/lessonIntro.jsp =================================================================== diff -u -rb35a95b84aa55576fe6af4e9187c807eeda6b99b -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision b35a95b84aa55576fe6af4e9187c807eeda6b99b) +++ lams_central/web/lessonIntro.jsp (.../lessonIntro.jsp) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -2,12 +2,8 @@ <%@ include file="/common/taglibs.jsp"%> - - - <fmt:message key="title.learner.window"/> - - - + + - - +
+
+ +
- - - -

- -
+
-
+
- +
- - - - - - - - +
+ Index: lams_learning/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -rb6e8dca20bffba9ce751b917ab4af7b252115f67 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_learning/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision b6e8dca20bffba9ce751b917ab4af7b252115f67) +++ lams_learning/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -6,6 +6,10 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%> +${empty hideHeader ? true : false } +<%@ attribute name="hideTitle" required="false" rtexprvalue="true"%> +${empty hideTitle ? false : true } <%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -49,143 +53,151 @@ - + + + -
-
-
- - - +
+ +
+
+ + + + +
+
+ Support activities +
+
    +
+
-
-
- Support activities -
-
    -
-
+
+
+ My progress +
+
    +
+
+
+
+ -
-
- My progress +
+ Skip to main content + + + + + +
+ + <${showHeader ? 'h2' : 'h1'} class="mb-3"> + + + + + + + +
+
+
+ + + -
+
+
+ +
+
+ + + -
- Skip to main content - - - -
- -

- - - -

- - - -
-
-
- - - -
-
- - - Index: lams_learning/web/loadToolActivity.jsp =================================================================== diff -u -r3a98d2ed66b1a6edc0a5aec5860d8c78dc1a9892 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision 3a98d2ed66b1a6edc0a5aec5860d8c78dc1a9892) +++ lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -21,97 +21,74 @@ - <%@ include file="/common/taglibs.jsp"%> + + + - - - - <fmt:message key="learner.title" /> - - - - - - - - - - - - - - - - - <%-- nprogress.css contents in learner.css --%> - - + + + + + } + + redirectPage(); + }); + - -
- -

- -

-
- - +
+
+ +
- - - - +
+ + + + +
+
+ + Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -rb6e8dca20bffba9ce751b917ab4af7b252115f67 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision b6e8dca20bffba9ce751b917ab4af7b252115f67) +++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -6,6 +6,10 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%> +${empty hideHeader ? true : false } +<%@ attribute name="hideTitle" required="false" rtexprvalue="true"%> +${empty hideTitle ? false : true } <%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -49,143 +53,151 @@ - + + + -
-
-
- - - +
+ +
+
+ + + + +
+
+ Support activities +
+
    +
+
-
-
- Support activities -
-
    -
-
+
+
+ My progress +
+
    +
+
+
+
+ -
-
- My progress +
+ Skip to main content + + + + + +
+ + <${showHeader ? 'h2' : 'h1'} class="mb-3"> + + + + + + + +
+
+
+ + + -
+
+
+ +
+
+ + + -
- Skip to main content - - - -
- -

- - - -

- - - -
-
-
- - - -
-
- - - Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp =================================================================== diff -u -rf007d7e87e33de37ad35d279b1da1d59c9f42055 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp (.../mainframe.jsp) (revision f007d7e87e33de37ad35d279b1da1d59c9f42055) +++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp (.../mainframe.jsp) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -1,21 +1,13 @@ - <%@ include file="/common/taglibs.jsp"%> - - - <fmt:message key="label.learning.title" /> - <%@ include file="/common/header.jsp"%> - - - - - - - - +
- - - - \ No newline at end of file +
+ Index: lams_tool_larsrc/web/pages/monitoring/comments.jsp =================================================================== diff -u -r06770d77acb444693664d588e5d2e8570adb96aa -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_tool_larsrc/web/pages/monitoring/comments.jsp (.../comments.jsp) (revision 06770d77acb444693664d588e5d2e8570adb96aa) +++ lams_tool_larsrc/web/pages/monitoring/comments.jsp (.../comments.jsp) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -1,33 +1,14 @@ - - <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.rsrc.ResourceConstants"%> +${requestScope.itemTitle}: - - - - - - - - - - - - ${requestScope.itemTitle} - - - - - ${requestScope.itemTitle}: - - + +
+
+ - - - Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -rb6e8dca20bffba9ce751b917ab4af7b252115f67 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision b6e8dca20bffba9ce751b917ab4af7b252115f67) +++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -6,6 +6,10 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%> +${empty hideHeader ? true : false } +<%@ attribute name="hideTitle" required="false" rtexprvalue="true"%> +${empty hideTitle ? false : true } <%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -49,143 +53,151 @@ - + + + -
-
-
- - - +
+ +
+
+ + + + +
+
+ Support activities +
+
    +
+
-
-
- Support activities -
-
    -
-
+
+
+ My progress +
+
    +
+
+
+
+ -
-
- My progress +
+ Skip to main content + + + + + +
+ + <${showHeader ? 'h2' : 'h1'} class="mb-3"> + + + + + + + +
+
+
+ + + -
+
+
+ +
+
+ + + -
- Skip to main content - - - -
- -

- - - -

- - - -
-
-
- - - -
-
- - - Index: lams_tool_nb/web/monitoring/comments.jsp =================================================================== diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rc568507be7453ecbf1f7e0b10ccddbf2bdf60fe1 --- lams_tool_nb/web/monitoring/comments.jsp (.../comments.jsp) (revision 3282e8325662ca873b88ceb07e627315d415a2c6) +++ lams_tool_nb/web/monitoring/comments.jsp (.../comments.jsp) (revision c568507be7453ecbf1f7e0b10ccddbf2bdf60fe1) @@ -1,33 +1,11 @@ - - <%@ include file="/includes/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%> - - - - - - - - - - - - <fmt:message key="activity.title"/> - - - - - : - - +: + +
- - - - - + mode="teacher" anonymous="${anonymous}" bootstrap5="true"/> +
+