[CHG] bundlify website
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files relative to "itself" (the file which executes it). After bundling, the path is incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place. bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
This commit is contained in:
parent
511cf0270c
commit
74d4d1f58d
|
@ -10,6 +10,28 @@
|
|||
<link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css' t-ignore="true"/>
|
||||
<link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
|
||||
</template>
|
||||
<template id="assets" name="Website assets">
|
||||
<t t-call="website.theme"/>
|
||||
|
||||
<script type="text/javascript" src="/web/static/lib/es5-shim/es5-shim.min.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
|
||||
<script type="text/javascript">
|
||||
// Bootstrap and jQuery UI conflicts
|
||||
$.fn.bstooltip = $.fn.tooltip;
|
||||
$.fn.bsbutton = $.fn.button;
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
|
||||
<script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
|
||||
|
||||
<script type="text/javascript" src="/website/static/src/js/website.js"></script>
|
||||
|
||||
<script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
|
||||
|
||||
</template>
|
||||
|
||||
<template id="website.submenu" name="Submenu">
|
||||
<li t-if="not submenu.child_id" t-att-class="
|
||||
|
@ -63,25 +85,7 @@
|
|||
<!-- Load stylesheets before scripts to avoid blocking -->
|
||||
<link rel='stylesheet' href='/web/static/lib/fontawesome/css/font-awesome.css'/>
|
||||
|
||||
<t t-call="website.theme"/>
|
||||
|
||||
<script type="text/javascript" src="/web/static/lib/es5-shim/es5-shim.min.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
|
||||
<script type="text/javascript">
|
||||
// Bootstrap and jQuery UI conflicts
|
||||
$.fn.bstooltip = $.fn.tooltip;
|
||||
$.fn.bsbutton = $.fn.button;
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
|
||||
<script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
|
||||
|
||||
<script type="text/javascript" src="/website/static/src/js/website.js"></script>
|
||||
|
||||
<script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
|
||||
<script type="text/javascript" src="/web/static/lib/bootstrap/js/bootstrap.js"></script>
|
||||
<t t-call-assets="website.assets"/>
|
||||
|
||||
<t t-raw="head or ''" name='layout_head'/>
|
||||
</head>
|
||||
|
@ -250,7 +254,14 @@
|
|||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
<xpath expr='//script[@src="/web/static/lib/bootstrap/js/bootstrap.js"]' position="before">
|
||||
<xpath expr='//t[@t-call-assets="website.assets"]' position="after">
|
||||
<t t-call-assets="website.editor_assets"/>
|
||||
</xpath>
|
||||
</template>
|
||||
<template id="editor_assets" name="Editor assets">
|
||||
<script type="text/javascript">
|
||||
var CKEDITOR_BASEPATH = '/web/static/lib/ckeditor/';
|
||||
</script>
|
||||
<link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
|
||||
<link rel='stylesheet' href='/website/static/src/css/editor.css'/>
|
||||
<link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
|
||||
|
@ -286,7 +297,6 @@
|
|||
<script t-if="translatable" type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
|
||||
|
||||
<script type="text/javascript" src="/website/static/src/js/jQuery.transfo.js"></script>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="debugger" inherit_option_id="website.layout" name="Debugger & Tests">
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<template id="editor_head" inherit_id="website.editor_head" name="Blog Editor" groups="base.group_document_user">
|
||||
<template id="editor_assets" inherit_id="website.editor_assets" name="Blog Editor" groups="base.group_document_user">
|
||||
<xpath expr="//script[@id='website_tour_js']" position="after">
|
||||
<script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
|
||||
<script type="text/javascript" src="/website_blog/static/src/js/website.tour.blog.js"></script>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<template id="editor_head" inherit_id="website.editor_head" name="Event Editor" groups="event.group_event_manager">
|
||||
<template id="editor_head" inherit_id="website.editor_assets" name="Event Editor" groups="event.group_event_manager">
|
||||
<xpath expr="//script[@id='website_tour_js']" position="after">
|
||||
<script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
|
||||
<script type="text/javascript" src="/website_event/static/src/js/website.tour.event.js"></script>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<template id="gengo_editor_head" inherit_id="website.editor_head" name="Editor Head" groups="base.group_website_publisher">
|
||||
<template id="gengo_editor_assets" inherit_id="website.editor_assets" name="Editor Head" groups="base.group_website_publisher">
|
||||
<xpath expr='//script[@src="/website/static/src/js/website.translator.js"]' position="after">
|
||||
<link rel="stylesheet" href="/website_gengo/static/src/css/website_gengo.css"></link>
|
||||
<script t-if="translatable" type="text/javascript" src="/website_gengo/static/src/js/website_gengo.js"></script>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<template id="editor_head" inherit_id="website.editor_head" name="Jobs Editor" groups="base.group_hr_manager">
|
||||
<template id="editor_assets" inherit_id="website.editor_assets" name="Jobs Editor" groups="base.group_hr_manager">
|
||||
<xpath expr="//script[@id='website_tour_js']" position="after">
|
||||
<script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js"></script>
|
||||
</xpath>
|
||||
|
|
|
@ -19,13 +19,17 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
<template id="head" inherit_id="website.layout" name="Mail customization">
|
||||
<xpath expr="//head" position="inside">
|
||||
<script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
|
||||
<template id="head" inherit_id="website.assets" name="Mail customization">
|
||||
<xpath expr="/t" position="inside">
|
||||
<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'/>
|
||||
</xpath>
|
||||
</template>
|
||||
<template id="editor" inherit_id="website.editor_assets" name="Mail snippet">
|
||||
<xpath expr="/t" position="inside">
|
||||
<script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
</xpath>
|
||||
</template>
|
||||
|
||||
<template id="editor_head" inherit_id="website.editor_head" name="Shop Editor" groups="base.group_sale_manager">
|
||||
<template id="editor_assets" inherit_id="website.editor_assets" name="Shop Editor" groups="base.group_sale_manager">
|
||||
<xpath expr="//script[@id='website_tour_js']" position="after">
|
||||
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
|
||||
<script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
|
||||
|
|
|
@ -22,11 +22,15 @@
|
|||
</div>
|
||||
</xpath>
|
||||
</template>
|
||||
<template id="twitter" inherit_id="website.layout" name="Twitter Snippet">
|
||||
<xpath expr="//head" position="inside">
|
||||
<template id="twitter" inherit_id="website.assets" name="Twitter Snippet">
|
||||
<xpath expr="/t" position="inside">
|
||||
<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>
|
||||
<script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js" groups="base.group_website_publisher"></script>
|
||||
<script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"/>
|
||||
</xpath>
|
||||
</template>
|
||||
<template id="twitter_editor" inherit_id="website.editor_assets" name="Twitter options">
|
||||
<xpath expr="/t" position="inside">
|
||||
<script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js" groups="base.group_website_publisher"/>
|
||||
</xpath>
|
||||
</template>
|
||||
</data>
|
||||
|
|
Loading…
Reference in New Issue