[MERGE] : merge with lp:~openerp-dev/openobject-addons/trunk-website-al-blog-imp-aja

bzr revid: aja@tinyerp.com-20140207061928-2s378cq1okd0fs2v

diff --cc addons/website/static/src/img/CMS_WMS_screens.jpg
index 08fc4aa,08fc4aa..0000000
deleted file mode 100644,100644
Binary files differ

diff --cc addons/website/static/src/img/OpemERP_board.jpg
index 05a854f,05a854f..0000000
deleted file mode 100644,100644
Binary files differ

diff --cc addons/website/static/src/img/mail-sc-00.png
index dbb14b4,dbb14b4..0000000
deleted file mode 100644,100644
Binary files differ

diff --cc addons/website/static/src/img/mail-sc-03.png
index 3011ef1,3011ef1..0000000
deleted file mode 100644,100644
Binary files differ

diff --cc addons/website/static/src/img/turnover_updated.png
index 8edbb5a,8edbb5a..0000000
deleted file mode 100644,100644
Binary files differ

diff --cc addons/website_blog/controllers/main.py
Simple merge

diff --cc addons/website_blog/data/website_blog_demo.xml
index edb63c2,edb63c2..2d21e08
--- 1/addons/website_blog/data/website_blog_demo.xml
--- 2/addons/website_blog/data/website_blog_demo.xml
+++ b/addons/website_blog/data/website_blog_demo.xml
@@@ -75,7 -75,7 +75,7 @@@
                          easily mark messages for future actions. Every inbox 
                          should be empty after having been processed; no more 
                          overload of information.
--                        <img class="img-responsive shadow" src="/website/static/src/img/mail-sc-00.png"/>
++                        <img class="img-responsive shadow" src="/website_blog/static/src/img/mail-sc-00.png"/>
                      </li><li>
                          Keep control of what you want to receive or don't want 
                          to receive. People should never receive spam. You 
@@@ -86,7 -86,7 +86,7 @@@
                          does not require you to click on every mail to read a 
                          thread. Reading a full thread, replying, attaching 
                          documents is super fast.
--                        <img class="img-responsive shadow" src="/website/static/src/img/mail-sc-03.png"/>
++                        <img class="img-responsive shadow" src="/website_blog/static/src/img/mail-sc-03.png"/>
                      </li><li>
                          <strong>A mix of push & pull:</strong> Today, people are victims 
                          of what others decide to push to them. OpenERP differentiates:
@@@ -137,7 -137,7 +137,7 @@@
              <div class="container">
                  <div class="row">
                      <div class="col-md-12">
--                        <img class="img-responsive" src="/website/static/src/img/CMS_WMS_screens.jpg" style="margin: 0 auto;"/>
++                        <img class="img-responsive" src="/website_blog/static/src/img/CMS_WMS_screens.jpg" style="margin: 0 auto;"/>
                      </div>
                      <div class="col-md-6 col-md-offset-3 mb16 mt16">
                          <p class="text-center">
@@@ -367,7 -367,7 +367,7 @@@
                  have a salary at that time.</p> 
                  <p>We changed the deal and I got the 3 million EUR. It allowed 
                  me to recruit a rocking management team.</p>
--                <img class="img-responsive shadow" src="/website/static/src/img/OpemERP_board.jpg"/>
++                <img class="img-responsive shadow" src="/website_blog/static/src/img/OpemERP_board.jpg"/>
                  <h3 class="mt16">Being a mature company<h3>
                  <p>With this money in our bank account, we boosted two 
                  departments: R&D and Sales. We burned two million EUR in 18 months, 
@@@ -392,7 -392,7 +392,7 @@@
                  over the span of roughly two years! This is when we understood 
                  that OpenERP is a marathon, not a sprint. Only 100% growth a 
                  year is ok... if you can keep the rhythm for several years.</p> 
--                <img class="img-responsive shadow" src="/website/static/src/img/turnover_updated.png"/>
++                <img class="img-responsive shadow" src="/website_blog/static/src/img/turnover_updated.png"/>
                  <p class="text-center" section_inner="1">
                  <strong>OpenERP Monthly Turnover</strong></p>
                  <p>As usual, I should have listened to my wife. She is way more 

diff --cc addons/website_blog/static/src/img/CMS_WMS_screens.jpg
index 0000000,0000000..08fc4aa
new file mode 100644 (file)
Binary files differ

diff --cc addons/website_blog/static/src/img/OpemERP_board.jpg
index 0000000,0000000..05a854f
new file mode 100644 (file)
Binary files differ

diff --cc addons/website_blog/static/src/img/mail-sc-00.png
index 0000000,0000000..dbb14b4
new file mode 100644 (file)
Binary files differ

diff --cc addons/website_blog/static/src/img/mail-sc-03.png
index 0000000,0000000..3011ef1
new file mode 100644 (file)
Binary files differ

diff --cc addons/website_blog/static/src/img/turnover_updated.png
index 0000000,0000000..8edbb5a
new file mode 100644 (file)
Binary files differ

diff --cc addons/website_blog/views/website_blog_templates.xml
index 4bfcc35,bb265af..90578a8
--- 1/addons/website_blog/views/website_blog_templates.xml
--- 2/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@@ -7,9 -7,7 +7,8 @@@
          <script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
          <script type="text/javascript" src="/website_blog/static/src/js/website.tour.blog.js"></script>
          <script type="text/javascript" src="/website_blog/static/lib/contentshare.js"></script>
-         <script type="text/javascript" src="/website_blog/static/lib/page-transitions/js/app.js"></script>
 +        <script type="text/javascript" src="/website_blog/static/lib/inlineDisqussions/inlineDisqussions.js"></script>
-         
+         <script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"/>
      </xpath>
  </template>
  
@@@ -256,61 -228,70 +230,72 @@@
      </xpath>
  </template>
  
- <!--<template id="blog_background_cover" name="Blog Cover"-->
- <!--        inherit_option_id="website_blog.blog_post_complete">-->
- <!--    <xpath expr="//div[@id='title']" position="attributes">-->
- <!--        <attribute name="class">blog_cover</attribute>-->
- <!--        <attribute t-if="blog_post.content_image" name="t-attf-style">background : url('data:image/png;base64,#{blog_post.content_image}') center center no-repeat;</attribute>-->
- <!--        <attribute t-if="not blog_post.content_image" name="style">background : #34495E;</attribute>-->
- <!--    </xpath>-->
- <!--    <xpath expr="//div[@id='title']" position="inside">-->
- <!--        <div class="text-center blog_item">-->
- <!--            <img class="img-circle" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(blog_post.create_uid.id)" style="width: 50px; margin-right: 10px;"/>-->
- <!--            <small class="text-muted" id="blog_author" t-field="blog_post.create_uid.name"/>-->
- <!--        </div>-->
- <!--        <div class="text-center mt64">-->
- <!--            <a href="#blog_content"><span class="fa fa-angle-down fa-2x fa-inverse"/></a>-->
- <!--        </div>-->
- <!--    </xpath>-->
- <!--</template>-->
 -<template id="blog_background_cover" name="Blog Cover"
++<!-- Options: Blog Post: Full Screen Background Image -->
++<template id="blog_post_background_cover" name="Blog Cover"
+         inherit_option_id="website_blog.blog_post_complete">
+     <xpath expr="//div[@id='title']" position="attributes">
+         <attribute name="class">blog_cover</attribute>
+         <attribute name="t-attf-style">background-image : url(data:image/jpg;base64,#{blog_post.content_image})</attribute>
+     </xpath>
+     <xpath expr="//div[@id='title']" position="inside">
+         <div class="text-center blog_item">
+             <img class="img-circle" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(blog_post.create_uid.partner_id.id)" style="width: 30px; margin-right: 10px;"/>
+             <small class="text-muted" id="blog_author" t-field="blog_post.create_uid.name"/>
+         </div>
+         <div class="text-center mt64">
+             <a href="#blog_content"><span class="fa fa-angle-down fa-2x fa-inverse"/></a>
+         </div>
+     </xpath>
+     <xpath expr="//section[@id='comments']" position="after">
+         <div class="cover_footer" t-attf-style="background-image: url(data:image/jpg;base64,#{next_post.content_image})">
+             <a class="js_next " t-attf-href="/blogpost/#{ slug(next_post) }"><p class="text-center">Read Next</p></a>
+             <h1 class="text-center" t-field="next_post.name"/>
+             <div class="text-center blog_item">
+                 <img class="img-circle" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(next_post.create_uid.partner_id.id)" style="width: 30px; margin-right: 10px;"/>
+                 <small class="text-muted" id="blog_author" t-field="next_post.create_uid.name"/>
+             </div>
+         </div>
+     </xpath>
+ </template>
  
- <!--<template id="blog_footer" name="Blog Footer"-->
- <!--        inherit_option_id="website_blog.blog_post_complete">-->
- <!--    <xpath expr="//section[@id='comments']" position="before">-->
- <!--        <div class="container mt16 mb32">-->
- <!--            <div class="col-sm-12">-->
- <!--                <div class="col-sm-4 col-sm-offset-2">-->
- <!--                    <hr class="mt0 mb0"/>-->
- <!--                    <strong class="text-muted text-right">WRITTEN BY</strong>-->
- <!--                    <div class="media">-->
- <!--                        <a class="pull-left" href="#">-->
- <!--                            <img class="img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(blog_post.create_uid.id)" style="width: 50px; margin-right: 10px;"/>-->
- <!--                        </a>-->
- <!--                        <div class="media-body">-->
- <!--                            <h4 class="media-heading"  t-field="blog_post.create_uid.name"></h4>-->
- <!--                            <p t-field="blog_post.create_uid.email"></p>-->
- <!--                            <small t-if="blog_post.website_published_datetime" class="text-right text-muted">Published on <t t-esc="blog_post.website_published_datetime"/></small>-->
- <!--                            <small t-if="not blog_post.website_published_datetime" class="text-right text-muted">Last Modified on <t t-esc="blog_post.write_date"/></small>-->
- <!--                        </div>-->
- <!--                    </div>-->
- <!--                </div>-->
- <!--                <div class="col-sm-4 col-sm-offset-2" t-if="blog_post.blog_id">-->
- <!--                    <hr class="mt0 mb0"/>-->
- <!--                    <strong class="text-muted text-right">PUBLISHED IN</strong>-->
- <!--                    <div class="media">-->
- <!--                        <a class="pull-left" href="#">-->
- <!--                            <img class="img-rounded" t-att-src="'/website/image?model=blog.blog&amp;field=image&amp;id='+str(blog_post.blog_id.id)" style="width: 50px; margin-right: 10px;"/>-->
- <!--                        </a>-->
- <!--                        <div class="media-body">-->
- <!--                            <h4 class="media-heading"  t-field="blog_post.blog_id.name"></h4>-->
- <!--                            <span t-field="blog_post.blog_id.description"/>-->
- <!--                        </div>-->
- <!--                    </div>-->
- <!--                </div>-->
- <!--            </div>-->
- <!--        </div>-->
- <!--    </xpath>-->
- <!--</template>-->
 -<template id="blog_footer" name="Blog Footer"
++<!-- Options: Blog Post: Footer author detail -->
++<template id="blog_post_footer" name="Blog Footer"
+         inherit_option_id="website_blog.blog_post_complete">
+     <xpath expr="//section[@id='comments']" position="before">
+         <div class="container mt16 mb32">
+             <div class="col-sm-12">
+                 <div class="col-sm-4 col-sm-offset-2">
+                     <hr class="mt0 mb0"/>
+                     <strong class="text-muted text-right">WRITTEN BY</strong>
+                     <div class="media">
+                         <a class="pull-left" href="#">
+                             <img class="img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(blog_post.create_uid.id)" style="width: 50px; margin-right: 10px;"/>
+                         </a>
+                         <div class="media-body">
+                             <h4 class="media-heading"  t-field="blog_post.create_uid.name"></h4>
+                             <p t-field="blog_post.create_uid.email"></p>
+                             <small t-if="blog_post.website_published_datetime" class="text-right text-muted">Published on <t t-esc="blog_post.website_published_datetime"/></small>
+                             <small t-if="not blog_post.website_published_datetime" class="text-right text-muted">Last Modified on <t t-esc="blog_post.write_date"/></small>
+                         </div>
+                     </div>
+                 </div>
+                 <div class="col-sm-4 col-sm-offset-2" t-if="blog_post.blog_id">
+                     <hr class="mt0 mb0"/>
+                     <strong class="text-muted text-right">PUBLISHED IN</strong>
+                     <div class="media">
+                         <a class="pull-left" href="#">
+                             <img class="img-rounded" t-att-src="'/website/image?model=blog.blog&amp;field=image&amp;id='+str(blog_post.blog_id.id)" style="width: 50px; margin-right: 10px;"/>
+                         </a>
+                         <div class="media-body">
+                             <h4 class="media-heading"  t-field="blog_post.blog_id.name"></h4>
+                             <span t-field="blog_post.blog_id.description"/>
+                         </div>
+                     </div>
+                 </div>
+             </div>
+         </div>
+     </xpath>
+ </template>
  
  <!-- Options: Blog Post: user can reply -->
  <template id="opt_blog_post_complete_comment" name="Allow Comments"