summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2015-07-08 10:14:05 +0200
committerqsm-odoo <qsm@odoo.com>2015-07-09 16:27:24 +0200
commitfc3b25cefd81ffb972a103e44c58f7c5d9bd276d (patch)
tree1f6b012205a8e895a9a22b139db182ef8745f0ba /addons
parentbf8bc292d6cff4f10a8032cdee3e1ed20b2c6992 (diff)
[MOVE] web, website_*: select2(-bootstrap) in web and assets-common
* select2 was linked in both backend and frontend (by web and website) * select2-bootstrap was in website and linked only in frontend but it is in fact needed in backend too + Remove useless link of the lib by other modules
Diffstat (limited to 'addons')
-rw-r--r--addons/web/static/lib/select2-bootstrap-css/select2-bootstrap.css (renamed from addons/website/static/lib/select2-bootstrap-css/select2-bootstrap.css)0
-rw-r--r--addons/web/views/webclient_templates.xml8
-rw-r--r--addons/website/views/website.backend.xml3
-rw-r--r--addons/website/views/website_templates.xml5
-rw-r--r--addons/website_forum/views/website_forum.xml4
-rw-r--r--addons/website_slides/view/website_slides.xml3
6 files changed, 5 insertions, 18 deletions
diff --git a/addons/website/static/lib/select2-bootstrap-css/select2-bootstrap.css b/addons/web/static/lib/select2-bootstrap-css/select2-bootstrap.css
index 7922f6ced71..7922f6ced71 100644
--- a/addons/website/static/lib/select2-bootstrap-css/select2-bootstrap.css
+++ b/addons/web/static/lib/select2-bootstrap-css/select2-bootstrap.css
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index ce3054ab3a3..df140e8ad1d 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -42,6 +42,11 @@
<!-- Datetime Picker -->
<link rel="stylesheet" href="/web/static/lib/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css"/>
<script type="text/javascript" src="/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js"></script>
+
+ <!-- Select 2 -->
+ <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
+ <link rel="stylesheet" href="/web/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
+ <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
</template>
<template id="jqueryui_conflict" name="jquery.ui.conflict">
@@ -69,9 +74,6 @@
<link rel="stylesheet" href="/web/static/lib/jquery.textext/jquery.textext.css"/>
<script type="text/javascript" src="/web/static/lib/jquery.textext/jquery.textext.js"></script>
- <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
- <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
-
<script src="/web/static/lib/bootstrap/js/affix.js"></script>
<script src="/web/static/lib/bootstrap/js/alert.js"></script>
<script src="/web/static/lib/bootstrap/js/button.js"></script>
diff --git a/addons/website/views/website.backend.xml b/addons/website/views/website.backend.xml
index 5564fd22b3c..2590051499c 100644
--- a/addons/website/views/website.backend.xml
+++ b/addons/website/views/website.backend.xml
@@ -15,9 +15,6 @@
<script type="text/javascript" src="/website/static/src/js/website.js"></script>
<script 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>
- <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='/website/static/src/css/website.css'/>
<link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css'/>
<t t-call="website.summernote"/>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 1f35f44e1e7..8c2a6c3c9fb 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -92,11 +92,6 @@
<script src="/web/static/lib/bootstrap/js/scrollspy.js"></script>
<script src="/web/static/lib/bootstrap/js/tab.js"></script>
<script src="/web/static/lib/bootstrap/js/transition.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="/web/static/lib/select2/select2.js"></script>
-
</template>
<template id="assets_backend" name="website assets for backend" inherit_id="web.assets_backend">
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index b333b9b55a4..44919b4e886 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -12,10 +12,6 @@
<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"/>
diff --git a/addons/website_slides/view/website_slides.xml b/addons/website_slides/view/website_slides.xml
index 4df31e4acd1..7a15d5a15d0 100644
--- a/addons/website_slides/view/website_slides.xml
+++ b/addons/website_slides/view/website_slides.xml
@@ -14,11 +14,8 @@
<!-- assets -->
<template id="assets_frontend" inherit_id="website.assets_frontend" name="Slide">
<xpath expr="." position="inside">
- <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
- <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
<link type="text/less" href="/website_slides/static/src/less/website_slides.less" rel="stylesheet" t-ignore="true"/>
<!-- Js widgets, ... order loading files is IMPORTANT -->
- <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
<script type="text/javascript" src="/website_slides/static/src/js/slides.js"/>
<script type="text/javascript" src="/website_slides/static/src/js/slides_upload.js"/>
</xpath>