diff options
| author | Christophe Simonis <chs@openerp.com> | 2011-11-08 17:36:44 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2011-11-08 17:36:44 +0100 |
| commit | 2ea47dc3b2aac73256f361c8ca65de7d8cb40e2c (patch) | |
| tree | 48ba730f8783b0dcfae4d1230c9f4aeea7a9ff1a /addons/web_dashboard/static | |
| parent | 1b7125432843d0db93628b04e56065e77d7d14ee (diff) | |
| parent | 61823d98e9177aefa0e6aecd8750ce2bcb192e9a (diff) | |
merge upstream
bzr revid: chs@openerp.com-20111108163644-8mlg48lua376lzgg
Diffstat (limited to 'addons/web_dashboard/static')
| -rw-r--r-- | addons/web_dashboard/static/src/js/dashboard.js | 3 | ||||
| -rw-r--r-- | addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 923b43ce034..e629a4a6ef5 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -1,6 +1,5 @@ openerp.web_dashboard = function(openerp) { var QWeb = openerp.web.qweb; -QWeb.add_template('/web_dashboard/static/src/xml/web_dashboard.xml'); if (!openerp.web_dashboard) { /** @namespace */ @@ -468,7 +467,7 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ [['name', '=', module_name], ['state', '=', 'uninstalled']]); var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade'); - $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'}); + $.blockUI(); Modules.read_slice(['id'], {}, function (records) { if (!(records.length === 1)) { $.unblockUI(); return; } Modules.call('state_update', diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index 87222baa5fd..77eab4b7e28 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -30,7 +30,7 @@ </t> <t t-name="DashBoard.action"> <div t-att-data-id="action.attrs.name" class="oe-dashboard-action"> - <h2 t-attf-class="oe-dashboard-action-header oe_view_title #{action.attrs.string ? '' : 'oe-dashboard-action-header-empty'}"> + <h2 t-attf-class="oe-dashboard-action-header #{action.attrs.string ? '' : 'oe-dashboard-action-header-empty'}"> <input class="oe-dashboard-action-input" type="text" name="title" value="" style="display: none"/> <t t-esc="action.attrs.string"/> <t t-if="!action.attrs.string">&nbsp;</t> |