[FIX] Merge last trunk

bzr revid: fme@openerp.com-20120215095940-2jv27t91i7u5mm0r

3 files changed, 15 insertions, 21 deletions

diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css
index 30645017d11..f7ecdf903e3 100644
--- a/addons/web_dashboard/static/src/css/dashboard.css
+++ b/addons/web_dashboard/static/src/css/dashboard.css
@@ -90,11 +90,6 @@
     padding:0 3px;
 }
 
-.openerp .oe-dashboard .oe-listview th.oe-sortable .ui-icon {
-    height: 100%;
-    margin-top: -9px;
-}
-
 /* Layouts */
 .openerp .oe-dashboard-layout_1 .oe-dashboard-column.index_0 {
     width: 100%;
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index ec2975d48d4..1ebc987c9f6 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -313,14 +313,17 @@ openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
                     name: record.action_id[1],
                     done: record.state !== 'open',
                     to_do: record.state === 'open',
-                    category: record['category_id'][1] || "Uncategorized"
+                    category: record['category_id'][1] || _t("Uncategorized")
                 }
             })
             .groupBy(function (record) {return record.category})
             .value();
         this.$element.html(QWeb.render('ConfigOverview.content', {
             completion: 100 * progress.done / progress.total,
-            groups: grouped_todos
+            groups: grouped_todos,
+            task_title: _t("Execute task \"%s\""),
+            checkbox_title: _t("Mark this task as done"),
+            _: _
         }));
         var $progress = this.$element.find('div.oe-config-progress-bar');
         $progress.progressbar({value: $progress.data('completion')});
@@ -419,18 +422,14 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
     },
     on_installed_database: function() {
         var self = this;
-        var ds = new openerp.web.DataSetSearch(this, 'ir.ui.menu', null, [['parent_id', '=', false]]);
-        var r = ds.read_slice( ['name', 'web_icon_data', 'web_icon_hover_data', 'module']).then(function (applications) {
-            //// Create a matrix of 3*x applications
-            //var rows = [];
-            //while (applications.length) {
-            //    rows.push(applications.splice(0, 3));
-            //}
-            //var tiles = QWeb.render('ApplicationTiles.content', {rows: rows});
-            var tiles = QWeb.render('ApplicationTiles.content', {applications: applications});
-            $(tiles).appendTo(self.$element).find('.oe_install-module-link').click(function () {
-                openerp.webclient.menu.on_menu_click(null, $(this).data('menu'))
-            });
+        self.rpc('/web/menu/get_user_roots', {}).then(function (menu_ids) {
+            var menuds = new openerp.web.DataSet(this, 'ir.ui.menu',{})
+                .read_ids(menu_ids, ['name', 'web_icon_data', 'web_icon_hover_data', 'module']).then(function (applications) {
+                    var tiles = QWeb.render('ApplicationTiles.content', {applications: applications});
+                    $(tiles).appendTo(self.$element).find('.oe_install-module-link').click(function () {
+                        openerp.webclient.menu.on_menu_click(null, $(this).data('menu'))
+                    });
+                });
         });
     }
 });
diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
index 4db96d5ebbe..9a9c0486400 100644
--- a/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -72,10 +72,10 @@
                 <li t-foreach="category_value" t-as="todo"
                     t-att-class="todo.done ? 'oe-done' : undefined"
                     t-att-data-id="todo.id"
-                    t-att-title="!todo.done ? 'Execute task \'' + todo.name + '\'' : undefined">
+                    t-att-title="!todo.done ? _.str.sprintf(task_title, todo.name) : undefined">
                     <span  style="text-decoration: underline;"><t t-esc="todo.name"/></span>
                     <input type="checkbox" t-att-value="todo.id"
-                       t-att-title="!todo.done ? 'Mark this task as done' : undefined"
+                       t-att-title="!todo.done ? checkbox_title : undefined"
                        t-att-checked="todo.done ? 'checked' : undefined"/>
                 </li>
             </ul></dd>