[MERGE]Merge with trunk upto revision no 1011.

bzr revid: kch@tinyerp.com-20110913054406-yrjafv0qdzzijizz

diff --cc addons/web/__openerp__.py
index bf149ff,dd4d207..52eee3a
--- 1/addons/web/__openerp__.py
--- 2/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@@ -46,6 -44,6 +45,7 @@@
          "static/lib/jquery.ui.notify/css/ui.notify.css",
          "static/src/css/base.css",
          "static/src/css/data_export.css",
 +        "static/src/css/data_import.css",
      ],
+     'wsgi' : 'app',
  }

diff --cc addons/web/controllers/main.py
Simple merge

diff --cc addons/web/static/src/js/boot.js
Simple merge

diff --cc addons/web/static/src/js/chrome.js
index 4d19287,c12d157..582ef51
--- 1/addons/web/static/src/js/chrome.js
--- 2/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@@ -426,9 -462,15 +461,16 @@@ openerp.web.Database = openerp.web.Widg
      }
  });
  
- openerp.web.Login =  openerp.web.Widget.extend({
+ openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
      remember_creditentials: true,
+     /**
+      * @constructs openerp.web.Login
+      * @extends openerp.web.Widget
 -     * 
++     *
+      * @param parent
+      * @param element_id
+      */
 +
      init: function(parent, element_id) {
          this._super(parent, element_id);
          this.has_local_storage = typeof(localStorage) != 'undefined';
@@@ -526,9 -568,15 +568,15 @@@
      }
  });
  
- openerp.web.Header =  openerp.web.Widget.extend({
+ openerp.web.Header =  openerp.web.Widget.extend(/** @lends openerp.web.Header# */{
      template: "Header",
      identifier_prefix: 'oe-app-header-',
+     /**
+      * @constructs openerp.web.Header
+      * @extends openerp.web.Widget
 -     * 
++     *
+      * @param parent
+      */
      init: function(parent) {
          this._super(parent);
          this.qs = "?" + jQuery.param.querystring();
@@@ -709,8 -757,15 +757,15 @@@
      }
  });
  
- openerp.web.Menu =  openerp.web.Widget.extend({
+ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
+     /**
+      * @constructs openerp.web.Menu
+      * @extends openerp.web.Widget
 -     * 
++     *
+      * @param parent
+      * @param element_id
+      * @param secondary_menu_id
+      */
      init: function(parent, element_id, secondary_menu_id) {
          this._super(parent, element_id);
          this.secondary_menu_id = secondary_menu_id;
@@@ -792,13 -847,13 +847,13 @@@
      }
  });
  
- openerp.web.Homepage = openerp.web.Widget.extend({
- });
- 
- openerp.web.Preferences = openerp.web.Widget.extend({
- });
- 
- openerp.web.WebClient = openerp.web.Widget.extend({
+ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{
+     /**
+      * @constructs openerp.web.WebClient
+      * @extends openerp.web.Widget
 -     * 
++     *
+      * @param element_id
+      */
      init: function(element_id) {
          this._super(null, element_id);
          openerp.webclient = this;

diff --cc addons/web/static/src/js/form.js
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge

diff --cc addons/web/static/src/xml/base.xml
index 654a4d4,c97b9d5..ce9f7aa
--- 1/addons/web/static/src/xml/base.xml
--- 2/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@@ -1524,4 -1393,17 +1530,18 @@@
          </p>
      </div>
  </t>
++
+ <t t-name="FieldStatus">
+     <div t-att-id="widget.element_id"></div>
+ </t>
+ <t t-name="FieldStatus.content">
+     <ul class="oe-arrow-list">
+         <t t-set="size" t-value="widget.to_show.length"/>
+         <t t-foreach="_.range(size)" t-as="i">
+             <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe-arrow-list-selected' : ''">
+                 <span class="oe-arrow-list-before" t-if="i &gt; 0"></span><span><t t-esc="widget.to_show[i][1]"/></span><span class="oe-arrow-list-after" t-if="i &lt; size - 1"></span>
+             </li>
+         </t>
+     </ul>
+ </t>
 -</templates>
 +</templates>