[MERGE]Merge with trunk upto revision no 1043.

bzr revid: kch@tinyerp.com-20110915070222-1sw9bpp36s42nvt2

1 files changed, 35 insertions, 17 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 238edbedb62..9f2c6e28401 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -40,7 +40,7 @@
     <tr>
         <td valign="top" id="oe_secondary_menu" class="secondary_menu">
         </td>
-        <td valign="top">
+        <td valign="top" class="oe-application-container">
             <div id="oe_app" class="oe-application">
             </div>
         </td>
@@ -420,12 +420,14 @@
     <table class="view-manager-main-table">
     <tr>
         <td class="view-manager-main-content">
-            <div class="oe_vm_switch">
-                <t t-if="views.length != 1" t-foreach="views" t-as="view">
-                    <button type="button" t-att-data-view-type="view.view_type">
-                        <t t-esc="view.view_type"/>
-                    </button>
-                </t>
+            <div class="oe-view-manager-header">
+                <div class="oe_vm_switch">
+                    <t t-if="views.length != 1" t-foreach="views" t-as="view">
+                        <button type="button" t-att-data-view-type="view.view_type">
+                            <t t-esc="view.view_type"/>
+                        </button>
+                    </t>
+                </div>
             </div>
             <div t-attf-id="#{prefix}_search" t-opentag="true"/>
             <t t-foreach="views" t-as="view">
@@ -442,9 +444,26 @@
 </t>
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
-    <t t-jquery=".view-manager-main-content" t-operation="prepend">
+    <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>
+    	   href="javascript: void(0)"> </a>
+        <h2 class="oe_view_title">
+            <t t-esc="self.action.name"/>
+            <button t-if="self.session.debug" class="oe_get_xml_view">
+                View#<span></span>
+            </button>
+        </h2>
+    </t>
+    <t t-jquery=".oe-view-manager-header" t-operation="after">
+        <ul class="oe-view-manager-logs"></ul>
     </t>
 </t>
 
@@ -502,7 +521,6 @@
     </div>
 </t>
 <t t-name="TreeView">
-    <h2 class="oe_view_title"><t t-esc="title"/></h2>
     <select t-if="toolbar" style="width: 30%">
     </select>
     <table class="oe-treeview-table">
@@ -632,7 +650,6 @@
 </t>
 <t t-name="FormView">
     <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 t-if="view.session.debug" class="oe_get_xml_view">View#<t t-esc="view.fields_view.view_id"/></button></h2>
         <div class="oe_form_buttons" t-if="view.options.action_buttons !== false">
             <!--<button type="button" class="oe_form_button_save">
                 <span class="oe_form_on_update">Save</span>
@@ -793,11 +810,13 @@
     <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldDate">
-    <input type="text" size="1" style="width: 100%"
-        t-att-name="widget.name"
-        t-att-id="widget.element_id + '_field'"
-        t-att-class="'field_' + widget.type"
-    />
+    <t t-call="FieldChar"/>
+    <img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
+         title="Select date" width="16" height="16" border="0"/>
+    <div class="oe_datepicker ui-widget-content ui-corner-all" style="display: none; position: absolute; z-index: 1;">
+        <div class="oe_datepicker_container"/>
+        <button type="button" class="oe_datepicker_close ui-state-default ui-priority-primary ui-corner-all" style="float: right;">Done</button>
+    </div>
 </t>
 <t t-name="FieldSelection">
     <select
@@ -974,7 +993,6 @@
     </button>
 </t>
 <t t-name="SearchView">
-    <h2 class="oe_view_title"><t t-esc="view.attrs['string']"/></h2>
     <form class="oe_forms">
         <t t-call="SearchView.render_lines"/>
         <div class="oe_search-view-buttons" style="text-align: right;">