From 98e87a51aef5c7457c444334f3f5270cbb947ba3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 09:09:46 +0100
Subject: [IMP] attachment: sidebar rendering of tipsy in html mode, and error
 fix

bzr revid: chm@openerp.com-20121207080946-f7zr853hvdhdrsk0
---
 addons/web/static/src/xml/base.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 62d8a872f25..09249c11ea5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -594,7 +594,23 @@
                 </button>
                 <ul class="oe_dropdown_menu">
                     <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
-                        <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
+                        <t t-if="section.name == 'files'">
+                            <t t-set="item.title">
+                                <b>Attachment : </b><br/>
+                                <t t-raw="item.name"/>
+                            </t>
+                            <t t-if="item.create_uid and item.create_uid[0]" t-set="item.title">
+                                <t t-raw="item.title"/><br/>
+                                <b>Created by : </b><br/>
+                                <t t-raw="item.create_uid[1] + ' ' + item.create_date"/>
+                            </t>
+                            <t t-if="item.create_uid and item.write_uid and item.create_uid[0] != item.write_uid[0]" t-set="item.title">
+                                <t t-raw="item.title"/><br/>
+                                <b>Modified by : </b><br/>
+                                <t t-raw="item.write_uid[1] + ' ' + item.write_date"/>
+                            </t>
+                        </t>
+                        <a class="oe_sidebar_action_a" t-att-title="item.title or ''" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
                             <t t-raw="item.label"/>
                         </a>
                          <a t-if="section.name == 'files' and !item.callback" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a>
-- 
cgit v1.2.3


From 27bc9ed5faf3df21c059ad2d06ebf255fe9dffde Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Dec 2012 10:11:34 +0100
Subject: [IMP] mail: fix display message attachment error

bzr revid: chm@openerp.com-20121207091134-9v0ce6o3dp8gca7l
---
 addons/web/static/src/xml/base.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index e50d6c68ffa..ad619345c45 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -636,6 +636,8 @@
     </div>
 </t>
 
+<t t-name="message_error_uploading">Uploading error</t>
+
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
     </select>
-- 
cgit v1.2.3


From 060ef9326849256a50a3ba5594af6b6ad3d0754f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 11 Dec 2012 12:18:24 +0100
Subject: [IMP] show company logo in chrome

bzr revid: chs@openerp.com-20121211111824-dj2ienybj2rxwhjj
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5ad24a43a6a..a8715515588 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -439,7 +439,7 @@
         <tr>
             <td class="oe_leftbar" valign="top">
                 <t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
-                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><img t-att-src='widget.session.url("/web/binary/company_logo")'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
-- 
cgit v1.2.3


From f817cd3f3868823a9880fff420e0932a55bb8ff7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 11 Dec 2012 15:45:51 +0100
Subject: [IMP] web: move controler download_attachment into mail. change
 render into _t

bzr revid: chm@openerp.com-20121211144551-9uryi1z1sxe9daxv
---
 addons/web/static/src/xml/base.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ad619345c45..e50d6c68ffa 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -636,8 +636,6 @@
     </div>
 </t>
 
-<t t-name="message_error_uploading">Uploading error</t>
-
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
     </select>
-- 
cgit v1.2.3


From 80133457d9870abc0f8d201b51d25e1c45882465 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 13 Dec 2012 16:00:33 +0100
Subject: [IMP] useability highlight select when option checked

bzr revid: fp@tinyerp.com-20121213150033-89zm08nfop2vf0fe
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 576f179854d..0cd9e48b885 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1368,7 +1368,7 @@
 </t>
 <t t-name="SelectCreatePopup.search.buttons">
     <t t-if="! widget.options.disable_multiple_selection">
-        <button type="button" class="oe_button oe_selectcreatepopup-search-select" disabled="disabled">Select</button>
+        <button type="button" class="oe_button oe_selectcreatepopup-search-select oe_highlight" disabled="disabled">Select</button>
     </t>
     <button type="button" class="oe_button oe_selectcreatepopup-search-create">Create</button>
     or <a class="oe_button oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
-- 
cgit v1.2.3


From fcf4d4040fbcae0fd5ddf3fccd0951c58fb8df66 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 18 Dec 2012 12:17:34 +0100
Subject: [ADD] Allow admin to edit the company logo

bzr revid: fme@openerp.com-20121218111734-wu02xaifqyqz1g20
---
 addons/web/static/src/xml/base.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index dc31a24dc31..5afadaeffd0 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -439,7 +439,10 @@
         <tr>
             <td class="oe_leftbar" valign="top">
                 <t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
-                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><img t-att-src='widget.session.url("/web/binary/company_logo")'/></a>
+                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}">
+                    <span class="oe_logo_edit">Edit Company data</span>
+                    <img t-att-src='widget.session.url("/web/binary/company_logo")'/>
+                </a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
-- 
cgit v1.2.3