[MERGE] from trunk

bzr revid: xmo@openerp.com-20131115132903-epi3321e4uxjqtn2

1 files changed, 20 insertions, 0 deletions

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 22367e24d47..2fa71d27f62 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,15 @@
         cancel: function () {
             website.reload();
         },
+        new_page: function (ev) {
+            ev.preventDefault();
+            website.prompt({
+                window_title: "New Page",
+                input: "Page Title",
+            }).then(function (val) {
+                document.location = '/pagenew/' + encodeURI(val);
+            });
+        },
     });
 
     var blocks_selector = _.keys(CKEDITOR.dtd.$block).join(',');