[MERGE] Merge parents
bzr revid: rim@openerp.com-20131224133718-1vgder5ofm0y76l5
This commit is contained in:
Richard Mathot (OpenERP)
@@ -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
|
||||
|
||||
@@ -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'],
|
||||
}
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<template id="website_homepage_demo" inherit_id="website.homepage" name="Homepage for Website">
|
||||
|
||||
<xpath expr="//div[@id='wrap']" position="attributes">
|
||||
<attribute name="class">oe_structure</attribute>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//div[@id='wrap']" position="inside">
|
||||
<section data-snippet-id="title" class="mt32 mb32">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12" data-snippet-id="colmd">
|
||||
<h1 class="text-center">Build Great Website</h1>
|
||||
<h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section data-snippet-id="image-text" class="mt32 mb32 dark">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
|
||||
<img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
|
||||
</div>
|
||||
<div class="col-md-6 mt32" data-snippet-id="colmd">
|
||||
<h3>A Section Subtitle</h3>
|
||||
<p>
|
||||
Write one or two paragraphs describing your product,
|
||||
services or a specific feature. To be successful
|
||||
your content needs to be useful to your readers.
|
||||
</p>
|
||||
<p>
|
||||
Start with the customer – find out what they want
|
||||
and give it to them.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div data-snippet-id="parallax">
|
||||
<div style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax oe_structure mt32 mb32 oe_big">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
|
||||
<h1 class="text-center">
|
||||
<b>A Great Title</b>
|
||||
</h1>
|
||||
<h3 class="text-center">
|
||||
And a motivating subtitle
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<section class="mt32 mb32" data-snippet-id="three-columns">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
|
||||
<h2>A Great Title</h2>
|
||||
<h3 class="text-muted">And a good subtitle</h3>
|
||||
</div>
|
||||
<div class="col-md-4" data-snippet-id="colmd">
|
||||
<img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
|
||||
<h4 class="mt16">Streamline Recruitments</h4>
|
||||
<p>
|
||||
Post job offers and keep track of each application
|
||||
received. Follow applicants in your recruitment process
|
||||
with the smart kanban view.
|
||||
</p><p>
|
||||
Save time by automating some communications with email
|
||||
templates. Resumes are indexed automatically, allowing
|
||||
you to easily find for specific profiles.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4" data-snippet-id="colmd">
|
||||
<img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
|
||||
<h4 class="mt16">Enterprise Social Network</h4>
|
||||
<p>
|
||||
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.
|
||||
</p><p>
|
||||
Interact with your collegues in real time with live chat.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4" data-snippet-id="colmd">
|
||||
<img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
|
||||
<h4 class="mt16">Leaves Management</h4>
|
||||
<p>
|
||||
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.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="mt32 mb32" data-snippet-id="cta">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
|
||||
<a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
|
||||
<a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</xpath>
|
||||
|
||||
</template>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
@@ -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 () {
|
||||
|
||||
+2
-2
@@ -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
|
||||
}
|
||||
@@ -232,44 +232,32 @@
|
||||
<section class="oe_snippet_body mt16 mb16">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12 text-center mt16 mb16">
|
||||
<h2>A Great Title</h2>
|
||||
<h3 class="text-muted">And a good subtitle</h3>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<img class="img img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
|
||||
<h4 class="mt16">Streamline Recruitments</h4>
|
||||
<p>
|
||||
Post job offers and keep track of each application
|
||||
received. Follow applicants in your recruitment process
|
||||
with the smart kanban view.
|
||||
</p><p>
|
||||
Save time by automating some communications with email
|
||||
templates. Resumes are indexed automatically, allowing
|
||||
you to easily find for specific profiles.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<img class="img img-rounded img-responsive" src="/website/static/src/img/desert_thumb.jpg"/>
|
||||
<h4 class="mt16">Enterprise Social Network</h4>
|
||||
<h4 class="mt16">Feature One</h4>
|
||||
<p>
|
||||
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.
|
||||
</p><p>
|
||||
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.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<img class="img img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg"/>
|
||||
<h4 class="mt16">Leaves Management</h4>
|
||||
<h4 class="mt16">Feature Two</h4>
|
||||
<p>
|
||||
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.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<img class="img img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
|
||||
<h4 class="mt16">Feature Three</h4>
|
||||
<p>
|
||||
Delete the above image or replace it with a picture
|
||||
that illustrates your message. Click on the picture to
|
||||
change it's <em>rounded corner</em> style.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<!-- Events banner for homepage -->
|
||||
|
||||
<template id="website_event_homepage" inherit_id="website_sale.website_sale_homepage" name="Event banner for Homepage">
|
||||
|
||||
<xpath expr="//div[@id='shop_banner']/div" position="before">
|
||||
<ol class="carousel-indicators">
|
||||
<li data-slide-to="0" data-target="#shop_banner" class="active"></li>
|
||||
<li data-target="#shop_banner" data-slide-to="1" class=""></li>
|
||||
</ol>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//div[@id='shop_banner']/div" position="inside">
|
||||
<div style="background-image: url(/website/static/src/img/banner/aqua.jpg);" class="item text_only">
|
||||
<div class="container">
|
||||
<div contenteditable="false" class="carousel-caption content">
|
||||
<h2>Promote Your Events</h2>
|
||||
|
||||
<h3>Sell Tickets Online</h3>
|
||||
|
||||
<p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
|
||||
</div>
|
||||
|
||||
<div class="carousel-image hidden-xs">
|
||||
<img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//*[@id='shop_banner']/div" position="after">
|
||||
<a data-slide="prev" href="#shop_banner" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
|
||||
<a data-slide="next" href="#shop_banner" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
|
||||
</xpath>
|
||||
|
||||
|
||||
</template>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
@@ -15,5 +15,5 @@ OpenERP Projects
|
||||
'views/website_project.xml',
|
||||
],
|
||||
'qweb': ['static/src/xml/*.xml'],
|
||||
'installable': True,
|
||||
'installable': False,
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
|
||||
<!-- Shop Banner for homepage -->
|
||||
|
||||
<template id="website_sale_homepage" inherit_id="website.homepage" name="Shop banner for Homepage">
|
||||
<xpath expr="//div[@id='wrap']/section" position="before">
|
||||
|
||||
<div id="shop_banner" contenteditable="false" class="oe_snippet_body carousel slide oe_medium mb32" data-snippet-id="carousel">
|
||||
<div class="carousel-inner">
|
||||
<div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
|
||||
<div class="container">
|
||||
<div contenteditable="false" class="carousel-caption content">
|
||||
<h2>OpenERP e-Commerce</h2>
|
||||
|
||||
<h3>An Awesome Shopping Experience</h3>
|
||||
|
||||
<p>
|
||||
<a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="carousel-image hidden-xs">
|
||||
<img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
Reference in New Issue
Block a user