Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookPrintDTO.java =================================================================== diff -u -r0d511541f6bfff14442dec68a5f0144c49781fab -r95eedb21a75a7b288b04bde8d691185b4ac0d6c7 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookPrintDTO.java (.../NotebookPrintDTO.java) (revision 0d511541f6bfff14442dec68a5f0144c49781fab) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookPrintDTO.java (.../NotebookPrintDTO.java) (revision 95eedb21a75a7b288b04bde8d691185b4ac0d6c7) @@ -66,6 +66,7 @@ private String title; private String instructions; private boolean groupedActivity; + private boolean allowRichEditor; private Map> usersBySession = new TreeMap<>(); public String getTitle() { @@ -92,6 +93,14 @@ this.groupedActivity = groupedActivity; } + public boolean isAllowRichEditor() { + return allowRichEditor; + } + + public void setAllowRichEditor(boolean allowRichEditor) { + this.allowRichEditor = allowRichEditor; + } + public Map> getUsersBySession() { return usersBySession; } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java =================================================================== diff -u -r0d511541f6bfff14442dec68a5f0144c49781fab -r95eedb21a75a7b288b04bde8d691185b4ac0d6c7 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 0d511541f6bfff14442dec68a5f0144c49781fab) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 95eedb21a75a7b288b04bde8d691185b4ac0d6c7) @@ -274,6 +274,7 @@ NotebookPrintDTO printDTO = new NotebookPrintDTO(); printDTO.setTitle(notebook.getTitle()); printDTO.setInstructions(notebook.getInstructions()); + printDTO.setAllowRichEditor(notebook.isAllowRichEditor()); boolean isGroupedActivity = notebookService.isGroupedActivity(toolContentID); printDTO.setGroupedActivity(isGroupedActivity); Index: lams_tool_notebook/web/pages/monitoring/print.jsp =================================================================== diff -u -r9929c791e2c8fbc910ad1ad2cbe6724ac4530bd9 -r95eedb21a75a7b288b04bde8d691185b4ac0d6c7 --- lams_tool_notebook/web/pages/monitoring/print.jsp (.../print.jsp) (revision 9929c791e2c8fbc910ad1ad2cbe6724ac4530bd9) +++ lams_tool_notebook/web/pages/monitoring/print.jsp (.../print.jsp) (revision 95eedb21a75a7b288b04bde8d691185b4ac0d6c7) @@ -1,6 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.notebook.util.NotebookConstants"%> + @@ -31,7 +32,7 @@ - @@ -41,24 +42,37 @@

+ -

- +

+ + + @@@ ${printDTO.allowRichEditor} + + + @@@ ${printDTO.allowRichEditor} @@@ TRU + + +

- +

+ +