diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 5915ee5b359..a617f712976 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -12,6 +12,16 @@ website.ready().then(website.init_editor); } + $(document).on('click', 'a.js_link2post', function (ev) { + ev.preventDefault(); + var form = document.createElement('form'); + form.action = this.pathname; // restrict to same origin + form.method = 'POST'; + // TODO: support this.search as form input fields + $(this).append(form); + form.submit(); + }); + $(document).on('hide.bs.dropdown', '.dropdown', function (ev) { // Prevent dropdown closing when a contenteditable children is focused if (ev.originalEvent @@ -383,6 +393,7 @@ 'click button[data-action=edit]': 'edit', 'click button[data-action=save]': 'save', 'click button[data-action=cancel]': 'cancel', + 'click a[data-action=new_page]': 'new_page', }, container: 'body', customize_setup: function() { @@ -531,6 +542,12 @@ cancel: function () { website.reload(); }, + new_page: function (ev) { + ev.preventDefault(); + website.prompt('Create a new page', 'Page name').then(function (val) { + document.location = '/pagenew/' + encodeURI(val); + }); + }, }); var blocks_selector = _.keys(CKEDITOR.dtd.$block).join(','); diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 0d166b9b549..6919af78b42 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -132,6 +132,42 @@ $error.modal('show'); }; + website.prompt = function (window_title, field_name, field_type, on_init) { + // A bootstraped version of javascript prompt albeit asynchronous + // Built to handle only one field, for anything more complex, use editor.Dialog class + // TODO: use option dict for parameters + field_type = field_type || 'input'; + on_init = on_init || function() {}; + var def = $.Deferred(); + var dialog = $(openerp.qweb.render('website.prompt', { + field_type: field_type, + field_name: field_name, + window_title: window_title, + })).appendTo("body"); + var input = dialog.find(field_type).first(); + var init = on_init(input); + $.when(init).then(function () { + dialog.modal('show'); + input.focus(); + dialog.on('click', '.btn-primary', function () { + def.resolve(input.val(), input); + dialog.remove(); + }); + }); + dialog.on('hidden.bs.modal', function () { + def.reject(); + dialog.remove(); + }); + if (input.is('input[type="text"]')) { + input.keypress(function (e) { + if (e.which == 13) { + dialog.find('.btn-primary').trigger('click'); + } + }); + } + return def; + }; + dom_ready.then(function () { /* ----- BOOTSTRAP STUFF ---- */ diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index 8ce2b155d7a..e24d93bf257 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -24,14 +24,10 @@