From b63f8f934a596135ae616645ad1669d465aeb3ad Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 20 Jul 2011 11:34:54 +0200
Subject: [imp] cosmetic improvement in m2o

bzr revid: nicolas.vanhoren@openerp.com-20110720093454-llijpau6l3zvpfc3
---
 addons/base/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index c5e3614ca4a..1f15796acbb 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -521,7 +521,7 @@
             <img src="/base/static/src/img/icons/gtk-index.png"/></span>
         <div t-att-id="widget.cm_id" class="contextMenu" style="display:none"><ul>
             <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open...</li>
-            <li t-att-id="widget.cm_id + '_create'">Create and Edit...</li>
+            <li t-att-id="widget.cm_id + '_create'">Create...</li>
             <li t-att-id="widget.cm_id + '_search'">Search...</li>
         </ul></div>
     </div>
-- 
cgit v1.2.3


From 3b19c459fab04bb15570a3f1c34d6c9176608f46 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 20 Jul 2011 13:23:42 +0200
Subject: [IMP] header add db and login

bzr revid: al@openerp.com-20110720112342-tnr6o3la3zikc7c8
---
 addons/base/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 1f15796acbb..04841a2e297 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -143,8 +143,8 @@
         <div class="company_logo" />
     </a>
     <h1 class="header_title" t-if="session.session_is_valid()">
-        <span class="company">$company</span> - (<span class="database">$database</span>)<br/>
-        <small class="username">$username session_id: <t t-esc="session.session_id"/></small>
+        <span class="database"><t t-esc="session.db"/></span> - <t t-esc="session.login"/> <br/>
+        <small class="username">rpc_session_id: <t t-esc="session.session_id"/></small>
     </h1>
     <div class="header_corner">
         <ul class="block" t-if="session.session_is_valid()">
-- 
cgit v1.2.3


From b15b501b8a8fd199d63a2cf2715944d2cca55c1a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 22 Jul 2011 17:05:37 +0200
Subject: [imp] managed filters startup

bzr revid: nicolas.vanhoren@openerp.com-20110722150537-i01yezky8fcar90h
---
 addons/base/static/src/xml/base.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 04841a2e297..b95d9da5aea 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -62,7 +62,7 @@
                         <td><label for="db">Database:</label></td>
                         <td>
                             <t t-if="!db_list">
-                                <input type="text" name="db" value="trunk" autofocus="true"/>
+                                <input type="text" name="db" value="" autofocus="true"/>
                             </t>
                             <t t-if="db_list">
                                 <select name="db">
@@ -664,14 +664,20 @@
             <input type="reset" value="Clear"/>
             <button class="oe_search-view-custom-filter-btn"><span>Advanced Filter</span></button>
             <select class="oe_search-view-filters-management">
-                <option value="_filters">-- Filters --</option>
-                <option value="_actions">-- Actions --</option>
-                <option value="save_filter">Save Filter</option>
-                <option value="manage_filters">Manage Filters</option>
+
             </select>
         </div>
     </form>
 </t>
+<t t-name="SearchView.managed-filters">
+    <option value="_filters">-- Filters --</option>
+    <t t-foreach="filters" t-as="filter">
+        <option t-att-value="'get:' + filter.id"><t t-esc="filter.name"/></option>
+    </t>
+    <option value="_actions">-- Actions --</option>
+    <option value="save_filter">Save Filter</option>
+    <option value="manage_filters">Manage Filters</option>
+</t>
 <t t-name="SearchView.render_lines">
     <table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0"
            t-foreach="lines" t-as="line">
-- 
cgit v1.2.3


From 95ccd74114399b6a668e66f8d1fb81cb484051d5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 22 Jul 2011 17:35:05 +0200
Subject: [imp] made usage of a managed filter possible

bzr revid: nicolas.vanhoren@openerp.com-20110722153505-g5mukqwfmd6eup2t
---
 addons/base/static/src/xml/base.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index b95d9da5aea..414dd0ed183 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -664,15 +664,16 @@
             <input type="reset" value="Clear"/>
             <button class="oe_search-view-custom-filter-btn"><span>Advanced Filter</span></button>
             <select class="oe_search-view-filters-management">
-
             </select>
         </div>
     </form>
 </t>
 <t t-name="SearchView.managed-filters">
     <option value="_filters">-- Filters --</option>
+    <t t-set="i" t-value="0"/>
     <t t-foreach="filters" t-as="filter">
-        <option t-att-value="'get:' + filter.id"><t t-esc="filter.name"/></option>
+        <option t-att-value="'get:' + i"><t t-esc="filter.name"/></option>
+        <t t-set="i" t-value="i+1"/>
     </t>
     <option value="_actions">-- Actions --</option>
     <option value="save_filter">Save Filter</option>
-- 
cgit v1.2.3


From 5bc4c09c3a814f28458522c7f7ba79eb88732fac Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 25 Jul 2011 11:52:32 +0200
Subject: [imp] remember db on login screen

bzr revid: nicolas.vanhoren@openerp.com-20110725095232-fzy7rs43y1udha4b
---
 addons/base/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 414dd0ed183..faab1eb3d6d 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -62,7 +62,7 @@
                         <td><label for="db">Database:</label></td>
                         <td>
                             <t t-if="!db_list">
-                                <input type="text" name="db" value="" autofocus="true"/>
+                                <input type="text" name="db" t-att-value="selected_db || ''" autofocus="true"/>
                             </t>
                             <t t-if="db_list">
                                 <select name="db">
-- 
cgit v1.2.3


From 05b9d6217fbd05fe44cdb6b60aec4c2e406c4983 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 25 Jul 2011 12:29:49 +0200
Subject: [FIX] formatting of aggregated fields, formatting of floats in list
 view (use digits if available, otherwise default to 2)

bzr revid: xmo@openerp.com-20110725102949-z7nkuwyybuczazxy
---
 addons/base/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 414dd0ed183..5bb63d2356a 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -293,7 +293,7 @@
         <tr>
             <td t-if="options.selectable"/>
             <td t-foreach="aggregate_columns" t-as="column" class="oe-list-footer oe-number"
-                t-att-data-field="column.field" t-att-title="column.label">
+                t-att-data-field="column.id" t-att-title="column.label">
             </td>
             <td t-if="options.deletable"/>
         </tr>
-- 
cgit v1.2.3


From fb0c16e24e502e168ea7ee9373fc0f1933ac4bc9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 25 Jul 2011 13:37:40 +0200
Subject: [imp] added possibility to save filters

bzr revid: nicolas.vanhoren@openerp.com-20110725113740-8q9vo1rlvexertc1
---
 addons/base/static/src/xml/base.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index faab1eb3d6d..5570415fdde 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -679,6 +679,13 @@
     <option value="save_filter">Save Filter</option>
     <option value="manage_filters">Manage Filters</option>
 </t>
+<t t-name="SearchView.managed-filters.add">
+    <div>
+        <p>Filter Name:</p>
+        <input type="text"/>
+        <p>(Any existing filter with the same name will be replaced)</p>
+    </div>
+</t>
 <t t-name="SearchView.render_lines">
     <table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0"
            t-foreach="lines" t-as="line">
-- 
cgit v1.2.3


From d0234fa5dd424e7722443fda7e41f955d857027a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 26 Jul 2011 23:00:05 +0200
Subject: [IMP] new Sidebar controller

Now, the views are responsible of the management of their own sidebar.
There is one sidebar per view.
The viewmanager creates the divs for each sidebar (as it does for each view).
The new Sidebar controller allows custom section with their own controller.

bzr revid: fme@openerp.com-20110726210005-xyalvw764y2xhvte
---
 addons/base/static/src/xml/base.xml | 54 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

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

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 0f7c3f3d51f..10d1539cde1 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -232,10 +232,32 @@
             </t>
         </td>
         <td class="view-manager-main-sidebar" height="100%">
+            <t t-foreach="views" t-as="view">
+                <div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/>
+            </t>
         </td>
     </tr>
     </table>
 </t>
+<t t-name="Sidebar">
+    <a class="toggle-sidebar"></a>
+    <div class="sidebar-content">
+        <div class="sidebar-actions">
+        </div>
+    </div>
+</t>
+<t t-name="Sidebar.section">
+    <h2><t t-esc="name"/></h2>
+    <div t-att-id="section_id">
+        <ul t-if="items">
+            <li t-foreach="items" t-as="item" t-att-class="item.classname">
+                <a class="oe_sidebar_action_a" t-att-id="item.element_id" href="#">
+                    <t t-esc="item.label"/>
+                </a>
+            </li>
+        </ul>
+    </div>
+</t>
 <table t-name="ListView" class="oe-listview-content">
     <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
     <thead class="ui-widget-header">
@@ -360,21 +382,20 @@
     <t t-raw="frame.render()"/>
 </t>
 <t t-name="FormView.sidebar.attachments">
-    <h2>Attachments</h2>
     <div class="oe-sidebar-attachments-toolbar">
         <div class="oe-binary-file-set" style="float: right">
             <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
                 method="post" enctype="multipart/form-data" action="/base/binary/upload_attachment">
                 <input type="hidden" name="session_id" t-att-value="session.session_id"/>
                 <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
-                <input type="hidden" name="model" t-att-value="dataset.model"/>
-                <input type="hidden" name="id" t-att-value="datarecord.id"/>
+                <input type="hidden" name="model" t-att-value="view.dataset.model"/>
+                <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
                 <button class="button" type="button">
                     <img src="/base/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
                     <span>Add</span>
                 </button>
                 <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
-                    t-att-onclick="datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
+                    t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
             </form>
             <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"> </iframe>
         </div>
@@ -384,7 +405,7 @@
         <li t-foreach="attachments" t-as="attachment">
             <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="'/base/binary/saveas?session_id='
                 + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
-                + '&amp;field=datas' + '&amp;fieldname=name' + '&amp;t=' + (new Date().getTime())"/>
+                + '&amp;field=datas&amp;fieldname=name&amp;t=' + (new Date().getTime())"/>
             <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
                 <t t-esc="attachment.name"/>
             </a>
@@ -849,29 +870,6 @@
         </t>
     </select>
 </t>
-<t t-name="ViewManager.sidebar">
-    <div t-att-id="element_id" class="sidebar-main-div closed-sidebar">
-
-    </div>
-</t>
-<t t-name="ViewManager.sidebar.internal">
-    <a class="toggle-sidebar"></a>
-    <div class="sidebar-content">
-        <div class="sidebar-attachments" t-if="view == 'form'"> </div>
-        <div class="sidebar-actions">
-            <t t-foreach="sidebar.sections" t-as="section" t-if="section.elements.length">
-                <h2><t t-esc="section.label"/></h2>
-                <ul>
-                    <li t-foreach="section.elements" t-as="element">
-                        <a class="oe_sidebar_action_a" t-attf-data-index="#{section_index}-#{element_index}" href="#">
-                            <t t-esc="element.name"/>
-                        </a>
-                    </li>
-                </ul>
-            </t>
-        </div>
-    </div>
-</t>
 <t t-name="DialogWarning">
     <table cellspacing="0" cellpadding="0" border="0" class="oe-dialog-warning">
     <tr>
-- 
cgit v1.2.3