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

[IMP] rename editor assets 

bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
This commit is contained in:
Fabien Meghazi 2014-04-25 12:17:53 +02:00
parent aca0ad4b8f
commit 4f16d15120
9 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/report/views/layouts.xml
View File

@ -38,11 +38,6 @@
<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" src="/web/static/lib/bootstrap/js/bootstrap.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>

19
addons/website/views/website_templates.xml
View File

@ -10,19 +10,10 @@
<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" src="/web/static/lib/jquery.form/jquery.form.js"></script>
<script type="text/javascript">
// Bootstrap and jQuery UI conflicts
$.fn.bstooltip = $.fn.tooltip;
$.fn.bsbutton = $.fn.button;
</script>
<template id="assets" name="Website assets">
<t t-call="web.assets_common"/>
<t t-call="website.theme"/>
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
<script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
@ -257,10 +248,10 @@
</div>
</xpath>
<xpath expr='//t[@t-call-assets="website.assets"]' position="after">
<t t-call-assets="website.editor_assets"/>
<t t-call-assets="website.assets_editor"/>
</xpath>
</template>
<template id="editor_assets" name="Editor assets">
<template id="assets_editor" name="Editor assets">
<script type="text/javascript">
var CKEDITOR_BASEPATH = '/web/static/lib/ckeditor/';
</script>

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

@ -2,7 +2,7 @@
<openerp>
<data>
<template id="editor_assets" inherit_id="website.editor_assets" name="Blog Editor" groups="base.group_document_user">
<template id="assets_editor" inherit_id="website.assets_editor" name="Blog Editor" groups="base.group_document_user">
<xpath expr="." position="inside">
<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
addons/website_event/views/website_event.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<template id="editor_head" inherit_id="website.editor_assets" name="Event Editor" groups="event.group_event_manager">
<template id="editor_head" inherit_id="website.assets_editor" name="Event Editor" groups="event.group_event_manager">
<xpath expr="." position="inside">
<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
addons/website_gengo/views/website_gengo.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<template id="gengo_editor_assets" inherit_id="website.editor_assets" name="Editor Head" groups="base.group_website_publisher">
<template id="gengo_assets_editor" inherit_id="website.assets_editor" 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
addons/website_hr_recruitment/views/templates.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<template id="editor_assets" inherit_id="website.editor_assets" name="Jobs Editor" groups="base.group_hr_manager">
<template id="assets_editor" inherit_id="website.assets_editor" name="Jobs Editor" groups="base.group_hr_manager">
<xpath expr="." position="inside">
<script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js"></script>
</xpath>

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

@ -25,7 +25,7 @@
<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">
<template id="editor" inherit_id="website.assets_editor" name="Mail snippet">
<xpath expr="/t" position="inside">
<script t-if="not translatable" type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
</xpath>

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

@ -10,7 +10,7 @@
</xpath>
</template>
<template id="editor_assets" inherit_id="website.editor_assets" name="Shop Editor" groups="base.group_sale_manager">
<template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor" groups="base.group_sale_manager">
<xpath expr="." position="inside">
<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>

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

@ -28,7 +28,7 @@
<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">
<template id="twitter_editor" inherit_id="website.assets_editor" name="Twitter options">
<xpath expr="/t" position="inside">
<script t-if="not translatable" type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js" groups="base.group_website_publisher"/>
</xpath>