From c12ee07b023e95336b5bd9ac9825ff9344f37db9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 23 Feb 2014 18:15:32 +0100
Subject: [PATCH] [IMP] cover by default

bzr revid: fp@tinyerp.com-20140223171532-p2ts7i40l8vlmx2p
---
 .../website_blog/data/website_blog_data.xml   |  3 +-
 .../website_blog/data/website_blog_demo.xml   |  1 -
 addons/website_blog/models/website_blog.py    |  2 +-
 .../static/src/css/website_blog.css           | 25 ++----
 .../static/src/css/website_blog.sass          | 22 ++---
 .../views/website_blog_templates.xml          | 87 +++++++------------
 6 files changed, 48 insertions(+), 92 deletions(-)

diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index be76f6160f7..3cacafe379b 100644
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -2,7 +2,8 @@
 <openerp>
     <data noupdate="1">
         <record id="blog_blog_1" model="blog.blog">
-            <field name="name">News</field>
+            <field name="name">Our News</field>
+            <field name="subtitle">Sharing our evolution with passion</field>
             <field name="description">Presentation of new OpenERP features</field>
             <field name="image" type="base64" file="website_blog/static/src/img/news.png"/>
         </record>
diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml
index 739917599ae..f6736e0f12d 100644
--- a/addons/website_blog/data/website_blog_demo.xml
+++ b/addons/website_blog/data/website_blog_demo.xml
@@ -133,7 +133,6 @@
             <field name="blog_id" ref="blog_blog_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(6, 0, [ref('blog_tag_1')])]"/>
-            <field name="content_image">/website_blog/static/src/img/post2.jpg</field>
             <field name="content">
 <![CDATA[<section class="mt16 mb16 " data-snippet-id='image-text'>
             <div class="container readable">
diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py
index 4ef23648a1d..61a724b9698 100644
--- a/addons/website_blog/models/website_blog.py
+++ b/addons/website_blog/models/website_blog.py
@@ -35,7 +35,7 @@ class Blog(osv.Model):
     _order = 'name'
     _columns = {
         'name': fields.char('Blog Name', required=True),
-        'subtitle': fields.char('Blog Subtitle', required=True),
+        'subtitle': fields.char('Blog Subtitle'),
         'description': fields.text('Description'),
         'image': fields.binary('Image'),
         'blog_post_ids': fields.one2many(
diff --git a/addons/website_blog/static/src/css/website_blog.css b/addons/website_blog/static/src/css/website_blog.css
index 00c9d59c387..23a8fc38b20 100644
--- a/addons/website_blog/static/src/css/website_blog.css
+++ b/addons/website_blog/static/src/css/website_blog.css
@@ -21,39 +21,32 @@ p.post-meta {
   top: -5px;
 }
 
-.blog_cover {
+.cover {
   -webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
   background-size: cover;
   background-position: center;
-  background-repeat: no-repeat;
   background-color: rgba(0, 0, 0, 0.3);
+  color: white;
+}
+
+.cover_header {
   min-height: 400px;
   height: 100vh;
-  color: white;
-  padding-top: 1vh;
+}
+.cover_header h1 {
+  padding-top: 20vh;
+  font-weight: bold;
 }
 
 .cover_footer {
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-color: rgba(0, 0, 0, 0.3);
   min-height: 200px;
   height: 50vh;
-  color: white;
   padding-top: 5vh;
   cursor: pointer;
 }
 
-.cover_title {
-  padding-top: 20vh;
-}
-
 /*Inline Discussion */
 .discussion {
   padding: 5px 10px 10px;
diff --git a/addons/website_blog/static/src/css/website_blog.sass b/addons/website_blog/static/src/css/website_blog.sass
index 6f04a7b7a28..ab7b964e6e6 100644
--- a/addons/website_blog/static/src/css/website_blog.sass
+++ b/addons/website_blog/static/src/css/website_blog.sass
@@ -20,36 +20,28 @@ p.post-meta
     position: relative
     top: -5px
 
-.blog_cover
+.cover
     -webkit-background-size: cover
     -moz-background-size: cover
     -o-background-size: cover
     background-size: cover
     background-position: center
-    background-repeat: no-repeat
     background-color: rgba(0, 0, 0, 0.3)
+    color: white
+
+.cover_header
     min-height : 400px
     height: 100vh
-    color: white
-    padding-top: 1vh
+    h1
+        padding-top : 20vh
+        font-weight: bold
 
 .cover_footer
-    -webkit-background-size: cover
-    -moz-background-size: cover
-    -o-background-size: cover
-    background-size: cover
-    background-position: center
-    background-repeat: no-repeat
-    background-color: rgba(0, 0, 0, 0.3)
     min-height : 200px
     height: 50vh
-    color: white
     padding-top: 5vh
     cursor: pointer
 
-.cover_title
-    padding-top : 20vh
-
 /*Inline Discussion
 
 .discussion
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 19425919178..faa6a95496e 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -161,20 +161,23 @@
 
 <!-- Blog Post Complete -->
 <template id="blog_post_complete" name="Blog Post">
-    <t t-call="website_blog.index">
+  <t t-call="website_blog.index">
 
-    <div class="container" id="title">
-        <h1 class="text-center" t-field="blog_post.name" id="blog_post_name"/>
-        <p class="post-meta text-muted text-center" name="blog_post_data">
-            <span class="fa fa-calendar oe_date" name="blog_post_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 class="cover cover_header text-center" id="title" t-attf-style="background-image : url(#{blog_post.content_image})">
+        <div class="text-right">
+            <a id="change_cover" t-ignore="true" class="btn btn-primary css_non_editable_mode_hidden">
+                Change Cover Photo
+            </a>
+        </div>
+        <h1 t-field="blog_post.name" id="blog_post_name"/>
+        <h2 t-field="blog_post.sub_title"/>
+        <div>
+            <img class="img-circle" t-att-src="'/website/image?model=res.users&amp;field=image_small&amp;id='+str(blog_post.create_uid.id)" style="width: 30px; margin-right: 10px;"/>
+            <small id="blog_author" t-field="blog_post.create_uid.name"/>
+        </div>
+        <a href="#blog_content" class="fa fa-angle-down fa-2x fa-inverse mt32"/>
     </div>
+
     <div class="container">
         <t t-call="website.publish_management">
             <t t-set="object" t-value="blog_post"/>
@@ -189,6 +192,7 @@
     </div>
     <div id="blog_content" t-field="blog_post.content"/>
 
+    <!-- FP Note: should we remove this or put it in options? -->
     <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">
@@ -207,7 +211,19 @@
             </li>
         </ul>
     </section>
-    </t>
+
+    <div class="cover cover_footer mb0 text-center" t-attf-style="background-image: url(#{next_post.content_image})" t-if="next_post" t-ignore="True">
+        <p>Read Next</p>
+        <a class="hidden js_next" t-attf-href="/blogpost/#{ slug(next_post) }#wrap"/>
+        <h1 t-field="next_post.name"/>
+        <h2 t-field="next_post.sub_title"/>
+        <div>
+            <img class="img-circle" t-att-src="'/website/image?model=res.users&amp;field=image_small&amp;id='+str(next_post.create_uid.id)" style="width: 30px; margin-right: 10px;"/>
+            <small id="blog_author" t-field="next_post.create_uid.name"/>
+        </div>
+    </div>
+
+  </t>
 </template>
 
 <template id="blog_breadcrumb" name="Breadcrumb"
@@ -230,51 +246,6 @@
     </xpath>
 </template>
 
-<!-- Options: Blog Post: Full Screen Background Image -->
-<template id="blog_post_background_cover" name="Blog Cover"
-        inherit_option_id="website_blog.blog_post_complete" inherit_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(#{blog_post.content_image})</attribute>
-    </xpath>
-    <xpath expr="//h1[@id='blog_post_name']" position="replace">
-        <div class="text-right">
-            <a id="change_cover" t-ignore="true" class="btn btn-primary css_non_editable_mode_hidden" style="cursor :pointer">
-                Change Cover Photo
-            </a>
-        </div>
-        <h1 class="text-center cover_title" t-ignore="true"><strong t-field="blog_post.name" id="blog_post_name"/></h1>
-        <p t-ignore="true" id="is_document_user" groups="base.group_document_user"/>
-    </xpath>
-    <xpath expr="//p[@name='blog_post_data']" position="replace">
-        <h2 class="text-center" t-field="blog_post.sub_title"/>
-        <p class="post-meta text-muted text-center" name="blog_post_data"/>
-    </xpath>
-    <xpath expr="//div[@id='title']" position="inside">
-        <div class="text-center blog_item" t-ignore="true">
-            <img class="img-circle" t-att-src="'/website/image?model=res.users&amp;field=image_small&amp;id='+str(blog_post.create_uid.id)" style="width: 30px; margin-right: 10px;"/>
-            <small id="blog_author" t-field="blog_post.create_uid.name"/>
-        </div>
-        <div class="text-center mt32">
-            <a href="#blog_content" t-ignore="true"><span class="fa fa-angle-down fa-2x fa-inverse"/></a>
-        </div>
-    </xpath>
-    <xpath expr="//section[@id='comments']" position="after">
-        <t t-if="next_post">
-            <div class="cover_footer mb0" t-attf-style="background-image: url(#{next_post.content_image})">
-                <p class="text-center" t-ignore="true">Read Next</p>
-                <a class="hidden js_next" t-attf-href="/blogpost/#{ slug(next_post) }#wrap"/>
-                <h1 class="text-center" t-field="next_post.name"/>
-                <h2 class="text-center" t-field="next_post.sub_title"/>
-                <div class="text-center blog_item" t-ignore="true">
-                    <img class="img-circle" t-att-src="'/website/image?model=res.users&amp;field=image_small&amp;id='+str(next_post.create_uid.id)" style="width: 30px; margin-right: 10px;"/>
-                    <small id="blog_author" t-field="next_post.create_uid.name"/>
-                </div>
-            </div>
-        </t>
-    </xpath>
-</template>
-
 <!-- Options: Blog Post: Footer author detail -->
 <template id="blog_post_footer" name="Blog Footer"
         inherit_option_id="website_blog.blog_post_complete">