diff --git a/addons/payment_acquirer_adyen/controllers/main.py b/addons/payment_acquirer_adyen/controllers/main.py index 706b26e163d..2ea9fb00c51 100644 --- a/addons/payment_acquirer_adyen/controllers/main.py +++ b/addons/payment_acquirer_adyen/controllers/main.py @@ -19,7 +19,7 @@ class AdyenController(http.Controller): @website.route([ '/payment/adyen/return/', - ], type='http', auth='public', methods=['POST']) + ], type='http', auth='public') def adyen_return(self, **post): """ Paypal IPN. """ _logger.info('Beginning Adyen form_feedback with post data %s', pprint.pformat(post)) # debug diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py index 0341cca94d9..e9b545c25c7 100644 --- a/addons/website/__openerp__.py +++ b/addons/website/__openerp__.py @@ -22,8 +22,9 @@ OpenERP Website CMS ], 'demo': [ 'data/website_demo.xml', + 'data/website_homepage_demo.xml', ], 'js': ['static/src/js/website.backend.js'], - 'qweb' : ['static/src/xml/website.backend.xml'], + 'qweb': ['static/src/xml/website.backend.xml'], 'css': ['static/src/css/website.backend.css'], } diff --git a/addons/website/data/website_homepage_demo.xml b/addons/website/data/website_homepage_demo.xml new file mode 100644 index 00000000000..da772adc6ed --- /dev/null +++ b/addons/website/data/website_homepage_demo.xml @@ -0,0 +1,124 @@ + + + + + + + + diff --git a/addons/website/tests/ui_suite/banner_tour_test.js b/addons/website/tests/ui_suite/banner_tour_test.js index b8ebb079934..27688695a14 100644 --- a/addons/website/tests/ui_suite/banner_tour_test.js +++ b/addons/website/tests/ui_suite/banner_tour_test.js @@ -1,13 +1,14 @@ -var testTemplate = require('./ui_test_template.js'); +var testRunner = require('./ui_test_runner.js'); -testTemplate.runTest(function testBannerTour (page) { - var waitFor = testTemplate.waitFor; - page.evaluate(function () { - localStorage.clear(); - }); +var waitFor = testRunner.waitFor; + +testRunner.run(function testBannerTour (page) { + page.evaluate(function () { localStorage.clear(); }); waitFor(function () { return page.evaluate(function () { - return window.openerp && window.openerp.website && window.openerp.website.TestConsole && window.openerp.website.TestConsole.test('banner'); + return window.openerp && window.openerp.website + && window.openerp.website.TestConsole + && window.openerp.website.TestConsole.test('banner'); }); }, function () { page.evaluate(function () { @@ -18,8 +19,7 @@ testTemplate.runTest(function testBannerTour (page) { var $edit = $('button[data-action=edit]'); var $carousel = $('#wrap [data-snippet-id=carousel]'); var $columns = $('#wrap [data-snippet-id=three-columns]'); - return $carousel && $carousel.length === 1 - && $columns && $columns.length === 1 + return $carousel.length === 1 && $columns.length === 1 && $('button[data-action=edit]').is(":visible"); }); }, function () { diff --git a/addons/website/tests/ui_suite/ui_test_template.js b/addons/website/tests/ui_suite/ui_test_runner.js similarity index 96% rename from addons/website/tests/ui_suite/ui_test_template.js rename to addons/website/tests/ui_suite/ui_test_runner.js index e0af7a02307..74c022fdbed 100644 --- a/addons/website/tests/ui_suite/ui_test_template.js +++ b/addons/website/tests/ui_suite/ui_test_runner.js @@ -17,7 +17,7 @@ function waitFor(ready, callback, timeout) { }, 100); }; -function runTest (test) { +function run (test) { var options = JSON.parse(phantom.args); var port = options.port ? ':'+options.port : ''; var path = options.path ? options.path : ''; @@ -40,5 +40,5 @@ function runTest (test) { module.exports = { waitFor: waitFor, - runTest: runTest + run: run } \ No newline at end of file diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 2f2d1a23c33..b9cb09302fa 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -232,44 +232,32 @@
-
-

A Great Title

-

And a good subtitle

-
-
- -

Streamline Recruitments

-

- Post job offers and keep track of each application - received. Follow applicants in your recruitment process - with the smart kanban view. -

- Save time by automating some communications with email - templates. Resumes are indexed automatically, allowing - you to easily find for specific profiles. -

-
-

Enterprise Social Network

+

Feature One

- Break down information silos. Share knowledge and best - practices amongst all employees. Follow specific people - or documents and join groups of interests to share - expertise and documents. -

- Interact with your collegues in real time with live chat. + Adapt these three columns to fit you design need. + To duplicate, delete or move columns, select the + column and use the top icons to perform your action.

-

Leaves Management

+

Feature Two

- Keep track of the vacation days accrued by each - employee. Employees enter their requests (paid - holidays, sick leave, etc), for managers to approve and - validate. It's all done in just a few clicks. The - agenda of each employee is updated accordingly. + To add a fourth column, reduce the size of these + three columns using the right icon of each block. + Then, duplicate one of the column to create a new + one as a copy. +

+
+
+ +

Feature Three

+

+ Delete the above image or replace it with a picture + that illustrates your message. Click on the picture to + change it's rounded corner style.

diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py index a245d05d5e2..dd13433c75c 100644 --- a/addons/website_event/__openerp__.py +++ b/addons/website_event/__openerp__.py @@ -21,7 +21,8 @@ Online Events ], 'qweb': ['static/src/xml/*.xml'], 'demo': [ - 'data/event_demo.xml' + 'data/event_demo.xml', + 'data/website_event_homepage_demo.xml', ], 'installable': True, } diff --git a/addons/website_event/data/website_event_homepage_demo.xml b/addons/website_event/data/website_event_homepage_demo.xml new file mode 100644 index 00000000000..6c99429b4f4 --- /dev/null +++ b/addons/website_event/data/website_event_homepage_demo.xml @@ -0,0 +1,43 @@ + + + + + + + + + + diff --git a/addons/website_project/__openerp__.py b/addons/website_project/__openerp__.py index 81d64cd8d3f..366ad1a4219 100644 --- a/addons/website_project/__openerp__.py +++ b/addons/website_project/__openerp__.py @@ -15,5 +15,5 @@ OpenERP Projects 'views/website_project.xml', ], 'qweb': ['static/src/xml/*.xml'], - 'installable': True, + 'installable': False, } diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py index f3e370d989d..f902c81c0a3 100644 --- a/addons/website_sale/__openerp__.py +++ b/addons/website_sale/__openerp__.py @@ -11,14 +11,15 @@ OpenERP E-Commerce 'author': 'OpenERP SA', 'depends': ['website', 'sale', 'product', 'payment_acquirer'], 'data': [ - 'website_sale_data.xml', + 'data/website_sale_data.xml', 'views/website_sale.xml', 'views/website_sale_backend.xml', 'security/ir.model.access.csv', 'security/website_sale.xml', ], 'demo': [ - 'website_sale_demo.xml', + 'data/website_sale_demo.xml', + 'data/website_sale_homepage_demo.xml', ], 'qweb': ['static/src/xml/*.xml'], 'installable': True, diff --git a/addons/website_sale/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml similarity index 100% rename from addons/website_sale/website_sale_data.xml rename to addons/website_sale/data/website_sale_data.xml diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/data/website_sale_demo.xml similarity index 100% rename from addons/website_sale/website_sale_demo.xml rename to addons/website_sale/data/website_sale_demo.xml diff --git a/addons/website_sale/data/website_sale_homepage_demo.xml b/addons/website_sale/data/website_sale_homepage_demo.xml new file mode 100644 index 00000000000..e99b299cc12 --- /dev/null +++ b/addons/website_sale/data/website_sale_homepage_demo.xml @@ -0,0 +1,36 @@ + + + + + + + + + +