From 4d582fbd0628a6bb37b5b6499ab757205e03c568 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 12 Oct 2011 11:31:53 +0200 Subject: [IMP] Homepage: use manual menu triggering for application tiles bzr revid: fme@openerp.com-20111012093153-50sh65dvhw3cds8k --- addons/web_dashboard/static/src/js/dashboard.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'addons/web_dashboard/static/src') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 3163453a122..545f453a27e 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -446,10 +446,8 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ self.$element.append(tiles) .find('.oe-dashboard-home-tile') .click(function () { - var $this = $(this); - $this.closest('.openerp') - .find('.menu a[data-menu=' + $this.data('menuid') + ']') - .click();}); + openerp.webclient.menu.on_menu_click(null, $(this).data('menuid')) + }); }); return r; }, -- cgit v1.2.3 From aaee11e85a1f0b340ed79dee9fae1f3ce56b3746 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 12 Oct 2011 12:15:04 +0200 Subject: [IMP] Improved dashboard styling bzr revid: fme@openerp.com-20111012101504-6xv34uolwizdb7t6 --- addons/web_dashboard/static/src/css/dashboard.css | 4 ++++ addons/web_dashboard/static/src/xml/web_dashboard.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'addons/web_dashboard/static/src') diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css index 4d48cd4ffbd..54b1cc7d2b5 100644 --- a/addons/web_dashboard/static/src/css/dashboard.css +++ b/addons/web_dashboard/static/src/css/dashboard.css @@ -34,6 +34,10 @@ -webkit-border-top-right-radius: 3px; border-top-right-radius: 3px; } +.openerp h2.oe-dashboard-action-header-empty { + padding-top: 0; + padding-bottom: 2px; +} .openerp a.oe-dashboard-action-rename { float: left; diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index fe96d72855d..87222baa5fd 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -30,9 +30,10 @@
-

+

+   -- cgit v1.2.3 From 8ae08903824e467c4352395d2c2a973d77a8c31a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 12 Oct 2011 11:28:51 +0200 Subject: [IMP] simplify finding out if a category is installed bzr revid: xmo@openerp.com-20111012092851-ce1klfj272bscn89 --- addons/web_dashboard/static/src/js/dashboard.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'addons/web_dashboard/static/src') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 545f453a27e..0eac5623b45 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -420,18 +420,15 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ // Check for installed application var Installer = new openerp.web.DataSet(this, 'base.setup.installer'); Installer.call('default_get', [], function (installed_modules) { - var installed = false; - _.each(installed_modules, function(v,k) { - if(_.startsWith(k,"cat")) { - installed =installed || v; - } - }); + var installed = _(installed_modules).any(function (active, name) { + return _.startsWith(name, 'cat') && active; }); + if(installed) { self.do_display_root_menu(); } else { self.do_display_installer(); } - } ); + }); }, do_display_root_menu: function() { var self = this; -- cgit v1.2.3 From 57d635f44df6767c849bfaf6e8e9c27a31e9cfa3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 14 Oct 2011 01:20:54 +0200 Subject: [FIX] soft reload after module installation lp bug: https://launchpad.net/bugs/873362 fixed bzr revid: al@openerp.com-20111013232054-2i5ptzfurjc429zw --- addons/web_dashboard/static/src/js/dashboard.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addons/web_dashboard/static/src') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 0eac5623b45..74393684ad2 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -485,9 +485,8 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ var self = this; new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) { $.unblockUI(); - self.do_action(action, function () { - // TODO: less brutal reloading - window.location.reload(true); + self.widget_parent.widget_parent.do_action(action, function () { + openerp.webclient.do_reload(); }); }); } -- cgit v1.2.3 From 2954d51fb3b534e86b57c4f1d8dbc2558b0f673d Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sat, 22 Oct 2011 22:20:19 +0200 Subject: [IMP] dashboard static homepage bzr revid: al@openerp.com-20111022202019-ng9s1fdy72yf26gu --- addons/web_dashboard/static/src/js/dashboard.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'addons/web_dashboard/static/src') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 74393684ad2..923b43ce034 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -378,8 +378,8 @@ openerp.web_dashboard.apps = { module: 'account_voucher', name: 'Invoicing', help: "Send invoice, track payments and reminders" }, { - module: 'project', name: 'Projects', - help: "Manage projects, track tasks, invoice task works, follow issues, \u2026" + module: 'point_of_sale', name: 'Point of Sales', + help: "Manage shop sales, use touch-screen POS" } ], [ { @@ -389,19 +389,19 @@ openerp.web_dashboard.apps = { module: 'stock', name: 'Warehouse', help: "Track your stocks, schedule product moves, manage incoming and outgoing shipments, \u2026" }, { - module: 'hr', name: 'Human Resources', - help: "Manage employees and their contracts, follow laves, recruit people, \u2026" + module: 'mrp', name: 'Manufacturing', + help: "Manage your manufacturing, control your supply chain, personalize master data, \u2026" }, { - module: 'point_of_sale', name: 'Point of Sales', - help: "Manage shop sales, use touch-screen POS" + module: 'account_accountant', name: 'Accounting and Finance', + help: "Record financial operations, automate followup, manage multi-currency, \u2026" } ], [ { - module: 'profile_tools', name: 'Extra Tools', - help: "Track ideas, manage lunch, create surveys, share data" + module: 'project', name: 'Projects', + help: "Manage projects, track tasks, invoice task works, follow issues, \u2026" }, { - module: 'mrp', name: 'Manufacturing', - help: "Manage your manufacturing, control your supply chain, personalize master data, \u2026" + module: 'hr', name: 'Human Resources', + help: "Manage employees and their contracts, follow laves, recruit people, \u2026" }, { module: 'marketing', name: 'Marketing', help: "Manage campaigns, follow activities, automate emails, \u2026" -- cgit v1.2.3