diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2016-08-19 16:11:03 -0700 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2016-08-19 16:11:03 -0700 |
| commit | 2e9374d00a2f4584332344fbefc1e25483a84e36 (patch) | |
| tree | 97a9747ee74fff1fbd3c4274f9f5f3eace9992cd | |
| parent | ffa998d64cf918d126e0b153fa5de545fcc8d8a3 (diff) | |
[IMP] mrp: App MRP --> Manufacturing (consistency between app and menu)
[IMP] website: better dialog when clicking on a menu in edit mode
(less options is easier)
| -rw-r--r-- | addons/mrp/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 5 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index ccd6ba1de3c..45d9248247e 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -3,7 +3,7 @@ { - 'name': 'MRP', + 'name': 'Manufacturing', 'version': '2.0', 'website': 'https://www.odoo.com/page/manufacturing', 'category': 'Manufacturing', diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index bc2dbf3b658..fdbf4e2282a 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -31,9 +31,8 @@ options.registry.menu_data = options.Class.extend({ title: _t("Confirmation"), $content: $(core.qweb.render("website.leaving_current_page_edition")), buttons: [ - {text: _t("Continue") + " *", classes: "btn-primary", click: save_editor_then_go_to.bind(null, this.link)}, - {text: _t("Continue & Edit") + " *", classes: "btn-primary", click: save_editor_then_go_to.bind(null, this.link + "?enable_editor=1")}, - {text: _t("Edit the menu") + " *", classes: "btn-primary", click: function () { + {text: _t("Go to Link"), classes: "btn-primary", click: save_editor_then_go_to.bind(null, this.link)}, + {text: _t("Edit the menu"), classes: "btn-primary", click: function () { var self = this; website.topBar.content_menu.edit_menu(function () { return editor.editor_bar.save_without_reload(); diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 1b2b8266764..52dbe4ca29f 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -23,7 +23,7 @@ </div> <div t-name="website.leaving_current_page_edition"> - <p>You are leaving the current page. What would you like to do ?</p> - <p class="text-muted">* Note that your current changes will be automatically saved.</p> + <p>What do you want to do?</p> + <p class="text-muted">Your current changes will be saved automatically.</p> </div> </templates> |