diff --git a/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.css b/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.css index 84fc283e01a..52b269a2f28 100644 --- a/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.css +++ b/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.css @@ -10,7 +10,7 @@ text-align: center; z-index: 7; } -.disqussion a { +.disqussion>a { opacity: 0; display: block; overflow: hidden; @@ -30,13 +30,13 @@ -o-transition: all 0.5s; transition: all 0.5s; } -.disqussion a.has-comments { +.disqussion>a.has-comments { opacity: .6; } -.disqussion-contain:hover .disqussion a { +.disqussion-contain:hover .disqussion>a { opacity: 1; } -.disqussion a:after { +.disqussion>a:after { border-left: 7px solid transparent; border-top: 7px solid #bbbbbb; left: 19px; @@ -51,11 +51,11 @@ -o-transition: all 0.5s; transition: all 0.5s; } -.disqussion:hover a, .disqussion.hovered a { +.disqussion:hover>a, .disqussion.hovered>a { opacity: 1; background: #57AD68; } -.disqussion:hover a:after, .disqussion.hovered a:after { +.disqussion:hover>a:after, .disqussion.hovered>a:after { border-top-color: #57AD68; } diff --git a/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js b/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js index 62c651bdee3..c489efe48d7 100644 --- a/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js +++ b/addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js @@ -10,6 +10,7 @@ var disqus_identifier; identifier: 'name', position: 'right', post_id: $('#blog_post_name').attr('data-oe-id'), + document_user : false, }; // Overwrite default options with user provided ones. @@ -121,13 +122,16 @@ var disqus_identifier; $('a[data-disqus-identifier="'+disqus_identifier+'"]').popover('destroy') disqus_identifier = identifier; var elt = $('a[data-disqus-identifier="'+identifier+'"]'); + var cls = settings.document_user ? '' : 'hidden'; + var login_cls = settings.document_user ? 'hidden' : ''; elt.append('\
') var comment = ''; _.each(data, function(res){ @@ -149,9 +153,7 @@ var disqus_identifier; html:true, content:function(){ return $($(this).data('contentwrapper')).html(); } - }).parent().delegate('button#comment_post', 'click', function() { - disqussionPostHandler(); - });; + }).parent().delegate('button#comment_post').on('click',disqussionPostHandler); }; var hideDisqussion = function() { diff --git a/addons/website_blog/static/src/js/website_blog.js b/addons/website_blog/static/src/js/website_blog.js index 0bbf3b75b0e..f41b26ab8b3 100644 --- a/addons/website_blog/static/src/js/website_blog.js +++ b/addons/website_blog/static/src/js/website_blog.js @@ -1,9 +1,7 @@ $(document).ready(function() { - - $("#blog_content p").inlineDisqussions(); //Allow inline comments on blog post + $("#blog_content p").inlineDisqussions({'document_user': $('#is_document_user').length}); //Allow inline comments on blog post $('.cover_footer').on('click',page_transist); - $('a[href^="#"]').on('click', animate); - + $('a[href^="#blog_content"]').on('click', animate); function page_transist(event) { event.preventDefault(); var translationValue = $('.cover_footer').get(0).getBoundingClientRect().top; @@ -34,7 +32,7 @@ $(document).ready(function() { } //bind again it takes control from now on, until page relaod. $(document).find('.cover_footer').on('click',page_transist); - $(document).find('a[href^="#"]').on('click', animate); + $(document).find('a[href^="#blog_content"]').on('click', animate); $(document).find("#blog_content p").inlineDisqussions(); }); } diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml index fc6dd6a3231..bcff0c92084 100644 --- a/addons/website_blog/views/website_blog_templates.xml +++ b/addons/website_blog/views/website_blog_templates.xml @@ -7,8 +7,6 @@ - - @@ -259,6 +257,7 @@