From 0330d9d962da467ce7cc947a71fd7d9daa5b1fad Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 31 Jul 2013 10:19:55 +0200 Subject: [PATCH 01/12] [FIX] website_mail: edit blog bzr revid: chm@openerp.com-20130731081955-h2d6nzwsc0icpssu --- addons/website_mail/views/website_mail.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index e7957ca8bf0..2a306fe567d 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -74,7 +74,7 @@

-

+
@@ -115,9 +115,9 @@ -

+

- +
Read more
From 3c7f3c752878c7af02f19244042402af7005250d Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 31 Jul 2013 10:34:37 +0200 Subject: [PATCH 02/12] [IMP] website_mail: change button layout bzr revid: chm@openerp.com-20130731083437-b35f7vpirq00bvn6 --- addons/website_mail/static/src/css/blog.css | 27 ++++---------------- addons/website_mail/static/src/css/blog.sass | 27 +++++--------------- addons/website_mail/views/website_mail.xml | 22 ++++++++-------- 3 files changed, 23 insertions(+), 53 deletions(-) diff --git a/addons/website_mail/static/src/css/blog.css b/addons/website_mail/static/src/css/blog.css index b61dbde7e0d..5b297e21242 100644 --- a/addons/website_mail/static/src/css/blog.css +++ b/addons/website_mail/static/src/css/blog.css @@ -2,35 +2,18 @@ position: relative; clear: both; } -.css_website_mail .media .css_button_publish { - position: absolute; - right: 5px; - top: 5px; -} -.css_website_mail .media .css_button_publish .css_publish { - color: green; +.css_website_mail .media .label-success { display: none; - background: none; } -.css_website_mail .media .css_button_publish .css_unpublish { - color: red; - background: none; -} -.css_website_mail .media .css_published .css_publish { - display: block; -} -.css_website_mail .media .css_published .css_unpublish { +.css_website_mail .css_published .label-important { display: none; } +.css_website_mail .css_published .label-success { + display: inline-block; +} .css_website_mail .has-error { border-color: red; } -.css_website_mail .css_older { - float: right; -} -.css_website_mail .css_newer { - float: left; -} .css_website_mail .css_nav_month { display: none; } diff --git a/addons/website_mail/static/src/css/blog.sass b/addons/website_mail/static/src/css/blog.sass index e49cf9cb168..66f3627fb6e 100644 --- a/addons/website_mail/static/src/css/blog.sass +++ b/addons/website_mail/static/src/css/blog.sass @@ -4,28 +4,15 @@ .media position: relative clear: both - .css_button_publish - position: absolute - right: 5px - top: 5px - .css_publish - color: green - display: none - background: none - .css_unpublish - color: red - background: none - .css_published - .css_publish - display: block - .css_unpublish - display: none + .label-success + display: none + .css_published + .label-important + display: none + .label-success + display: inline-block .has-error border-color: red - .css_older - float: right - .css_newer - float: left .css_nav_month display: none &:first-of-type diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index 2a306fe567d..e02caa82577 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -69,9 +69,9 @@
From 729f65bd71cf41b9ca1d358b7bfa3935b951981d Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 31 Jul 2013 11:06:25 +0200 Subject: [PATCH 03/12] [IMP] website: add menu item in backend bzr revid: chm@openerp.com-20130731090625-6q7d2kmgaslvu3dl --- addons/website/static/src/js/website.js | 5 +++++ addons/website/website_data.xml | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 2cd647a44c0..b7efa4d2535 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -471,4 +471,9 @@ instance.web.ActionRedirect = function(parent, action) { }; instance.web.client_actions.add("redirect", "instance.web.ActionRedirect"); +instance.web.GoToWebsite = function(parent, action) { + window.location.href = window.location.href.replace(/[?#].*/, '').replace(/\/admin[\/]?$/, ''); +}; +instance.web.client_actions.add("website.gotowebsite", "instance.web.GoToWebsite"); + }; diff --git a/addons/website/website_data.xml b/addons/website/website_data.xml index 6356ab52816..07fc6cefebb 100644 --- a/addons/website/website_data.xml +++ b/addons/website/website_data.xml @@ -16,5 +16,20 @@ + + + Website + website.gotowebsite + website + + + + + Go to Website + + + + + \ No newline at end of file From 7f74e4ade1bf7fd885cc8647b0cd68edd5b599af Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 31 Jul 2013 11:01:51 +0200 Subject: [PATCH 05/12] [FIX] disable automatic insertion of paragraphs in content sections by ckeditor bzr revid: xmo@openerp.com-20130731090151-q0gqmjx50wf6nm2n --- addons/website/static/src/js/website.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index b7efa4d2535..4e5bae1b5b4 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -327,6 +327,8 @@ instance.website.RTE = instance.web.Widget.extend({ customConfig: '', // Disable ACF allowedContent: true, + // Don't insert paragraphs around content in e.g.
  • + autoParagraph: false, }; }, // TODO clean From b466e934d93eaf30c656569885301bd7464dc4e7 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 31 Jul 2013 11:13:37 +0200 Subject: [PATCH 06/12] [IMP] website_mail: clean css bzr revid: chm@openerp.com-20130731091337-ni60flzow98mc4mz --- addons/website_mail/static/src/css/blog.css | 4 ---- addons/website_mail/static/src/css/blog.sass | 2 -- 2 files changed, 6 deletions(-) diff --git a/addons/website_mail/static/src/css/blog.css b/addons/website_mail/static/src/css/blog.css index 5b297e21242..8edea7d3306 100644 --- a/addons/website_mail/static/src/css/blog.css +++ b/addons/website_mail/static/src/css/blog.css @@ -1,7 +1,3 @@ -.css_website_mail .media { - position: relative; - clear: both; -} .css_website_mail .media .label-success { display: none; } diff --git a/addons/website_mail/static/src/css/blog.sass b/addons/website_mail/static/src/css/blog.sass index 66f3627fb6e..e0e8828d9f2 100644 --- a/addons/website_mail/static/src/css/blog.sass +++ b/addons/website_mail/static/src/css/blog.sass @@ -2,8 +2,6 @@ .css_website_mail .media - position: relative - clear: both .label-success display: none .css_published From 444db7145616c0533fe3e1611b1d261f769d0ba5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 31 Jul 2013 11:15:13 +0200 Subject: [PATCH 07/12] [HACK] filter snippets so ckeditor is not applied to them bzr revid: xmo@openerp.com-20130731091513-u3fklrijeuc6l80a --- addons/website/static/src/js/website.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 4e5bae1b5b4..277c9b4143f 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -43,7 +43,10 @@ instance.website.EditorBar = instance.web.Widget.extend({ .parent().show(); // TODO: span edition changing edition state (save button) var $editables = $('[data-oe-model]') - .not('link, script').prop('contentEditable', true) + .not('link, script') + // FIXME: propagation should make "meta" blocks non-editable in the first place... + .not('.oe_snippet_editor') + .prop('contentEditable', true) .addClass('oe_editable'); var $rte_ables = $editables.filter('div, p, li, section, header, footer').not('[data-oe-type]'); var $raw_editables = $editables.not($rte_ables); From 8d3c6b5b7978a6f7d04752e14bd560f0a42819fc Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 31 Jul 2013 11:26:27 +0200 Subject: [PATCH 08/12] [IMP] website_mail: layout comments on blog bzr revid: chm@openerp.com-20130731092627-inzev1oqbn3gt63j --- addons/website_mail/views/website_mail.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml index e02caa82577..9ac2d477d3e 100644 --- a/addons/website_mail/views/website_mail.xml +++ b/addons/website_mail/views/website_mail.xml @@ -83,7 +83,7 @@
      -
    • +
      • From c5f28af3fef490d6ea4a33e0b102d5912683bed0 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 31 Jul 2013 12:22:48 +0200 Subject: [PATCH 10/12] [WHATEVER] make snippet editor do stuff bzr revid: xmo@openerp.com-20130731102248-kl5upc2w48h9bisv --- addons/website/static/src/css/snippets.css | 26 ++++++++------ addons/website/static/src/js/website.js | 42 ++++++++++++---------- addons/website/views/views.xml | 8 ++--- 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 65a6e714f97..2cbf2fb16ba 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -42,14 +42,12 @@ .oe_snippet_editor{ position: fixed; z-index: 1000; - bottom: 0px; - left: 0px; - right: 0px; + bottom: 0; + left: 0; + right: 0; height: 214px; background: rgb(160,160,160); - box-shadow: 0px 1px 3px rgb(100,100,100) inset; - overflow-y: hidden; - overflow-x: scroll; + box-shadow: 0 1px 3px rgb(100,100,100) inset; } .oe_snippet_list{ @@ -64,14 +62,12 @@ height: 160px; border-radius: 3px; background: white; - margin: 20px; - margin-left: 0px; + margin: 20px 20px 20px 0; cursor: pointer; border: 2px solid transparent; - box-shadow: 0px 1px 3px rgb(100,100,100); + box-shadow: 0 1px 3px rgb(100,100,100); position: relative; - top: 0px; - -webkit-transition: all 150ms linear; + top: 0; overflow: hidden; vertical-align: top; user-select: none; @@ -161,6 +157,14 @@ line-height: 160px; padding: 0px; } + +.oe_snippet_drop { + border: 1px dashed black; + min-height: 25px; +} +.oe_snippet_drop.oe_accepting { + border: 1px dashed #24ff0f; +} /* [class*="span"]{ margin-left: 0px !important; diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 277c9b4143f..9a274c6b99d 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -104,27 +104,31 @@ instance.website.EditorBar = instance.web.Widget.extend({ cancel: function () { window.location.reload(); }, - snippet_start: function () { + setup_droppable: function () { var self = this; - $('.oe_snippet').click(function(ev) { + $('.oe_snippet_drop').remove(); + var droppable = '
      '; + var $zone = $('section.container'); + $zone.before(droppable).after(droppable); + + $(".oe_snippet_drop").droppable({ + hoverClass: 'oe_accepting', + drop: function( event, ui ) { + console.log(event, ui, "DROP"); + + $(event.target).replaceWith($(ui.draggable).html()); + $('.oe_selected').remove(); + self.setup_droppable(); + } + }).hide(); + }, + snippet_start: function () { + this.setup_droppable(); + + $('.oe_snippet').draggable().click(function(ev) { + $(".oe_snippet_drop").show(); $('.oe_selected').removeClass('oe_selected'); - var $snippet = $(ev.currentTarget); - $snippet.addClass('oe_selected'); - $snippet.draggable(); - var selector = $snippet.data("selector"); - var $zone = $(".oe_website_body " + selector); - var droppable = '
      .
      .
      .
      .
      .
      '; - $zone.before(droppable); - $zone.after(droppable); - $(".oe_snippet_drop").droppable({ - drop: function( event, ui ) { - console.log(event, ui, "DROP"); - var $target = $(event.target); - $target.before($snippet.html()); - $('.oe_selected').remove(); - $('.oe_snippet_drop').remove(); - } - }); + $(ev.currentTarget).addClass('oe_selected'); }); }, diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index 38582837ad2..7028fcdf820 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -99,7 +99,7 @@