Index: lams_central/web/css/components.css =================================================================== diff -u -rdcdefe0500af5e2870c489d3a7f0cdacf931c3d6 -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_central/web/css/components.css (.../components.css) (revision dcdefe0500af5e2870c489d3a7f0cdacf931c3d6) +++ lams_central/web/css/components.css (.../components.css) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -484,7 +484,7 @@ min-height: 100vh; border-radius: 2.8rem; overflow: hidden; - background-color: #fff; + background-color: var(--bs-white); } .component-page-wrapper button.no-decoration { @@ -1623,4 +1623,4 @@ .gate-opened-icon { cursor: pointer; } -*/ +*/ \ No newline at end of file Index: lams_gradebook/lams_gradebook.eml =================================================================== diff -u -rf3144d7b1c275056481fd76050bad49b0ba6d06d -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_gradebook/lams_gradebook.eml (.../lams_gradebook.eml) (revision f3144d7b1c275056481fd76050bad49b0ba6d06d) +++ lams_gradebook/lams_gradebook.eml (.../lams_gradebook.eml) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -1,6 +1,9 @@ - + + + + Index: lams_monitoring/lams_monitoring.eml =================================================================== diff -u -rf3144d7b1c275056481fd76050bad49b0ba6d06d -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_monitoring/lams_monitoring.eml (.../lams_monitoring.eml) (revision f3144d7b1c275056481fd76050bad49b0ba6d06d) +++ lams_monitoring/lams_monitoring.eml (.../lams_monitoring.eml) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -1,6 +1,10 @@ - + + + + + Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -re820169ce662888b003dbe47ef24a48cf19d124c -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision e820169ce662888b003dbe47ef24a48cf19d124c) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -95,174 +95,90 @@ csrfTokenName = '', csrfTokenValue = '', - decoderDiv = $('
'), LABELS = { - - EMAIL_NOTIFICATIONS_TITLE : '', - - FORCE_COMPLETE_CLICK : decoderDiv.html('').text(), - - FORCE_COMPLETE_BUTTON : '', - - FORCE_COMPLETE_END_LESSON_CONFIRM : decoderDiv.html('').text(), - - FORCE_COMPLETE_ACTIVITY_CONFIRM : decoderDiv.html('').text(), - - FORCE_COMPLETE_REMOVE_CONTENT : decoderDiv.html('').text(), - - FORCE_COMPLETE_DROP_FAIL : '', - - LEARNER_GROUP_COUNT : '', - - LEARNER_GROUP_SHOW : '', - - LEARNER_GROUP_REMOVE_PROGRESS : decoderDiv.html('').text(), - - EMAIL_BUTTON : '', - - NOTIFCATIONS : '', - - SAVE_BUTTON : '', - - CANCEL_BUTTON : '', - - LEARNER_FINISHED_DIALOG_TITLE : '', - - LESSON_PRESENCE_ENABLE_ALERT : decoderDiv.html('').text(), - - LESSON_PRESENCE_DISABLE_ALERT : decoderDiv.html('').text(), - - LESSON_IM_ENABLE_ALERT : decoderDiv.html('').text(), - - LESSON_IM_DISABLE_ALERT : decoderDiv.html('').text(), - - LESSON_REMOVE_ALERT : decoderDiv.html('').text(), - - LESSON_REMOVE_DOUBLECHECK_ALERT : decoderDiv.html('').text(), - - LESSON_STATE_CREATED : '', - - LESSON_STATE_SCHEDULED : '', - - LESSON_STATE_STARTED : '', - - LESSON_STATE_SUSPENDED : '', - - LESSON_STATE_FINISHED : '', - - LESSON_STATE_ARCHIVED : '', - - LESSON_STATE_REMOVED : '', - - LESSON_STATE_ACTION_DISABLE : '', - - LESSON_STATE_ACTION_ACTIVATE : '', - - LESSON_STATE_ACTION_REMOVE : '', - - LESSON_STATE_ACTION_ARCHIVE : '', - - LESSON_ERROR_SCHEDULE_DATE : decoderDiv.html('').text(), - - LESSON_EDIT_CLASS : '', - - CLASS_ADD_ALL_CONFIRM : '', - - CLASS_ADD_ALL_SUCCESS : '', - - LESSON_GROUP_DIALOG_CLASS : '', - - CURRENT_ACTIVITY : '', - - COMPLETED_ACTIVITY : '', - - ATTEMPTED_ACTIVITY : '', - - TOSTART_ACTIVITY : '', - - SUPPORT_ACTIVITY : '', - - PROGRESS_NOT_STARTED : '', - - TIME_CHART : '', - - TIME_CHART_TOOLTIP : '', - - LIVE_EDIT_CONFIRM : decoderDiv.html('').text(), - - CONTRIBUTE_GATE : '', - - CONTRIBUTE_GATE_PASSWORD : '', - - CONTRIBUTE_GROUPING : '', - - CONTRIBUTE_BRANCHING : '', - - CONTRIBUTE_CONTENT_EDITED : '', - - CONTRIBUTE_TOOL : '', - - CONTRIBUTE_TOOLTIP : '', - - CONTRIBUTE_BUTTON : '', - - CONTRIBUTE_OPEN_GATE_NOW_BUTTON : '', - - CONTRIBUTE_OPEN_GATE_NOW_TOOLTIP : '', - - CONTRIBUTE_OPEN_GATE_BUTTON : '', - - CONTRIBUTE_OPEN_GATE_TOOLTIP : '', - - CONTRIBUTE_OPENED_GATE : '', - - CONTRIBUTE_OPENED_GATE_TOOLTIP : '', - - CONTRIBUTE_ATTENTION : '', - - HELP : '', - - LESSON_INTRODUCTION : '', - - EMAIL_TITLE : '', - - TOUR_DISABLED_ELEMENT : '', - - PROGRESS_EMAIL_SUCCESS : '', - - PROGRESS_EMAIL_SEND_NOW_QUESTION : '', - - PROGRESS_EMAIL_SEND_FAILED : '', - - PROGRESS_SELECT_DATE_FIRST : '', - - PROGRESS_ENTER_TWO_DATES_FIRST : '', - - PROGRESS_EMAIL_GENERATE_ONE : '', - - PROGRESS_EMAIL_GENERATE_TWO : '', - - PROGRESS_EMAIL_TITLE : '', - - ERROR_DATE_IN_PAST : '', - - LESSON_START : '', - - LESSON_FINISH : '', - - LESSON_ACTIVITY_SCORES_ENABLE_ALERT : decoderDiv.html('').text(), - - LESSON_ACTIVITY_SCORES_DISABLE_ALERT : decoderDiv.html('').text(), - - RESCHEDULE : decoderDiv.html('').text(), - - LESSON_ERROR_START_END_DATE : decoderDiv.html('').text(), - - LIVE_EDIT_BUTTON: '', - - LIVE_EDIT_TOOLTIP: '', - - LIVE_EDIT_WARNING: '' + EMAIL_NOTIFICATIONS_TITLE : "", + FORCE_COMPLETE_CLICK : "", + FORCE_COMPLETE_BUTTON : "", + FORCE_COMPLETE_END_LESSON_CONFIRM : "", + FORCE_COMPLETE_ACTIVITY_CONFIRM : "", + FORCE_COMPLETE_REMOVE_CONTENT : "", + FORCE_COMPLETE_DROP_FAIL : "", + LEARNER_GROUP_COUNT : "", + LEARNER_GROUP_SHOW : "", + LEARNER_GROUP_REMOVE_PROGRESS : "", + EMAIL_BUTTON : "", + NOTIFCATIONS : "", + SAVE_BUTTON : "", + CANCEL_BUTTON : "", + LEARNER_FINISHED_DIALOG_TITLE : "", + LESSON_PRESENCE_ENABLE_ALERT : "", + LESSON_PRESENCE_DISABLE_ALERT : "", + LESSON_IM_ENABLE_ALERT : "", + LESSON_IM_DISABLE_ALERT : "", + LESSON_REMOVE_ALERT : "", + LESSON_REMOVE_DOUBLECHECK_ALERT : "", + LESSON_STATE_CREATED : "", + LESSON_STATE_SCHEDULED : "", + LESSON_STATE_STARTED : "", + LESSON_STATE_SUSPENDED : "", + LESSON_STATE_FINISHED : "", + LESSON_STATE_ARCHIVED : "", + LESSON_STATE_REMOVED : "", + LESSON_STATE_ACTION_DISABLE : "", + LESSON_STATE_ACTION_ACTIVATE : "", + LESSON_STATE_ACTION_REMOVE : "", + LESSON_STATE_ACTION_ARCHIVE : "", + LESSON_ERROR_SCHEDULE_DATE : "", + LESSON_EDIT_CLASS : "", + CLASS_ADD_ALL_CONFIRM : "", + CLASS_ADD_ALL_SUCCESS : "", + LESSON_GROUP_DIALOG_CLASS : "", + CURRENT_ACTIVITY : "", + COMPLETED_ACTIVITY : "", + ATTEMPTED_ACTIVITY : "", + TOSTART_ACTIVITY : "", + SUPPORT_ACTIVITY : "", + PROGRESS_NOT_STARTED : "", + TIME_CHART : "", + TIME_CHART_TOOLTIP : "", + LIVE_EDIT_CONFIRM : "", + CONTRIBUTE_GATE : "", + CONTRIBUTE_GATE_PASSWORD : "", + CONTRIBUTE_GROUPING : "", + CONTRIBUTE_BRANCHING : "", + CONTRIBUTE_CONTENT_EDITED : "", + CONTRIBUTE_TOOL : "", + CONTRIBUTE_TOOLTIP : "", + CONTRIBUTE_BUTTON : "", + CONTRIBUTE_OPEN_GATE_NOW_BUTTON: "", + CONTRIBUTE_OPEN_GATE_NOW_TOOLTIP: "", + CONTRIBUTE_OPEN_GATE_BUTTON: "", + CONTRIBUTE_OPEN_GATE_TOOLTIP: "", + CONTRIBUTE_OPENED_GATE: "", + CONTRIBUTE_OPENED_GATE_TOOLTIP: "", + CONTRIBUTE_ATTENTION: "", + HELP: "", + LESSON_INTRODUCTION: "", + EMAIL_TITLE: "", + TOUR_DISABLED_ELEMENT: "", + PROGRESS_EMAIL_SUCCESS: "", + PROGRESS_EMAIL_SEND_NOW_QUESTION: "", + PROGRESS_EMAIL_SEND_FAILED: "", + PROGRESS_SELECT_DATE_FIRST: "", + PROGRESS_ENTER_TWO_DATES_FIRST: "", + PROGRESS_EMAIL_GENERATE_ONE: "", + PROGRESS_EMAIL_GENERATE_TWO: "", + PROGRESS_EMAIL_TITLE: "", + ERROR_DATE_IN_PAST: "", + LESSON_START: "", + LESSON_FINISH: "", + LESSON_ACTIVITY_SCORES_ENABLE_ALERT: "", + LESSON_ACTIVITY_SCORES_DISABLE_ALERT: "", + RESCHEDULE: "", + LESSON_ERROR_START_END_DATE: "", + LIVE_EDIT_BUTTON: "", + LIVE_EDIT_TOOLTIP: "", + LIVE_EDIT_WARNING: "" }; @@ -587,6 +503,13 @@ + +
+
+ + + +
Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r2f6e8f9ecfee5b8078479721374d0cbeee3d699d -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_tool_laqa/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2f6e8f9ecfee5b8078479721374d0cbeee3d699d) +++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -26,7 +26,7 @@ button.advanced = Advanced button.done = Done tool.icon.name = Q&A -button.submitAllContent = Submit +button.submitAllContent = Finish button.getNextQuestion = Next button.getPreviousQuestion = Previous label.question1 = Question 1 @@ -42,7 +42,7 @@ label.question = Question description label.answers = Answers: label.answer = Answer: -button.endLearning = Next activity +button.endLearning = Next Activity label.learning.user = Learner label.learning.attemptTime = Date label.learning.response = Response @@ -80,7 +80,7 @@ label.response.hidden = Hidden button.try.again = Try again label.add.question = Add new -label.authoring.title.col = Title: +label.authoring.title.col = Title label.authoring.instructions.col = Instructions: label.redo = Redo questions label.refresh = Refresh @@ -201,8 +201,8 @@ label.posted.by = {0} on {1} label.noredo.enabled = Note: after answer these questions, no changes are allowed. label.select.leader = Select leader -label.question.options = Questions options -label.activity.completion = End of activity +label.question.options = Question options +label.activity.completion = End of Activity label.notifications = Notifications label.words.required = Words required label.other.options = More settings @@ -230,5 +230,5 @@ label.answer.required = Require answer? label.prevent.learner.autosave.mutliple.tabs = You seem to have two LAMS tabs open for this exam. Please close one of them. Otherwise, answers will not be recorder properly and affect your score. label.no.added.questions = No questions have been added. Please add at least one question. -label.questions.choice.collection.new.option = -label.questions.choice.collection.new.prompt = Enter a name for the new collection: \ No newline at end of file +label.questions.choice.collection.new.option = [Add new collection] +label.questions.choice.collection.new.prompt = Enter a name for the new collection: Index: lams_tool_laqa/web/learning/AnswersContent.jsp =================================================================== diff -u -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612 -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612) +++ lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -109,7 +109,7 @@ - + Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r32f3f705d823a49087f987328dece4f3f9248c75 -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 32f3f705d823a49087f987328dece4f3f9248c75) +++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -7,7 +7,6 @@ label.download = Download label.save = Save label.cancel = Cancel -label.files = files label.authoring.heading = Submit Files Authoring label.authoring.heading.basic = Basic label.authoring.heading.basic.desc = Basic input information for submission @@ -19,13 +18,10 @@ label.authoring.save.button = Save label.authoring.cancel.button = Cancel authoring.exception = There is a problem submitting content, the reason is {0} -label.learner.upload.restrictions: File restrictions -label.learner.upload.restrictions.and: and -label.learner.upload.restrictions.files: file(s) to add label.learner.fileName = Name label.learner.filePath = File label.learner.fileDescription = Description -label.learner.upload = Add files +label.learner.upload = Add files label.learner.finished = Finished uploading label.learner.time = Uploaded label.learner.dateOfSubmission = Submission date @@ -39,7 +35,7 @@ label.monitoring.heading.userlist = Summary label.monitoring.heading.userlist.desc = User List Description label.monitoring.heading.instructions = Instructions -label.monitoring.heading.edit.activity = Edit Activity +label.monitoring.heading.edit.activity = Edit activity label.monitoring.heading.edit.activity.desc = Edit Activity description label.monitoring.heading.stats = Analytics label.monitoring.heading.stats.desc = Statistics description @@ -89,10 +85,10 @@ label.limit.number.upload = Set maximum number of files to upload label.number.to.upload = Number of files to upload label.unlimited = Unlimited -message.left.upload.limit = maximum of {0} +message.left.upload.limit = maximum of : {0} messsage.learner.finish.confirm = Are you going to finish submission? label.edit = Edit -message.no.reflection.available = No Notebook available +message.no.reflection.available = No notebook entry has been added. error.attachment.executable = The uploaded file can not be an executable message.alertContentEdit = Warning: One or more learners have accessed this activity. Changing this content will result in learners getting different information. message.warnLockOnFinish = Note: After you click on "Next Activity" and you come back to this Submit Files, you won't be able to continue adding files. @@ -131,7 +127,7 @@ button.submit = Finish label.monitoring.file.delete = Delete mark file label.file.options = File options -label.activity.completion = End of activity +label.activity.completion = End of Activity label.notifications = Notifications label.view.files = View files label.deleted = Deleted @@ -155,7 +151,7 @@ label.waiting.for.leader.finish = Please wait until a group leader finishes the activity. label.select.leader = Leader selection label.waiting.for.leader.launch.time.limit = Leader has not started the activity. Please wait until the leader commences it. -label.use.select.leader.tool.output = Use leaders from Leader tool +label.use.select.leader.tool.output = Use leaders from Select Leader tool label.marks.released = Marks have been released outcome.authoring.title = Learning outcomes outcome.authoring.input = Search and select by outcome name or code @@ -164,7 +160,7 @@ error.upload = Error while uploading file: {0} outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome? label.enable.min.limit = Set minimum number of files to upload -label.should.upload.another = minimum of {0} +label.should.upload.another = minimum of: {0} outcome.authoring.create.new = [create new] label.monitoring.change.leader = Change leader label.monitoring.leader.successfully.changed = Leader changed @@ -174,3 +170,7 @@ output.desc.manual.grading = Manual grading label.add.tip = Fill details above and click this button to submit the file. label.min.limit.preview = Since you are a teacher in the preview mode, you can finish the activity without submitting sufficient files. +label.files = files +label.learner.upload.restrictions = Upload restrictions +label.learner.upload.restrictions.files = files(s) to add +label.learner.upload.restrictions.and = and \ No newline at end of file Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) +++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -7,7 +7,6 @@ label.download = Download label.save = Save label.cancel = Cancel -label.files = files label.authoring.heading = Submit Files Authoring label.authoring.heading.basic = Basic label.authoring.heading.basic.desc = Basic input information for submission @@ -19,13 +18,10 @@ label.authoring.save.button = Save label.authoring.cancel.button = Cancel authoring.exception = There is a problem submitting content, the reason is {0} -label.learner.upload.restrictions: File restrictions -label.learner.upload.restrictions.and: and -label.learner.upload.restrictions.files: file(s) to add label.learner.fileName = Name label.learner.filePath = File label.learner.fileDescription = Description -label.learner.upload = Add files +label.learner.upload = Add files label.learner.finished = Finished uploading label.learner.time = Uploaded label.learner.dateOfSubmission = Submission date @@ -39,7 +35,7 @@ label.monitoring.heading.userlist = Summary label.monitoring.heading.userlist.desc = User List Description label.monitoring.heading.instructions = Instructions -label.monitoring.heading.edit.activity = Edit Activity +label.monitoring.heading.edit.activity = Edit activity label.monitoring.heading.edit.activity.desc = Edit Activity description label.monitoring.heading.stats = Analytics label.monitoring.heading.stats.desc = Statistics description @@ -89,10 +85,10 @@ label.limit.number.upload = Set maximum number of files to upload label.number.to.upload = Number of files to upload label.unlimited = Unlimited -message.left.upload.limit = maximum of {0} +message.left.upload.limit = maximum of : {0} messsage.learner.finish.confirm = Are you going to finish submission? label.edit = Edit -message.no.reflection.available = No Notebook available +message.no.reflection.available = No notebook entry has been added. error.attachment.executable = The uploaded file can not be an executable message.alertContentEdit = Warning: One or more learners have accessed this activity. Changing this content will result in learners getting different information. message.warnLockOnFinish = Note: After you click on "Next Activity" and you come back to this Submit Files, you won't be able to continue adding files. @@ -131,7 +127,7 @@ button.submit = Finish label.monitoring.file.delete = Delete mark file label.file.options = File options -label.activity.completion = End of activity +label.activity.completion = End of Activity label.notifications = Notifications label.view.files = View files label.deleted = Deleted @@ -155,7 +151,7 @@ label.waiting.for.leader.finish = Please wait until a group leader finishes the activity. label.select.leader = Leader selection label.waiting.for.leader.launch.time.limit = Leader has not started the activity. Please wait until the leader commences it. -label.use.select.leader.tool.output = Use leaders from Leader tool +label.use.select.leader.tool.output = Use leaders from Select Leader tool label.marks.released = Marks have been released outcome.authoring.title = Learning outcomes outcome.authoring.input = Search and select by outcome name or code @@ -164,7 +160,7 @@ error.upload = Error while uploading file: {0} outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome? label.enable.min.limit = Set minimum number of files to upload -label.should.upload.another = minimum of {0} +label.should.upload.another = minimum of: {0} outcome.authoring.create.new = [create new] label.monitoring.change.leader = Change leader label.monitoring.leader.successfully.changed = Leader changed @@ -174,3 +170,7 @@ output.desc.manual.grading = Manual grading label.add.tip = Fill details above and click this button to submit the file. label.min.limit.preview = Since you are a teacher in the preview mode, you can finish the activity without submitting sufficient files. +label.files = files +label.learner.upload.restrictions = Upload restrictions +label.learner.upload.restrictions.files = files(s) to add +label.learner.upload.restrictions.and = and \ No newline at end of file Index: lams_www/web/public/ckeditor-templates/bootsnippets.js =================================================================== diff -u -re89f33c45b15f15523af0fe3b7100450048b967d -rb6e6befa01b244e05a9aa6408e0de4a56327deb0 --- lams_www/web/public/ckeditor-templates/bootsnippets.js (.../bootsnippets.js) (revision e89f33c45b15f15523af0fe3b7100450048b967d) +++ lams_www/web/public/ckeditor-templates/bootsnippets.js (.../bootsnippets.js) (revision b6e6befa01b244e05a9aa6408e0de4a56327deb0) @@ -119,7 +119,7 @@ 'Success ' + 'Info ' + 'Warning ' + - 'Danger ' + 'Danger ' }, { title: 'textQuote', @@ -254,7 +254,7 @@ html: '
' + '
' + - ' ' + + ' ' + ' ' + @@ -509,4 +509,4 @@ '
' } ] -} ); +} ); \ No newline at end of file