diff --git a/src/scripts/tutti/2_comments.js b/src/scripts/tutti/2_comments.js index c62cc38d..c877fc6c 100644 --- a/src/scripts/tutti/2_comments.js +++ b/src/scripts/tutti/2_comments.js @@ -147,14 +147,17 @@ function loadComment(comment_id, projection) function loadComments(commentsUrl) { + var commentsContainer = $('#comments-embed'); + return $.get(commentsUrl) .done(function(dataHtml) { // Update the DOM injecting the generate HTML into the page - $('#comments-container').html(dataHtml); + commentsContainer.html(dataHtml); }) .fail(function(xhr) { statusBarSet('error', "Couldn't load comments. Error: " + xhr.responseText, 'pi-attention', 5000); - $('#comments-container').html(' Reload comments'); + + commentsContainer.html(' Reload comments'); }); } diff --git a/src/styles/_comments.sass b/src/styles/_comments.sass index fe1b077c..6d712bbe 100644 --- a/src/styles/_comments.sass +++ b/src/styles/_comments.sass @@ -2,10 +2,8 @@ $comments-width-max: 710px #comments-container margin-top: 15px - padding: 5px 20px 20px 20px position: relative border-top: 1px solid $color-background - min-height: 170px &.texture diff --git a/src/styles/_project.sass b/src/styles/_project.sass index e37e3051..fddde19f 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -689,6 +689,8 @@ ul.project_nav-edit-list &.active opacity: 1 + #comments-embed + padding: 5px 20px 20px 20px /* Project context on the right of the navigation */ /* Contains #project_context */ diff --git a/src/templates/nodes/custom/asset/file/view_embed.jade b/src/templates/nodes/custom/asset/file/view_embed.jade index ee243a83..b6c04fc5 100644 --- a/src/templates/nodes/custom/asset/file/view_embed.jade +++ b/src/templates/nodes/custom/asset/file/view_embed.jade @@ -97,7 +97,7 @@ | {% endif %} - #comments-container + #comments-embed #comments-list-items-loading i.pi-spin diff --git a/src/templates/nodes/custom/asset/image/view_embed.jade b/src/templates/nodes/custom/asset/image/view_embed.jade index 8dba9977..a9d77dbc 100644 --- a/src/templates/nodes/custom/asset/image/view_embed.jade +++ b/src/templates/nodes/custom/asset/image/view_embed.jade @@ -102,7 +102,8 @@ | {% if (node._created | pretty_date) != (node._updated | pretty_date) %} span(title="Updated {{ node._updated }}") (updated {{ node._updated | pretty_date }}) | {% endif %} - #comments-container + + #comments-embed #comments-list-items-loading i.pi-spin diff --git a/src/templates/nodes/custom/asset/video/view_embed.jade b/src/templates/nodes/custom/asset/video/view_embed.jade index d18bb1c1..6c280f7e 100644 --- a/src/templates/nodes/custom/asset/video/view_embed.jade +++ b/src/templates/nodes/custom/asset/video/view_embed.jade @@ -114,7 +114,7 @@ | {% endif %} - #comments-container + #comments-embed #comments-list-items-loading i.pi-spin diff --git a/src/templates/nodes/custom/asset/view_theatre_embed.jade b/src/templates/nodes/custom/asset/view_theatre_embed.jade index b9487408..7752faaa 100644 --- a/src/templates/nodes/custom/asset/view_theatre_embed.jade +++ b/src/templates/nodes/custom/asset/view_theatre_embed.jade @@ -40,7 +40,7 @@ a(href="{{ node.short_link }}") {{ node.short_link }} | {% endif %} - #comments-container + #comments-embed #comments-list-items-loading i.pi-spin diff --git a/src/templates/nodes/custom/post/view_embed.jade b/src/templates/nodes/custom/post/view_embed.jade index be58eea5..e4c014ef 100644 --- a/src/templates/nodes/custom/post/view_embed.jade +++ b/src/templates/nodes/custom/post/view_embed.jade @@ -75,7 +75,7 @@ meta(name="twitter:description", content="{{ node.properties.content }}") | {{ node.properties.content }} - #comments-container + #comments-embed #comments-list-items-loading i.pi-spin