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

[FIX] Use the local bootstrap 

bzr revid: openerp-sle@openerp-sle.home-20140216110430-sbzd306ufay3ukxn
This commit is contained in:
openerp-sle 2014-02-16 12:04:30 +01:00
parent 2445e9f0bc
commit f43f978427
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/report/controllers/main.py
View File

@ -134,6 +134,7 @@ class Report(http.Controller):
# Get some css and script in order to build a minimal html page for the report.
# This page will later be sent to wkhtmltopdf.
css = self._get_url_content('/report/static/src/css/reset.min.css')
css += self._get_url_content('/web/static/lib/bootstrap/css/bootstrap.css')
css += self._get_url_content('/website/static/src/css/website.css')
subst = self._get_url_content('/report/static/src/js/subst.js')
@ -144,7 +145,6 @@ class Report(http.Controller):
<html style="height: 0mm;">
<head>
<style type='text/css'>{0}</style>
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css">
<script type='text/javascript'>{1}</script>
</head>
<body class="container" onload='subst()'>

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

@ -24,7 +24,7 @@
<meta name="keywords" t-att-value="main_object and 'website_meta_keywords' in main_object
and main_object.website_meta_keywords or website_meta_keywords"/>
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css"/>
<link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css' t-ignore="true"/>
<link rel="stylesheet" type="text/css" href='/website/static/src/css/website.css'/>
<style type="text/css">
<t t-call="report.style"/>