Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rfa8175bc3e7c902954f9332e0ad5e173737c8c0c -r31e745cc987c2a96d6fb7ceac3da385729e912ca --- lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fa8175bc3e7c902954f9332e0ad5e173737c8c0c) +++ lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 31e745cc987c2a96d6fb7ceac3da385729e912ca) @@ -14,6 +14,8 @@ label.authoring.basic.instruction = Pad content label.authoring.basic.description = Description label.authoring.advance.lock.on.finished = Lock when finished +label.authoring.advance.gallery.walk.enabled = Gallery Walk +label.authoring.advance.gallery.walk.read.only = Disable commentary and rating 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 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql (revision 0) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql (revision 31e745cc987c2a96d6fb7ceac3da385729e912ca) @@ -0,0 +1,16 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- Put all sql statements below here + +--LDEV-5120 Add column for Doku Gallery Walk + +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; + +-- Put all sql statements above here + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java =================================================================== diff -u -r8f7e92f0c90ad0462aa647b387dec6f14cf5012e -r31e745cc987c2a96d6fb7ceac3da385729e912ca --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 8f7e92f0c90ad0462aa647b387dec6f14cf5012e) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 31e745cc987c2a96d6fb7ceac3da385729e912ca) @@ -107,8 +107,13 @@ @Column(name = "reflect_instructions") private String reflectInstructions; - // general information + @Column(name = "gallery_walk_enabled") + private boolean galleryWalkEnabled; + @Column(name = "gallery_walk_read_only") + private boolean galleryWalkReadOnly; + + // general information @Column(name = "create_date") private Date created; @@ -408,4 +413,20 @@ public void setReflectOnActivity(boolean reflectOnActivity) { this.reflectOnActivity = reflectOnActivity; } -} + + public boolean isGalleryWalkEnabled() { + return galleryWalkEnabled; + } + + public void setGalleryWalkEnabled(boolean galleryWalkEnabled) { + this.galleryWalkEnabled = galleryWalkEnabled; + } + + public boolean isGalleryWalkReadOnly() { + return galleryWalkReadOnly; + } + + public void setGalleryWalkReadOnly(boolean galleryWalkReadOnly) { + this.galleryWalkReadOnly = galleryWalkReadOnly; + } +} \ No newline at end of file Index: lams_tool_doku/web/pages/authoring/advance.jsp =================================================================== diff -u -r7188dda72df3933f73dba00d7d1eb44c86c72e8d -r31e745cc987c2a96d6fb7ceac3da385729e912ca --- lams_tool_doku/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 7188dda72df3933f73dba00d7d1eb44c86c72e8d) +++ lams_tool_doku/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 31e745cc987c2a96d6fb7ceac3da385729e912ca) @@ -2,6 +2,18 @@ + +