From 06d65b090a93e8a7d38d4c1971e3a93595cf9a1f Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 2 Jul 2013 20:51:06 +0200 Subject: [PATCH] snippet part0 bzr revid: al@openerp.com-20130702185106-98ac5l76kyx4kaq8 --- addons/website/__openerp__.py | 8 +- addons/website/static/src/js/snippets.js | 81 ------------ addons/website/static/src/js/website.js | 82 +++++++++++++ addons/website/static/src/snippets.html | 126 ------------------- addons/website/views/views.xml | 150 ++++++++++++++++++----- 5 files changed, 209 insertions(+), 238 deletions(-) delete mode 100644 addons/website/static/src/js/snippets.js delete mode 100644 addons/website/static/src/snippets.html diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py index e148f0101a9..aa2d6baa527 100644 --- a/addons/website/__openerp__.py +++ b/addons/website/__openerp__.py @@ -12,8 +12,12 @@ OpenERP Website CMS 'installable': True, 'data': [ 'views/views.xml' + ], + 'js': [ + 'static/src/js/website.js', + ], + 'css': [ + 'static/src/css/*.css', ], - 'js': ['static/src/js/website.js'], - 'css': ['static/src/css/website.css'], 'qweb': ['static/src/xml/*.xml'], } diff --git a/addons/website/static/src/js/snippets.js b/addons/website/static/src/js/snippets.js deleted file mode 100644 index 10a66a4312c..00000000000 --- a/addons/website/static/src/js/snippets.js +++ /dev/null @@ -1,81 +0,0 @@ -$(function(){ - - var selected_snippet = null; - function snippet_click(event){ - if(selected_snippet){ - selected_snippet.removeClass('oe_selected'); - if(selected_snippet[0] === $(this)[0]){ - selected_snippet = null; - event.preventDefault(); - make_static(); - return; - } - } - $(this).addClass('oe_selected'); - selected_snippet = $(this); - make_editable(); - event.preventDefault(); - } - $('.oe_snippet').click(snippet_click); - - var hover_element = null; - - function make_editable( constraint_after, constraint_inside ){ - if(selected_snippet && selected_snippet.hasClass('oe_new')){ - $('.oe_snippet_demo').addClass('oe_new'); - }else{ - $('.oe_snippet_demo').removeClass('oe_new'); - } - - $('.oe_page *').off('mouseover'); - $('.oe_page *').off('mouseleave'); - $('.oe_page *').mouseover(function(event){ - console.log('hover:',this); - if(hover_element){ - hover_element.removeClass('oe_selected'); - hover_element.off('click'); - } - $(this).addClass('oe_selected'); - $(this).click(append_snippet); - hover_element = $(this); - event.stopPropagation(); - }); - $('.oe_page *').mouseleave(function(){ - if(hover_element && $(this) === hover_element){ - hover_element = null; - $(this).removeClass('oe_selected'); - } - }); - } - - function make_static(){ - $('.oe_snippet_demo').removeClass('oe_new'); - $('.oe_page *').off('mouseover'); - $('.oe_page *').off('mouseleave'); - $('.oe_page .oe_selected').removeClass('oe_selected'); - } - - - function append_snippet(event){ - console.log('click',this,event.button); - if(event.button === 0){ - if(selected_snippet){ - if(selected_snippet.hasClass('oe_new')){ - var new_snippet = $("
"); - new_snippet.append($(this).clone()); - new_snippet.click(snippet_click); - $('.oe_snippet.oe_selected').before(new_snippet); - }else{ - $(this).after($('.oe_snippet.oe_selected').contents().clone()); - } - selected_snippet.removeClass('oe_selected'); - selected_snippet = null; - make_static(); - } - }else if(event.button === 1){ - $(this).remove(); - } - event.preventDefault(); - } - -}); diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 35069ac42e2..4c42884711c 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -65,4 +65,86 @@ instance.website.EditorBar = instance.web.Widget.extend({ } }); +$(function(){ + + var selected_snippet = null; + function snippet_click(event){ + if(selected_snippet){ + selected_snippet.removeClass('oe_selected'); + if(selected_snippet[0] === $(this)[0]){ + selected_snippet = null; + event.preventDefault(); + make_static(); + return; + } + } + $(this).addClass('oe_selected'); + selected_snippet = $(this); + make_editable(); + event.preventDefault(); + } + $('.oe_snippet').click(snippet_click); + + var hover_element = null; + + function make_editable( constraint_after, constraint_inside ){ + if(selected_snippet && selected_snippet.hasClass('oe_new')){ + $('.oe_snippet_demo').addClass('oe_new'); + }else{ + $('.oe_snippet_demo').removeClass('oe_new'); + } + + $('.oe_page *').off('mouseover'); + $('.oe_page *').off('mouseleave'); + $('.oe_page *').mouseover(function(event){ + console.log('hover:',this); + if(hover_element){ + hover_element.removeClass('oe_selected'); + hover_element.off('click'); + } + $(this).addClass('oe_selected'); + $(this).click(append_snippet); + hover_element = $(this); + event.stopPropagation(); + }); + $('.oe_page *').mouseleave(function(){ + if(hover_element && $(this) === hover_element){ + hover_element = null; + $(this).removeClass('oe_selected'); + } + }); + } + + function make_static(){ + $('.oe_snippet_demo').removeClass('oe_new'); + $('.oe_page *').off('mouseover'); + $('.oe_page *').off('mouseleave'); + $('.oe_page .oe_selected').removeClass('oe_selected'); + } + + + function append_snippet(event){ + console.log('click',this,event.button); + if(event.button === 0){ + if(selected_snippet){ + if(selected_snippet.hasClass('oe_new')){ + var new_snippet = $("
"); + new_snippet.append($(this).clone()); + new_snippet.click(snippet_click); + $('.oe_snippet.oe_selected').before(new_snippet); + }else{ + $(this).after($('.oe_snippet.oe_selected').contents().clone()); + } + selected_snippet.removeClass('oe_selected'); + selected_snippet = null; + make_static(); + } + }else if(event.button === 1){ + $(this).remove(); + } + event.preventDefault(); + } + +}); + }; diff --git a/addons/website/static/src/snippets.html b/addons/website/static/src/snippets.html deleted file mode 100644 index a7399a931cc..00000000000 --- a/addons/website/static/src/snippets.html +++ /dev/null @@ -1,126 +0,0 @@ - - - OpenERP Snippet Editor - - - - - - - - - - -
-
-
-
-
- - - -
-
-
-
-
-
-
-

A very friendly Point of Sale

-

Set up in a minute, Sell in seconds

-
-
-
- - - -
-
-
-

- OpenERP's Point of Sale introduces a super clean interface with no installation required - that runs online and offline on modern hardwares. -

-

- It's full integration with the company inventory and accounting, gives you real time statistics and - consolidations amongst all shops without the hassle of integrating several applications. -

-
- Start your free trial -
-
-
-
-
-
-
- Start your free trial -
-
-
-
-
-
-

A very friendly Point of Sale

-

Set up in a minute, Sell in seconds

-
-
-

- OpenERP's Point of Sale introduces a super clean interface with no installation required - that runs online and offline on modern hardwares. -

-

- It's full integration with the company inventory and accounting, gives you real time statistics and - consolidations amongst all shops without the hassle of integrating several applications. -

-
- Start your free trial -
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
- -
-
-
-

A very friendly Point of Sale

-

Set up in a minute, Sell in seconds

-
-
-
- - - -
-
-
-

- OpenERP's Point of Sale introduces a super clean interface with no installation required - that runs online and offline on modern hardwares. -

-

- It's full integration with the company inventory and accounting, gives you real time statistics and - consolidations amongst all shops without the hassle of integrating several applications. -

-
- Start your free trial -
-
-
-
-
- - diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml index a4e1f14cd61..7098ae77997 100644 --- a/addons/website/views/views.xml +++ b/addons/website/views/views.xml @@ -11,7 +11,8 @@ <t t-esc="res_company.name"/> - + + @@ -32,7 +33,8 @@ - + +
@@ -85,6 +87,123 @@

&copy; Company name.

+ + + + + + @@ -135,32 +254,5 @@ - -