+
+
+
+ <%@ include file="topicview.jsp"%>
+
+
+">
+
+
+
+
+
+
+
+
Index: lams_central/web/comments/msgview.jsp
===================================================================
diff -u
--- lams_central/web/comments/msgview.jsp (revision 0)
+++ lams_central/web/comments/msgview.jsp (revision 46bcb6ea758a272250071d1a571d008c6745e593)
@@ -0,0 +1,132 @@
+<%-- commentDto, commentUid, msgLevel needs to be in the session elsewhere --%>
+
+
+
+
+
+|
+ |
+
|
+
+ |
+
+  "
+ onclick="javascript:likeEntry(${commentDto.comment.uid});" id="msglikebutton${commentDto.comment.uid}">
+  "
+ onclick="javascript:dislikeEntry(${commentDto.comment.uid});" id="msgdislikebutton${commentDto.comment.uid}">
+  "
+ id="msglikebutton${commentDto.comment.uid}">
+  "
+ id="msgdislikebutton${commentDto.comment.uid}">
+ |
+
+">
+
+
+
+
Index: lams_central/web/comments/reply.jsp
===================================================================
diff -u
--- lams_central/web/comments/reply.jsp (revision 0)
+++ lams_central/web/comments/reply.jsp (revision 46bcb6ea758a272250071d1a571d008c6745e593)
@@ -0,0 +1,76 @@
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<%@ page import="org.lamsfoundation.lams.comments.util.CommentConstants"%>
+
+
+
+
+
+
+
+
+
+">
+
+
+
+
+
+
Index: lams_central/web/comments/topicview.jsp
===================================================================
diff -u
--- lams_central/web/comments/topicview.jsp (revision 0)
+++ lams_central/web/comments/topicview.jsp (revision 46bcb6ea758a272250071d1a571d008c6745e593)
@@ -0,0 +1,166 @@
+<%@ page import="org.lamsfoundation.lams.comments.util.CommentConstants"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+ <%@ include file="msgview.jsp"%>
+
+ | |
' + _options.loadingHtml + '
');
+
+ return $e.animate({scrollTop: $inner.outerHeight()}, 0, function() {
+ $inner.find('div.jscroll-added').last().load(data.nextHref, function(r, status, xhr) {
+ if (status === 'error') {
+ return _destroy();
+ }
+ var $next = $(this).find(_options.nextSelector).first();
+ data.waiting = false;
+ data.nextHref = $next.attr('href') ? $.trim($next.attr('href') + ' ' + _options.contentSelector) : false;
+ $('.jscroll-next-parent', $e).remove(); // Remove the previous next link now that we have a new one
+ _checkNextHref();
+ if (_options.callback) {
+ _options.callback.call(this);
+ }
+ _debug('dir', data);
+ });
+ });
+ }
+
+ // Safe console debug - http://klauzinski.com/javascript/safe-firebug-console-in-javascript
+ function _debug(m) {
+ if (_options.debug && typeof console === 'object' && (typeof m === 'object' || typeof console[m] === 'function')) {
+ if (typeof m === 'object') {
+ var args = [];
+ for (var sMethod in m) {
+ if (typeof console[sMethod] === 'function') {
+ args = (m[sMethod].length) ? m[sMethod] : [m[sMethod]];
+ console[sMethod].apply(console, args);
+ } else {
+ console.log.apply(console, args);
+ }
+ }
+ } else {
+ console[m].apply(console, Array.prototype.slice.call(arguments, 1));
+ }
+ }
+ }
+
+ // Expose API methods via the jQuery.jscroll namespace, e.g. $('sel').jscroll.method()
+ $.extend($e.jscroll, {
+ destroy: _destroy
+ });
+ return $e;
+ };
+
+ // Define the jscroll plugin method and loop
+ $.fn.jscroll = function(m) {
+ return this.each(function() {
+ var $this = $(this),
+ data = $this.data('jscroll');
+ // Instantiate jScroll on this element if it hasn't been already
+ if (data && data.initialized) return;
+ var jscroll = new jScroll($this, m);
+ });
+ };
+})(jQuery);
\ No newline at end of file
Index: lams_central/web/includes/javascript/jquery.treetable.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/jquery.treetable.js (revision 0)
+++ lams_central/web/includes/javascript/jquery.treetable.js (revision 46bcb6ea758a272250071d1a571d008c6745e593)
@@ -0,0 +1,634 @@
+/*
+ * jQuery treetable Plugin 3.2.0
+ * http://ludo.cubicphuse.nl/jquery-treetable
+ *
+ * Copyright 2013, Ludo van den Boom
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ */
+(function($) {
+ var Node, Tree, methods;
+
+ Node = (function() {
+ function Node(row, tree, settings) {
+ var parentId;
+
+ this.row = row;
+ this.tree = tree;
+ this.settings = settings;
+
+ // TODO Ensure id/parentId is always a string (not int)
+ this.id = this.row.data(this.settings.nodeIdAttr);
+
+ // TODO Move this to a setParentId function?
+ parentId = this.row.data(this.settings.parentIdAttr);
+ if (parentId != null && parentId !== "") {
+ this.parentId = parentId;
+ }
+
+ this.treeCell = $(this.row.children(this.settings.columnElType)[this.settings.column]);
+ this.expander = $(this.settings.expanderTemplate);
+ this.indenter = $(this.settings.indenterTemplate);
+ this.children = [];
+ this.initialized = false;
+
+ // Modified Fiona Malikoff 6 Mar 2015 - we want to put the twister triangle after the message not before.
+ // Changed prepend to append.
+ // this.treeCell.prepend(this.indenter);
+ this.treeCell.append(this.indenter);
+
+ }
+
+ Node.prototype.addChild = function(child) {
+ return this.children.push(child);
+ };
+
+ Node.prototype.ancestors = function() {
+ var ancestors, node;
+ node = this;
+ ancestors = [];
+ while (node = node.parentNode()) {
+ ancestors.push(node);
+ }
+ return ancestors;
+ };
+
+ Node.prototype.collapse = function() {
+ if (this.collapsed()) {
+ return this;
+ }
+
+ this.row.removeClass("expanded").addClass("collapsed");
+
+ this._hideChildren();
+ this.expander.attr("title", this.settings.stringExpand);
+
+ if (this.initialized && this.settings.onNodeCollapse != null) {
+ this.settings.onNodeCollapse.apply(this);
+ }
+
+ return this;
+ };
+
+ Node.prototype.collapsed = function() {
+ return this.row.hasClass("collapsed");
+ };
+
+ // TODO destroy: remove event handlers, expander, indenter, etc.
+
+ Node.prototype.expand = function() {
+ if (this.expanded()) {
+ return this;
+ }
+
+ this.row.removeClass("collapsed").addClass("expanded");
+
+ if (this.initialized && this.settings.onNodeExpand != null) {
+ this.settings.onNodeExpand.apply(this);
+ }
+
+ if ($(this.row).is(":visible")) {
+ this._showChildren();
+ }
+
+ this.expander.attr("title", this.settings.stringCollapse);
+
+ return this;
+ };
+
+ Node.prototype.expanded = function() {
+ return this.row.hasClass("expanded");
+ };
+
+ Node.prototype.hide = function() {
+ this._hideChildren();
+ this.row.hide();
+ return this;
+ };
+
+ Node.prototype.isBranchNode = function() {
+ if(this.children.length > 0 || this.row.data(this.settings.branchAttr) === true) {
+ return true;
+ } else {
+ return false;
+ }
+ };
+
+ Node.prototype.updateBranchLeafClass = function(){
+ this.row.removeClass('branch');
+ this.row.removeClass('leaf');
+ this.row.addClass(this.isBranchNode() ? 'branch' : 'leaf');
+ };
+
+ Node.prototype.level = function() {
+ return this.ancestors().length;
+ };
+
+ Node.prototype.parentNode = function() {
+ if (this.parentId != null) {
+ return this.tree[this.parentId];
+ } else {
+ return null;
+ }
+ };
+
+ Node.prototype.removeChild = function(child) {
+ var i = $.inArray(child, this.children);
+ return this.children.splice(i, 1)
+ };
+
+ Node.prototype.render = function() {
+ var handler,
+ settings = this.settings,
+ target;
+
+ if (settings.expandable === true && this.isBranchNode()) {
+ handler = function(e) {
+ $(this).parents("table").treetable("node", $(this).parents("tr").data(settings.nodeIdAttr)).toggle();
+ return e.preventDefault();
+ };
+
+ this.indenter.html(this.expander);
+ target = settings.clickableNodeNames === true ? this.treeCell : this.expander;
+
+ target.off("click.treetable").on("click.treetable", handler);
+ target.off("keydown.treetable").on("keydown.treetable", function(e) {
+ if (e.keyCode == 13) {
+ handler.apply(this, [e]);
+ }
+ });
+ }
+
+ this.indenter[0].style.paddingLeft = "" + (this.level() * settings.indent) + "px";
+
+ return this;
+ };
+
+ Node.prototype.reveal = function() {
+ if (this.parentId != null) {
+ this.parentNode().reveal();
+ }
+ return this.expand();
+ };
+
+ Node.prototype.setParent = function(node) {
+ if (this.parentId != null) {
+ this.tree[this.parentId].removeChild(this);
+ }
+ this.parentId = node.id;
+ this.row.data(this.settings.parentIdAttr, node.id);
+ return node.addChild(this);
+ };
+
+ Node.prototype.show = function() {
+ if (!this.initialized) {
+ this._initialize();
+ }
+ this.row.show();
+ if (this.expanded()) {
+ this._showChildren();
+ }
+ return this;
+ };
+
+ Node.prototype.toggle = function() {
+ if (this.expanded()) {
+ this.collapse();
+ } else {
+ this.expand();
+ }
+ return this;
+ };
+
+ Node.prototype._hideChildren = function() {
+ var child, _i, _len, _ref, _results;
+ _ref = this.children;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ child = _ref[_i];
+ _results.push(child.hide());
+ }
+ return _results;
+ };
+
+ Node.prototype._initialize = function() {
+ var settings = this.settings;
+
+ this.render();
+
+ if (settings.expandable === true && settings.initialState === "collapsed") {
+ this.collapse();
+ } else {
+ this.expand();
+ }
+
+ if (settings.onNodeInitialized != null) {
+ settings.onNodeInitialized.apply(this);
+ }
+
+ return this.initialized = true;
+ };
+
+ Node.prototype._showChildren = function() {
+ var child, _i, _len, _ref, _results;
+ _ref = this.children;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ child = _ref[_i];
+ _results.push(child.show());
+ }
+ return _results;
+ };
+
+ return Node;
+ })();
+
+ Tree = (function() {
+ function Tree(table, settings) {
+ this.table = table;
+ this.settings = settings;
+ this.tree = {};
+
+ // Cache the nodes and roots in simple arrays for quick access/iteration
+ this.nodes = [];
+ this.roots = [];
+ }
+
+ Tree.prototype.collapseAll = function() {
+ var node, _i, _len, _ref, _results;
+ _ref = this.nodes;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ node = _ref[_i];
+ _results.push(node.collapse());
+ }
+ return _results;
+ };
+
+ Tree.prototype.expandAll = function() {
+ var node, _i, _len, _ref, _results;
+ _ref = this.nodes;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ node = _ref[_i];
+ _results.push(node.expand());
+ }
+ return _results;
+ };
+
+ Tree.prototype.findLastNode = function (node) {
+ if (node.children.length > 0) {
+ return this.findLastNode(node.children[node.children.length - 1]);
+ } else {
+ return node;
+ }
+ };
+
+ Tree.prototype.loadRows = function(rows) {
+ var node, row, i;
+
+ if (rows != null) {
+ for (i = 0; i < rows.length; i++) {
+ row = $(rows[i]);
+
+ if (row.data(this.settings.nodeIdAttr) != null) {
+ node = new Node(row, this.tree, this.settings);
+ this.nodes.push(node);
+ this.tree[node.id] = node;
+
+ if (node.parentId != null && this.tree[node.parentId]) {
+ this.tree[node.parentId].addChild(node);
+ } else {
+ this.roots.push(node);
+ }
+ }
+ }
+ }
+
+ for (i = 0; i < this.nodes.length; i++) {
+ node = this.nodes[i].updateBranchLeafClass();
+ }
+
+ return this;
+ };
+
+ Tree.prototype.move = function(node, destination) {
+ // Conditions:
+ // 1: +node+ should not be inserted as a child of +node+ itself.
+ // 2: +destination+ should not be the same as +node+'s current parent (this
+ // prevents +node+ from being moved to the same location where it already
+ // is).
+ // 3: +node+ should not be inserted in a location in a branch if this would
+ // result in +node+ being an ancestor of itself.
+ var nodeParent = node.parentNode();
+ if (node !== destination && destination.id !== node.parentId && $.inArray(node, destination.ancestors()) === -1) {
+ node.setParent(destination);
+ this._moveRows(node, destination);
+
+ // Re-render parentNode if this is its first child node, and therefore
+ // doesn't have the expander yet.
+ if (node.parentNode().children.length === 1) {
+ node.parentNode().render();
+ }
+ }
+
+ if(nodeParent){
+ nodeParent.updateBranchLeafClass();
+ }
+ if(node.parentNode()){
+ node.parentNode().updateBranchLeafClass();
+ }
+ node.updateBranchLeafClass();
+ return this;
+ };
+
+ Tree.prototype.removeNode = function(node) {
+ // Recursively remove all descendants of +node+
+ this.unloadBranch(node);
+
+ // Remove node from DOM (CommentDTO instance from a given Comment.
+ *
+ * @param msg
+ * @return
+ */
+ public static CommentDTO getCommentDTO(Comment comment){
+ if(comment == null)
+ return null;
+
+ CommentDTO dto = new CommentDTO();
+ dto.setComment(comment);
+ if(comment.getCreatedBy() != null)
+ dto.setAuthorname(comment.getCreatedBy().getFirstName()+" "+comment.getCreatedBy().getLastName());
+
+ dto.liked = false;
+ dto.disliked = false;
+
+ return dto;
+ }
+
+ /**
+ * Get a list of CommentDTO according to given list of Comment.
+ * @param msgList
+ * @return
+ */
+ public static Listjava.util.Comparator interface. Based on the Topic Comparator from Forum.
+ */
+public class TopicComparator implements Comparator