Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r112bc8f5362c4612bdded9b2e87d6fb59dd23a87 -r3db92c115d59863057a7e6bad8126d1cd1b319ee --- lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 112bc8f5362c4612bdded9b2e87d6fb59dd23a87) +++ lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3db92c115d59863057a7e6bad8126d1cd1b319ee) @@ -19,6 +19,7 @@ label.authoring.advance.gallery.walk.read.only.tooltip = Students will not be able to neither comment on nor rate other groups' work. label.authoring.advance.gallery.walk.info1 = Use Gallery Walk to promote inter- and intra-teams discussion, higher order thinking, cooperative learning and team building. label.authoring.advance.gallery.walk.info2 = If enabled, after you start Gallery Walk in Monitoring, the document created for each team is shared to all other teams. Teams then can give each others feedback and rate on their work. +label.authoring.advance.gallery.walk.instructions = Instructions for Gallery Walk (optional) 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. Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql =================================================================== diff -u -re606aaebe2ef85c40a4054ef76abf62c94d224a4 -r3db92c115d59863057a7e6bad8126d1cd1b319ee --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql (.../patch20201122.sql) (revision e606aaebe2ef85c40a4054ef76abf62c94d224a4) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql (.../patch20201122.sql) (revision 3db92c115d59863057a7e6bad8126d1cd1b319ee) @@ -8,7 +8,8 @@ ALTER TABLE tl_ladoku11_dokumaran ADD COLUMN gallery_walk_enabled TINYINT NOT NULL DEFAULT 0, ADD COLUMN gallery_walk_read_only TINYINT NOT NULL DEFAULT 0, ADD COLUMN gallery_walk_started TINYINT NOT NULL DEFAULT 0, - ADD COLUMN gallery_walk_finished TINYINT NOT NULL DEFAULT 0; + ADD COLUMN gallery_walk_finished TINYINT NOT NULL DEFAULT 0, + ADD COLUMN gallery_walk_instructions TEXT; -- Put all sql statements above here Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java =================================================================== diff -u -re606aaebe2ef85c40a4054ef76abf62c94d224a4 -r3db92c115d59863057a7e6bad8126d1cd1b319ee --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision e606aaebe2ef85c40a4054ef76abf62c94d224a4) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 3db92c115d59863057a7e6bad8126d1cd1b319ee) @@ -119,6 +119,9 @@ @Column(name = "gallery_walk_finished") private boolean galleryWalkFinished; + @Column(name = "gallery_walk_instructions") + private String galleryWalkInstructions; + // general information @Column(name = "create_date") private Date created; @@ -451,4 +454,12 @@ public void setGalleryWalkFinished(boolean galleryWalkFinished) { this.galleryWalkFinished = galleryWalkFinished; } + + public String getGalleryWalkInstructions() { + return galleryWalkInstructions; + } + + public void setGalleryWalkInstructions(String galleryWalkInstructions) { + this.galleryWalkInstructions = galleryWalkInstructions; + } } \ No newline at end of file Index: lams_tool_doku/web/pages/authoring/advance.jsp =================================================================== diff -u -r112bc8f5362c4612bdded9b2e87d6fb59dd23a87 -r3db92c115d59863057a7e6bad8126d1cd1b319ee --- lams_tool_doku/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 112bc8f5362c4612bdded9b2e87d6fb59dd23a87) +++ lams_tool_doku/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 3db92c115d59863057a7e6bad8126d1cd1b319ee) @@ -98,6 +98,13 @@ + +
+ + +
+ Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp =================================================================== diff -u -raff64342912af452323d5c64a08cce75a520c88d -r3db92c115d59863057a7e6bad8126d1cd1b319ee --- lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision aff64342912af452323d5c64a08cce75a520c88d) +++ lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision 3db92c115d59863057a7e6bad8126d1cd1b319ee) @@ -89,8 +89,13 @@ - +

+ +
+

+
+

Index: lams_tool_doku/web/pages/learning/learning.jsp =================================================================== diff -u -ra64203626f07fdb357f278eded8b32f921606dc2 -r3db92c115d59863057a7e6bad8126d1cd1b319ee --- lams_tool_doku/web/pages/learning/learning.jsp (.../learning.jsp) (revision a64203626f07fdb357f278eded8b32f921606dc2) +++ lams_tool_doku/web/pages/learning/learning.jsp (.../learning.jsp) (revision 3db92c115d59863057a7e6bad8126d1cd1b319ee) @@ -172,9 +172,8 @@ - +

-