Index: lams_central/web/comments/comments.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/comments.jsp,v diff -u -r1.6.2.4 -r1.6.2.5 --- lams_central/web/comments/comments.jsp 9 Feb 2016 18:52:57 -0000 1.6.2.4 +++ lams_central/web/comments/comments.jsp 23 Feb 2016 14:23:03 -0000 1.6.2.5 @@ -1,5 +1,4 @@ - <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-html" prefix="html"%> @@ -28,14 +27,14 @@ - + - - + + -
+
- + -
-
- - -   - +
+ +   + +
-
Index: lams_central/web/comments/msgview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/msgview.jsp,v diff -u -r1.4.2.4 -r1.4.2.5 --- lams_central/web/comments/msgview.jsp 29 Jan 2016 00:12:48 -0000 1.4.2.4 +++ lams_central/web/comments/msgview.jsp 23 Feb 2016 14:23:03 -0000 1.4.2.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/new.jsp,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_central/web/comments/new.jsp 18 Jan 2016 03:26:27 -0000 1.4.2.3 +++ lams_central/web/comments/new.jsp 23 Feb 2016 14:23:03 -0000 1.4.2.4 @@ -4,82 +4,113 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%> - -
-
- - - -
-
- +
+
+
+
+

+ +

+
+
+ +
+
+ + + + + + + +   + +
+
+ +
+ +
+
-
- - -   - - - -
-
- +
+ + + Index: lams_central/web/comments/reply.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/reply.jsp,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_central/web/comments/reply.jsp 18 Jan 2016 03:26:27 -0000 1.2.2.3 +++ lams_central/web/comments/reply.jsp 23 Feb 2016 14:23:03 -0000 1.2.2.4 @@ -8,69 +8,80 @@ -
-
- - - +
+ + + -
-
- - -   - - - -
-
+
+ +   + +
+
- Index: lams_central/web/comments/topicview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/comments/topicview.jsp,v diff -u -r1.5.2.3 -r1.5.2.4 --- lams_central/web/comments/topicview.jsp 18 Jan 2016 03:26:27 -0000 1.5.2.3 +++ lams_central/web/comments/topicview.jsp 23 Feb 2016 14:23:03 -0000 1.5.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/jquery.treetable.lams.css,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_central/web/css/jquery.treetable.lams.css 12 Jan 2016 12:20:06 -0000 1.1.2.2 +++ lams_central/web/css/jquery.treetable.lams.css 23 Feb 2016 14:23:03 -0000 1.1.2.3 @@ -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 { Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.timeago.js'. Fisheye: No comparison available. Pass `N' to diff?