[Merge] Merged with latest branch.

bzr revid: noz@tinyerp.com-20110718053005-40qxjjeybb9xv294

1 files changed, 34 insertions, 37 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9651227c804..3baaa01ad4b 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -421,41 +421,40 @@
     </tr>
     </table>
 </t>
-<table t-name="ListView">
+<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)"/>
-    <t t-set="actions_span" t-value="Math.floor((options.deletable or options.addable) ? columns_count/2 : 0)"/>
     <thead class="ui-widget-header">
-        <tr>
-            <th t-if="actions_span" t-att-colspan="actions_span"
-                class="oe-actions">
-                <t t-if="flags.action_buttons !== false">
-                    <button type="button" class="oe-list-add"
-                            t-if="options.addable">
-                        <t t-esc="options.addable"/>
-                    </button>
-                    <button type="button" class="oe-list-delete"
-                            t-if="options.selectable and options.deletable">
-                        Delete
-                    </button>
-                </t>
-            </th>
-            <th t-att-colspan="columns_count - actions_span"
-                class="oe-list-pager">
-                <t t-if="flags.pager !== false">
-                    <button type="button" disabled="disabled"
-                            data-pager-action="first">First</button>
-                    <button type="button" disabled="disabled"
-                            data-pager-action="previous"
-                            >&lt;&lt;</button>
+        <tr t-if="flags.action_buttons !== false or flags.pager !== false">
+            <th t-att-colspan="columns_count">
+                <table>
+                    <tr>
+                        <td t-if="flags.action_buttons !== false" class="oe-actions">
+                            <button type="button" class="oe-list-add"
+                                    t-if="options.addable">
+                                <t t-esc="options.addable"/>
+                            </button>
+                            <button type="button" class="oe-list-delete"
+                                    t-if="options.selectable and options.deletable">
+                                Delete
+                            </button>
+                        </td>
+                        <th t-if="flags.pager !== false" class="oe-list-pager">
+                            <button type="button" disabled="disabled"
+                                    data-pager-action="first">First</button>
+                            <button type="button" disabled="disabled"
+                                    data-pager-action="previous"
+                                    >&lt;</button>
 
-                    <span class="oe-pager-state">
-                    </span>
+                            <span class="oe-pager-state">
+                            </span>
 
-                    <button type="button" disabled="disabled"
-                            data-pager-action="next">&gt;&gt;</button>
-                    <button type="button" disabled="disabled"
-                            data-pager-action="last">Last</button>
-                </t>
+                            <button type="button" disabled="disabled"
+                                    data-pager-action="next">&gt;</button>
+                            <button type="button" disabled="disabled"
+                                    data-pager-action="last">Last</button>
+                        </th>
+                    </tr>
+                </table>
             </th>
         </tr>
         <tr t-if="options.header">
@@ -468,10 +467,8 @@
             <t t-foreach="columns" t-as="column">
                 <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
                     t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)">
-                    <t t-if="column.tag !== 'button'">
-                        <t t-esc="column.string"/>
-                        <span t-att-class="(fields_view.sorted.field === column.id) ? ('ui-icon' + (fields_view.sorted.reversed ? ' ui-icon-triangle-1-n' : ' ui-icon-triangle-1-s')) : ''"/>
-                    </t>
+                    <t t-if="column.tag !== 'button'"
+                        ><t t-esc="column.string"/></t>
                 </th>
             </t>
             <th t-if="options.deletable" width="1"/>
@@ -521,8 +518,8 @@
     <t t-raw="frame.render()"/>
 </t>
 <t t-name="FormView">
-    <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
     <div class="oe_form_header" t-att-id="view.element_id + '_header'">
+        <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/> <button class="oe_get_xml_view">xml</button></h2>
         <div class="oe_form_buttons" t-if="view.flags.action_buttons !== false">
             <!--<button type="button" class="oe_form_button_save">
                 <span class="oe_form_on_update">Save</span>
@@ -996,7 +993,7 @@
         <select class="searchview_extended_prop_op"/>
         <span class="searchview_extended_prop_value"/>
         <a class="searchview_extended_delete_prop"
-                href="javascript:void(0)"><span></span></a>
+                href="javascript:void(0)"><span> </span></a>
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">