Index: lams_central/web/comments/msgview.jsp =================================================================== diff -u -rd75897c8f1cee96060648be0cec1e9f983a465e4 -rb655a75c3d5169a2e886a235fc4682855b2a3038 --- lams_central/web/comments/msgview.jsp (.../msgview.jsp) (revision d75897c8f1cee96060648be0cec1e9f983a465e4) +++ lams_central/web/comments/msgview.jsp (.../msgview.jsp) (revision b655a75c3d5169a2e886a235fc4682855b2a3038) @@ -1,114 +1,126 @@ <%-- commentDto, commentUid, msgLevel needs to be in the session elsewhere --%> - - - - - - - - - - + - - - highlight - - - - - - -

px;"> - - - - - - - - - - -

- - - - - - - - - - () - - -

- - - - - - - - -

- - comments/newReplyTopic.do?sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid} - Reply - · - - - - comments/editTopic.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time} - Edit - · - + + + + + + + + - - - - - - comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=false - - - - - comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=true - - - - · - + + + highlight + + + + + - ${commentDto.comment.likeCount} - - - - - " - 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}"> - - - - - -

px;"> +

+ + + + + + + + - + "> + + | () + +

+ + + + + + + +

+ + + comments/newReplyTopic.do?sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid} + Reply + · + + + + comments/editTopic.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time} + Edit + · + + + + + + + + comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=false + + + + + comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=true + + + + · + + + ${commentDto.comment.likeCount} + + + + + " + 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/new.jsp =================================================================== diff -u -r5297fc67fa56d2984dfa874443ebcf7ddc6a0ca8 -rb655a75c3d5169a2e886a235fc4682855b2a3038 --- lams_central/web/comments/new.jsp (.../new.jsp) (revision 5297fc67fa56d2984dfa874443ebcf7ddc6a0ca8) +++ lams_central/web/comments/new.jsp (.../new.jsp) (revision b655a75c3d5169a2e886a235fc4682855b2a3038) @@ -4,82 +4,113 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%> - -

- - - -

- +

+ +

+ + + + + + + + + +

+ +

- - - - - - -

- +

+ + + Index: lams_central/web/comments/reply.jsp =================================================================== diff -u -r5297fc67fa56d2984dfa874443ebcf7ddc6a0ca8 -rb655a75c3d5169a2e886a235fc4682855b2a3038 --- lams_central/web/comments/reply.jsp (.../reply.jsp) (revision 5297fc67fa56d2984dfa874443ebcf7ddc6a0ca8) +++ lams_central/web/comments/reply.jsp (.../reply.jsp) (revision b655a75c3d5169a2e886a235fc4682855b2a3038) @@ -8,69 +8,80 @@ -

- - Index: lams_central/web/comments/topicview.jsp =================================================================== diff -u -r5297fc67fa56d2984dfa874443ebcf7ddc6a0ca8 -rb655a75c3d5169a2e886a235fc4682855b2a3038 --- lams_central/web/comments/topicview.jsp (.../topicview.jsp) (revision 5297fc67fa56d2984dfa874443ebcf7ddc6a0ca8) +++ lams_central/web/comments/topicview.jsp (.../topicview.jsp) (revision b655a75c3d5169a2e886a235fc4682855b2a3038) @@ -3,13 +3,13 @@ - + expandable:true,initialState:'expanded', - expanderTemplate:' ${prompt}', + expanderTemplate:' ${prompt}', stringCollapse:'${hide}',stringExpand:'${show}', clickableNodeNames:true,indent:${indent}, onNodeInitialized:function() { @@ -39,7 +39,7 @@ var replyDiv = document.createElement("div"); replyDiv.id = 'reply'; - var parentDiv = document.getElementById('msg'+commentUid); + var parentDiv = document.getElementById('pb-msg'+commentUid); parentDiv.appendChild(replyDiv); $(replyDiv).load(url); @@ -56,7 +56,7 @@ var editDiv = document.createElement("div"); editDiv.id = 'edit'; - var parentDiv = document.getElementById('msg'+commentUid); + var parentDiv = document.getElementById('pb-msg'+commentUid); parentDiv.appendChild(editDiv); $(editDiv).load(url); @@ -138,8 +138,8 @@

- +

@@ -164,8 +164,8 @@ -

/comments/viewTopic.do?pageLastId=${maxThreadUid}&likeCount=${minThreadLike}&pageSize=${sessionMap.pageSize}&sessionMapID=${sessionMapID} - " class="button"> + " class="btn btn-xs btn-default">

Index: lams_central/web/css/jquery.treetable.lams.css =================================================================== diff -u -rd3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746 -rb655a75c3d5169a2e886a235fc4682855b2a3038 --- lams_central/web/css/jquery.treetable.lams.css (.../jquery.treetable.lams.css) (revision d3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746) +++ lams_central/web/css/jquery.treetable.lams.css (.../jquery.treetable.lams.css) (revision b655a75c3d5169a2e886a235fc4682855b2a3038) @@ -1,6 +1,6 @@ table.treetable span.indenter { text-align: left; - width: 250px; + } table.treetable tr.collapsed span.indenter a { @@ -14,7 +14,7 @@ table.treetable tr span.indenter a { outline: none; /* Expander shows outline after upgrading to 3.0 (#141) */ border-bottom: none; /* Hide the dotted line underneath */ - width: 250px; + width: 5px; } table.treetable tr.collapsed.selected span.indenter a { Index: lams_central/web/includes/javascript/jquery.timeago.js =================================================================== diff -u --- lams_central/web/includes/javascript/jquery.timeago.js (revision 0) +++ lams_central/web/includes/javascript/jquery.timeago.js (revision b655a75c3d5169a2e886a235fc4682855b2a3038) @@ -0,0 +1,225 @@ +/** + * Timeago is a jQuery plugin that makes it easy to support automatically + * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). + * + * @name timeago + * @version 1.5.2 + * @requires jQuery v1.2.3+ + * @author Ryan McGeary + * @license MIT License - http://www.opensource.org/licenses/mit-license.php + * + * For usage and examples, visit: + * http://timeago.yarp.com/ + * + * Copyright (c) 2008-2015, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) + */ + +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } else if (typeof module === 'object' && typeof module.exports === 'object') { + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + $.timeago = function(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords($.timeago.parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return inWords($.timeago.datetime(timestamp)); + } + }; + var $t = $.timeago; + + $.extend($.timeago, { + settings: { + refreshMillis: 60000, + allowPast: true, + allowFuture: false, + localeTitle: false, + cutoff: 0, + autoDispose: true, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + inPast: 'any moment now', + seconds: "less than a minute", + minute: "about a minute", + minutes: "%d minutes", + hour: "about an hour", + hours: "about %d hours", + day: "a day", + days: "%d days", + month: "about a month", + months: "%d months", + year: "about a year", + years: "%d years", + wordSeparator: " ", + numbers: [] + } + }, + + inWords: function(distanceMillis) { + if (!this.settings.allowPast && ! this.settings.allowFuture) { + throw 'timeago allowPast and allowFuture settings can not both be set to false.'; + } + + var $l = this.settings.strings; + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (this.settings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + if (!this.settings.allowPast && distanceMillis >= 0) { + return this.settings.strings.inPast; + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || + seconds < 90 && substitute($l.minute, 1) || + minutes < 45 && substitute($l.minutes, Math.round(minutes)) || + minutes < 90 && substitute($l.hour, 1) || + hours < 24 && substitute($l.hours, Math.round(hours)) || + hours < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator || ""; + if ($l.wordSeparator === undefined) { separator = " "; } + return $.trim([prefix, words, suffix].join(separator)); + }, + + parse: function(iso8601) { + var s = $.trim(iso8601); + s = s.replace(/\.\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900 + return new Date(s); + }, + datetime: function(elem) { + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + } + }); + + // functions that can be called via $(el).timeago('action') + // init is default when no action is given + // functions are called with context of a single element + var functions = { + init: function() { + var refresh_el = $.proxy(refresh, this); + refresh_el(); + var $s = $t.settings; + if ($s.refreshMillis > 0) { + this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis); + } + }, + update: function(timestamp) { + var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp); + $(this).data('timeago', { datetime: date }); + if ($t.settings.localeTitle) $(this).attr("title", date.toLocaleString()); + refresh.apply(this); + }, + updateFromDOM: function() { + $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); + refresh.apply(this); + }, + dispose: function () { + if (this._timeagoInterval) { + window.clearInterval(this._timeagoInterval); + this._timeagoInterval = null; + } + } + }; + + $.fn.timeago = function(action, options) { + var fn = action ? functions[action] : functions.init; + if (!fn) { + throw new Error("Unknown function name '"+ action +"' for timeago"); + } + // each over objects here and call the requested function + this.each(function() { + fn.call(this, options); + }); + return this; + }; + + function refresh() { + var $s = $t.settings; + + //check if it's still visible + if ($s.autoDispose && !$.contains(document.documentElement,this)) { + //stop if it has been removed + $(this).timeago("dispose"); + return this; + } + + var data = prepareData(this); + + if (!isNaN(data.datetime)) { + if ( $s.cutoff == 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { + $(this).text(inWords(data.datetime)); + } + } + return this; + } + + function prepareData(element) { + element = $(element); + if (!element.data("timeago")) { + element.data("timeago", { datetime: $t.datetime(element) }); + var text = $.trim(element.text()); + if ($t.settings.localeTitle) { + element.attr("title", element.data('timeago').datetime.toLocaleString()); + } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { + element.attr("title", text); + } + } + return element.data("timeago"); + } + + function inWords(date) { + return $t.inWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); +}));