Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rfc143daf333d8916a9b6b97f71a206a65b2c300d -r4adbb3660cec075433902cce3f4b964831650a4f
--- lams_tool_task/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fc143daf333d8916a9b6b97f71a206a65b2c300d)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4adbb3660cec075433902cce3f4b964831650a4f)
@@ -28,14 +28,14 @@
label.authoring.basic.description =Description
label.authoring.basic.add.task =Add Task
label.authoring.basic.task.isRequired =Required task
-label.authoring.basic.task.isCommentsAllowed =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired =Are comments required to complete task?
-label.authoring.basic.task.isFilesAllowed =Allow participants to add files
-label.authoring.basic.task.isFilesRequired =Are files required to complete task?
+label.authoring.basic.task.isCommentsAllowed =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired =File required to complete task
label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
label.authoring.basic.task.show.only.to.monitoring =Show only to monitoring
label.authoring.basic.task.show.to.all.learners =Show to all learners
-label.authoring.basic.task.isChildTask =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
label.authoring.basic.task.parent.task.name =Parent:
label.authoring.basic.task.list.title =Task List
label.authoring.basic.resource.task =Task
@@ -45,16 +45,14 @@
label.authoring.basic.resource.description.input =Description
label.authoring.online.instruction =Online Instructions:
label.authoring.offline.instruction =Offline Instructions:
-label.authoring.online.file =Upload online file
-label.authoring.offline.file =Upload offline file
+label.authoring.online.file =Online Instructions File:
+label.authoring.offline.file =Offline Instructions File:
label.authoring.choosefile.button =Choose file
-label.authoring.upload.online.button =Upload Online
-label.authoring.upload.offline.button =Upload Offline
-label.authoring.online.delete =Delete
-label.authoring.offline.delete =Delete
-label.authoring.advance.allow.contribute.tasks =Allow learners to contribute tasks
+label.authoring.instructions.upload.button =Upload
+label.authoring.instructions.delete.button =Delete
+label.authoring.advance.allow.contribute.tasks =Allow Learners to contribute tasks
label.authoring.advance.lock.on.finished =Lock when finished
-label.authoring.advance.monitor.verification.required =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required =Monitor needs to verify these tasks before letting Learners to complete activity
label.authoring.advanced.reflectOnActivity =Add Notebook at end of Task List with the following instructions:
label.authoring.advance.run.content.sequentialOrder =Tasks have to be completed in sequential order
label.authoring.advance.minimum.number.tasks =Minimum number of tasks to complete
Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rfc143daf333d8916a9b6b97f71a206a65b2c300d -r4adbb3660cec075433902cce3f4b964831650a4f
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision fc143daf333d8916a9b6b97f71a206a65b2c300d)
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4adbb3660cec075433902cce3f4b964831650a4f)
@@ -24,14 +24,14 @@
label.authoring.basic.description =Description
label.authoring.basic.add.task =Add Task
label.authoring.basic.task.isRequired =Required task
-label.authoring.basic.task.isCommentsAllowed =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired =Are comments required to complete task
-label.authoring.basic.task.isFilesAllowed =Allow participants to add files
-label.authoring.basic.task.isFilesRequired =Are files required to complete task
+label.authoring.basic.task.isCommentsAllowed =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired =File required to complete task
label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
label.authoring.basic.task.show.only.to.monitoring =Show only to monitoring
label.authoring.basic.task.show.to.all.learners =Show to all learners
-label.authoring.basic.task.isChildTask =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
label.authoring.basic.task.parent.task.name =Parent:
label.authoring.basic.task.list.title =Task List
label.authoring.basic.resource.task =Task
@@ -41,16 +41,14 @@
label.authoring.basic.resource.description.input =Description
label.authoring.online.instruction =Online Instructions:
label.authoring.offline.instruction =Offline Instructions:
-label.authoring.online.file =Upload online file
-label.authoring.offline.file =Upload offline file
+label.authoring.online.file =Online Instructions File:
+label.authoring.offline.file =Offline Instructions File:
label.authoring.choosefile.button =Choose file
-label.authoring.upload.online.button =Upload Online
-label.authoring.upload.offline.button =Upload Offline
-label.authoring.online.delete =Delete
-label.authoring.offline.delete =Delete
-label.authoring.advance.allow.contribute.tasks =Allow learners to contribute tasks
+label.authoring.instructions.upload.button =Upload
+label.authoring.instructions.delete.button =Delete
+label.authoring.advance.allow.contribute.tasks =Allow Learners to contribute tasks
label.authoring.advance.lock.on.finished =Lock when finished
-label.authoring.advance.monitor.verification.required =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required =Monitor needs to verify these tasks before letting Learners to complete activity
label.authoring.advanced.reflectOnActivity =Add Notebook at end of Task List with the following instructions:
label.authoring.advance.run.content.sequentialOrder =Tasks have to be completed in sequential order
label.authoring.advance.minimum.number.tasks =Minimum number of tasks to complete
Index: lams_tool_task/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -r4adbb3660cec075433902cce3f4b964831650a4f
--- lams_tool_task/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/conf/language/rams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4adbb3660cec075433902cce3f4b964831650a4f)
@@ -28,14 +28,14 @@
label.authoring.basic.description =Description
label.authoring.basic.add.task =Add Task
label.authoring.basic.task.isRequired =Required task
-label.authoring.basic.task.isCommentsAllowed =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired =Are comments required to complete task
-label.authoring.basic.task.isFilesAllowed =Allow participants to add files
-label.authoring.basic.task.isFilesRequired =Are files required to complete task
+label.authoring.basic.task.isCommentsAllowed =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired =File required to complete task
label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
label.authoring.basic.task.show.only.to.monitoring =Show only to monitoring
label.authoring.basic.task.show.to.all.learners =Show to all learners
-label.authoring.basic.task.isChildTask =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
label.authoring.basic.task.parent.task.name =Parent:
label.authoring.basic.task.list.title =Task List
label.authoring.basic.resource.task =Task
@@ -45,16 +45,14 @@
label.authoring.basic.resource.description.input =Description
label.authoring.online.instruction =Online Instructions
label.authoring.offline.instruction =Offline Instructions
-label.authoring.online.file =Upload online file
-label.authoring.offline.file =Upload offline file
+label.authoring.online.file =Online Instructions File:
+label.authoring.offline.file =Offline Instructions File:
label.authoring.choosefile.button =Choose file
-label.authoring.upload.online.button =Upload Online:
-label.authoring.upload.offline.button =Upload Offline:
-label.authoring.online.delete =Delete
-label.authoring.offline.delete =Delete
-label.authoring.advance.allow.contribute.tasks =Allow learners to contribute tasks
+label.authoring.instructions.upload.button =Upload
+label.authoring.instructions.delete.button =Delete
+label.authoring.advance.allow.contribute.tasks =Allow Learners to contribute tasks
label.authoring.advance.lock.on.finished =Lock when finished
-label.authoring.advance.monitor.verification.required =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required =Monitor needs to verify these tasks before letting Learners to complete activity
label.authoring.advanced.reflectOnActivity =Add Notebook at end of Task List with the following instructions:
label.authoring.advance.run.content.sequentialOrder =Tasks have to be completed in sequential order
label.authoring.advance.minimum.number.tasks =Minimum number of tasks to complete
Index: lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -r4adbb3660cec075433902cce3f4b964831650a4f
--- lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4adbb3660cec075433902cce3f4b964831650a4f)
@@ -28,14 +28,14 @@
label.authoring.basic.description =Description
label.authoring.basic.add.task =Add Task
label.authoring.basic.task.isRequired =Required task
-label.authoring.basic.task.isCommentsAllowed =Allow participants to add comments
-label.authoring.basic.task.isCommentsRequired =Are comments required to complete task
-label.authoring.basic.task.isFilesAllowed =Allow participants to add files
-label.authoring.basic.task.isFilesRequired =Are files required to complete task
+label.authoring.basic.task.isCommentsAllowed =Allow Learners to add comment(s)
+label.authoring.basic.task.isCommentsRequired =Comment required to complete task
+label.authoring.basic.task.isFilesAllowed =Allow Learners to add file(s)
+label.authoring.basic.task.isFilesRequired =File required to complete task
label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
label.authoring.basic.task.show.only.to.monitoring =Show only to monitoring
label.authoring.basic.task.show.to.all.learners =Show to all learners
-label.authoring.basic.task.isChildTask =Don't display until parent has been completed
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
label.authoring.basic.task.parent.task.name =Parent:
label.authoring.basic.task.list.title =Task List
label.authoring.basic.resource.task =Task
@@ -45,16 +45,14 @@
label.authoring.basic.resource.description.input =Description
label.authoring.online.instruction =Online Instructions:
label.authoring.offline.instruction =Offline Instructions:
-label.authoring.online.file =Upload online file
-label.authoring.offline.file =Upload offline file
+label.authoring.online.file =Online Instructions File:
+label.authoring.offline.file =Offline Instructions File:
label.authoring.choosefile.button =Choose file
-label.authoring.upload.online.button =Upload Online
-label.authoring.upload.offline.button =Upload Offline
-label.authoring.online.delete =Delete
-label.authoring.offline.delete =Delete
-label.authoring.advance.allow.contribute.tasks =Allow learners to contribute tasks
+label.authoring.instructions.upload.button =Upload
+label.authoring.instructions.delete.button =Delete
+label.authoring.advance.allow.contribute.tasks =Allow Learners to contribute tasks
label.authoring.advance.lock.on.finished =Lock when finished
-label.authoring.advance.monitor.verification.required =Monitor need to verify these tasks before letting participants to complete activity
+label.authoring.advance.monitor.verification.required =Monitor needs to verify these tasks before letting Learners to complete activity
label.authoring.advanced.reflectOnActivity =Add Notebook at end of Task List with the following instructions:
label.authoring.advance.run.content.sequentialOrder =Tasks have to be completed in sequential order
label.authoring.advance.minimum.number.tasks =Minimum number of tasks to complete
Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql
===================================================================
diff -u -rb914807350b96a71647d5120ff2b57f9638a7968 -r4adbb3660cec075433902cce3f4b964831650a4f
--- lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision b914807350b96a71647d5120ff2b57f9638a7968)
+++ lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision 4adbb3660cec075433902cce3f4b964831650a4f)
@@ -150,7 +150,7 @@
`online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `lock_when_finished`,
`minimum_number_tasks_complete`, `is_sequential_order`, `allow_contribute_tasks`, `is_monitor_verification_required`,
`reflect_on_activity`) VALUES
- (1,NULL,NULL,NULL,'TaskList','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0);
+ (1,NULL,NULL,NULL,'Task List','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0,0);
INSERT INTO `tl_latask10_taskList_item` (`uid`, `sequence_id`, `description`, `init_item`, `organization_xml`, `title`, `create_by`, `create_date`, `create_by_author`, `is_required`, `is_comments_allowed`, `is_comments_required`, `is_files_allowed`, `is_files_required`, `is_comments_files_allowed`, `show_comments_to_all`, `is_child_task`, `parent_task_name`, `taskList_uid`, `session_uid`) VALUES
(1,1,NULL,NULL,NULL,'Task number 1',null,NOW(),1,0,0,0,0,0,0,1,0,NULL,1,NULL);
Index: lams_tool_task/web/pages/authoring/instructions.jsp
===================================================================
diff -u -r3586894175c75dc22f79d022d0543550391f00e5 -r4adbb3660cec075433902cce3f4b964831650a4f
--- lams_tool_task/web/pages/authoring/instructions.jsp (.../instructions.jsp) (revision 3586894175c75dc22f79d022d0543550391f00e5)
+++ lams_tool_task/web/pages/authoring/instructions.jsp (.../instructions.jsp) (revision 4adbb3660cec075433902cce3f4b964831650a4f)
@@ -82,7 +82,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
Index: lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r4adbb3660cec075433902cce3f4b964831650a4f
--- lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp (.../instructionfilelist.jsp) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp (.../instructionfilelist.jsp) (revision 4adbb3660cec075433902cce3f4b964831650a4f)
@@ -48,13 +48,13 @@
-
+
-
+