Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.52 -r1.420.2.53 Binary files differ Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.138.2.15 -r1.138.2.16 --- lams_central/conf/language/lams/ApplicationResources.properties 23 Dec 2015 15:08:36 -0000 1.138.2.15 +++ lams_central/conf/language/lams/ApplicationResources.properties 12 Jan 2016 12:19:52 -0000 1.138.2.16 @@ -661,4 +661,25 @@ ckeditor.math.accents =Accents ckeditor.math.formatting =Formatting -#======= End labels: Exported 438 labels for en AU ===== +heading.comments=Comments +label.hidden=Comment Hidden +label.reply =Reply +label.hide=Hide +label.show=Show +label.post =Post +label.refresh = Refresh Comments +error.cannot.redisplay.please.refresh =Your changes have been saved but cannot be redisplayed. Please select refresh to reload the comments. +error.please.refresh =An error has occurred. Your post may not have been saved. Please select refresh to start again. +label.showhide.prompt =Show/Hide Replies +message.complete.or.cancel.reply =Please complete or cancel the current reply before starting a new reply. +message.complete.or.cancel.edit =Please complete or cancel the current edit before starting a new edit. +label.show.more.messages =More Comments +label.likes=Likes +label.comment.body.validation=The comment must be between 1 and 5000 characters long. +label.edited=Edited +label.like=Like +label.dislike=Dislike +label.no.comments=No Comments +label.newest.first=Newest First +label.top.comments=Top Comments +#======= End labels: Exported 439 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.111.2.5 -r1.111.2.6 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 9 Jan 2015 02:37:01 -0000 1.111.2.5 +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 12 Jan 2016 12:19:52 -0000 1.111.2.6 @@ -644,5 +644,25 @@ authoring.fla.page.svg.generator.title =SVG Generator authoring.fla.tool.groups.all =All - -#======= End labels: Exported 438 labels for en AU ===== +heading.comments=Comments +label.hidden=Comment Hidden +label.reply =Reply +label.hide=Hide +label.show=Show +label.post =Post +label.refresh = Refresh Comments +error.cannot.redisplay.please.refresh =Your changes have been saved but cannot be redisplayed. Please select refresh to reload the comments. +error.please.refresh =An error has occurred. Your post may not have been saved. Please select refresh to start again. +label.showhide.prompt =Show/Hide Replies +message.complete.or.cancel.reply =Please complete or cancel the current reply before starting a new reply. +message.complete.or.cancel.edit =Please complete or cancel the current edit before starting a new edit. +label.show.more.messages =More Comments +label.likes=Likes +label.comment.body.validation=The comment must be between 1 and 5000 characters long. +label.edited=Edited +label.like=Like +label.dislike=Dislike +label.no.comments=No Comments +label.newest.first=Newest First +label.top.comments=Top Comments +#======= End labels: Exported 439 labels for en AU ===== Index: lams_central/conf/xdoclet/struts-actions.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/struts-actions.xml,v diff -u -r1.7 -r1.7.2.1 --- lams_central/conf/xdoclet/struts-actions.xml 3 Apr 2012 08:00:47 -0000 1.7 +++ lams_central/conf/xdoclet/struts-actions.xml 12 Jan 2016 12:19:52 -0000 1.7.2.1 @@ -10,4 +10,101 @@ > - --> \ No newline at end of file + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/comments/CommentConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentForm.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/Comments.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/CommentsAuthor.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3.2.1 -r1.3.2.2 --- lams_central/web/WEB-INF/tlds/lams/lams.tld 4 Aug 2014 14:00:35 -0000 1.3.2.1 +++ lams_central/web/WEB-INF/tlds/lams/lams.tld 12 Jan 2016 12:20:30 -0000 1.3.2.2 @@ -481,5 +481,13 @@ head /WEB-INF/tags/Head.tag + + Comments + /WEB-INF/tags/Comments.tag + + + CommentsAuthor + /WEB-INF/tags/CommentsAuthor.tag + Fisheye: Tag 1.6.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/comments.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/edit.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/msgview.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/msgviewwrapper.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/new.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/reply.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/topicview.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/comments/topicviewwrapper.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/css/defaultHTML_learner.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner.css,v diff -u -r1.32.2.4 -r1.32.2.5 --- lams_central/web/css/defaultHTML_learner.css 3 Nov 2015 02:53:14 -0000 1.32.2.4 +++ lams_central/web/css/defaultHTML_learner.css 12 Jan 2016 12:20:06 -0000 1.32.2.5 @@ -616,4 +616,56 @@ /* jQuery tablesorter/pager/filter defaults */ .tablesorter .disabled { display: none +} + +/* Comments Widget */ +iframe.commentFrame{ + border: 0 none; + margin: 0; + padding: 0; + overflow: hidden; +} + + +.comment-author { + color:#0087e5; + font-size:11px; + margin-bottom:2px; +} + +.comment-date { + font-size:11px; + margin-bottom:2px; +} + +table.comment { + width:100%; + margin-left:0px; + padding-top:0px; + margin-bottom:5px; + text-align:left; +} + +table.comment td { + padding:0px; + padding-left:0px; + font-size:11px; + vertical-align:top; +} +a.comment { + color: #47bc23; + text-decoration: none; + border-bottom: none; +} +textarea.comment { + width: 99%; + height: 60px; + margin-bottom:10px; +} +div.comment-entry { + width: 98%; +} + +.fa-faded { + color: silver } \ No newline at end of file Index: lams_central/web/css/defaultHTML_learner_mobile.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner_mobile.css,v diff -u -r1.7.2.2 -r1.7.2.3 --- lams_central/web/css/defaultHTML_learner_mobile.css 3 Nov 2015 02:53:14 -0000 1.7.2.2 +++ lams_central/web/css/defaultHTML_learner_mobile.css 12 Jan 2016 12:20:06 -0000 1.7.2.3 @@ -222,4 +222,56 @@ /* jQuery tablesorter/pager/filter defaults */ .tablesorter .disabled { display: none +} + +/* Comments Widget */ +iframe.commentFrame{ + border: 0 none; + margin: 0; + padding: 0; + overflow: hidden; +} + + +.comment-author { + color:#0087e5; + font-size:11px; + margin-bottom:2px; +} + +.comment-date { + font-size:11px; + margin-bottom:2px; +} + +table.comment { + width:100%; + margin-left:0px; + padding-top:0px; + margin-bottom:5px; + text-align:left; +} + +table.comment td { + padding:0px; + padding-left:0px; + font-size:11px; + vertical-align:top; +} +a.comment { + color: #47bc23; + text-decoration: none; + border-bottom: none; +} +textarea.comment { + width: 99%; + height: 60px; + margin-bottom:10px; +} +div.comment-entry { + width: 98%; +} + +.fa-faded { + color: silver } \ No newline at end of file Index: lams_central/web/css/defaultHTML_rtl_learner.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_rtl_learner.css,v diff -u -r1.16.14.3 -r1.16.14.4 --- lams_central/web/css/defaultHTML_rtl_learner.css 3 Nov 2015 02:53:14 -0000 1.16.14.3 +++ lams_central/web/css/defaultHTML_rtl_learner.css 12 Jan 2016 12:20:06 -0000 1.16.14.4 @@ -544,4 +544,56 @@ /* jQuery tablesorter/pager/filter defaults */ .tablesorter .disabled { display: none +} + +/* Comments Widget */ +iframe.commentFrame{ + border: 0 none; + margin: 0; + padding: 0; + overflow: hidden; +} + + +.comment-author { + color:#0087e5; + font-size:11px; + margin-bottom:2px; +} + +.comment-date { + font-size:11px; + margin-bottom:2px; +} + +table.comment { + width:100%; + margin-left:0px; + padding-top:0px; + margin-bottom:5px; + text-align:left; +} + +table.comment td { + padding:0px; + padding-left:0px; + font-size:11px; + vertical-align:top; +} +a.comment { + color: #47bc23; + text-decoration: none; + border-bottom: none; +} +textarea.comment { + width: 99%; + height: 60px; + margin-bottom:10px; +} +div.comment-entry { + width: 98%; +} + +.fa-faded { + color: silver } \ No newline at end of file Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/css/jquery.treetable.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/css/jquery.treetable.lams.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/font-awesome/css/font-awesome.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/font-awesome/css/font-awesome.min.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/font-awesome/fonts/FontAwesome.otf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/font-awesome/fonts/FontAwesome.otf,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.eot =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.eot,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.svg =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.svg,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.ttf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.ttf,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.woff =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.woff,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.woff2 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.woff2,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/comments.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.jscroll.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.treetable.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/Comment.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentLike.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/comments/CommentSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml,v diff -u -r1.10.2.4 -r1.10.2.5 --- lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml 19 Oct 2014 08:35:42 -0000 1.10.2.4 +++ lams_common/src/java/org/lamsfoundation/lams/beanRefContext.xml 12 Jan 2016 12:20:17 -0000 1.10.2.5 @@ -41,6 +41,7 @@ /org/lamsfoundation/lams/applicationContext.xml /org/lamsfoundation/lams/toolApplicationContext.xml + /org/lamsfoundation/lams/comments/commentsContext.xml /org/lamsfoundation/lams/contentrepository/applicationContext.xml /org/lamsfoundation/lams/lesson/lessonApplicationContext.xml /org/lamsfoundation/lams/learning/learningApplicationContext.xml Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/CommentSession.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/commentsContext.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentLikeDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/dao/ICommentSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentSessionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/dto/CommentDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/util/TopicComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/comments/util/TopicComparatorLike.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040053.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/language/lams/ApplicationResources.properties,v diff -u -r1.19.2.1 -r1.19.2.2 --- lams_tool_nb/conf/language/lams/ApplicationResources.properties 12 Mar 2015 16:10:01 -0000 1.19.2.1 +++ lams_tool_nb/conf/language/lams/ApplicationResources.properties 12 Jan 2016 12:24:33 -0000 1.19.2.2 @@ -57,6 +57,10 @@ monitor.summary.td.notebookInstructions =Notebook instructions label.authoring.heading =Noticeboard Authoring button.submit =Finish +advanced.allow.comments=Allow learner comments +label.view.comments=View Comments +advanced.comments.like.only=Like Button Only +advanced.comments.like.and.dislike=Like and Dislike Buttons #======= End labels: Exported 50 labels for en AU ===== Index: lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.19.2.1 -r1.19.2.2 --- lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties 12 Mar 2015 16:10:01 -0000 1.19.2.1 +++ lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties 12 Jan 2016 12:24:33 -0000 1.19.2.2 @@ -57,6 +57,10 @@ monitor.summary.td.notebookInstructions =Notebook instructions label.authoring.heading =Noticeboard Authoring button.submit =Finish +advanced.allow.comments=Allow learner comments +label.view.comments=View Comments +advanced.comments.like.only=Like Button Only +advanced.comments.like.and.dislike=Like and Dislike Buttons #======= End labels: Exported 50 labels for en AU ===== Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java,v diff -u -r1.27 -r1.27.2.1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java 17 Jan 2014 22:10:33 -0000 1.27 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java 12 Jan 2016 12:24:32 -0000 1.27.2.1 @@ -62,7 +62,8 @@ public static final String MONITOR_PAGE = "monitorPage"; public static final String MONITOR_REFLECTION_PAGE ="monitorReflectionPage"; - + public static final String MONITOR_COMMENTS_PAGE ="monitorCommentsPage"; + // ------------------------------ // Action Names // ------------------------------ Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java,v diff -u -r1.20.2.1 -r1.20.2.2 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java 3 Sep 2014 10:34:16 -0000 1.20.2.1 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.java 12 Jan 2016 12:24:32 -0000 1.20.2.2 @@ -73,7 +73,13 @@ /** nullable persistent field */ private Date dateUpdated; - + + /** nullable persistent field */ + private boolean allowComments; + + /** nullable persistent field */ + private boolean commentsLikeAndDislike; + /** persistent field */ private Set nbSessions = new HashSet(); @@ -83,8 +89,8 @@ /** full constructor */ public NoticeboardContent(Long nbContentId, String title, String content, boolean defineLater, - boolean reflectOnActivity, String reflectInstructions, boolean contentInUse, Long creatorUserId, - Date dateCreated, Date dateUpdated) { + boolean reflectOnActivity, String reflectInstructions, boolean contentInUse, Long creatorUserId, + Date dateCreated, Date dateUpdated, boolean allowComments, boolean commentsLikeAndDislike) { this.nbContentId = nbContentId; this.title = title; this.content = content; @@ -95,6 +101,8 @@ this.creatorUserId = creatorUserId; this.dateCreated = dateCreated; this.dateUpdated = dateUpdated; + this.allowComments = allowComments; + this.commentsLikeAndDislike = commentsLikeAndDislike; } /** @@ -113,6 +121,8 @@ this.creatorUserId = null; this.dateCreated = dateCreated; this.dateUpdated = null; + this.allowComments = false; + this.commentsLikeAndDislike = false; } /** @@ -213,6 +223,38 @@ } /** + * @hibernate.property column="allow_comments" length="1" + */ + + public boolean isAllowComments() { + return allowComments; + } + + /** + * @param allowComments + * The allowComments to set. + */ + public void setAllowComments(boolean allowComments) { + this.allowComments = allowComments; + } + + /** + * @hibernate.property column="comments_like_dislike" length="1" + */ + + public boolean isCommentsLikeAndDislike() { + return commentsLikeAndDislike; + } + + /** + * @param commentsLikeAndDislike + * The commentsLikeAndDislike to set. + */ + public void setCommentsLikeAndDislike(boolean commentsLikeAndDislike) { + this.commentsLikeAndDislike = commentsLikeAndDislike; + } + + /** * @hibernate.property column="nb_content_id" length="20" not-null="true" */ @@ -277,7 +319,7 @@ RepositoryCheckedException { NoticeboardContent newContent = new NoticeboardContent(toContentId, nb.getTitle(), nb.getContent(), nb.isDefineLater(), nb.getReflectOnActivity(), nb.getReflectInstructions(), nb.isContentInUse(), - nb.getCreatorUserId(), nb.getDateCreated(), nb.getDateUpdated()); + nb.getCreatorUserId(), nb.getDateCreated(), nb.getDateUpdated(), nb.isAllowComments(), nb.isCommentsLikeAndDislike()); return newContent; } Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20151210.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dbupdates/patch20160105.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java,v diff -u -r1.26 -r1.26.2.1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java 17 Jan 2014 22:10:34 -0000 1.26 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java 12 Jan 2016 12:24:32 -0000 1.26.2.1 @@ -77,6 +77,8 @@ private String contentFolderID; private String defineLater; + private boolean allowComments; + private boolean commentsLikeAndDislike; private boolean reflectOnActivity; private String reflectInstructions; @@ -95,6 +97,18 @@ this.defineLater = defineLater; } + public boolean isAllowComments() { + return allowComments; + } + public void setAllowComments(boolean allowComments) { + this.allowComments = allowComments; + } + public boolean isCommentsLikeAndDislike() { + return commentsLikeAndDislike; + } + public void setCommentsLikeAndDislike(boolean commentsLikeAndDislike) { + this.commentsLikeAndDislike = commentsLikeAndDislike; + } public boolean getReflectOnActivity() { return reflectOnActivity; } @@ -194,6 +208,8 @@ { setTitle(nbContent.getTitle()); setBasicContent(nbContent.getContent()); + setAllowComments(nbContent.isAllowComments()); + setCommentsLikeAndDislike(nbContent.isCommentsLikeAndDislike()); setReflectOnActivity(nbContent.getReflectOnActivity()); setReflectInstructions(nbContent.getReflectInstructions()); } @@ -202,6 +218,8 @@ { nbContent.setTitle(getTitle()); nbContent.setContent(getBasicContent()); + nbContent.setAllowComments(isAllowComments()); + nbContent.setCommentsLikeAndDislike(isCommentsLikeAndDislike()); if (defineLater == null || defineLater.length() == 0) { // ie. If defineLater is null or empty, this means we are in authoring nbContent.setReflectOnActivity(getReflectOnActivity()); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java,v diff -u -r1.22 -r1.22.2.1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java 9 Apr 2013 12:46:33 -0000 1.22 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java 12 Jan 2016 12:24:32 -0000 1.22.2.1 @@ -204,6 +204,8 @@ NoticeboardContent nbContent = nbService.retrieveNoticeboardBySessionID(toolSessionID); request.setAttribute("reflectInstructions", nbContent.getReflectInstructions()); request.setAttribute("title", nbContent.getTitle()); + request.setAttribute("allowComments", nbContent.isAllowComments()); + request.setAttribute("likeAndDislike", nbContent.isCommentsLikeAndDislike()); // get the existing reflection entry NotebookEntry entry = nbService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, NoticeboardConstants.TOOL_SIGNATURE, getUserID(request).intValue()); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java,v diff -u -r1.29 -r1.29.2.1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java 17 Jan 2014 22:10:34 -0000 1.29 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java 12 Jan 2016 12:24:32 -0000 1.29.2.1 @@ -185,9 +185,11 @@ request.setAttribute("reflectEntry", notebookEntry.getEntry()); } request.setAttribute("reflectInstructions", nbContent.getReflectInstructions()); - request.setAttribute("reflectOnActivity", nbContent.getReflectOnActivity()); + request.setAttribute("reflectOnActivity", nbContent.getReflectOnActivity()); + request.setAttribute("allowComments", nbContent.isAllowComments()); + request.setAttribute("likeAndDislike", nbContent.isCommentsLikeAndDislike()); - Boolean userFinished = (nbUser!=null && NoticeboardUser.COMPLETED.equals(nbUser.getUserStatus())); + Boolean userFinished = (nbUser!=null && NoticeboardUser.COMPLETED.equals(nbUser.getUserStatus())); request.setAttribute("userFinished", userFinished); LearningWebUtil.putActivityPositionInRequestByToolSessionId(toolSessionID, request, getServlet() Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java,v diff -u -r1.32 -r1.32.2.1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java 30 Mar 2014 13:58:27 -0000 1.32 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java 12 Jan 2016 12:24:32 -0000 1.32.2.1 @@ -71,6 +71,7 @@ * input=".monitoringContent" validate="false" parameter="method" * @struts:action-forward name="monitorPage" path="/monitoring/monitoring.jsp" * @struts:action-forward name="monitorReflectionPage" path="/monitoring/reflection.jsp" + * @struts:action-forward name="monitorCommentsPage" path="/monitoring/comments.jsp" * ----------------XDoclet Tags-------------------- */ public class NbMonitoringAction extends LamsDispatchAction { @@ -119,13 +120,15 @@ Set sessions = content.getNbSessions(); Iterator i = sessions.iterator(); - Map map = new HashMap(); + Map numUsersMap = new HashMap(); + Map sessionIdMap = new HashMap(); List reflections = new ArrayList(); while (i.hasNext()) { NoticeboardSession session = (NoticeboardSession) i.next(); int numUsersInSession = nbService.getNumberOfUsersInSession(session); - map.put(session.getNbSessionName(), new Integer(numUsersInSession)); + numUsersMap.put(session.getNbSessionName(), new Integer(numUsersInSession)); + sessionIdMap.put(session.getNbSessionName(), session.getNbSessionId()); // Get list of users that have made a reflection entry if (content.getReflectOnActivity()) { List sessionUsers = nbService.getUsersBySession(session.getNbSessionId()); @@ -143,16 +146,19 @@ } } } - monitorForm.setGroupStatsMap(map); + monitorForm.setGroupStatsMap(numUsersMap); + monitorForm.setSessionIdMap(sessionIdMap); boolean isGroupedActivity = nbService.isGroupedActivity(toolContentId); request.setAttribute("isGroupedActivity", isGroupedActivity); - + // Set reflection statistics, if reflection is set request.setAttribute("reflectOnActivity", content.getReflectOnActivity()); request.setAttribute("reflectInstructions", content.getReflectInstructions()); request.setAttribute("reflections", reflections); - + + request.setAttribute("allowComments", content.isAllowComments()); + String currentTab = WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true); monitorForm.setCurrentTab(currentTab != null? currentTab : SUMMARY_TABID); request.setAttribute(FORM, monitorForm); @@ -178,5 +184,15 @@ return mapping.findForward(NoticeboardConstants.MONITOR_REFLECTION_PAGE); } - + + public ActionForward viewComments ( + ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws NbApplicationException + { + request.setAttribute(NoticeboardConstants.TOOL_SESSION_ID, request.getParameter(NoticeboardConstants.TOOL_SESSION_ID)); + return mapping.findForward(NoticeboardConstants.MONITOR_COMMENTS_PAGE); + } + } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java,v diff -u -r1.14 -r1.14.2.1 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java 17 Jan 2014 22:10:34 -0000 1.14 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java 12 Jan 2016 12:24:32 -0000 1.14.2.1 @@ -72,6 +72,7 @@ private String contentEditable; private Integer totalLearners; private Map groupStatsMap; + private Map sessionIdMap; /** * @return Returns the parametersToAppend. @@ -154,4 +155,10 @@ public void setTotalLearners(Integer totalLearners) { this.totalLearners = totalLearners; } + public Map getSessionIdMap() { + return sessionIdMap; + } + public void setSessionIdMap(Map sessionIdMap) { + this.sessionIdMap = sessionIdMap; + } } Index: lams_tool_nb/web/learnerContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/learnerContent.jsp,v diff -u -r1.31 -r1.31.2.1 --- lams_tool_nb/web/learnerContent.jsp 3 Apr 2014 18:32:19 -0000 1.31 +++ lams_tool_nb/web/learnerContent.jsp 12 Jan 2016 12:24:33 -0000 1.31.2.1 @@ -1,3 +1,4 @@ +<%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%> <%@ include file="/includes/taglibs.jsp"%> @@ -65,6 +66,10 @@ + + + +
@@ -95,6 +100,7 @@
+ Index: lams_tool_nb/web/reflect.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/reflect.jsp,v diff -u -r1.12 -r1.12.2.1 --- lams_tool_nb/web/reflect.jsp 30 Mar 2014 14:19:55 -0000 1.12 +++ lams_tool_nb/web/reflect.jsp 12 Jan 2016 12:24:33 -0000 1.12.2.1 @@ -1,3 +1,4 @@ +<%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants"%> <%@ include file="/includes/taglibs.jsp"%> +