[MERGE] from trunk

bzr revid: xmo@openerp.com-20110822123258-thxewwdvbysap4jt

3 files changed, 40 insertions, 37 deletions

diff --git a/addons/base_default_home/static/src/css/home.css b/addons/base_default_home/static/src/css/home.css
index c2a6989a510..bbf47f29cc4 100644
--- a/addons/base_default_home/static/src/css/home.css
+++ b/addons/base_default_home/static/src/css/home.css
@@ -1,24 +1,21 @@
 .oe-static-home {
+    padding: 0.5em 0.5em;
     text-align: center;
 }
+.oe-static-home h1 {
+    margin: 0 0 0.3em
+}
 .oe-static-home-banner {
     display: inline-block;
-    margin:  0.5em 0;
+    margin:  auto 0;
     padding: 0.5em 5em;
-    border: 1px inset #808080;
-    background-color: #e6e3e3;
-    -moz-border-radius: 2em;
-    -webkit-border-radius: 2em;
-    border-radius: 2em;
     text-align: left;
 }
-.oe-static-home-banner h1 {
-    margin: 0 0 0.3em
-}
-.oe-static-home-banner p {
-
+.oe-static-home-banner li {
+    font-size: 150%;
+    font-weight: bold;
 }
-.oe-static-home-banner address {
+.oe-static-home address {
     font-style: normal;
     padding-left: 2em;
 }
diff --git a/addons/base_default_home/static/src/js/home.js b/addons/base_default_home/static/src/js/home.js
index ebdf7ea7d00..eaa8a72e3fa 100644
--- a/addons/base_default_home/static/src/js/home.js
+++ b/addons/base_default_home/static/src/js/home.js
@@ -63,30 +63,44 @@ openerp.base_default_home = function (openerp) {
                 if (!_(installed_modules).isEmpty()) {
                     return old_home.call(self);
                 }
-                self.$element.find('.oe-application').html(
-                    QWeb.render('StaticHome', {
-                        url: window.location.protocol + '//' + window.location.host + window.location.pathname,
-                        session: self.session,
-                        rows: openerp.base_default_home.applications
-                })).delegate('.oe-static-home-tile-text button', 'click', function () {
-                    self.install_module($(this).val());
+                self.action_manager.do_action({
+                    type: 'ir.actions.client',
+                    tag: 'home.default'
                 })
-
             }, function (err, event) {
                 event.preventDefault();
                 return old_home.call(self);
             });
+        }
+    });
+
+    openerp.base.client_actions.add(
+        'home.default', 'openerp.base_default_home.DefaultHome');
+    openerp.base_default_home.DefaultHome = openerp.base.View.extend({
+        template: 'StaticHome',
+        start: function () {
+            var r = this._super(), self = this;
+            this.$element.delegate('.oe-static-home-tile-text button', 'click', function () {
+                self.install_module($(this).val());
+            });
+            return r;
+        },
+        render: function () {
+            return this._super({
+                url: window.location.protocol + '//' + window.location.host + window.location.pathname,
+                session: this.session,
+                rows: openerp.base_default_home.applications
+            })
         },
         install_module: function (module_name) {
             var Modules = new openerp.base.DataSetSearch(
-                this, 'ir.module.module', null,
-                [['name', '=', module_name], ['state', '=', 'uninstalled']]),
-                Upgrade = new openerp.base.DataSet(this, 'base.module.upgrade');
+                this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]);
+            var Upgrade = new openerp.base.DataSet(this, 'base.module.upgrade');
 
             $.blockUI({
                 message: '<img src="/base_default_home/static/src/img/throbber.gif">'
             });
-            Modules.read_slice({fields: ['id']}, function (records) {
+            Modules.read_slice(['id'], {}, function (records) {
                 if (!(records.length === 1)) { return; }
                 Modules.call('state_update',
                     [_.pluck(records, 'id'), 'to install', ['uninstalled']],
diff --git a/addons/base_default_home/static/src/xml/base_default_home.xml b/addons/base_default_home/static/src/xml/base_default_home.xml
index 9fee5b221bf..a57b8f30ff3 100644
--- a/addons/base_default_home/static/src/xml/base_default_home.xml
+++ b/addons/base_default_home/static/src/xml/base_default_home.xml
@@ -1,17 +1,11 @@
 <template>
     <div t-name="StaticHome" class="oe-static-home">
+        <h1>Welcome to your new OpenERP instance.</h1>
         <div class="oe-static-home-banner">
-            <h1>Welcome to OpenERP</h1>
-            <p>
-                Don't forget to bookmark your application address to come back
-                later:
-            </p>
-            <address>
-                URL: <a t-att-href="url"><t t-esc="url"/></a><br/>
-                login: <t t-esc="session.login"/>
-            </address>
+            <li>Bookmark this <a t-att-href="url">page</a></li>
+            <li>Remember your login: <i><t t-esc="session.login"/></i></li>
+            <li>Choose the first OpenERP Application you want to install..</li>
         </div>
-
         <div class="oe-static-home-tiles">
             <table width="100%">
                 <tr t-foreach="rows" t-as="row">
@@ -27,9 +21,7 @@
                                     <div class="oe-static-home-tile-text">
                                         <h2><t t-esc="application.name"/></h2>
                                         <p><t t-esc="application.help"/></p>
-                                        <button type="button"
-                                                t-att-value="application.module">
-                                            Install</button>
+                                        <button type="button" t-att-value="application.module"> Install</button>
                                     </div>
                                 </td>
                             </tr>