projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45c592c
)
[FIX] website_forum: correct syntax error left during previous forward-port
author
Christophe Simonis
<chs@odoo.com>
Tue, 2 Dec 2014 15:55:10 +0000
(16:55 +0100)
committer
Christophe Simonis
<chs@odoo.com>
Tue, 2 Dec 2014 15:55:10 +0000
(16:55 +0100)
addons/website_forum/views/website_forum.xml
patch
|
blob
|
history
diff --git
a/addons/website_forum/views/website_forum.xml
b/addons/website_forum/views/website_forum.xml
index
9ded2c9
..
e02f4cd
100644
(file)
--- a/
addons/website_forum/views/website_forum.xml
+++ b/
addons/website_forum/views/website_forum.xml
@@
-12,6
+12,10
@@
<!-- Front-end custom css / js + ckeditor lib and customization -->
<template id="assets_frontend" inherit_id="website.assets_frontend" name="Forum Assets">
<xpath expr="." position="inside">
<!-- Front-end custom css / js + ckeditor lib and customization -->
<template id="assets_frontend" inherit_id="website.assets_frontend" name="Forum Assets">
<xpath expr="." position="inside">
+ <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
+ <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
+ <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
+
<link rel='stylesheet' href="/web/static/lib/jquery.textext/jquery.textext.css"/>
<link rel='stylesheet' href='/website_forum/static/src/css/website_forum.css'/>
<script type="text/javascript" src="/website_forum/static/src/js/website_forum.js"/>
<link rel='stylesheet' href="/web/static/lib/jquery.textext/jquery.textext.css"/>
<link rel='stylesheet' href='/website_forum/static/src/css/website_forum.css'/>
<script type="text/javascript" src="/website_forum/static/src/js/website_forum.js"/>
@@
-45,10
+49,6
@@
</form>
</template>
</form>
</template>
- <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
- <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
- <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
- <script type="text/javascript" src="/website_forum/static/src/js/website_forum.js"/>
<!-- Page Index -->
<template id="header" name="Forum Index">
<t t-call="website.layout">
<!-- Page Index -->
<template id="header" name="Forum Index">
<t t-call="website.layout">