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

[FIX] survey: mess with JS loading 

Since yesterday, JS bundles are now loaded at the end of the webpage.
Old-style modules that hardlink js code in the <head> section are now
broken since they use jQuery's $.
This commit is contained in:
Richard Mathot 2014-09-17 11:53:14 +02:00
parent 73a01a16ab
commit 4dec8b54f4
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/survey/views/survey_result.xml
View File

@ -1,15 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<template id="assets_frontend_result" inherit_id="website.assets_frontend" name="Survey Results assets">
<xpath expr="." position="inside">
<script src="/web_graph/static/lib/nvd3/d3.v3.js"></script>
<script src="/web_graph/static/lib/nvd3/nv.d3.js"></script>
<script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
<link href="/web_graph/static/src/css/nv.d3.css" rel="stylesheet" type="text/css"></link>
<link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
</xpath>
</template>
<template id="result" name="Survey Result">
<t t-call="website.layout">
<t t-set="head">
<link href="/web_graph/static/src/css/nv.d3.css" rel="stylesheet" type="text/css"></link>
<link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
<script src="/web_graph/static/lib/nvd3/d3.v3.js"></script>
<script src="/web_graph/static/lib/nvd3/nv.d3.js"></script>
<script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
</t>
<div class="oe_structure" />
<div class="container">
<div class="jumbotron mt32">

11
addons/survey/views/survey_templates.xml
View File

@ -82,11 +82,13 @@
</template>
<!-- A survey -->
<template id="assets_frontend" inherit_id="website.assets_frontend" name="Survey assets">
<xpath expr="." position="inside">
<script type="text/javascript" src="/survey/static/src/js/survey.js" />
</xpath>
</template>
<template id="survey" name="Survey">
<t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/survey/static/src/js/survey.js" />
</t>
<div class="wrap">
<div class="oe_structure"/>
<div class="container">
@ -260,9 +262,6 @@
<!-- Printable view of a survey (all pages) -->
<template id="survey_print" name="Survey">
<t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/survey/static/src/js/survey.js" />
</t>
<div class="wrap">
<div class="container">
<div class="row">