merge upstream

bzr revid: chs@openerp.com-20111213162531-1p76dk3xknouit35

diff --cc addons/web/common/session.py
Simple merge

diff --cc addons/web/static/src/js/chrome.js
index 1eaab8b,f737d8e..9d83e18
--- 1/addons/web/static/src/js/chrome.js
--- 2/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@@ -1009,41 -1011,25 +1005,39 @@@ openerp.web.WebClient = openerp.web.Wid
          this.session.on_session_valid.add_last(this.header.do_update);
          this.session.on_session_invalid.add_last(this.header.do_update);
          this.session.on_session_valid.add_last(this.on_logged);
+         this.session.on_session_invalid.add_last(this.on_logged_out);
  
 -        this.menu = new openerp.web.Menu(this, "oe_menu", "oe_secondary_menu");
 -        this.menu.on_action.add(this.on_menu_action);
  
-         this.url_internal_hashchange = false;
-         this.url_external_hashchange = false;
-         jQuery(window).bind('hashchange', this.on_url_hashchange);
+         this._current_state = null;
  
      },
      start: function() {
          this._super.apply(this, arguments);
 -        this.notification.prependTo(this.$element);
 -        this.loading.appendTo($('#oe_loading'));
 -        this.header.appendTo($("#oe_header"));
 -        this.session.start();
 -        this.login.appendTo($('#oe_login'));
 -        this.menu.start();
 +        var self = this;
 +        openerp.connection.bind(function() {
 +       
 +            var params = {};
 +            if(jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
 +                self.$element.addClass("kitten-mode-activated");
 +            }
 +            self.$element.html(QWeb.render("Interface", params));
 +            openerp.connection.session_restore();
 +
 +
 +            // TODO nivification of menu Widget !!!
 +            self.menu = new openerp.web.Menu(self, "oe_menu", "oe_secondary_menu");
 +            self.menu.on_action.add(self.on_menu_action);
 +
 +
 +            self.notification.prependTo(self.$element);
 +            self.loading.appendTo($('#oe_loading'));
 +            self.header.appendTo($("#oe_header"));
 +            self.login.appendTo($('#oe_login'));
 +            self.menu.start();
 +        });
      },
      do_reload: function() {
-         this.session.session_restore();
-         this.menu.do_reload();
+         return $.when(this.session.session_restore(),this.menu.do_reload());
      },
      do_notify: function() {
          var n = this.notification;

diff --cc addons/web/static/src/js/core.js
index ddfca9d,d3734d2..7123fe2
--- 1/addons/web/static/src/js/core.js
--- 2/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@@ -539,13 -498,11 +540,13 @@@ openerp.web.Connection = openerp.web.Ca
                  username: result.login
              });
              self.session_save();
 -            self.on_session_valid();
 +
 +            self.on_session_valid(success_callback);
              return true;
 -        }).then(success_callback);
 +        //}).done(success_callback);
 +        });
      },
-     login: function() { this.session_login.apply(this, arguments); },
+     login: function() { this.session_authenticate.apply(this, arguments); },
      /**
       * Reloads uid and session_id from local storage, if they exist
       */

diff --cc addons/web/static/src/xml/base.xml
index 393cb46,f1f8990..f42d173
--- 1/addons/web/static/src/xml/base.xml
--- 2/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@@ -863,8 -883,7 +883,7 @@@
          t-att-id="widget.element_id"
          t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
          style="width: 100%"
-     />
-     <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='widget.session.server + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
 -    /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
++    /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='widget.session.server + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
  </t>
  <t t-name="FieldChar.readonly">
      <div
@@@ -910,8 -928,7 +928,12 @@@
          t-att-id="widget.element_id"
          t-attf-class="field_#{widget.type}"
          style="width: 100%"
++<<<<<<< TREE
 +    ></textarea>
 +    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='widget.session.server + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
++=======
+     ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
++>>>>>>> MERGE-SOURCE
  </t>
  <t t-name="web.datetimepicker">
      <div class="oe_datepicker_root">
@@@ -918,10 -936,8 +941,13 @@@
          <input type="text" size="1" style="width: 100%"
              t-att-name="widget.name"
              t-attf-class="oe_datepicker_master field_#{widget.type_of_date}"
++<<<<<<< TREE
 +        />
 +        <img class="oe_input_icon oe_datepicker_trigger" t-att-src='widget.session.server + "/web/static/src/img/ui/field_calendar.png"'
++=======
+         /><img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
++>>>>>>> MERGE-SOURCE
               title="Select date" width="16" height="16" border="0"/>
-         <input type="text" size="1" class="oe_datepicker_container" disabled="disabled"/>
      </div>
  </t>
  <t t-name="FieldSelection">