[MERGE] trunk

bzr revid: xmo@openerp.com-20111207091404-1zdmhmsnvhveq7c4

1 files changed, 40 insertions, 28 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fd4e623b926..a75101f9867 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -360,10 +360,6 @@
             <li>
                 <a href="javascript:void(0)" title="About" class="about"><img src="/web/static/src/img/header-about.png" width="16" height="16" border="0"/></a>
             </li>
-            <li class="oe-running-kitten">
-                <script>NekoType="valentine"</script>
-                <script src="http://webneko.net/n200504.js"></script>
-            </li>
         </ul>
         <div class="block">
             <a href="#logout" class="logout">LOGOUT</a>
@@ -418,11 +414,12 @@
 </t>
 <t t-name="ViewManager">
     <table class="view-manager-main-table">
+    <tbody>
     <tr>
         <td class="view-manager-main-content">
             <div class="oe-view-manager-header">
                 <h2 class="oe_view_title" t-if="self.flags.display_title !== false">
-                    <t t-esc="self.display_title()"/>
+                    <span class="oe_view_title_text"><t t-esc="self.display_title()"/></span>
                 </h2>
                 <div class="oe_vm_switch">
                     <t t-if="views.length != 1" t-foreach="views" t-as="view">
@@ -443,21 +440,30 @@
             </t>
         </td>
     </tr>
+    </tbody>
     </table>
 </t>
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
-    <t t-jquery=".oe-view-manager-header" t-operation="prepend">
-        <blockquote t-if="self.action.help and !self.flags.low_profile
-                         and !(self.action.id in self.session.hidden_menutips)">
-            <p><t t-esc="self.action.help"/></p>
-            <div>
-                <button type="button" name="hide">Hide this tip</button>
-                <button type="button" name="disable">Disable all tips</button>
-            </div>
-        </blockquote>
-    	<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
-    	   href="javascript: void(0)"> </a>
+    <t t-jquery=".view-manager-main-table tbody" t-operation="prepend">
+        <tr>
+            <td class="oe_view_manager_menu_tips" colspan="2">
+                <blockquote t-if="self.action.help and !self.flags.low_profile
+                                 and !(self.action.id in self.session.hidden_menutips)">
+                    <p><t t-esc="self.action.help"/></p>
+                    <div>
+                        <button type="button" name="hide">Hide this tip</button>
+                        <button type="button" name="disable">Disable all tips</button>
+                    </div>
+                </blockquote>
+            </td>
+        </tr>
+    </t>
+    <t t-jquery="h2.oe_view_title" t-operation="prepend">
+        <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
+            href="javascript: void(0)"> </a>
+    </t>
+    <t t-jquery="h2.oe_view_title" t-operation="after">
         <button t-if="self.session.debug" class="oe_get_xml_view">
             View#<span></span>
         </button>
@@ -643,7 +649,7 @@
         </td>
     </t>
     <td t-if="options.deletable" class='oe-record-delete' width="1">
-        <button type="button" name="delete">♻</button>
+        <button type="button" name="delete"></button>
     </td>
 </tr>
 <t t-name="ListView.row.form">
@@ -730,6 +736,11 @@
     </tr>
     </table>
 </t>
+<t t-name="WidgetFrame.readonly" t-extend="WidgetFrame">
+    <t t-jquery="&gt;table">
+        this.attr('class', this.attr('class')+' oe_form_readonly');
+    </t>
+</t>
 <t t-name="WidgetGroup">
     <t t-if="widget.string">
     <fieldset class="oe_group_box">
@@ -1129,16 +1140,17 @@
     </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:' + 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>
-    <option value="add_to_dashboard">Add to Dashboard</option>
-    <option value="manage_filters">Manage Filters</option>
+    <option/>
+    <optgroup label="-- Filters --">
+        <t t-foreach="filters" t-as="filter">
+            <option t-attf-value="get:#{filter_index}"><t t-esc="filter.name"/></option>
+        </t>
+    </optgroup>
+    <optgroup label="-- Actions --">
+        <option value="save_filter">Save Filter</option>
+        <option value="add_to_dashboard">Add to Dashboard</option>
+        <option value="manage_filters">Manage Filters</option>
+    </optgroup>
 </t>
 <t t-name="SearchView.managed-filters.add">
     <div>
@@ -1674,7 +1686,7 @@
     </table>
 </t>
 <t t-name="ImportView.error">
-    <p style="white-space:pre-line;">The import failed due to:<t t-esc="error.message"/></p>
+    <p style="white-space:pre;">The import failed due to:<t t-esc="error.message"/></p>
     <t t-if="error.preview">
         <p>Here is a preview of the file we could not import:</p>
         <pre><t t-esc="error.preview"/></pre>