odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #225 from odoo-dev/master-frontend-assets 

[IMP] Move website assets to frontend bundle
This commit is contained in:
Fabien Meghazi 2014-05-27 11:49:28 +02:00
parent 4da882d48f 51e10ffbac
commit dd900408de
11 changed files with 51 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/website_blog/views/website_blog_templates.xml
View File

@ -336,16 +336,17 @@
</p> </p>
</xpath> </xpath>
</template> </template>
<template id="blog_navigation_frontend" inherit_id="website.assets_frontend" name="Blog Navigation Frontend">
<xpath expr="." position="inside">
<link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
<script type="text/javascript" src="/website_blog/static/src/js/website_blog.inline.discussion.js"></script>
<script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"/>
<script type="text/javascript" src="/website_blog/static/lib/contentshare.js"/>
</xpath>
</template>
<!-- Page --> <!-- Page -->
<template id="index" name="Blog Navigation"> <template id="index" name="Blog Navigation">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
<script type="text/javascript" src="/website_blog/static/src/js/website_blog.inline.discussion.js"></script>
<script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"/>
<script type="text/javascript" src="/website_blog/static/lib/contentshare.js"/>
</t>
<div id="wrap" class="js_blog"> <div id="wrap" class="js_blog">
<t t-raw="0"/> <t t-raw="0"/>
</div> </div>

2
addons/website_event/views/website_event.xml
View File

@ -3,7 +3,7 @@
<data> <data>
<template id="event_script" inherit_id="website.assets_frontend" name="Country Events Snippet Script"> <template id="event_script" inherit_id="website.assets_frontend" name="Country Events Snippet Script">
<xpath expr="/t" position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script> <script type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script>
</xpath> </xpath>
</template> </template>

17
addons/website_event_track/views/website_event.xml
View File

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<template id="even_track_frontend" inherit_id="website.assets_frontend" name="Event Track Frontend">
<template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout"> <xpath expr="." position="inside">
<xpath expr="//t[@t-call='website.layout']" position="inside"> <link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>
<t t-set="head"> <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
<link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>
<t t-raw="head or ''"/>
</t>
</xpath> </xpath>
</template>
<template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout">
<xpath expr="//div[@id='wrap']" position="inside"> <xpath expr="//div[@id='wrap']" position="inside">
<div class="container mt32 mb16 hidden-print" t-if="event.sponsor_ids"> <div class="container mt32 mb16 hidden-print" t-if="event.sponsor_ids">
<section data-snippet-id="title"> <section data-snippet-id="title">
@ -42,10 +41,6 @@
<template id="agenda"> <template id="agenda">
<t t-call="website_event.layout"> <t t-call="website_event.layout">
<t t-set="head">
<script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
<t t-raw="head or ''"/>
</t>
<section class="container"> <section class="container">
<h1 class="text-center" t-field="event.name"/> <h1 class="text-center" t-field="event.name"/>
<div class="form-inline pull-right"> <div class="form-inline pull-right">

9
addons/website_mail/static/src/js/website_email_designer.js
View File

@ -1,13 +1,4 @@
(function () { (function () {
'use strict';
var website = openerp.website;
website.snippet.BuildingBlock.include({
_get_snippet_url: function () {
return '/website_mail/snippets';
}
});
// Copy the template to the body of the email // Copy the template to the body of the email
$(document).ready(function () { $(document).ready(function () {
$('.js_template_set').click(function(ev) { $('.js_template_set').click(function(ev) {

6
addons/website_mail/static/src/js/website_mail.editor.js
View File

@ -3,6 +3,12 @@
var website = openerp.website; var website = openerp.website;
var _t = openerp._t; var _t = openerp._t;
website.snippet.BuildingBlock.include({
_get_snippet_url: function () {
return '/website_mail/snippets';
}
});
website.snippet.options.subscribe = website.snippet.Option.extend({ website.snippet.options.subscribe = website.snippet.Option.extend({
on_prompt: function () { on_prompt: function () {

9
addons/website_mail/views/website_email_designer.xml
View File

@ -3,11 +3,14 @@
<data> <data>
<!-- Template Choice page --> <!-- Template Choice page -->
<template id="website_email_frontend" inherit_id="website.assets_frontend" name="Website Mail Frontend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
</xpath>
</template>
<template id="email_designer" name="Email Designer"> <template id="email_designer" name="Email Designer">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
</t>
<div id="wrap" class="container" t-ignore="True"> <div id="wrap" class="container" t-ignore="True">
<div id="email_template" class="mb32" t-att-style="mode != 'email_template' and 'display: none' or ''"> <div id="email_template" class="mb32" t-att-style="mode != 'email_template' and 'display: none' or ''">
<a class="mt16 btn btn-default pull-right" <a class="mt16 btn btn-default pull-right"

4
addons/website_mail/views/website_mail.xml
View File

@ -20,13 +20,13 @@
</template> </template>
<template id="head" inherit_id="website.assets_frontend" name="Mail customization"> <template id="head" inherit_id="website.assets_frontend" name="Mail customization">
<xpath expr="/t" position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script> <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
<link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/> <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
</xpath> </xpath>
</template> </template>
<template id="editor" inherit_id="website.assets_editor" name="Mail snippet"> <template id="editor" inherit_id="website.assets_editor" name="Mail snippet">
<xpath expr="/t" position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js"></script> <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js"></script>
</xpath> </xpath>
</template> </template>

18
addons/website_quote/views/website_quotation.xml
View File

@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<template id="website_quote_frontend" inherit_id="website.assets_frontend" name="Website Quote Frontend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
<script type="text/javascript" src="/website_quote/static/lib/jSignature/jSignature.min.js"></script>
<link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
</xpath>
</template>
<template id="pricing" name="Price"> <template id="pricing" name="Price">
<section data-snippet-id="title"> <section data-snippet-id="title">
<h1 class="page-header">Pricing</h1> <h1 class="page-header">Pricing</h1>
@ -161,12 +168,6 @@
<template id="so_quotation" name="Product Quotation"> <template id="so_quotation" name="Product Quotation">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
<script type="text/javascript" src="/website_quote/static/lib/jSignature/jSignature.min.js"></script>
<link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
<t t-raw="head or ''"/>
</t>
<body data-spy="scroll" data-target=".navspy"> <body data-spy="scroll" data-target=".navspy">
<div class="container"> <div class="container">
<div class="row mt16"> <div class="row mt16">
@ -457,11 +458,6 @@
<template id="so_template" name="SO Template"> <template id="so_template" name="SO Template">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
<link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
<t t-raw="head or ''"/>
</t>
<body data-spy="scroll" data-target=".navspy"> <body data-spy="scroll" data-target=".navspy">
<div class="container"> <div class="container">
<div class="row mt16"> <div class="row mt16">

37
addons/website_sale/views/templates.xml
View File

@ -111,8 +111,6 @@
<script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script> <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
</t> </t>
<link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/> <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<t t-raw="head or ''"/> <t t-raw="head or ''"/>
</t> </t>
<t t-set="additional_title">Shop</t> <t t-set="additional_title">Shop</t>
@ -304,14 +302,18 @@
</template> </template>
<!-- /shop/product product page --> <!-- /shop/product product page -->
<template id="website_sale_frontend" inherit_id="website.assets_frontend" name="Website Sale Frontend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
</xpath>
</template>
<template id="product" name="Product"> <template id="product" name="Product">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
</t>
<t t-set="additional_title" t-value="product.name"/> <t t-set="additional_title" t-value="product.name"/>
<div itemscope="itemscope" itemtype="http://schema.org/Product" id="wrap" class="js_sale"> <div itemscope="itemscope" itemtype="http://schema.org/Product" id="wrap" class="js_sale">
@ -484,11 +486,6 @@
<template id="cart" name="Shopping Cart"> <template id="cart" name="Shopping Cart">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<t t-raw="head or ''"/>
</t>
<div id="wrap"> <div id="wrap">
<div class="container oe_website_sale"> <div class="container oe_website_sale">
@ -671,11 +668,6 @@
<template id="checkout"> <template id="checkout">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<t t-raw="head or ''"/>
</t>
<t t-set="additional_title">Shop - Checkout</t> <t t-set="additional_title">Shop - Checkout</t>
<div id="wrap"> <div id="wrap">
<div class="container oe_website_sale"> <div class="container oe_website_sale">
@ -832,12 +824,6 @@
<template id="payment"> <template id="payment">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<t t-raw="head or ''"/>
</t>
<t t-set="additional_title">Shop - Select Payment Mode</t> <t t-set="additional_title">Shop - Select Payment Mode</t>
<div id="wrap"> <div id="wrap">
<div class="container oe_website_sale"> <div class="container oe_website_sale">
@ -956,11 +942,6 @@
<template id="confirmation"> <template id="confirmation">
<t t-call="website.layout"> <t t-call="website.layout">
<t t-set="head">
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
<t t-raw="head or ''"/>
</t>
<t t-set="additional_title">Shop - Confirmed</t> <t t-set="additional_title">Shop - Confirmed</t>
<div id="wrap"> <div id="wrap">
<div class="container oe_website_sale"> <div class="container oe_website_sale">

6
addons/website_sale_delivery/views/website_sale_delivery.xml
View File

@ -16,11 +16,13 @@
</xpath> </xpath>
</template> </template>
<template id="payment_delivery" name="Delivery Costs" inherit_id="website_sale.payment"> <template id="website_sale_delivery_frontend" inherit_id="website.assets_frontend" name="Website Sale Delivery Frontend">
<xpath expr="//t[@t-set='head']" position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/website_sale_delivery/static/src/js/website_sale_delivery.js"></script> <script type="text/javascript" src="/website_sale_delivery/static/src/js/website_sale_delivery.js"></script>
</xpath> </xpath>
</template>
<template id="payment_delivery" name="Delivery Costs" inherit_id="website_sale.payment">
<xpath expr="//div[@id='payment_method']" position="before"> <xpath expr="//div[@id='payment_method']" position="before">
<div t-if="deliveries" class="row" id="delivery_carrier"> <div t-if="deliveries" class="row" id="delivery_carrier">
<div class="col-lg-5 col-sm-6"> <div class="col-lg-5 col-sm-6">

4
addons/website_twitter/views/twitter_snippet.xml
View File

@ -23,13 +23,13 @@
</xpath> </xpath>
</template> </template>
<template id="twitter" inherit_id="website.assets_frontend" name="Twitter Snippet"> <template id="twitter" inherit_id="website.assets_frontend" name="Twitter Snippet">
<xpath expr="/t" position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" href="/website_twitter/static/src/css/website.twitter.css" type="text/css"/> <link rel="stylesheet" href="/website_twitter/static/src/css/website.twitter.css" type="text/css"/>
<script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"/> <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"/>
</xpath> </xpath>
</template> </template>
<template id="twitter_editor" inherit_id="website.assets_editor" name="Twitter options"> <template id="twitter_editor" inherit_id="website.assets_editor" name="Twitter options">
<xpath expr="/t" position="inside"> <xpath expr="." position="inside">
<script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js"/> <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js"/>
</xpath> </xpath>
</template> </template>