<fmt:message key="label.branching.title"/>

	- - - - - - -	- - - - - - - - - -		+ +

- - -

+ + + + -

- - - - - - - -

- -

+ + + + + + + + + + + +

+ + +

+ +

+ + + + + + + +

+ +

- - + + + + +

+ + + + + + + + + + + +

+ +

+ + + + + + + + + + -

- - - - - - - - - - - -

- -

- - - - - - - - - - \ No newline at end of file + Index: lams_learning/web/grouping/wait.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/grouping/wait.jsp (.../wait.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/grouping/wait.jsp (.../wait.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -19,32 +19,43 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ include file="/common/taglibs.jsp"%> - - - - - + + - - - + + <fmt:message key="label.view.groups.title"/> + + + + - -

- -

- + + + + + + + + + + + + +

+ +

+ + +

+ +

+ + + + -

- -

- - - \ No newline at end of file + Index: lams_learning/web/lessonComplete.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -19,190 +19,209 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - - + - - +<%@ include file="/common/taglibs.jsp"%> - - - - + + + + + + + + + + - // submit lesson total mark to the integrated server in case request comes from an integrated server - if (${not empty lessonFinishUrl}) { - $.ajax({ - url: "${lessonFinishUrl}", - type: "POST", - dataType: 'html', - cache: false, - async: 'false', - success: function (data) { - //log mark has been successfullly pushed to the integrated server - if (data && ((data == 'OK') || (data == 'No Lineitem object found'))) { - $.ajax({ - url: "logLessonMarkPushedToIntegrations", - data: {lessonID: "${lessonID}"}, - type: "POST", - cache: false - }); - } - }, - error: function (ajaxContext) { - alert("There was an error on trying to submit lesson total mark to the integrated server: " + ajaxContext.responseText) - } - }); - } - - - $(document).ready(function(){ - // Create the organisation view grid with sub grid for users - $("#userGradebookGrid").jqGrid({ - datatype : "json", - url : "gradebook/gradebook/getLessonCompleteGridData.do?lessonID=${lessonID}", - height : "100%", - // use new theme - guiStyle : "bootstrap", - iconSet : 'fontAwesome', - autoencode : false, - colNames : [ - '', - '', - '', - '' - ], - colModel : [ - { - 'name' : 'name', - 'index' : 'name', - 'title' : false - }, - { - 'name' : 'progress', - 'index' : 'progress', - 'align' : 'center', - 'width' : 100, - 'title' : false - }, - { - 'name' : 'averageMark', - 'index' : 'averageMark', - 'align' : 'center', - 'width' : 100, - 'title' : false - }, - { - 'name' : 'mark', - 'index' : 'mark', - 'align' : 'center', - 'width' : 100, - 'title' : false - } - ], - beforeProcessing : function(data) { - // Wrap each activity name in a link to show same pop up - // as if the user clicked the activity in progress bar. - // The code depends on progressBar.js import in Page.tag - $.each(data.rows, function() { - this.cell[0] = '' + this.cell[0] + ''; - }); - }, - loadComplete : function(data) { - // display non-grid data - $('#learnerLessonMark').text(data.learnerLessonMark); - $('#averageLessonMark').text(data.averageLessonMark); - }, - loadError : function(xhr,st,err) { - $("#userGradebookGrid").clearGridData(); - $.jgrid.info_dialog('', - '', - ''); + + + + - - + } -

- - - - - -

+ + $(document).ready(function(){ + // Create the organisation view grid with sub grid for users + $("#userGradebookGrid").jqGrid({ + datatype : "json", + url : "gradebook/gradebook/getLessonCompleteGridData.do?lessonID=${lessonID}", + height : "100%", + // use new theme + guiStyle : "bootstrap", + iconSet : 'fontAwesome', + autoencode : false, + colNames : [ + '', + '', + '', + '' + ], + colModel : [ + { + 'name' : 'name', + 'index' : 'name', + 'title' : false + }, + { + 'name' : 'progress', + 'index' : 'progress', + 'align' : 'center', + 'width' : 100, + 'title' : false + }, + { + 'name' : 'averageMark', + 'index' : 'averageMark', + 'align' : 'center', + 'width' : 100, + 'title' : false + }, + { + 'name' : 'mark', + 'index' : 'mark', + 'align' : 'center', + 'width' : 100, + 'title' : false + } + ], + beforeProcessing : function(data) { + // Wrap each activity name in a link to show same pop up + // as if the user clicked the activity in progress bar. + // The code depends on progressBar.js import in Page.tag + $.each(data.rows, function() { + this.cell[0] = '' + this.cell[0] + ''; + }); + }, + loadComplete : function(data) { + // display non-grid data + $('#learnerLessonMark').text(data.learnerLessonMark); + $('#averageLessonMark').text(data.averageLessonMark); + }, + loadError : function(xhr,st,err) { + $("#userGradebookGrid").clearGridData(); + $.jgrid.info_dialog('', + '', + ''); + } + }); + }); + -

- - - - - - - - -

+ - -

- - - - + + +

+ + + + +

- - - +

- + - - + + + + +

- - - -

:

+ +

+ + + + +

+ -

- - \ No newline at end of file + +

+ + + + + +

+ + + +

+ +

:

+ +

+ + + + + Index: lams_learning/web/loadToolActivity.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -18,65 +18,86 @@ http://www.gnu.org/licenses/gpl.txt --%> - -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - - - -<%-- nprogress.css contents in learner.css --%> - - + - +<%@ include file="/common/taglibs.jsp"%> - + + + + - + + + - -

- -

- - + + + + + + + <%-- nprogress.css contents in learner.css --%> + + + + + + + + + + +

+ +

+ + + + + + - + Index: lams_learning/web/msgContent.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/msgContent.jsp (.../msgContent.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/web/msgContent.jsp (.../msgContent.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -1,14 +1,58 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-lams" prefix="lams" %> +<%@ include file="/common/taglibs.jsp"%> + + + <fmt:message key="error.title" /> + - + + + + - + + + - - ${messageKey} - + + + + + + + + ${messageKey} + + + + - \ No newline at end of file + + + \ No newline at end of file Index: lams_learning/web/notebook/addnew.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/notebook/addnew.jsp (.../addnew.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/notebook/addnew.jsp (.../addnew.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -18,60 +18,80 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - + - - - +<%@ include file="/common/taglibs.jsp"%> - - <%=CoreNotebookConstants.SCRATCH_PAD_SIG%> - - - <%=CoreNotebookConstants.JOURNAL_SIG%> - + + + <fmt:message key="mynotes.title" /> + - - + + + + - - - + + + -

- -

+ + + + + + + + + + <%=CoreNotebookConstants.SCRATCH_PAD_SIG%> + + + <%=CoreNotebookConstants.JOURNAL_SIG%> + + + + + + + + + + +

+ +

+ + +

+ + + + + -

- - -

- - - - - + + + Index: lams_learning/web/notebook/view.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/notebook/view.jsp (.../view.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/notebook/view.jsp (.../view.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -18,157 +18,176 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - - - + - - <%=CoreNotebookConstants.SCRATCH_PAD_SIG%> - - - <%=CoreNotebookConstants.JOURNAL_SIG%> - +<%@ include file="/common/taglibs.jsp"%> - - - - - - - - - - + - + + <fmt:message key="mynotes.title" /> + - - - - - - - - - - - - - - - - - + + + + - -

- - - - - - - - - - - - -

+ + + -

+ + + + + + + + <%=CoreNotebookConstants.SCRATCH_PAD_SIG%> + + + <%=CoreNotebookConstants.JOURNAL_SIG%> + + + + + + + + + + + + + + + + + + + + + + + - -

- - -

- - + + - - - -

- -

- - - + + + + + + +

+ + + - + - - - - - -
+ + + + + +

+ +

- - - - - - - - - +

+ + +

+ + - - - + + - - - - +

+ +

+ + + + + + + + - - - - - - - - - - - - - - - + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + - - + Index: lams_learning/web/notebook/viewall.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/notebook/viewall.jsp (.../viewall.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/notebook/viewall.jsp (.../viewall.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -18,138 +18,158 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - - - - + - - - - +<%@ include file="/common/taglibs.jsp"%> - - - - - -

- -

+ - - - + + <fmt:message key="mynotes.title" /> + - - - - - - - + + + + - - - - + + + -

- - - - - - - - - - -

- -

- - - - - - - - - - - -

- - - -

- - - - - - - - - - -

- - - - - - - - - - - - - - - - - -


- - - - - - - - - - - -

- - -

- + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + + + + + +

+ + + - + + + - + + +

+ + + + + + + + + + + +

+ + + +

+ + + - + + + - + + +

+ + + + + + + + + + + + + + + + + +


+ + + + + + + + + + + +

+ + +

+ +

- - + + + + + - \ No newline at end of file + Index: lams_learning/web/notebook/viewalljournals.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/notebook/viewalljournals.jsp (.../viewalljournals.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/notebook/viewalljournals.jsp (.../viewalljournals.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -18,73 +18,93 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-lams" prefix="lams"%> - - - + - - +<%@ include file="/common/taglibs.jsp"%> -

- -

+ - + + <fmt:message key="mynotes.title" /> + - + + + + - - - -

- - - - - + + + + + + + + + + + +

+ +

+ + + + + + +

+ + + + + + + + + +

+ + +

+ + + + + + + + + + + + + + + +


+ + + + + + + + + + + +

+ +

+ - - - + - -

- - - - - - - - - - - - - - - - -


- - - - - - - - - - - -

- -

- + Index: lams_learning/web/optionsActivity.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -1,192 +1,236 @@ -<%@ include file="/common/taglibs.jsp"%> +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ -<% - if (request.getAttribute("activity") instanceof org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity) { - request.setAttribute("isOptionsWithSequencesActivity", "true"); - } -%> + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. - + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA - + http://www.gnu.org/licenses/gpl.txt +--%> - -

- -

- + -

+<%@ include file="/common/taglibs.jsp"%> - - + -

+ + <fmt:message key="learner.title" /> + - - - - - - - - - - - - - - - - - - + + + + - - -

- - - - - - - - - - - - - - - - -

- -

+ + + -

- - - - - - - - - - - - - - - - - - - - -

- - -

- - - - + + <% + if (request.getAttribute("activity") instanceof org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity) { + request.setAttribute("isOptionsWithSequencesActivity", "true"); + } + %> + - - - - - - - -

- - + + + + +

+ +

+ + +

+ + + + +

+ + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + +

+ +

- - - - + + + + + + + + + + + + + + - - - + - - +

+ + +

+ + + + + + + + + + + + +

- - + + + + + + + + + + + + + - + + + + + + + + - - -

+ + +

+ +

+ + + + + + + + + + +

+ + + + + + -

- -

- - - - - - - - - - -

- - - - \ No newline at end of file Index: lams_learning/web/parallelActivity.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/parallelActivity.jsp (.../parallelActivity.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/parallelActivity.jsp (.../parallelActivity.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -19,24 +19,39 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt" %> + +<%@ include file="/common/taglibs.jsp"%> -<%-- TODO: use type --%> - - - " - name="TaskFrame" - frameborder="" bordercolor="#E0E7EB" - id="lamsDynamicFrame"> - - + - - <body> - <fmt:message key="message.activity.parallel.noFrames" /> - </body> - + + <fmt:message key="learner.title" /> + + + + + + + + + + + + + " + name="TaskFrame" + frameborder="" bordercolor="#E0E7EB" + id="lamsDynamicFrame"> + + + + + <body> + <fmt:message key="message.activity.parallel.noFrames" /> + </body> + + + Index: lams_learning/web/partialCompleted.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/partialCompleted.jsp (.../partialCompleted.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/partialCompleted.jsp (.../partialCompleted.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -19,17 +19,36 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-function" prefix="fn"%> -<%@ taglib uri="tags-lams" prefix="lams"%> + +<%@ include file="/common/taglibs.jsp"%> - -

- -

+ - + + <fmt:message key="learner.title" /> + + + + + + + + + + + + +

+ +

+ + + + + + + Index: lams_learning/web/progressBroken.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/progressBroken.jsp (.../progressBroken.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/web/progressBroken.jsp (.../progressBroken.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -18,19 +18,58 @@ http://www.gnu.org/licenses/gpl.txt --%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + <fmt:message key="error.title" /> + + + + + + + + + + + + + + + + + +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - -

- -

- - + + Index: lams_learning/web/welcome.jsp =================================================================== diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 --- lams_learning/web/welcome.jsp (.../welcome.jsp) (revision 1f7150d6142f994d113ba543736a9f7c0e154337) +++ lams_learning/web/welcome.jsp (.../welcome.jsp) (revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4) @@ -19,19 +19,39 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="tags-fmt" prefix="fmt"%> -<%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-lams" prefix="lams" %> + - - - - - +<%@ include file="/common/taglibs.jsp"%> + + + <fmt:message key="learner.title" /> + + + + + + + + + + + + + + + + + + + + + +

:

:

:

:

- - - - - - - - - - - - -

+ + + - + - - - - - - + + + + + +

- - - - - - - - - - -

- - - - - - - - - - -

+ + + - + + + - + + +

+ + + - + + + - + + +

- -

+ +

+ + + - + - - - - - -
+ + + + + +