[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9347...

[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9347 revid:dle@openerp.com-20140324162524-ew3c3eauj3kcnefi

bzr revid: dle@openerp.com-20140324162852-iubef1i0hwpxiske

addons/website_blog/static/description/index.html

 <section class="oe_container">
     <div class="oe_row oe_spaced">
         <div class="oe_span12">
-            <h2 class="oe_slogan">Awesome Open Source Blogging Plateform</h2>
+            <h2 class="oe_slogan">Awesome Open Source Blogging Platform</h2>
             <h3 class="oe_slogan">Write, Design, Promote, Engage</h3>
         </div>
         <div class="oe_span6">
@@ -15,7 +15,7 @@
         <div class="oe_span6">
             <p class='oe_mt32'>
 				Express yourself with the OpenERP enterprise grade blogging
-				plateform. Write beautiful blog posts, engage with visitors,
+				platform. Write beautiful blog posts, engage with visitors,
 				translate content and moderate social streams.
             </p><p>
 				Get your blog posts efficiently referenced in Google and

addons/website_event_track/models/event.py

@@ -171,6 +171,7 @@ class event_sponsors(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Sponsor/Customer', required=True),
         'url': fields.text('Sponsor Website'),
         'sequence': fields.related('sponsor_type_id', 'sequence', string='Sequence', store=True),
+        'image_medium': fields.related('partner_id', 'image_medium', string='Logo')
     }
 
     def has_access_to_partner(self, cr, uid, ids, context=None):

addons/website_event_track/views/website_event.xml

@@ -15,10 +15,10 @@
                 <h2 class="text-center mb32">Our Sponsors</h2>
             </section>
             <div class="row">
-                <div t-attf-class="col-md-#{(len(event.sponsor_ids) > 6) and 2 or (12/ len(event.sponsor_ids))} text-center" t-foreach="event.sponsor_ids" t-as="sponsor">
+                <div t-attf-class="col-md-#{(len(event.sponsor_ids) > 6) and 2 or (12/ len(event.sponsor_ids))} text-center mb16" t-foreach="event.sponsor_ids" t-as="sponsor">
                     <t t-if="sponsor.url">
                         <a t-att-href="sponsor.url" style="position: relative; display: inline-block;">
-                            <span t-field="sponsor.partner_id.image"
+                            <span t-field="sponsor.image_medium"
                                 t-field-options='{"widget": "image", "class": "shadow"}'/>
                             <div class="ribbon-wrapper">
                                 <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
@@ -27,7 +27,7 @@
                     </t>
                     <t t-if="not sponsor.url">
                         <span style="position: relative; display: inline-block;">
-                            <span t-field="sponsor.partner_id.image"
+                            <span t-field="sponsor.image_medium"
                                 t-field-options='{"widget": "image", "class": "shadow"}'/>
                             <div class="ribbon-wrapper">
                                 <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>