[merge] merge proposal soon refused

bzr revid: ahu@openerp.com-20111222141625-vo57xyuhdhznnums

diff --cc addons/web/static/src/css/base.css
index dc56d8b,7392c1e..e01400b
--- 1/addons/web/static/src/css/base.css
--- 2/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -1411,14 -1405,13 +1425,17 @@@ label.error 
      border-spacing: 4px;
  }
  .openerp .ui-widget-header {
-     background-image: none;
-     background-color: white;
+     background: white none;
+ }
+ /* progress bars */
+ .openerp .ui-progressbar .ui-widget-header {
+     background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
  }
  
 +.openerp tfoot.ui-widget-header .oe-list-footer { /* adding some space to the footer */
 +    padding: 4px 0 5px 0;
 +}
 +
  /* Sidebar */
  .openerp .view-manager-main-table {
      margin: 0;

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

diff --cc addons/web/static/src/js/views.js
index 19600d9,42298c5..c61a753
--- 1/addons/web/static/src/js/views.js
--- 2/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@@ -27,7 -27,7 +27,8 @@@ session.web.ActionManager = session.web
          this.client_widget = null;
      },
      render: function() {
 +        return "<div id='"+this.element_id+"' style='height:100%;'></div>";
+         return '<div id="' + this.element_id + '" style="height: 100%;"></div>';
      },
      dialog_stop: function () {
          if (this.dialog) {

diff --cc addons/web/static/src/xml/base.xml
Simple merge

diff --cc addons/web_dashboard/static/src/css/dashboard.css
Simple merge

diff --cc addons/web_dashboard/static/src/xml/web_dashboard.xml
index ed44325,99a83cb..ce675ec
--- 1/addons/web_dashboard/static/src/xml/web_dashboard.xml
--- 2/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@@ -105,8 -105,8 +105,10 @@@
  </t>
  
  <t t-name="web_dashboard.ApplicationTiles">
 +    <div>
 +        <h1 class="welcome_message">Welcome to OpenERP</h1>
+     <div class="oe_applications_tiles">
+     <h1>Welcome to OpenERP</h1>
      </div>
  </t>