Move page-level comments to the bottom

If they’re at the top and somebody goes to the page just to look at the
file and not at the comments, a huge discussion at the top can be very
distracting.

We assume that people will go to pages more often to see the
files/diffs/commits than to look at comments.

Author: nb

code_comments/htdocs/code-comments.css

@@ -82,7 +82,7 @@ ul.comments>li .text {
 	border: 0;
 	margin: 0;
 }
-#top-comments button {
+#page-comments button {
 	margin-bottom: 16px;
 }
 tr.with-comments {

code_comments/htdocs/code-comments.js

@@ -31,7 +31,7 @@ var underscore = _.noConflict();
 			revision: CodeComments.revision,
 			type: CodeComments.page
 		},
-		fetchTopComments: function() {
+		fetchPageComments: function() {
 			return this.fetch( { data: _.extend( { line: 0 }, this.defaultFetchParams ) } );
 		},
 		fetchLineComments: function() {
@@ -63,23 +63,23 @@ var underscore = _.noConflict();
 		}
 	});
 
-	window.TopCommentsView = Backbone.View.extend({
-		id: 'top-comments',
+	window.PageCommentsView = Backbone.View.extend({
+		id: 'page-comments',
 
-		template:  _.template(CodeComments.templates.top_comments_block),
+		template:  _.template(CodeComments.templates.page_comments_block),
 		events: {
 			'click button': 'showAddCommentDialog'
 		},
 
 		initialize: function() {
-			TopComments.bind('add',   this.addOne, this);
-			TopComments.bind('reset', this.addAll, this);
+			PageComments.bind('add',   this.addOne, this);
+			PageComments.bind('reset', this.addAll, this);
 		},
 
 		render: function() {
 			$(this.el).html(this.template());
 			this.$('button').button();
-			TopComments.fetchTopComments();
+			PageComments.fetchPageComments();
 			return this;
 		},
 
@@ -89,12 +89,12 @@ var underscore = _.noConflict();
 		},
 		addAll: function() {
 			var view = this;
-			TopComments.each(function(comment) {
+			PageComments.each(function(comment) {
 				view.addOne.call(view, comment);
 			});
 		},
 		showAddCommentDialog: function(e) {
-			AddCommentDialog.open(TopComments);
+			AddCommentDialog.open(PageComments);
 		}
 
 	});
@@ -302,15 +302,15 @@ var underscore = _.noConflict();
 		}
 	} );
 
-	window.TopComments = new CommentsList();
+	window.PageComments = new CommentsList();
 	window.LineComments = new CommentsList();
-	window.TopCommentsBlock = new TopCommentsView();
+	window.PageCommentsBlock = new PageCommentsView();
 	window.LineCommentsBlock = new LineCommentsView();
 	window.AddCommentDialog = new AddCommentDialogView();
 	window.LineCommentBubbles = new LineCommentBubblesView({el: $('#preview, .diff .entries')});
 	window.Rows = new RowsView( { tableSelector: 'table.code tbody, table.trac-diff tbody' } );
 
-	$(CodeComments.selectorToInsertBefore).before(TopCommentsBlock.render().el);
+	$(CodeComments.selectorToInsertAfter).after(PageCommentsBlock.render().el);
 	LineCommentsBlock.render();
 	AddCommentDialog.render();
 	LineCommentBubbles.render();

…nts/templates/js/top-comments-block.html …ts/templates/js/page-comments-block.htmlcode_comments/templates/js/top-comments-block.html renamed to code_comments/templates/js/page-comments-block.html code_comments/templates/js/top-comments-block.html renamed to code_comments/templates/js/page-comments-block.html

@@ -55,7 +55,7 @@ def get_navigation_items(self, req):
 class JSDataForRequests(CodeComments):
     implements(IRequestFilter)
 
-    js_templates = ['top-comments-block', 'comment', 'add-comment-dialog', 'line-comment', 'comments-for-a-line',]
+    js_templates = ['page-comments-block', 'comment', 'add-comment-dialog', 'line-comment', 'comments-for-a-line',]
 
     # IRequestFilter methods
     def pre_process_request(self, req, handler):
@@ -106,14 +106,14 @@ def templates_js_data(self):
         return data
 
     def changeset_js_data(self, req, data):
-        return {'page': 'changeset', 'revision': data['new_rev'], 'path': '', 'selectorToInsertBefore': 'div.diff:first'}
+        return {'page': 'changeset', 'revision': data['new_rev'], 'path': '', 'selectorToInsertAfter': 'div.diff div.diff:last'}
 
     def browser_js_data(self, req, data):
-        return {'page': 'browser', 'revision': data['rev'], 'path': data['path'], 'selectorToInsertBefore': 'table#info, table#dirlist'}
+        return {'page': 'browser', 'revision': data['rev'], 'path': data['path'], 'selectorToInsertAfter': 'table.code'}
 
     def attachment_js_data(self, req, data):
         path = req.path_info.replace('/attachment/', 'attachment:/')
-        return {'page': 'attachment', 'revision': 0, 'path': path, 'selectorToInsertBefore': 'table#info'}
+        return {'page': 'attachment', 'revision': 0, 'path': path, 'selectorToInsertAfter': 'div#preview'}
 
     def template_js_data(self, name):
         file_name = name + '.html'