From b6a7402fdbddfe817fa36292e6f89e8659f9bdea Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 21 May 2014 11:20:37 +0200
Subject: [PATCH 01/19] [FIX] report: correct page numbering

---
 openerp/report/render/rml2pdf/trml2pdf.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py
index 91dfc9dd79b..00b119ac61f 100644
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@ -104,7 +104,7 @@ class NumberedCanvas(canvas.Canvas):
         self.setFont("Helvetica", 8)
         self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40),
             " %(this)i / %(total)i" % {
-               'this': self._pageNumber+1,
+               'this': self._pageNumber,
                'total': page_count,
             }
         )
@@ -1001,8 +1001,6 @@ class _rml_template(object):
             if story_cnt > 0:
                 fis.append(platypus.PageBreak())
             fis += r.render(node_story)
-            # Reset Page Number with new story tag
-            fis.append(PageReset())
             story_cnt += 1
         try:
             if self.localcontext and self.localcontext.get('internal_header',False):

From b7c6b1cbca9a3ae0043bed40018bb88a8ebbb184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 21 May 2014 16:27:17 +0200
Subject: [PATCH 02/19] [FIX] website_mail: message description should
 effectively be limited to the first 30 characters.

---
 addons/website_mail/models/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py
index 1e50611fa00..cff950f2962 100644
--- a/addons/website_mail/models/mail_message.py
+++ b/addons/website_mail/models/mail_message.py
@@ -34,7 +34,7 @@ class MailMessage(osv.Model):
                 res[message.id] = message.subject
             else:
                 plaintext_ct = html2plaintext(message.body)
-                res[message.id] = plaintext_ct + '%s' % (' [...]' if len(plaintext_ct) >= 20 else '')
+                res[message.id] = plaintext_ct[:30] + '%s' % (' [...]' if len(plaintext_ct) >= 30 else '')
         return res
 
     _columns = {

From 52eb9cba89cc0d057f65b3f20e551ba6559226ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 21 May 2014 16:32:31 +0200
Subject: [PATCH 03/19] [IMP] website_mail_group: refactored layout of
 displayed mailing lists and their archive. Should be a bit more easy to use
 and understand. Todo: fix number of displayed thread / replies, and probably
 re-do the layout once somebody decides to change everything.

---
 addons/website_mail_group/controllers/main.py |  26 +-
 .../views/website_mail_group.xml              | 376 +++++++++++-------
 2 files changed, 261 insertions(+), 141 deletions(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 88eb1a7e9b7..4449a38f999 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -9,7 +9,8 @@ from openerp.addons.web.http import request
 
 
 class MailGroup(http.Controller):
-    _thread_per_page = 10
+    _thread_per_page = 5
+    _replies_per_page = 1
 
     def _get_archives(self, group_id):
         MailMessage = request.registry['mail.message']
@@ -27,7 +28,7 @@ class MailGroup(http.Controller):
     def view(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        group_ids = group_obj.search(cr, uid, [], context=context)
+        group_ids = group_obj.search(cr, uid, [('alias_id', '!=', False), ('alias_id.alias_name', '!=', False)], context=context)
         values = {'groups': group_obj.browse(cr, uid, group_ids, context)}
         return request.website.render('website_mail_group.mail_groups', values)
 
@@ -85,7 +86,28 @@ class MailGroup(http.Controller):
             'message': message,
             'group': group,
             'mode': mode,
+            'archives': self._get_archives(group.id),
             'date_begin': date_begin,
             'date_end': date_end,
         }
         return request.website.render('website_mail_group.group_message', values)
+
+    @http.route(
+        '''/groups/<model('mail.group'):group>/<model('mail.message', "[('model','=','mail.group'), ('res_id','=',group[0])]"):message>/get_replies''',
+        type='json', auth="public", methods=['POST'], website=True)
+    def render_messages(self, group, message, **post):
+        last_displayed_id = post.get('last_displayed_id')
+        if not last_displayed_id:
+            return False
+        Message = request.registry['mail.message']
+        replies_domain = [('id', '<', int(last_displayed_id)), ('parent_id', '=', message.id)]
+        msg_ids = Message.search(request.cr, request.uid, replies_domain, limit=self._replies_per_page, context=request.context)
+        msg_count = Message.search(request.cr, request.uid, replies_domain, count=True, context=request.context)
+        messages = Message.browse(request.cr, request.uid, msg_ids, context=request.context)
+        values = {
+            'group': group,
+            'thread_header': message,
+            'messages': messages,
+            'msg_more_count': msg_count - self._replies_per_page,
+        }
+        return request.registry['ir.ui.view'].render(request.cr, request.uid, 'website_mail_group.messages_short', values, engine='ir.qweb', context=request.context)
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 87f8755c04a..b8e757e5c4a 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -1,152 +1,228 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <template id="footer_mailing_list" inherit_id="website.layout" name="Footer Mailing List Link">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a t-attf-href="/groups">Mailing List</a></li>
-        </xpath>
-    </template>
-    <template id="mail_groups" name="Mailing Lists">
-        <t t-call="website.layout">
-            <div class="container">
-                <h1>
-                    Our Mailing Lists
-                </h1>
-                <div class="row">
-                    <div class="col-sm-4" style="height: 140px" t-foreach="groups" t-as="group">
-                        <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
-                        <div>
-                            <strong><a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/></strong>
-                            <div t-esc="group.description" class="text-muted"/>
-                            <t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </t>
-    </template>
 
-    <template id="group_messages" name="Message Threads">
-        <t t-call="website.layout">
-            <section class="container">
-                <div class="row mt8">
-                    <div class="col-md-5 mt16">
-                        <ol class="breadcrumb">
-                            <li><a href="/groups">Mailing Lists</a></li>
-                            <li class="active" t-esc="group.name"/>
-                        </ol>
-                    </div>
-                    <div class="col-md-5 pull-right">
-                        <t t-call="website.pager"/>
-                    </div>
-                </div>
-                <h1 class="mt8 mb32">
-                    <span t-field="group.name"/>
-                    <small>List Archive</small>
-                </h1>
-                <div class="row">
-                    <div class="col-md-3">
-                        <ul class="nav nav-pills nav-stacked" id="group_mode">
-                            <li t-attf-class="#{mode=='thread' and 'active' or ''}">
-                                <a t-attf-href="/groups/#{ slug(group) }?mode=thread">By thread</a>
-                            </li>
-                            <li t-attf-class="#{mode=='date' and not date_begin and 'active' or ''}">
-                                <a t-attf-href="/groups/#{ slug(group) }?mode=date">By date</a>
-                                <ul class="nav nav-pills nav-stacked" style="margin-left: 8px;">
-                                    <t t-foreach="archives" t-as="month_archive">
-                                    <li t-att-class="month_archive['date_begin'] == date_begin and 'active' or None">
-                                        <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&amp;date_begin=#{ month_archive['date_begin'] }&amp;date_end=#{month_archive['date_end']}">
-                                            <t t-esc="month_archive['date']"/>
-                                            <span class="pull-right badge" t-esc="month_archive['date_count']"/>
-                                        </a>
-                                    </li>
-                                    </t>
-                                </ul>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="col-md-9">
-                        <t t-call="website_mail_group.messages_short"/>
-                    </div>
+<template id="footer_mailing_list" inherit_id="website.layout" name="Footer Mailing List Link">
+    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+        <li><a t-attf-href="/groups">Mailing List</a></li>
+    </xpath>
+</template>
+
+<template id="mail_groups" name="Mailing Lists">
+    <t t-call="website.layout">
+        <div id="wrap" class="oe_structure oe_empty">
+            <section class="bg-primary jumbotron mt0 mb0">
+                <div class="container">
+                    <h1>Stay in touch with our Community</h1>
+                    <p>Alone we can do so little, together we can do so much</p>
                 </div>
             </section>
-        </t>
-    </template>
-
-    <template id="group_message">
-        <t t-call="website.layout">
-            <div class="container">
-                <div class="row mt8">
-                    <div class="col-md-5">
-                        <ol class="breadcrumb mb8">
-                            <li><a href="/groups">Mailing Lists</a></li>
-                            <li>
-                                <a t-attf-href="/groups/#{slug(group)}?mode=#{mode}&amp;date_begin=#{date_begin}&amp;date_end=#{date_end}">
-                                    <span t-field="group.name"/>
-                                </a>
-                            </li>
-                            <li class="active" t-esc="message.subject or 'Message'"/>
-                        </ol>
-                    </div>
+        </div>
+        <div class="container mt32">
+            <div class="row mt8" t-foreach="groups" t-as="group">
+                <div class="col-md-3">
+                    <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
+                    <strong><a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/></strong><br />
+                    <i class='fa fa-envelope-o'/>
+                    <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
                 </div>
-
-                <h1 t-field="message.subject"/>
-                <img class="img-rounded pull-left" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
-                <h4 class="mt0 mb32">
-                    <t t-if="message.author_id">
-                         <span t-field="message.author_id" style="display: inline-block;" t-field-options='{
-                                "widget": "contact",
-                                "fields": ["name"]
-                            }'/>
-                    </t>
-                    <t t-if="not message.author_id"><t t-esc="message.email_from"/></t>
-                    on <span t-field="message.date"/>
-                </h4>
-                <div t-raw="message.body"/>
-
-                <div class="row" t-if="message.attachment_ids">
-                    <h3 class="col-sm-12">Attachment(s):</h3>
-                    <div class="col-md-2 col-sm-3 text-center" t-foreach='message.attachment_ids' t-as='attachment'>
-                        <a t-att-href="'/mail/download_attachment?model=mail.message&amp;id='+str(message.id)+'&amp;method=download_attachment&amp;attachment_id='+str(attachment.id)" target="_blank">
-                            <t t-if="attachment.file_type == 'webimage'">
-                                <img t-att-src="'/web/binary/image?model=ir.attachment&amp;field=datas&amp;id=' + str(attachment.id) + '&amp;resize=100,80'"
-                                    class='oe_attachment_embedded'></img>
-                            </t>
-                            <t t-if="attachment.file_type != 'webimage'">
-                                <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"
-                                    class='oe_attachment_webimage'></img>
-                            </t>
-                            <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
-                        </a>
-                    </div>
+                <div class="col-md-5">
+                    <div t-esc="group.description" class="text-muted"/>
                 </div>
-                <div t-if="message.child_ids">
-                    <h2 class="page-header">Follow ups</h2>
-                    <t t-set="messages" t-value="message.child_ids"/>
-                    <t t-call="website_mail_group.messages_short"/>
+                <div class="col-md-2">
+                    <i class='fa fa-user'/> <t t-esc="len(group.message_follower_ids)"/> participants<br />
+                    <i class='fa fa-envelope-o'/> <t t-esc="len(group.message_ids)"/> messages
                 </div>
-                <div t-if="message.parent_id">
-                    <h2 class="page-header">Reference</h2>
-                    <t t-set="messages" t-value="[message.parent_id]"/>
-                    <t t-call="website_mail_group.messages_short"/>
-                </div>
-
-                <div class="jumbotron mt64">
-                    <h1>Join the discussion</h1>
-                    <p>
-                        Join this mailing list to follow or participate to this discussion.<br/>
-                        <span t-field="group.name"/>: <i t-field="group.description"/>
-                    </p>
+                <div class="col-md-2">
                     <t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>
                 </div>
             </div>
-        </t>
-    </template>
+        </div>
+    </t>
+</template>
 
-    <template id="messages_short">
+<template id="group_messages" name="Message Threads">
+    <t t-call="website.layout">
+        <t t-set="head">
+            <link rel='stylesheet' href="/website_mail_group/static/src/css/website_mail_group.css"/>
+            <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"/>
+        </t>
+        <section class="container">
+            <div class="row mt8">
+                <ol class="breadcrumb pull-left">
+                    <li><a href="/groups">Mailing Lists</a></li>
+                    <li>
+                        <a t-attf-href="/groups/#{slug(group)}?#{mode and 'mode=%s' % mode or ''}#{date_begin and '&amp;date_begin=%s' % date_begin or ''}#{date_end and '&amp;date_end=%s' % date_end or ''}"><t t-esc="group.name"/></a>
+                    </li>
+                </ol>
+            </div>
+            <div class="row">
+                <h1 class="text-center">
+                    <t t-esc="group.name"/> mailing list archives
+                </h1><h4 class="text-center text-muted">
+                    <i class='fa fa-envelope-o'/>
+                    <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
+                </h4>
+            </div>
+            <div class="row">
+                <div class="col-md-3">
+                    <h2>Archives</h2>
+                    <ul class="nav nav-pills nav-stacked" id="group_mode">
+                        <li t-attf-class="#{mode=='thread' and 'active' or ''}">
+                            <a t-attf-href="/groups/#{ slug(group) }?mode=thread">By thread</a>
+                        </li>
+                        <li t-attf-class="#{mode=='date' and not date_begin and 'active' or ''}">
+                            <a t-attf-href="/groups/#{ slug(group) }?mode=date">By date</a>
+                            <ul class="nav nav-pills nav-stacked" style="margin-left: 8px;">
+                                <t t-foreach="archives" t-as="month_archive">
+                                <li t-att-class="month_archive['date_begin'] == date_begin and 'active' or None">
+                                    <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&amp;date_begin=#{ month_archive['date_begin'] }&amp;date_end=#{month_archive['date_end']}">
+                                        <t t-esc="month_archive['date']"/>
+                                        <span class="pull-right badge" t-esc="month_archive['date_count']"/>
+                                    </a>
+                                </li>
+                                </t>
+                            </ul>
+                        </li>
+                    </ul>
+                </div>
+                <div class="col-md-9">
+                    <div>
+                        <t t-call="website.pager"/>
+                    </div>
+                    <t t-call="website_mail_group.messages_short">
+                        <t t-set="messages" t-value="messages"/>
+                        <t t-set="msg_more_count" t-value="0"/>
+                        <t t-set="thread_header" t-value="None"/>
+                    </t>
+                    <div>
+                        <t t-call="website.pager"/>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </t>
+</template>
+
+<template id="group_message">
+    <t t-call="website.layout">
+        <t t-set="head">
+            <link rel='stylesheet' href="/website_mail_group/static/src/css/website_mail_group.css"/>
+            <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"/>
+        </t>
+        <section class="container">
+            <div class="row mt8">
+                <ol class="breadcrumb pull-left">
+                    <li><a href="/groups">Mailing Lists</a></li>
+                    <li>
+                        <a t-attf-href="/groups/#{slug(group)}?#{mode and 'mode=%s' % mode or ''}#{date_begin and '&amp;date_begin=%s' % date_begin or ''}#{date_end and '&amp;date_end=%s' % date_end or ''}"><t t-esc="group.name"/></a>
+                    </li>
+                    <li t-if="message" class="active"><t t-esc="message.description"/></li>
+                </ol>
+            </div>
+            <div class="row">
+                <h1 class="text-center">
+                    <t t-esc="group.name"/> mailing list archives
+                </h1><h4 class="text-center text-muted">
+                    <i class='fa fa-envelope-o'/>
+                    <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
+                </h4>
+            </div>
+            <div class="row">
+                <div class="col-md-3">
+                    <h4>Browse archives</h4>
+                    <ul class="nav nav-pills nav-stacked" id="group_mode">
+                        <li t-attf-class="#{mode=='thread' and 'active' or ''}">
+                            <a t-attf-href="/groups/#{ slug(group) }?mode=thread">By thread</a>
+                        </li>
+                        <li t-attf-class="#{mode=='date' and not date_begin and 'active' or ''}">
+                            <a t-attf-href="/groups/#{ slug(group) }?mode=date">By date</a>
+                            <ul class="nav nav-pills nav-stacked" style="margin-left: 8px;">
+                                <t t-foreach="archives" t-as="month_archive">
+                                <li t-att-class="month_archive['date_begin'] == date_begin and 'active' or None">
+                                    <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&amp;date_begin=#{ month_archive['date_begin'] }&amp;date_end=#{month_archive['date_end']}">
+                                        <t t-esc="month_archive['date']"/>
+                                        <span class="pull-right badge" t-esc="month_archive['date_count']"/>
+                                    </a>
+                                </li>
+                                </t>
+                            </ul>
+                        </li>
+                    </ul>
+                </div>
+                <div class="col-md-9">
+                    <div class="media">
+                        <img class="img-rounded pull-left mt0 media-object o_mg_avatar"
+                            t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)"/>
+                        <div class="media-body">
+                            <h4 class="media-heading" t-esc="message.description"/>
+                            <small>
+                                by
+                                <t t-if="message.author_id">
+                                    <span t-field="message.author_id" style="display: inline-block;" t-field-options='{
+                                        "widget": "contact",
+                                        "fields": ["name"]
+                                    }'/>
+                                </t>
+                                <t t-if="not message.author_id"><t t-esc="message.email_from"/></t>
+                                - <i class="fa fa-calendar"/> <t t-esc="message.date"/>
+                            </small>
+                            <div t-raw="message.body"/>
+
+                            <div>
+                                <p t-if="message.attachment_ids" class="mt8">
+                                    <a href="#" class="o_mg_link_hide">
+                                        <i class="fa fa-chevron-right"/> <t t-raw="len(message.attachment_ids)"/> attachments
+                                    </a>
+                                    <a href="#" class="o_mg_link_show">
+                                        <i class="fa fa-chevron-down"/> <t t-raw="len(message.attachment_ids)"/> attachments
+                                    </a>
+                                </p>
+                                <div class="o_mg_link_content">
+                                    <div class="col-md-2 col-sm-3 text-center" t-foreach='message.attachment_ids' t-as='attachment'>
+                                        <a t-att-href="'/mail/download_attachment?model=mail.message&amp;id='+str(message.id)+'&amp;method=download_attachment&amp;attachment_id='+str(attachment.id)" target="_blank">
+                                            <t t-if="attachment.file_type == 'webimage'">
+                                                <img t-att-src="'/web/binary/image?model=ir.attachment&amp;field=datas&amp;id=' + str(attachment.id) + '&amp;resize=100,80'"
+                                                    class='oe_attachment_embedded'
+                                                    t-att-title="attachment.name"/>
+                                            </t>
+                                            <t t-if="attachment.file_type != 'webimage'">
+                                                <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"
+                                                    class='oe_attachment_webimage'
+                                                    t-att-title="attachment.name"/>
+                                            </t>
+                                            <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div t-if="message.child_ids" class="o_mg_replies">
+                        <h4 class="page-header">Follow-Ups</h4>
+                        <t t-call="website_mail_group.messages_short">
+                            <t t-set="messages" t-value="message.child_ids[:1]"/>
+                            <t t-set="msg_more_count" t-value="len(message.child_ids) - 1"/>
+                            <t t-set="thread_header" t-value="message"/>
+                        </t>
+                    </div>
+                    <div t-if="message.parent_id">
+                        <h4 class="page-header">Reference</h4>
+                        <t t-call="website_mail_group.messages_short">
+                            <t t-set="messages" t-value="[message.parent_id]"/>
+                        </t>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </t>
+</template>
+
+<template id="messages_short">
+    <div>
         <ul class="media-list">
             <li t-foreach="messages" t-as="thread" class="media">
-                <img class="img-rounded pull-left mt0 media-object" style="height: 40px"
+                <img class="img-rounded pull-left mt0 media-object o_mg_avatar"
                     t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
                 <div class="media-body">
                     <h4 class="media-heading">
@@ -160,15 +236,37 @@
                                 "fields": ["name"]
                             }'/>
                         </t>
-                        <t t-if="not thread.author_id"><t t-esc="thread.email_from"/></t>
-                        <span class="fa fa-comment-o">
-                            <t t-raw="len(thread.child_ids)"/> replies
-                        </span>
+                        - <i class="fa fa-calendar"/> <t t-esc="thread.date"/>
+                        - <i class="fa fa-paperclip"/> <t t-esc="len(thread.attachment_ids)"/>
                     </small>
+                    <t t-if="not thread.author_id"><t t-esc="thread.email_from"/></t>
+                    <p t-if="thread.child_ids" class="mt8">
+                        <a href="#" class="o_mg_link_hide">
+                            <i class="fa fa-chevron-right"/> <t t-raw="len(thread.child_ids)"/> replies
+                        </a>
+                        <a href="#" class="o_mg_link_show">
+                            <i class="fa fa-chevron-down"/> <t t-raw="len(thread.child_ids)"/> replies
+                        </a>
+                    </p>
+                    <div class="o_mg_link_content o_mg_replies">
+                        <t t-call="website_mail_group.messages_short">
+                            <t t-set="messages" t-value="thread.child_ids[:1]"/>
+                            <t t-set="msg_more_count" t-value="len(thread.child_ids) - 1"/>
+                            <t t-set="thread_header" t-value="thread"/>
+                        </t>
+                    </div>
                 </div>
             </li>
         </ul>
-    </template>
+        <p t-if="messages and msg_more_count > 0 and thread_header" class="well well-sm">
+            <button class="fa btn-link o_mg_read_more"
+                t-attf-data-href="/groups/#{slug(group)}/#{slug(thread_header)}/get_replies"
+                t-attf-data-msg-id="#{messages[-1].id}">
+                show <t t-esc="msg_more_count"/> more replies
+            </button>
+        </p>
+    </div>
+</template>
 
 </data>
 </openerp>

From 007725cd0798b0634c68f04c6d6f39a4d0e91ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 21 May 2014 16:35:15 +0200
Subject: [PATCH 04/19] [FIX] website_mail_group: added forgotten files for css
 / js.

---
 .../static/src/css/website_mail_group.css     | 12 ++++++
 .../static/src/js/website_mail_group.js       | 41 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 addons/website_mail_group/static/src/css/website_mail_group.css
 create mode 100644 addons/website_mail_group/static/src/js/website_mail_group.js

diff --git a/addons/website_mail_group/static/src/css/website_mail_group.css b/addons/website_mail_group/static/src/css/website_mail_group.css
new file mode 100644
index 00000000000..27482ebd203
--- /dev/null
+++ b/addons/website_mail_group/static/src/css/website_mail_group.css
@@ -0,0 +1,12 @@
+.o_mg_avatar {
+    width: 40px;
+    height: 40px;
+}
+
+.o_mg_link_show {
+    display: none;
+}
+
+.o_mg_link_content {
+    display: none;
+}
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
new file mode 100644
index 00000000000..4c588367409
--- /dev/null
+++ b/addons/website_mail_group/static/src/js/website_mail_group.js
@@ -0,0 +1,41 @@
+$(document).ready(function () {
+
+    $('.o_mg_link_hide').on('click', function (ev) {
+        ev.preventDefault();
+        var $link = $(ev.currentTarget);
+        var $container = $link.parents('div').first();
+        $container.find('.o_mg_link_hide').first().hide();
+        $container.find('.o_mg_link_show').first().show();
+        $container.find('.o_mg_link_content').first().show();
+        return false;
+    });
+
+    $('.o_mg_link_show').on('click', function (ev) {
+        ev.preventDefault();
+        var $link = $(ev.currentTarget);
+        var $container = $link.parents('div').first();
+        $container.find('.o_mg_link_hide').first().show();
+        $container.find('.o_mg_link_show').first().hide();
+        $container.find('.o_mg_link_content').first().hide();
+        return false;
+    });
+
+    $('body').on('click', 'button.o_mg_read_more', function (ev) {
+        var $link = $(ev.target);
+        return openerp.jsonRpc($link.data('href'), 'call', {
+            'last_displayed_id': $link.data('msg-id'),
+        }).then(function (data) {
+            if (! data) {
+                return true;
+            }
+            var $current_ul = $link.parents('.o_mg_replies').first().find('ul.media-list');
+            if ($current_ul) {
+                $(data).find('li.media').insertAfter($current_ul.find('li.media').last());
+                $(data).find('p.well').appendTo($current_ul);
+            }
+            var $show_more = $link.parents('p.well').first();
+            $show_more.remove();
+            return true;
+        });
+    });
+});
\ No newline at end of file

From 1b40b5b37a0f017da29accb770a1482626d83432 Mon Sep 17 00:00:00 2001
From: --global <tde@openerp.com>
Date: Wed, 21 May 2014 16:52:24 +0200
Subject: [PATCH 05/19] [IMP] [BACKPORT] Converto bzrignore to gitignore, like
 what has been done in master.

---
 .bzrignore | 15 ---------------
 .gitignore | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 .bzrignore
 create mode 100644 .gitignore

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 86a1881981f..00000000000
--- a/.bzrignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.*
-*.egg-info
-*.orig
-*.vim
-build/
-RE:^bin/
-RE:^dist/
-RE:^include/
-
-RE:^share/
-RE:^man/
-RE:^lib/
-
-RE:^addons/\w+/doc/_build/
-RE:^.*?/node_modules
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..4b38dc02ac7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,28 @@
+# sphinx build directories
+_build/
+
+# dotfiles
+.*
+# compiled python files
+*.py[co]
+# setup.py egg_info
+*.egg-info
+# emacs backup files
+*~
+# hg stuff
+*.orig
+status
+
+# generated for windows installer?
+install/win32/*.bat
+install/win32/meta.py
+
+# various virtualenv
+/bin/
+/build/
+/dist/
+/include/
+/lib/
+/man/
+/share/
+/src/
\ No newline at end of file

From 37d6fe344b3735f6b33f32cb8a1322cc3d9fc39d Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Wed, 21 May 2014 17:10:50 +0200
Subject: [PATCH 06/19] [FIX] website_event_track: display speakers name to
 public users

---
 addons/website_event_track/controllers/event.py    | 11 +++++++++++
 addons/website_event_track/views/website_event.xml | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index 712c168e1db..e24aee7e62d 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -88,10 +88,21 @@ class website_event(http.Controller):
             days_tracks_count[day] = len(tracks)
             days[day] = self._prepare_calendar(event, tracks)
 
+        cr, uid, context = request.cr, request.uid, request.context
+        track_obj = request.registry['event.track']
+        tracks_ids = track_obj.search(cr, openerp.SUPERUSER_ID, [('event_id', '=', event.id)], context=context)
+        speakers = dict()
+        for t in track_obj.browse(cr, openerp.SUPERUSER_ID, tracks_ids, context=context):
+            acc = ""
+            for speaker in t.speaker_ids:
+                acc = speaker.name + u" – " + acc if acc else speaker.name
+            speakers[t.id] = acc
+
         return request.website.render("website_event_track.agenda", {
             'event': event,
             'days': days,
             'days_nbr': days_tracks_count,
+            'speakers': speakers,
             'tag': tag
         })
 
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 45531ef73b0..3cea1b35599 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -85,8 +85,8 @@
                                         <a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }">
                                             <span t-esc="track and track.name"/>
                                         </a>
-                                        <div class="text-muted" t-foreach="track.speaker_ids" t-as="speaker">
-                                            <small t-esc="speaker.display_name"/>
+                                        <div class="text-muted">
+                                            <small t-esc="speakers[track.id]"/>
                                         </div>
                                     </t>
                                 </td>
@@ -98,11 +98,11 @@
                     <t t-set="track" t-value="dt[1][False][0]"/>
                     <td t-att-colspan="len(locations)-1" t-attf-class="text-center event_color_#{track.color} #{track and 'event_track' or ''}">
                         <a t-attf-href="/event/#{ slug(event) }/track/#{ slug(track) }">
-                            <span t-esc="track.name"/><br/>
-                            <div class="text-muted" t-foreach="track.speaker_ids" t-as="speaker">
-                                <small t-esc="speaker.display_name"/>
-                            </div>
+                            <span t-esc="track.name"/>
                         </a>
+                        <div class="text-muted">
+                            <small t-esc="speakers[track.id]"/>
+                        </div>
                     </td>
                 </t>
             </tr>

From a096ae0080bc6555a8b832e87d4de6b827257304 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 21 May 2014 19:12:37 +0200
Subject: [PATCH 07/19] [FIX] http: force rolleback for failed http request

1st issue:
When an exception was raised, it was badly handled by the website in case of
website_enabled key. The response page was generated without calling super.
The WebRequest object being responsible to rollback the transaction in case
of errors.

2sd issue:
The _failed attribute is required to rollback the transaction in an WebRequest
object. Previously it was only set in the JsonRequest object (which inherit
from WebRequest), replace by call to super. The attribute _failed is now set
in the WebRequest object.
---
 addons/website/models/ir_http.py | 3 ++-
 openerp/http.py                  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 696734b5f05..f724eb2fa5a 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -99,6 +99,7 @@ class ir_http(orm.AbstractModel):
             werkzeug.exceptions.abort(werkzeug.utils.redirect(url))
 
     def _handle_exception(self, exception=None, code=500):
+        res = super(ir_http, self)._handle_exception(exception)
         if isinstance(exception, werkzeug.exceptions.HTTPException) and hasattr(exception, 'response') and exception.response:
             return exception.response
         if getattr(request, 'website_enabled', False) and request.website:
@@ -136,7 +137,7 @@ class ir_http(orm.AbstractModel):
                 html = request.website._render('website.http_error', values)
             return werkzeug.wrappers.Response(html, status=code, content_type='text/html;charset=utf-8')
 
-        return super(ir_http, self)._handle_exception(exception)
+        return res
 
 class ModelConverter(ir.ir_http.ModelConverter):
     def __init__(self, url_map, model=False):
diff --git a/openerp/http.py b/openerp/http.py
index 24f538f3828..68c206793bc 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -207,7 +207,7 @@ class WebRequest(object):
         """Called within an except block to allow converting exceptions
            to abitrary responses. Anything returned (except None) will
            be used as response.""" 
-        raise 
+        self._failed = exception # prevent tx commit
 
     def _call_function(self, *args, **kwargs):
         request = self
@@ -374,8 +374,8 @@ class JsonRequest(WebRequest):
         """Called within an except block to allow converting exceptions
            to abitrary responses. Anything returned (except None) will
            be used as response.""" 
+        super(JsonRequest, self)._handle_exception(exception)
         _logger.exception("Exception during JSON request handling.")
-        self._failed = exception # prevent tx commit            
         error = {
                 'code': 200,
                 'message': "OpenERP Server Error",

From 538d97a6b387e64cd205769df6456a2eda3ecd7f Mon Sep 17 00:00:00 2001
From: --global <tde@openerp.com>
Date: Thu, 22 May 2014 12:25:35 +0200
Subject: [PATCH 08/19] [FIX] website_mail_group: better layout for main
 mailing lists page: more space for subscribe button

---
 addons/website_mail_group/views/website_mail_group.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index b8e757e5c4a..d1674cad5de 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -26,14 +26,14 @@
                     <i class='fa fa-envelope-o'/>
                     <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
                 </div>
-                <div class="col-md-5">
+                <div class="col-md-4">
                     <div t-esc="group.description" class="text-muted"/>
                 </div>
                 <div class="col-md-2">
                     <i class='fa fa-user'/> <t t-esc="len(group.message_follower_ids)"/> participants<br />
                     <i class='fa fa-envelope-o'/> <t t-esc="len(group.message_ids)"/> messages
                 </div>
-                <div class="col-md-2">
+                <div class="col-md-3">
                     <t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>
                 </div>
             </div>

From b0def9d479973caf1a64dcd2a31f8cc7bf5c330a Mon Sep 17 00:00:00 2001
From: --global <tde@openerp.com>
Date: Thu, 22 May 2014 12:48:09 +0200
Subject: [PATCH 09/19] [FIX] website_mail_group: order archives by date
 descending

---
 addons/website_mail_group/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 4449a38f999..2789b235668 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -16,7 +16,7 @@ class MailGroup(http.Controller):
         MailMessage = request.registry['mail.message']
         groups = MailMessage.read_group(
             request.cr, request.uid, [('model', '=', 'mail.group'), ('res_id', '=', group_id)], ['subject', 'date'],
-            groupby="date", orderby="date asc", context=request.context)
+            groupby="date", orderby="date desc", context=request.context)
         for group in groups:
             begin_date = datetime.datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
             end_date = datetime.datetime.strptime(group['__domain'][1][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()

From a6eaa7bac375ce702483266e4afb64b72484a3be Mon Sep 17 00:00:00 2001
From: --global <tde@openerp.com>
Date: Thu, 22 May 2014 12:48:32 +0200
Subject: [PATCH 10/19] [FIX] website_mail_group: email-based author was
 wrongly placed in the layout

---
 addons/website_mail_group/views/website_mail_group.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index d1674cad5de..0e10b343cc1 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -236,10 +236,10 @@
                                 "fields": ["name"]
                             }'/>
                         </t>
+                        <t t-if="not thread.author_id"><t t-esc="thread.email_from"/></t>
                         - <i class="fa fa-calendar"/> <t t-esc="thread.date"/>
                         - <i class="fa fa-paperclip"/> <t t-esc="len(thread.attachment_ids)"/>
                     </small>
-                    <t t-if="not thread.author_id"><t t-esc="thread.email_from"/></t>
                     <p t-if="thread.child_ids" class="mt8">
                         <a href="#" class="o_mg_link_hide">
                             <i class="fa fa-chevron-right"/> <t t-raw="len(thread.child_ids)"/> replies

From 8a6b0d1d4d42550a953b731494a1b8d137a10166 Mon Sep 17 00:00:00 2001
From: --global <tde@openerp.com>
Date: Thu, 22 May 2014 13:29:49 +0200
Subject: [PATCH 11/19] [FIX] website_mail_group: number of thread and replies
 back to normal values after testing.

---
 addons/website_mail_group/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 2789b235668..e0259834a2e 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -9,8 +9,8 @@ from openerp.addons.web.http import request
 
 
 class MailGroup(http.Controller):
-    _thread_per_page = 5
-    _replies_per_page = 1
+    _thread_per_page = 20
+    _replies_per_page = 10
 
     def _get_archives(self, group_id):
         MailMessage = request.registry['mail.message']

From 47f24697ec01ea349b43f53770d5a365c9802488 Mon Sep 17 00:00:00 2001
From: --global <tde@openerp.com>
Date: Thu, 22 May 2014 13:38:07 +0200
Subject: [PATCH 12/19] [FIX] website_mail_group: effectively handle
 replies_per_page parameter that controls the number of replies to display
 under each message.

---
 addons/website_mail_group/controllers/main.py          | 2 ++
 addons/website_mail_group/views/website_mail_group.xml | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index e0259834a2e..7e397d32bbf 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -74,6 +74,7 @@ class MailGroup(http.Controller):
             'archives': self._get_archives(group.id),
             'date_begin': date_begin,
             'date_end': date_end,
+            'replies_per_page': self._replies_per_page,
         }
         return request.website.render('website_mail_group.group_messages', values)
 
@@ -89,6 +90,7 @@ class MailGroup(http.Controller):
             'archives': self._get_archives(group.id),
             'date_begin': date_begin,
             'date_end': date_end,
+            'replies_per_page': self._replies_per_page,
         }
         return request.website.render('website_mail_group.group_message', values)
 
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 0e10b343cc1..b187f6f1f8a 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -201,8 +201,8 @@
                     <div t-if="message.child_ids" class="o_mg_replies">
                         <h4 class="page-header">Follow-Ups</h4>
                         <t t-call="website_mail_group.messages_short">
-                            <t t-set="messages" t-value="message.child_ids[:1]"/>
-                            <t t-set="msg_more_count" t-value="len(message.child_ids) - 1"/>
+                            <t t-set="messages" t-value="message.child_ids[:replies_per_page]"/>
+                            <t t-set="msg_more_count" t-value="len(message.child_ids) - replies_per_page"/>
                             <t t-set="thread_header" t-value="message"/>
                         </t>
                     </div>
@@ -250,8 +250,8 @@
                     </p>
                     <div class="o_mg_link_content o_mg_replies">
                         <t t-call="website_mail_group.messages_short">
-                            <t t-set="messages" t-value="thread.child_ids[:1]"/>
-                            <t t-set="msg_more_count" t-value="len(thread.child_ids) - 1"/>
+                            <t t-set="messages" t-value="thread.child_ids[:replies_per_page]"/>
+                            <t t-set="msg_more_count" t-value="len(thread.child_ids) - replies_per_page"/>
                             <t t-set="thread_header" t-value="thread"/>
                         </t>
                     </div>

From 1d70ecd80d591e98a3f0a422df3dfe2ace3b0f5d Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Fri, 23 May 2014 11:55:48 +0200
Subject: [PATCH 13/19] [IMP] website: add max_height and max_width options to
 image Qweb widget

---
 addons/website/models/ir_qweb.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index ad2b63a6dd9..40b407a040a 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -265,10 +265,16 @@ class Image(orm.AbstractModel):
         if options is None: options = {}
         classes = ['img', 'img-responsive'] + options.get('class', '').split()
 
-        return ir_qweb.HTMLSafe('<img class="%s" src="/website/image?model=%s&field=%s&id=%s"/>' % (
+        size_params = []
+        if options.has_key('max_width'):
+            size_params.append("max_width=%i" % options['max_width'])
+        if options.has_key('max_height'):
+            size_params.append("max_height=%i" % options['max_height'])
+
+        return ir_qweb.HTMLSafe('<img class="%s" src="/website/image?model=%s&field=%s&id=%s&%s"/>' % (
             ' '.join(itertools.imap(werkzeug.utils.escape, classes)),
             record._model._name,
-            field_name, record.id))
+            field_name, record.id, '&'.join(size_params)))
 
     local_url_re = re.compile(r'^/(?P<module>[^]]+)/static/(?P<rest>.+)$')
     def from_html(self, cr, uid, model, column, element, context=None):

From 15ea4563afec91c0a7449f37f5ccb3d9ceea3538 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Fri, 23 May 2014 11:58:25 +0200
Subject: [PATCH 14/19] [FIX] website_crm_partner_assign: better display of
 partners logos

---
 .../views/website_crm_partner_assign.xml                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 6d5b93793ad..0dd5616070b 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -86,8 +86,8 @@
                         </t>
                         <div class="media">
                             <a class="pull-left" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}"
-                               t-field="partner.image_small"
-                               t-field-options='{"widget": "image", "class": "media-object"}'
+                               t-field="partner.image"
+                               t-field-options='{"widget": "image", "class": "media-object", "max_width": 128}'
                             ></a>
                             <div class="media-body o_partner_body" style="min-height: 64px;">
                                 <a class="media-heading" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}">

From dc98882c9097695674ef428fa90772e74afa4bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 23 May 2014 12:39:50 +0200
Subject: [PATCH 15/19] [FIX] website_mail_group: added forgotten parameter for
 a view, added previously in this branch

---
 addons/website_mail_group/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 7e397d32bbf..56bc4797dd5 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -111,5 +111,6 @@ class MailGroup(http.Controller):
             'thread_header': message,
             'messages': messages,
             'msg_more_count': msg_count - self._replies_per_page,
+            'replies_per_page': self._replies_per_page,
         }
         return request.registry['ir.ui.view'].render(request.cr, request.uid, 'website_mail_group.messages_short', values, engine='ir.qweb', context=request.context)

From c40f184102c419213b64107226aa0a622f849753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 23 May 2014 12:40:08 +0200
Subject: [PATCH 16/19] [IMP] website_mail_group: better variables name in js
 file

---
 .../static/src/js/website_mail_group.js                  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
index 4c588367409..c9b8ae797ed 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.js
@@ -28,10 +28,11 @@ $(document).ready(function () {
             if (! data) {
                 return true;
             }
-            var $current_ul = $link.parents('.o_mg_replies').first().find('ul.media-list');
-            if ($current_ul) {
-                $(data).find('li.media').insertAfter($current_ul.find('li.media').last());
-                $(data).find('p.well').appendTo($current_ul);
+            var $thread_container = $link.parents('.o_mg_replies').first().find('ul.media-list');
+            if ($thread_container) {
+                var $last_msg = $thread_container.find('li.media').last();
+                $(data).find('li.media').insertAfter($last_msg);
+                $(data).find('p.well').appendTo($thread_container);
             }
             var $show_more = $link.parents('p.well').first();
             $show_more.remove();

From 9fadd0b04cab4fc54526a1f4dcafc2e77d3f6050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 23 May 2014 13:17:33 +0200
Subject: [PATCH 17/19] [IMP] website_mail_group: display previous / next
 message when browsing + take into account thread or date mode.

---
 addons/website_mail_group/controllers/main.py     | 15 +++++++++++++++
 .../views/website_mail_group.xml                  | 12 ++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 56bc4797dd5..7320ebc6548 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -83,6 +83,19 @@ class MailGroup(http.Controller):
     ], type='http', auth="public", website=True)
     def thread_discussion(self, group, message, mode='thread', date_begin=None, date_end=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
+        Message = request.registry['mail.message']
+        if mode == 'thread':
+            base_domain = [('model', '=', 'mail.group'), ('res_id', '=', group.id), ('parent_id', '=', message.parent_id and message.parent_id.id or False)]
+        else:
+            base_domain = [('model', '=', 'mail.group'), ('res_id', '=', group.id)]
+        next_message = None
+        next_message_ids = Message.search(cr, uid, base_domain + [('date', '<', message.date)], order="date DESC", limit=1, context=context)
+        if next_message_ids:
+            next_message = Message.browse(cr, uid, next_message_ids[0], context=context)
+        prev_message = None
+        prev_message_ids = Message.search(cr, uid, base_domain + [('date', '>', message.date)], order="date ASC", limit=1, context=context)
+        if prev_message_ids:
+            prev_message = Message.browse(cr, uid, prev_message_ids[0], context=context)
         values = {
             'message': message,
             'group': group,
@@ -91,6 +104,8 @@ class MailGroup(http.Controller):
             'date_begin': date_begin,
             'date_end': date_end,
             'replies_per_page': self._replies_per_page,
+            'next_message': next_message,
+            'prev_message': prev_message,
         }
         return request.website.render('website_mail_group.group_message', values)
 
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index b187f6f1f8a..76edd524753 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -151,6 +151,18 @@
                     </ul>
                 </div>
                 <div class="col-md-9">
+                    <div class="row">
+                        <h4 class="col-md-6">
+                            <t t-if="prev_message"><a t-attf-href='/groups/#{slug(group)}/#{slug(prev_message)}?#{mode and "mode=%s" % mode or ""}'>
+                                <i class="fa fa-arrow-left"/> <t t-esc="prev_message.description"/>
+                            </a></t>
+                        </h4>
+                        <h4 class="col-md-6">
+                            <t t-if="next_message"><a class="pull-right" t-attf-href='/groups/#{slug(group)}/#{slug(next_message)}?#{mode and "mode=%s" % mode or ""}'>
+                                <t t-esc="next_message.description"/> <i class="fa fa-arrow-right"/>
+                            </a></t>
+                        </h4>
+                    </div>
                     <div class="media">
                         <img class="img-rounded pull-left mt0 media-object o_mg_avatar"
                             t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)"/>

From 4362c6127f1520bee50662dd151c073b2e94c91c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 23 May 2014 15:03:23 +0200
Subject: [PATCH 18/19] [IMP] use url_encode when building url query string

I have no idea why I originall implemented that crap via string munging.
---
 addons/website/models/ir_qweb.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 40b407a040a..0e1fe2beb89 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -15,6 +15,7 @@ import urllib2
 import urlparse
 import re
 
+import werkzeug.urls
 import werkzeug.utils
 from dateutil import parser
 from lxml import etree, html
@@ -265,16 +266,19 @@ class Image(orm.AbstractModel):
         if options is None: options = {}
         classes = ['img', 'img-responsive'] + options.get('class', '').split()
 
-        size_params = []
-        if options.has_key('max_width'):
-            size_params.append("max_width=%i" % options['max_width'])
-        if options.has_key('max_height'):
-            size_params.append("max_height=%i" % options['max_height'])
+        url_params = {
+            'model': record._model._name,
+            'field': field_name,
+            'id': record.id,
+        }
+        for options_key in ['max_width', 'max_height']:
+            if options.get(options_key):
+                url_params[options_key] = options[options_key]
 
-        return ir_qweb.HTMLSafe('<img class="%s" src="/website/image?model=%s&field=%s&id=%s&%s"/>' % (
+        return ir_qweb.HTMLSafe('<img class="%s" src="/website/image?%s"/>' % (
             ' '.join(itertools.imap(werkzeug.utils.escape, classes)),
-            record._model._name,
-            field_name, record.id, '&'.join(size_params)))
+            werkzeug.urls.url_encode(url_params)
+        ))
 
     local_url_re = re.compile(r'^/(?P<module>[^]]+)/static/(?P<rest>.+)$')
     def from_html(self, cr, uid, model, column, element, context=None):

From 327dda0bded911078ec4155247adec8522f6ba87 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 23 May 2014 15:11:13 +0200
Subject: [PATCH 19/19] [FIX] correctly handle invalid max_width/max_height
 passed to website._image

---
 addons/website/models/website.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index e0aac6dbbbf..9828e9aa39d 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -555,8 +555,10 @@ class website(osv.osv):
         if record.get(presized):
             response.data = data
             return response
-
-        fit = int(max_width), int(max_height)
+        try:
+            fit = int(max_width), int(max_height)
+        except TypeError:
+            fit = (maxint, maxint)
         w, h = image.size
         max_w, max_h = fit