Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r8f7e92f0c90ad0462aa647b387dec6f14cf5012e -r3be35f313edf8bef8b654f8fb53cfa19d526cd1c --- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8f7e92f0c90ad0462aa647b387dec6f14cf5012e) +++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 3be35f313edf8bef8b654f8fb53cfa19d526cd1c) @@ -1,30 +1,30 @@ -appName = dokumaran +appName = doKu #language code: en #locale code: AU -#=================== labels for doKumaran =================# +#=================== labels for doKu =================# -activity.title =doKumaran -activity.description =Sharing resources with others. -activity.helptext =Uploading your resources to share with others. -tool.display.name =DoKumaran Tool +activity.title =doKu +activity.description =doKu is an collaborative real-time editor, allowing students to simultaneously edit a text document and see all of the participants' edits in real-time, with the ability to display each author's text in their own color. +activity.helptext =Students can create online documents collaboratively in real-time +tool.display.name =doKu Tool tool.description =Tool for sharing resources. -appName =doKumaran -label.authoring.heading =DoKumaran Authoring -label.author.title =doKumaran +appName =doKu +label.authoring.heading =doKU Authoring +label.author.title =doKu label.authoring.heading.basic =Basic label.authoring.heading.advance =Advanced -label.authoring.heading.basic.desc =Basic input information for doKumaran -label.authoring.heading.advance.desc =Please input advance options for doKumaran +label.authoring.heading.basic.desc =Basic input information for doKu +label.authoring.heading.advance.desc =Please add advance options for doKu label.authoring.basic.title =Title -label.authoring.basic.instruction =Instruction +label.authoring.basic.instruction =Instructions label.authoring.basic.description =Description label.authoring.advance.lock.on.finished =Lock when finished label.authoring.save.button =Save label.authoring.cancel.button =Cancel error.msg.default.content.not.find =Could not retrieve default content record for this tool. authoring.msg.cancel.save =Do you want to close this window without saving? -label.learning.title =doKumaran Learning +label.learning.title =doKu Learning monitoring.tab.summary =Summary monitoring.tab.statistics =Statistic monitoring.tab.edit.activity =Edit activity @@ -40,22 +40,22 @@ label.save =Save define.later.message =Please wait for the instructor to complete the contents of this activity. button.try.again =Try again -label.authoring.advanced.reflectOnActivity =Add a notebook at end of doKumaran with the following instructions: +label.authoring.advanced.reflectOnActivity =Add a notebook at end of the activity with the following instructions: title.reflection =Notebook entry label.continue =Continue message.no.reflection.available =No notebook available message.alertContentEdit =Warning: One of 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\u201d, if you come back to this doKumaran, you won\u2019t be able to share new resources. -message.activityLocked =The instructor has set this activity not to allow you to edit doKumaran after you have finished it. +message.warnLockOnFinish =Note: After you click on "Next Activity\u201d, if you come back to this activity, you won\u2019t be able to share new resources. +message.activityLocked =The instructor has set this activity not to allow you to edit it after you have finished it. label.on =On label.off =Off monitor.summary.th.advancedSettings =Advanced settings -monitor.summary.td.addNotebook =Add a notebook at end of doKumaran +monitor.summary.td.addNotebook =Add a notebook at end of activity monitor.summary.td.notebookInstructions =Notebook instructions label.submit =Finish label.resource.options =Resources options label.activity.completion =End of activity -pageTitle.admin =Dokumaran settings +pageTitle.admin =doKu settings label.select.leader =Leader selection label.use.select.leader.tool.output =Use leaders from Select Leader tool label.show.chat =Show the chat button @@ -72,8 +72,8 @@ label.waiting.for.leader =Please, wait while somebody will become a group leader. label.users.from.group =Other learners participating in current group: label.refresh =Refresh -label.shared.pad.id =Shared pad id that allows using the same pad between several doKumaran activities -label.allow.multiple.leaders =All leaders participate together (applicable only for non-grouped doKumaran activities) +label.shared.pad.id =Shared pad id that allows using the same pad between several doKu activities +label.allow.multiple.leaders =All leaders participate together (applicable only for non-grouped doKu activities) label.timeslider =Timeslider label.export.pad.html =Export as HTML label.recreate.faulty.pad =Recreate pad @@ -89,8 +89,17 @@ label.time.left =Time left label.time.is.over =Time is over. No more editing is allowed. +label.monitoring.learner.marks.header =Marks +label.monitoring.learner.marks.first.name =First name +label.monitoring.learner.marks.last.name =Last name +label.monitoring.learner.marks.mark =Mark +label.monitoring.learner.marks.mark.tip =(click to edit) +messsage.monitoring.learner.marks.no.data = No learner data found +messsage.monitoring.learner.marks.update.fail = Error while updating a learner mark + outcome.authoring.title =Learning outcomes outcome.authoring.input =Search and select by outcome name or code outcome.authoring.existing =Added outcomes outcome.authoring.existing.none =none +outcome.authoring.create.new = [create new] #======= End labels: Exported 164 labels for en AU ===== Index: lams_tool_doku/db/sql/activity_insert.sql =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3be35f313edf8bef8b654f8fb53cfa19d526cd1c --- lams_tool_doku/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 3be35f313edf8bef8b654f8fb53cfa19d526cd1c) @@ -21,7 +21,7 @@ ( NULL , 'Collaborative real-time document editor' -, 'doKumaran' +, 'doKu' , 1 , 2 , 0 Index: lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql =================================================================== diff -u -r4ba184e420dd753ae8e2dcc9434581a794fa244d -r3be35f313edf8bef8b654f8fb53cfa19d526cd1c --- lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql (.../create_lams_tool_dokumaran.sql) (revision 4ba184e420dd753ae8e2dcc9434581a794fa244d) +++ lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql (.../create_lams_tool_dokumaran.sql) (revision 3be35f313edf8bef8b654f8fb53cfa19d526cd1c) @@ -67,7 +67,7 @@ INSERT INTO `tl_ladoku11_dokumaran` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `lock_on_finished`, `instructions`, `content_in_use`, `define_later`, `content_id`, `show_chat`, `show_line_numbers`, `shared_pad_id`, `use_select_leader_tool_ouput`, `allow_multiple_leaders`, `reflect_on_activity`) VALUES - (1,NULL,NULL,NULL,'doKumaran','0','Instructions ',0,0,${default_content_id},0,0,NULL,0,0,0); + (1,NULL,NULL,NULL,'doKu','0','Instructions ',0,0,${default_content_id},0,0,NULL,0,0,0); -- Inserting the required config item into the config table -- Etherpad API key is added so the Etherpad works there automatically for each build Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql =================================================================== diff -u -r8f7e92f0c90ad0462aa647b387dec6f14cf5012e -r3be35f313edf8bef8b654f8fb53cfa19d526cd1c --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql (.../patch20200324.sql) (revision 8f7e92f0c90ad0462aa647b387dec6f14cf5012e) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql (.../patch20200324.sql) (revision 3be35f313edf8bef8b654f8fb53cfa19d526cd1c) @@ -1,14 +1,16 @@ SET AUTOCOMMIT = 0; SET FOREIGN_KEY_CHECKS = 0; --- This patch contains files patch20170303.sql to patch20190103.sql --- It should upgrade this tool to version 3.1 - -- LDEV-4994 Add description field ALTER TABLE tl_ladoku11_dokumaran ADD COLUMN description MEDIUMTEXT; +-- LDEV-5008 Rename doKumaran tool +-- Set default tool content +UPDATE tl_ladoku11_dokumaran SET description = 'Instructions', instructions = 'Document' where UID = 1; + + -- If there were no errors, commit and restore autocommit to on COMMIT; SET AUTOCOMMIT = 1; -SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql =================================================================== diff -u --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql (revision 0) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql (revision 3be35f313edf8bef8b654f8fb53cfa19d526cd1c) @@ -0,0 +1,17 @@ +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS = 0; + +-- LDEV-4997 Migrate Etherpad to central as service + +DROP TABLE tl_ladoku11_configuration; + +UPDATE lams_tool SET admin_url = NULL WHERE tool_signature = 'ladoku11'; + +-- LDEV-5008 Rename doKumaran tool +UPDATE lams_learning_activity SET title = 'doKu' WHERE language_file = 'org.lamsfoundation.lams.tool.dokumaran.ApplicationResources'; +UPDATE tl_ladoku11_dokumaran SET title = 'doKu' WHERE uid = 1; + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1;