[FIX] : Header should have full height background and revert unwanted chages

bzr revid: aja@tinyerp.com-20140131113325-ry2fi5poilcx0498

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 8873887..2b004eb 100644 (file)
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -280,3 +280,11 @@ class WebsiteBlog(http.Controller):
         }
         return [values]
 
+    @http.route('/blog_post/change_layout', type='json', auth="public", website=True)
+    def check_layout(self, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        view_obj = request.registry.get('ir.ui.view')
+        view_data = view_obj.search_read(cr, SUPERUSER_ID, [('name','=','Blog Cover')],['inherit_id', 'inherit_option_id'])[0]
+        if view_data['inherit_id']:
+            return [True]
+        return []

diff --git a/addons/website_blog/static/lib/page-transitions/css/styles.css b/addons/website_blog/static/lib/page-transitions/css/styles.css
index 1ccf0e9..72b79a2 100644 (file)
--- a/addons/website_blog/static/lib/page-transitions/css/styles.css
+++ b/addons/website_blog/static/lib/page-transitions/css/styles.css
@@ -1,11 +1,11 @@
 /* line 2, ../scss/_extensions.scss */
-.container, body article.page .content {
+.container, main div.page .content {
   max-width: 100%;
   margin: 0 auto;
 }
 
 /* line 7, ../scss/_extensions.scss */
-.stretchy-bg, body article.page .big-image {
+.stretchy-bg, main div.page .big-image {
   background-position: center center;
   background-repeat: none;
   -webkit-background-size: cover;
@@ -13,12 +13,15 @@
   -o-background-size: cover;
   background-size: cover !important;
 }
+main div.page.next .big-image{
+  height : 50vh;
+}
 
-.big-image, body article.page .big-image {
-  height: 300px;
+main div.page.current .big-image {
+  height: 100vh;
 }
-@media only screen and (min-width: 500px) {
-  .big-image, body article.page .big-image {
+@media (min-width: 500px) {
+  .big-image, main div.page .big-image {
     height: 420px;
   }
 }
@@ -40,13 +43,13 @@
 }
 
 /* line 18, ../scss/_mixins.scss */
-body {
+main {
   scrollbar-face-color: #666666;
   scrollbar-track-color: rgba(255, 255, 255, 0.1);
 }
 
 /* line 11, ../scss/styles.scss */
-body {
+main {
   color: #555;
   padding: 20px;
   padding: 0;
@@ -57,42 +60,44 @@ body {
   line-height: 1.8em;
   /* Responsive typography, yay! */
 }
-body h1, body h2, body h3, body h4, body h5, body h6 {
+main h1, main h2, main h3, main h4, main h5, main h6 {
   color: #333;
 }
 /* line 36, ../scss/styles.scss */
-body article.page {
+main div.page {
   -webkit-transform-origin: bottom center;
   /* Class applied when when page fades away. */
   /* The large image that accompanies every post. */
   /* The content. */
 }
 /* line 39, ../scss/styles.scss */
-body article.page.hidden {
+main div.page.hidden {
   display: none;
 }
 /* line 42, ../scss/styles.scss */
-body article.page.next .big-image, body article.page.next .big-image {
+main div.page.next .big-image, main div.page.next .big-image {
   cursor: pointer;
 }
 /* line 43, ../scss/styles.scss */
-body article.page.next .big-image .inner, body article.page.next .big-image .inner {
+main div.page.next .big-image .inner, main div.page.next .big-image .inner {
   opacity: 1;
 }
-body article.page.current .big-image .inner, body article.page.current .big-image .inner {
+main div.page.current .big-image .inner, main div.page.current .big-image .inner {
   opacity: 1;
 }
-body article.page.current .big-image .inner .fader .text .goto-next, body article.page.current .big-image .inner .fader .text .goto-next {
+main div.page.current .big-image .inner .fader .text .goto-next, main div.page.current .big-image .inner .fader .text .goto-next {
+  opacity: 0;
+}
+main div.page.next .post-meta {
   opacity: 0;
 }
-
 
 /* line 47, ../scss/styles.scss */
-body article.page.content-hidden .content {
+main div.page.content-hidden .content {
   display: none;
 }
 /* line 51, ../scss/styles.scss */
-body article.page.fade-up-out {
+main div.page.fade-up-out {
   opacity: 0;
   -webkit-transform: scale(0.8) translate3d(0, -10%, 0);
   -moz-transform: scale(0.8) translate3d(0, -10%, 0);
@@ -105,14 +110,14 @@ body article.page.fade-up-out {
   transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1);
 }
 /* line 57, ../scss/styles.scss */
-body article.page.easing-upward {
+main div.page.easing-upward {
   -webkit-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1);
   -moz-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1);
   -o-transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1);
   transition: all 450ms cubic-bezier(0.165, 0.84, 0.44, 1);
 }
 /* line 69, ../scss/styles.scss */
-body article.page .big-image .inner, body article.page .big-image .inner {
+main div.page .big-image .inner, main div.page .big-image .inner {
   position: relative;
   width: 100%;
   height: 100%;
@@ -125,13 +130,13 @@ body article.page .big-image .inner, body article.page .big-image .inner {
   transition: all 0.1s ease;
 }
 /* line 78, ../scss/styles.scss */
-body article.page .big-image .inner .fader, body article.page .big-image .inner .fader {
+main div.page .big-image .inner .fader, main div.page .big-image .inner .fader {
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.3);
 }
 /* line 83, ../scss/styles.scss */
-body article.page .big-image .inner .fader .text {
+main div.page .big-image .inner .fader .text {
   position: absolute;
   top: 50%;
   left: 50%;
@@ -143,21 +148,21 @@ body article.page .big-image .inner .fader .text {
   transform: translateX(-50%) translateY(-50%);
 }
 /* line 89, ../scss/styles.scss */
-body article.page .big-image .inner .fader .text a, body article.page .big-image .inner .fader .text h1, body article.page .big-image .inner .fader .text h2 {
+main div.page .big-image .inner .fader .text a, main div.page .big-image .inner .fader .text h1, main div.page .big-image .inner .fader .text h2 {
   color: white;
 }
 body article.page .big-image .inner .fader .text h4 {
   color: white;
 }
 /* line 91, ../scss/styles.scss */
-body article.page .big-image .inner .fader .text a {
+main div.page .big-image .inner .fader .text a {
   color: white;
   border-bottom: 1px solid white;
   text-decoration: none;
   line-height: 1.5em;
 }
 /* line 99, ../scss/styles.scss */
-body article.page .big-image .inner .fader .text h1 {
+main div.page .big-image .inner .fader .text h1 {
   margin: 0;
   margin-top: 0.1em;
   padding-top: 0em;
@@ -166,7 +171,7 @@ body article.page .big-image .inner .fader .text h1 {
   line-height: 1.1em;
 }
 /* line 105, ../scss/styles.scss */
-body article.page .big-image .inner .fader .text h2 {
+main div.page .big-image .inner .fader .text h2 {
   margin: 0;
   margin-top: 0.2em;
   padding-top: 0em;
@@ -175,11 +180,11 @@ body article.page .big-image .inner .fader .text h2 {
   line-height: 1.2em;
 }
 /* line 119, ../scss/styles.scss */
-body article.page .content {
+main div.page .content {
   padding: 0 3em;
 }
 /* line 123, ../scss/styles.scss */
-body article.page .content h3 {
+main div.page .content h3 {
   color: #999;
   margin-top: 3em;
   padding-top: 0em;
@@ -188,7 +193,7 @@ body article.page .content h3 {
   line-height: 1.5em;
 }
 /* line 131, ../scss/styles.scss */
-body article.page .content h1 {
+main div.page .content h1 {
   margin-top: 0em;
   padding-top: 0em;
   padding-bottom: 0em;
@@ -196,6 +201,6 @@ body article.page .content h1 {
   line-height: 1.08em;
 }
 /* line 140, ../scss/styles.scss */
-body article.page .content p:last-child {
+main div.page .content p:last-child {
   margin-bottom: 3em;
 }

diff --git a/addons/website_blog/static/lib/page-transitions/js/app.js b/addons/website_blog/static/lib/page-transitions/js/app.js
index 5d4653b..09c8e95 100644 (file)
--- a/addons/website_blog/static/lib/page-transitions/js/app.js
+++ b/addons/website_blog/static/lib/page-transitions/js/app.js
@@ -22,6 +22,7 @@ var ArticleAnimator = ArticleAnimator || {
 ArticleAnimator.load = function(){
   this.currentPostIndex = getURLIndex();
   this.makeSelections();
+  $body.empty();
   $body.append( this.$current )
   $body.append( this.$next )
 
@@ -209,10 +210,15 @@ function getURLIndex(){
 ************************************************************************/ 
 $(document).ready(function(){
   /* A couple of selections. */
-  $body         = $('main');
+  $body         = $('#wrap');
   $window       = $(window);
   $html         = $(document.documentElement);
 
   /* Let's get it started. */
-    ArticleAnimator.load();
+    openerp.jsonRpc("/blog_post/change_layout", 'call', {})
+    .then(function (data) {
+        if(!data[0])
+            return;
+        ArticleAnimator.load();
+    });
 })

diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index a90c06e..a247e7d 100644 (file)
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -135,69 +135,124 @@
 </template>
 
 <!-- Options: Blog Post Summary: hide author -->
-<!--<template id="opt_blog_post_short_author" name="Author"-->
-<!--        inherit_option_id="website_blog.blog_post_short">-->
-<!--    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">-->
-<!--        <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_post_short_author" name="Author"
+        inherit_option_id="website_blog.blog_post_short">
+    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">
+        <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
+    </xpath>
+</template>
 
 <!-- Option: Blog Post Summary: show tags -->
-<!--<template id="opt_blog_post_short_tags" name="Tags"-->
-<!--        inherit_option_id="website_blog.blog_post_short" inherit_id="website_blog.blog_post_short">-->
-<!--    <xpath expr="//p[@name='blog_post_data']" position="after">-->
-<!--        <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">-->
-<!--            <span class="fa fa-tags"/>-->
-<!--            <t t-foreach="blog_post.tag_ids" t-as="tag">-->
-<!--                <a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;-->
-<!--            </t>-->
-<!--        </p>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_post_short_tags" name="Tags"
+        inherit_option_id="website_blog.blog_post_short" inherit_id="website_blog.blog_post_short">
+    <xpath expr="//p[@name='blog_post_data']" position="after">
+        <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
+            <span class="fa fa-tags"/>
+            <t t-foreach="blog_post.tag_ids" t-as="tag">
+                <a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
+            </t>
+        </p>
+    </xpath>
+</template>
+
+
+<template id="blog_post_cover" name="Blog Cover" inherit_option_id="website_blog.blog_post_complete">
+        <xpath expr="//div[@id='title']" position="replace">
+            <div class='page hidden' id="title">
+                <div class='big-image'>
+                    <div class='inner'>
+                        <div class='fader'>
+                            <div class='text'>
+                                <a class='goto-next'>Read Next</a>
+                                <h1 class='title'></h1>
+                                <h2 class='description'></h2>
+                                <h4 class='byline'>
+                                    <span class="author_image"/>
+                                    <span class='author'></span>
+                                </h4>
+                                <p class="post-meta text-muted text-center" name="blog_post_data"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="content">
+                    <div class='text'></div>
+                </div>
+            </div>
+      </xpath>
+</template>
 
+<!-- Blog Post Complete -->
 <template id="blog_post_complete" name="Blog Post">
     <t t-call="website_blog.index">
-        <article class='page hidden'>
-            <div class='big-image'>
-                <div class='inner'>
-                  <div class='fader'>
-                    <div class='text'>
-                      <a class='goto-next'>Read Next</a>
-                      <h1 class='title'></h1>
-                      <h2 class='description'></h2>
-                      <h4 class='byline'>
-                        <span class='author_image'></span><span class='author'></span>
-                    </h4>
+
+    <div class="container" id="title">
+        <h1 class="text-center" t-field="blog_post.name"/>
+        <p class="post-meta text-muted text-center" name="blog_post_data">
+            <span class="fa fa-calendar oe_date"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
+            <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o"> With
+                <a t-attf-href="#comments">
+                    <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
+                    <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
+                </a>
+            </span>
+        </p>
+    </div>
+    <div class="container">
+        <t t-call="website.publish_management">
+            <t t-set="object" t-value="blog_post"/>
+            <t t-set="publish_edit" t-value="True"/>
+            <li>
+                <form class="duplicate hidden" action="/blogpost/duplicate">
+                    <input name="blog_post_id" t-att-value="blog_post.id"/>
+                </form>
+                <a href="#" class="duplicate" onclick="$(this).prev('form').submit()">Duplicate</a>
+            </li>
+        </t>
+    </div>
+
+    <div t-field="blog_post.content"/>
+
+    <section id="comments" class="container">
+        <ul class="media-list" id="comments-list">
+            <li t-foreach="blog_post.website_message_ids" t-as="message" class="media">
+                <div class="media-body">
+                    <img class="media-object pull-left" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(message.author_id.id)" style="width: 50px; margin-right: 10px;"/>
+                    <div class="media-body">
+                        <t t-call="website.publish_short">
+                            <t t-set="object" t-value="message"/>
+                        </t>
+                        <h5 class="media-heading">
+                            <span t-field="message.author_id"/> <small>on <span t-field="message.date"/></small>
+                        </h5>
+                        <div t-field="message.body"/>
                     </div>
-                  </div>
                 </div>
-            </div>
-            <div class='content'>
-              <div class='text'></div>
-            </div>
-      </article>
+            </li>
+        </ul>
+    </section>
     </t>
 </template>
 
-<!--<template id="blog_breadcrumb" name="Breadcrumb"-->
-<!--        inherit_option_id="website_blog.blog_post_complete">-->
-<!--    <xpath expr="//div[@id='title']" position="before">-->
-<!--        <div class="container">-->
-<!--          <div class="row">-->
-<!--            <div class="col-sm-9">-->
-<!--                <ol class="breadcrumb">-->
-<!--                    <li><a t-attf-href="/blog/#{ slug(blog) }"><span t-field="blog.name"/></a></li>-->
-<!--                    <li t-if="tag"><a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }"><span t-field="tag.name"/></a></li>-->
-<!--                    <li t-if="tag and date"><a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }/date/#{ date }" t-esc="date_name"/></li>-->
-<!--                    <li t-if="not tag and date"><a t-attf-href="/blog/#{ slug(blog) }/date/#{ date }" t-esc="date_name"/></li>-->
-<!--                    <li class="active"><span t-field="blog_post.name"/></li>-->
-<!--                </ol>-->
-<!--            </div><div class="col-sm-3">-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="blog_breadcrumb" name="Breadcrumb"
+        inherit_option_id="website_blog.blog_post_complete">
+    <xpath expr="//div[@id='title']" position="before">
+        <div class="container">
+          <div class="row">
+            <div class="col-sm-9">
+                <ol class="breadcrumb">
+                    <li><a t-attf-href="/blog/#{ slug(blog) }"><span t-field="blog.name"/></a></li>
+                    <li t-if="tag"><a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }"><span t-field="tag.name"/></a></li>
+                    <li t-if="tag and date"><a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }/date/#{ date }" t-esc="date_name"/></li>
+                    <li t-if="not tag and date"><a t-attf-href="/blog/#{ slug(blog) }/date/#{ date }" t-esc="date_name"/></li>
+                    <li class="active"><span t-field="blog_post.name"/></li>
+                </ol>
+            </div><div class="col-sm-3">
+            </div>
+          </div>
+        </div>
+    </xpath>
+</template>
 
 <!--<template id="blog_background_cover" name="Blog Cover"-->
 <!--        inherit_option_id="website_blog.blog_post_complete">-->
@@ -256,52 +311,52 @@
 <!--</template>-->
 
 <!-- Options: Blog Post: user can reply -->
-<!--<template id="opt_blog_post_complete_comment" name="Allow Comments"-->
-<!--        inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete"-->
-<!--        groups="website_mail.group_comment">-->
-<!--    <xpath expr="//ul[@id='comments-list']" position="before">-->
-<!--        <section class="mb32 css_editable_mode_hidden">-->
-<!--            <form id="comment" t-attf-action="/blogpost/comment" method="POST">-->
-<!--                <input name="blog_post_id" t-att-value="blog_post.id" type="hidden"/>-->
-<!--                <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>-->
-<!--                <div class="pull-left mb32" style="width: 75%%">-->
-<!--                    <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>-->
-<!--                    <button type="submit" class="btn btn-primary mt8">Post</button>-->
-<!--                </div>-->
-<!--            </form>-->
-<!--        </section>-->
-<!--        <div class="clearfix"/>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_post_complete_comment" name="Allow Comments"
+        inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete"
+        groups="website_mail.group_comment">
+    <xpath expr="//ul[@id='comments-list']" position="before">
+        <section class="mb32 css_editable_mode_hidden">
+            <form id="comment" t-attf-action="/blogpost/comment" method="POST">
+                <input name="blog_post_id" t-att-value="blog_post.id" type="hidden"/>
+                <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
+                <div class="pull-left mb32" style="width: 75%%">
+                    <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
+                    <button type="submit" class="btn btn-primary mt8">Post</button>
+                </div>
+            </form>
+        </section>
+        <div class="clearfix"/>
+    </xpath>
+</template>
 
 <!-- Options: Blog Post: hide author -->
-<!--<template id="opt_blog_post_complete_author" name="Authors"-->
-<!--        inherit_option_id="website_blog.blog_post_complete">-->
-<!--    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">-->
-<!--        <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_post_complete_author" name="Authors"
+        inherit_option_id="website_blog.blog_post_complete">
+    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">
+        <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
+    </xpath>
+</template>
 
 <!-- Options: Blog Post: show blog -->
-<!--<template id="opt_blog_post_complete_blog" name="Blog"-->
-<!--        inherit_option_id="website_blog.blog_post_complete">-->
-<!--    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">-->
-<!--        <span class="fa fa-folder-open"> In <span t-field="blog_post.blog_id"/> &amp;nbsp;</span>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_post_complete_blog" name="Blog"
+        inherit_option_id="website_blog.blog_post_complete">
+    <xpath expr="//span[@class='fa fa-calendar oe_date']" position="after">
+        <span class="fa fa-folder-open"> In <span t-field="blog_post.blog_id"/> &amp;nbsp;</span>
+    </xpath>
+</template>
 
 <!-- Options: Blog Post: show tags -->
-<!--<template id="opt_blog_post_complete_tags" name="Tags"-->
-<!--        inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">-->
-<!--    <xpath expr="//p[@name='blog_post_data']" position="after">-->
-<!--        <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">-->
-<!--            <span class="fa fa-tags"/>-->
-<!--            <t t-foreach="blog_post.tag_ids" t-as="tag">-->
-<!--                <a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;-->
-<!--            </t>-->
-<!--        </p>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_post_complete_tags" name="Tags"
+        inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">
+    <xpath expr="//p[@name='blog_post_data']" position="after">
+        <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
+            <span class="fa fa-tags"/>
+            <t t-foreach="blog_post.tag_ids" t-as="tag">
+                <a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
+            </t>
+        </p>
+    </xpath>
+</template>
 
 <!-- Page -->
 <template id="index" name="Blog Navigation">
@@ -318,116 +373,116 @@
 
 <!-- Option: Right Column for extra info -->
 
-<!--<template id="index_right" name="Right Column"-->
-<!--        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>-->
-<!--        </div>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="index_right" name="Right Column"
+        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>
+        </div>
+    </xpath>
+</template>
 
 <!-- Option: Right Column: tags -->
-<!--<template id="opt_blog_rc_tags" name="Tags"-->
-<!--        inherit_option_id="website_blog.index_right">-->
-<!--    <xpath expr="//div[@id='blog_right_column']" position="inside">-->
-<!--        <section class="mt32">-->
-<!--        <h4>Tags</h4>-->
-<!--        <ul class="nav nav-pills nav-stacked">-->
-<!--            <t t-foreach="tags" t-as="tag_id">-->
-<!--            <li t-att-class="tag and tag_id.id == tag.id and 'active' or None" style="display: inline-block;">-->
-<!--                <a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag_id) }"><span t-field="tag_id.name"/></a>-->
-<!--            </li>-->
-<!--            </t>-->
-<!--        </ul>-->
-<!--        </section>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_rc_tags" name="Tags"
+        inherit_option_id="website_blog.index_right">
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+        <h4>Tags</h4>
+        <ul class="nav nav-pills nav-stacked">
+            <t t-foreach="tags" t-as="tag_id">
+            <li t-att-class="tag and tag_id.id == tag.id and 'active' or None" style="display: inline-block;">
+                <a t-attf-href="/blog/#{ slug(blog) }/tag/#{ slug(tag_id) }"><span t-field="tag_id.name"/></a>
+            </li>
+            </t>
+        </ul>
+        </section>
+    </xpath>
+</template>
 
 <!-- Option: Right Column: archives -->
-<!--<template id="opt_blog_rc_history" name="Archives"-->
-<!--        inherit_option_id="website_blog.index_right">-->
-<!--    <xpath expr="//div[@id='blog_right_column']" position="inside">-->
-<!--        <section class="mt32">-->
-<!--        <h4>Archives</h4>-->
-<!--        <ul class="nav nav-pills nav-stacked">-->
-<!--            <t t-foreach="nav_list" t-as="months">-->
-<!--            <li t-att-class="months['date'] == date and 'active' or None">-->
-<!--                <a t-ignore="True" t-attf-href="/blog/#{ slug(blog) }/#{ tag and 'tag/%s/' % slug(tag) or '' }date/#{ months['date'] }"><t t-esc="months['create_date']"/><span class="pull-right badge" t-esc="months['create_date_count']"/></a>-->
-<!--            </li>-->
-<!--            </t>-->
-<!--        </ul>-->
-<!--        </section>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_rc_history" name="Archives"
+        inherit_option_id="website_blog.index_right">
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+        <h4>Archives</h4>
+        <ul class="nav nav-pills nav-stacked">
+            <t t-foreach="nav_list" t-as="months">
+            <li t-att-class="months['date'] == date and 'active' or None">
+                <a t-ignore="True" t-attf-href="/blog/#{ slug(blog) }/#{ tag and 'tag/%s/' % slug(tag) or '' }date/#{ months['date'] }"><t t-esc="months['create_date']"/><span class="pull-right badge" t-esc="months['create_date_count']"/></a>
+            </li>
+            </t>
+        </ul>
+        </section>
+    </xpath>
+</template>
 
 <!-- Option: Right Column: about us -->
-<!--<template id="opt_blog_rc_about_us" name="About Us" priority="2"-->
-<!--        inherit_option_id="website_blog.index_right">-->
-<!--    <xpath expr="//div[@id='blog_right_column']" position="inside">-->
-<!--        <section class="mt32">-->
-<!--        <h4>About us</h4>-->
-<!--        <p>-->
-<!--            Write a small text here for when <b>new visitors</b> find your website-->
-<!--            through your <b>blog entries</b>, referenced in Google.-->
-<!--        </p>-->
-<!--        <div>-->
-<!--            <a href="/page/website.contactus"><button class="btn btn-primary">Contact us</button></a>-->
-<!--        </div>-->
-<!--        </section>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_rc_about_us" name="About Us" priority="2"
+        inherit_option_id="website_blog.index_right">
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+        <h4>About us</h4>
+        <p>
+            Write a small text here for when <b>new visitors</b> find your website
+            through your <b>blog entries</b>, referenced in Google.
+        </p>
+        <div>
+            <a href="/page/website.contactus"><button class="btn btn-primary">Contact us</button></a>
+        </div>
+        </section>
+    </xpath>
+</template>
 
 <!-- Option: Right Column: follow us -->
-<!--<template id="opt_blog_rc_follow_us" name="Follow us" priority="4"-->
-<!--        inherit_option_id="website_blog.index_right">-->
-<!--    <xpath expr="//div[@id='blog_right_column']" position="inside">-->
-<!--        <section class="mt32">-->
-<!--            <h4>Follow us<small t-if="blog">: <t t-esc="blog.name"/></small></h4>-->
-<!--            <t t-if="blog">-->
-<!--                <t t-call="website_mail.follow">-->
-<!--                    <t t-set="email" t-value="user_id.email"/>-->
-<!--                    <t t-set="object" t-value="blog"/>-->
-<!--                </t>-->
-<!--            </t>-->
-<!--            <p class="text-muted mb0 mt16">-->
-<!--                Participate on our social stream.-->
-<!--            </p>-->
-<!--            <h2 class="mt4">-->
-<!--                <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>-->
-<!--                <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>-->
-<!--                <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>-->
-<!--                <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>-->
-<!--                <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>-->
-<!--                <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>-->
-<!--            </h2>-->
-<!--        </section>-->
-<!--    </xpath>-->
-<!--</template>-->
+<template id="opt_blog_rc_follow_us" name="Follow us" priority="4"
+        inherit_option_id="website_blog.index_right">
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+            <h4>Follow us<small t-if="blog">: <t t-esc="blog.name"/></small></h4>
+            <t t-if="blog">
+                <t t-call="website_mail.follow">
+                    <t t-set="email" t-value="user_id.email"/>
+                    <t t-set="object" t-value="blog"/>
+                </t>
+            </t>
+            <p class="text-muted mb0 mt16">
+                Participate on our social stream.
+            </p>
+            <h2 class="mt4">
+                <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
+                <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
+                <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
+            </h2>
+        </section>
+    </xpath>
+</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>-->
-<!--    </xpath>-->
-<!--</template>-->
+<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>
+    </xpath>
+</template>
 
 </data>
 </openerp>