pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] report: use assets

Browse Source 
Three assets: assets_common for shared assets (html/pdf), assets_editor
for editor styles and scripts, assets_pdf to tweak only the pdf output
This commit is contained in:
Simon Lejeune
2015-09-28 14:32:31 +02:00
parent 0e304bf77e
commit f26988cf7a
3 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/report/static/src/css/report.css
+1 -10
View File
@@ -5,6 +5,7 @@ body {
.border-black td {
border-top: 1px solid black !important;
}
/* See https://github.com/wkhtmltopdf/wkhtmltopdf/issues/1524 */
.table-condensed > tbody > tr {
page-break-inside: avoid !important;
}
@@ -24,13 +25,3 @@ body {
display: none;
}
.o_editable:not(:empty)[data-oe-model="ir.ui.view"]:hover,
.o_editable:not(:empty)[data-oe-model="ir.ui.view"] th:hover,
.o_editable:not(:empty)[data-oe-model="ir.ui.view"] td:hover,
.o_editable[data-oe-type][data-oe-model="ir.ui.view"]:hover,
.o_editable[data-oe-type][data-oe-model="ir.ui.view"] th:hover,
.o_editable[data-oe-type][data-oe-model="ir.ui.view"] td:hover {
-moz-box-shadow: #DDCC33 0 0 5px 2px inset;
-webkit-box-shadow: #DDCC33 0 0 5px 2px inset;
box-shadow: #DDCC33 0 0 5px 2px inset;
}
addons/report/static/src/css/report.editor.css
+11
View File
@@ -0,0 +1,11 @@
.o_editable:not(:empty)[data-oe-model="ir.ui.view"]:hover,
.o_editable:not(:empty)[data-oe-model="ir.ui.view"] th:hover,
.o_editable:not(:empty)[data-oe-model="ir.ui.view"] td:hover,
.o_editable[data-oe-type][data-oe-model="ir.ui.view"]:hover,
.o_editable[data-oe-type][data-oe-model="ir.ui.view"] th:hover,
.o_editable[data-oe-type][data-oe-model="ir.ui.view"] td:hover {
-moz-box-shadow: #DDCC33 0 0 5px 2px inset;
-webkit-box-shadow: #DDCC33 0 0 5px 2px inset;
box-shadow: #DDCC33 0 0 5px 2px inset;
}
addons/report/views/layouts.xml
+22 -10
View File
@@ -1,6 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<template id="report.assets_common">
<link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/>
<link href="/website/static/src/css/website.css" rel="stylesheet"/>
<link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/>
<link href="/base/static/src/css/description.css" rel="stylesheet"/>
<link href="/report/static/src/css/report.css" rel="stylesheet"/>
</template>
<template id="report.assets_pdf">
<link href="/report/static/src/css/reset.min.css" rel="stylesheet"/>
</template>
<template id="report.assets_editor">
<link href="/report/static/src/css/report.editor.css" rel="stylesheet"/>
<script type="text/javascript" src="/web/static/src/js/framework/session_instance.js"></script>
<script type="text/javascript" src='/report/static/src/js/report.editor.js' />
</template>
<template id="layout" name="Report layout">&lt;!DOCTYPE html&gt;
<html t-att-lang="lang and lang.replace('_', '-')"
t-att-data-editable="'1' if editable else None"
@@ -14,12 +32,10 @@
<meta charset="utf-8" />
<meta name="viewport" content="initial-scale=1"/>
<title><t t-esc="title or 'Odoo Report'"/></title>
<link rel='stylesheet' href='/report/static/src/css/report.css'/>
<link id="bootstrap_css" rel='stylesheet' href='/web/static/lib/bootstrap/css/bootstrap.css'/>
<t t-call-assets="report.assets_common"/>
<t t-if="editable">
<t t-call-assets="web_editor.assets_editor"/>
<script type="text/javascript" src="/web/static/src/js/framework/session_instance.js"></script>
<script type="text/javascript" src='/report/static/src/js/report.editor.js' />
<t t-call-assets="report.assets_editor"/>
</t>
</head>
<body class="container" t-att-style="editable and 'margin-top: 40px;'">
@@ -144,12 +160,8 @@
&lt;!DOCTYPE html&gt;
<html style="height: 0;">
<head>
<link href="/report/static/src/css/reset.min.css" rel="stylesheet"/>
<link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/>
<link href="/website/static/src/css/website.css" rel="stylesheet"/>
<link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/>
<link href="/base/static/src/css/description.css" rel="stylesheet"/>
<link href="/report/static/src/css/report.css" rel="stylesheet"/>
<t t-call-assets="report.assets_pdf"/>
<t t-call-assets="report.assets_common"/>
<style type='text/css'><t t-raw="css"/></style>
<t t-if="subst is True">
<script>