Index: lams_learning/web/css/components-learner.css =================================================================== diff -u -r3292b9fc1f55ad9d0cc75de4aa6f11f7d6f1136e -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 --- lams_learning/web/css/components-learner.css (.../components-learner.css) (revision 3292b9fc1f55ad9d0cc75de4aa6f11f7d6f1136e) +++ lams_learning/web/css/components-learner.css (.../components-learner.css) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) @@ -131,7 +131,7 @@ flex-direction: row-reverse; } -.component-page-wrapper #finishButton { +.activity-bottom-buttons button, .activity-bottom-buttons a { box-shadow: 0px 3px 6px var(--bs-gray-400); } Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rdecee05de5d7a90fe2aef3af04f588494262685b -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 --- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision decee05de5d7a90fe2aef3af04f588494262685b) +++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) @@ -7,6 +7,7 @@ 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 @@ -18,10 +19,13 @@ 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 = Upload +label.learner.upload = Add files label.learner.finished = Finished uploading label.learner.time = Uploaded label.learner.dateOfSubmission = Submission date @@ -61,7 +65,7 @@ submit.upload.twice = You already upload this file, please waiting for a while. submit.modenotsupported = The mode "{0}" you''ve requested is not supported submit.successful = The content has been created successfully. -learner.form.filepath.displayname = Upload file name +learner.form.filepath.displayname = No file uploaded errors.mark.invalid.number = Mark is invalid number format. authoring.msg.cancel.save = Do you want to close this window without saving? define.later.message = Please wait for the instructor to complete the contents of this activity. @@ -76,7 +80,7 @@ error.title.blank = Title can not be blank. label.authoring.advanced.reflectOnActivity = Add a notebook at end of Submit Files with the following instructions: error.reflection.emtpy = Please input Notebook entry -title.reflection = Notebook Entry +title.reflection = Notebook entry label.continue = Continue monitoring.user.fullname = Name monitoring.user.loginname = Username @@ -85,7 +89,7 @@ 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 number of files to be submitted: {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 @@ -160,7 +164,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 number of files to be submitted: {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 Index: lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag =================================================================== diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 --- lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag (.../DefineLater.tag) (revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7) +++ lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag (.../DefineLater.tag) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) @@ -49,18 +49,12 @@ -
-
-
- -
-
+
+
-
-
- -
+ + \ No newline at end of file Index: lams_tool_sbmt/web/learner/definelater.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 --- lams_tool_sbmt/web/learner/definelater.jsp (.../definelater.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/web/learner/definelater.jsp (.../definelater.jsp) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) @@ -1,24 +1,18 @@ +<%@ include file="/common/taglibs.jsp"%> + + + -<%@include file="/common/taglibs.jsp"%> +
+
+
+ +
+
+ +
+ +
- - - <%@ include file="/common/header.jsp"%> - - - - - - - - - - - - - - - - - + \ No newline at end of file Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp =================================================================== diff -u -rb34c71671f23ff0ff819867dd39d239231a55a95 -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 --- lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision b34c71671f23ff0ff819867dd39d239231a55a95) +++ lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) @@ -41,7 +41,7 @@
-
+

@@ -130,7 +130,7 @@
- +
Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp =================================================================== diff -u -reb89290d3882c2f77a92373fb37c53a38f8efef9 -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 --- lams_tool_sbmt/web/learner/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision eb89290d3882c2f77a92373fb37c53a38f8efef9) +++ lams_tool_sbmt/web/learner/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) @@ -15,7 +15,7 @@ } -
+
Index: lams_tool_sbmt/web/learner/waitforleader.jsp =================================================================== diff -u -reb89290d3882c2f77a92373fb37c53a38f8efef9 -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 --- lams_tool_sbmt/web/learner/waitforleader.jsp (.../waitforleader.jsp) (revision eb89290d3882c2f77a92373fb37c53a38f8efef9) +++ lams_tool_sbmt/web/learner/waitforleader.jsp (.../waitforleader.jsp) (revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85) @@ -13,7 +13,7 @@
-
+