Merge PR #1598 into 13.0

Signed-off-by pedrobaeza
pull/1606/head
OCA-git-bot 2020-05-07 07:30:30 +00:00
commit 7c26d8926c
5 changed files with 41996 additions and 71 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -24,8 +24,8 @@ odoo.define("web_timeline.TimelineView", function(require) {
var TimelineView = AbstractView.extend({ var TimelineView = AbstractView.extend({
display_name: _lt("Timeline"), display_name: _lt("Timeline"),
icon: "fa-tasks", icon: "fa-tasks",
jsLibs: ["/web_timeline/static/lib/vis-timeline/vis-timeline-graph2d.min.js"], jsLibs: ["/web_timeline/static/lib/vis-timeline/vis-timeline-graph2d.js"],
cssLibs: ["/web_timeline/static/lib/vis-timeline/vis-timeline-graph2d.min.css"], cssLibs: ["/web_timeline/static/lib/vis-timeline/vis-timeline-graph2d.css"],
config: { config: {
Model: TimelineModel, Model: TimelineModel,
Controller: TimelineController, Controller: TimelineController,

View File

@ -18,6 +18,7 @@ $vis-item-content-padding: 0 3px !important;
} }
.vis-item-content { .vis-item-content {
width: 100%;
padding: $vis-item-content-padding; padding: $vis-item-content-padding;
} }
} }

View File

@ -6,20 +6,11 @@
inherit_id="web.assets_backend" inherit_id="web.assets_backend"
> >
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link
rel="stylesheet"
type="text/css"
href="/web_timeline/static/lib/vis-timeline/vis-timeline-graph2d.css"
/>
<link <link
rel="stylesheet" rel="stylesheet"
type="text/scss" type="text/scss"
href="/web_timeline/static/src/scss/web_timeline.scss" href="/web_timeline/static/src/scss/web_timeline.scss"
/> />
<script
type="text/javascript"
src="/web_timeline/static/lib/vis-timeline/vis-timeline-graph2d.min.js"
/>
<script <script
type="text/javascript" type="text/javascript"
src="/web_timeline/static/src/js/timeline_view.js" src="/web_timeline/static/src/js/timeline_view.js"