pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]right to left our blog

Browse Source 
bzr revid: mba@tinyerp.com-20140213133359-5bt7zhlszfqo3pw7
This commit is contained in:
Mahendra Barad (OpenERP)
2014-02-13 19:03:59 +05:30
parent f5d51081ce
commit 1235e99646
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js
+2 -3
View File
@@ -18,7 +18,7 @@ var disqus_identifier;
// Append #disqus_thread to body if it doesn't exist yet.
if ($('#disqussions_wrapper').length === 0) {
$('<div id="disqussions_wrapper"></div>').appendTo($('body'));
$('<div id="disqussions_wrapper"></div>').appendTo($('#blog_content'));
}
// Attach a discussion to each paragraph.
@@ -68,7 +68,7 @@ var disqus_identifier;
.parent()
.appendTo('#disqussions_wrapper');
a.css({
'top': node.offset().top + 30,
'top': node.offset().top,
'left': settings.position == 'right' ? node.offset().left + node.outerWidth() : node.offset().left - a.outerWidth()
});
@@ -91,7 +91,6 @@ var disqus_identifier;
};
var disqussionPostHandler = function() {
console.log('identifier',disqus_identifier)
openerp.jsonRpc("/blogpost/post_discussion", 'call', {
'blog_post_id': settings.post_id,
'discussion': disqus_identifier,
addons/website_blog/static/src/js/website_blog.js
+1 -1
View File
@@ -33,7 +33,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^="#blog_content"]').on('click', animate);
$(document).find("#blog_content p").inlineDisqussions();
$(document).find("#blog_content p").inlineDisqussions({'document_user': $('#is_document_user').length});
});
}
});
addons/website_blog/views/website_blog_templates.xml
+27 -20
View File
@@ -395,12 +395,10 @@
inherit_option_id="website_blog.index">
<xpath expr="//div[@id='wrap']" position="replace">
<div class="container mt16 js_website_blog">
<div class="row">
<div class="col-lg-8 col-sm-8" id="blog_left_column">
<t t-raw="0"/>
</div>
<div class="col-lg-3 col-lg-offset-1 col-sm-4" id="blog_right_column"/>
<div class="col-lg-7 col-sm-7" id="blog_left_column">
<t t-raw="0"/>
</div>
<div class="col-lg-3 col-sm-3 pull-right" id="blog_right_column"/>
</div>
</xpath>
</template>
@@ -484,21 +482,30 @@
</template>
<!-- Option: Right Column: blogs -->
<template id="opt_blog_rc_blogs" name="Our Blogs" priority="6"
inherit_option_id="website_blog.index_right">
<xpath expr="//div[@id='blog_right_column']" position="inside">
<section class="mt32 mb32">
<h4>Our Blogs</h4>
<ul class="nav nav-pills nav-stacked">
<t t-foreach="blogs" t-as="nav_blog">
<li t-att-class="nav_blog.id == blog.id and 'active' or ''">
<a t-attf-href="/blog/#{ slug(nav_blog) }">
<span t-field="nav_blog.name"/>
</a>
</li>
</t>
</ul>
</section>
<template id="opt_blog_rc_blogs" name="Our Blogs"
inherit_option_id="website_blog.index">
<xpath expr="//div[@id='wrap']" position="replace">
<div class="mt16 js_website_blog">
<div class="row">
<div class="col-lg-2 col-sm-2" id="blog_left_column">
<section class="mt32 mb32 pull-right">
<h4>Our Blogs</h4>
<ul class="nav nav-pills nav-stacked">
<t t-foreach="blogs" t-as="nav_blog">
<li t-att-class="nav_blog.id == blog.id and 'active' or ''">
<a t-attf-href="/blog/#{ slug(nav_blog) }">
<span t-field="nav_blog.name"/>
</a>
</li>
</t>
</ul>
</section>
</div>
<div class="col-lg-10 col-sm-10" id="wrap">
<t t-raw="0"/>
</div>
</div>
</div>
</xpath>
</template>