mirror of https://github.com/OCA/web.git
Revert "Merge PR #1330 into 12.0"
This reverts commitpull/1362/head0f95b0fb0a
, reversing changes made tod0ba3d3baf
.
parent
aed62d6662
commit
79df8aadbe
|
@ -183,7 +183,6 @@ Contributors
|
||||||
* Leonardo Donelli <donelli@webmonks.it>
|
* Leonardo Donelli <donelli@webmonks.it>
|
||||||
* Adrien Didenot <adrien.didenot@horanet.com>
|
* Adrien Didenot <adrien.didenot@horanet.com>
|
||||||
* Dennis Sluijk <d.sluijk@onestein.nl>
|
* Dennis Sluijk <d.sluijk@onestein.nl>
|
||||||
* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
|
|
||||||
|
|
||||||
Other credits
|
Other credits
|
||||||
~~~~~~~~~~~~~
|
~~~~~~~~~~~~~
|
||||||
|
|
|
@ -86,7 +86,7 @@ msgstr ""
|
||||||
|
|
||||||
#. module: web_timeline
|
#. module: web_timeline
|
||||||
#. openerp-web
|
#. openerp-web
|
||||||
#: code:addons/web_timeline/static/src/js/timeline_renderer.js:476
|
#: code:addons/web_timeline/static/src/js/timeline_renderer.js:467
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Template \"timeline-item\" not present in timeline view definition."
|
msgid "Template \"timeline-item\" not present in timeline view definition."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
|
@ -4,4 +4,3 @@
|
||||||
* Leonardo Donelli <donelli@webmonks.it>
|
* Leonardo Donelli <donelli@webmonks.it>
|
||||||
* Adrien Didenot <adrien.didenot@horanet.com>
|
* Adrien Didenot <adrien.didenot@horanet.com>
|
||||||
* Dennis Sluijk <d.sluijk@onestein.nl>
|
* Dennis Sluijk <d.sluijk@onestein.nl>
|
||||||
* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
|
|
||||||
|
|
|
@ -560,7 +560,6 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
|
||||||
<li>Leonardo Donelli <<a class="reference external" href="mailto:donelli@webmonks.it">donelli@webmonks.it</a>></li>
|
<li>Leonardo Donelli <<a class="reference external" href="mailto:donelli@webmonks.it">donelli@webmonks.it</a>></li>
|
||||||
<li>Adrien Didenot <<a class="reference external" href="mailto:adrien.didenot@horanet.com">adrien.didenot@horanet.com</a>></li>
|
<li>Adrien Didenot <<a class="reference external" href="mailto:adrien.didenot@horanet.com">adrien.didenot@horanet.com</a>></li>
|
||||||
<li>Dennis Sluijk <<a class="reference external" href="mailto:d.sluijk@onestein.nl">d.sluijk@onestein.nl</a>></li>
|
<li>Dennis Sluijk <<a class="reference external" href="mailto:d.sluijk@onestein.nl">d.sluijk@onestein.nl</a>></li>
|
||||||
<li>Serpent Consulting Services Pvt. Ltd. <<a class="reference external" href="mailto:support@serpentcs.com">support@serpentcs.com</a>></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="section" id="other-credits">
|
<div class="section" id="other-credits">
|
||||||
|
|
|
@ -29,35 +29,3 @@
|
||||||
left: 0px;
|
left: 0px;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vis-labelset {
|
|
||||||
position: relative;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
overflow: visible !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vis-labelset .vis-label:first-child {
|
|
||||||
background: lightgrey;
|
|
||||||
position: sticky;
|
|
||||||
top: 0px !important;
|
|
||||||
z-index: 999;
|
|
||||||
max-height: 100px;
|
|
||||||
height: 100px !important;
|
|
||||||
display: -webkit-flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vis-foreground .vis-group:first-child {
|
|
||||||
background: lightgrey;
|
|
||||||
position: sticky;
|
|
||||||
top: 0px !important;
|
|
||||||
z-index: 999;
|
|
||||||
max-height: 100px;
|
|
||||||
height: 100px !important;
|
|
||||||
display: -webkit-flex;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vis-background .vis-group:nth-child(2) .vis-line{
|
|
||||||
display:none !important;
|
|
||||||
}
|
|
||||||
|
|
|
@ -210,10 +210,7 @@ odoo.define('web_timeline.TimelineRenderer', function (require) {
|
||||||
onAdd: self.on_add,
|
onAdd: self.on_add,
|
||||||
onMove: self.on_move,
|
onMove: self.on_move,
|
||||||
onUpdate: self.on_update,
|
onUpdate: self.on_update,
|
||||||
onRemove: self.on_remove,
|
onRemove: self.on_remove
|
||||||
horizontalScroll: false,
|
|
||||||
verticalScroll:true,
|
|
||||||
zoomKey: 'ctrlKey',
|
|
||||||
});
|
});
|
||||||
this.qweb = new QWeb(session.debug, {_s: session.origin}, false);
|
this.qweb = new QWeb(session.debug, {_s: session.origin}, false);
|
||||||
if (this.arch.children.length) {
|
if (this.arch.children.length) {
|
||||||
|
@ -226,12 +223,6 @@ odoo.define('web_timeline.TimelineRenderer', function (require) {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.timeline = new vis.Timeline(self.$timeline.empty().get(0));
|
this.timeline = new vis.Timeline(self.$timeline.empty().get(0));
|
||||||
$(this.timeline.dom.leftContainer).scroll(function() {
|
|
||||||
var hei = ($('.vis-foreground .vis-group:first-child')[0].style.height).split("px");
|
|
||||||
var itemset_height = ($('.vis-itemset')[0].style.height).split("px");
|
|
||||||
var new_height = parseInt(itemset_height[0]) - (parseInt(hei[0]) - 100)
|
|
||||||
$('.vis-itemset').css('height', new_height)
|
|
||||||
});
|
|
||||||
this.timeline.setOptions(this.options);
|
this.timeline.setOptions(this.options);
|
||||||
if (self.mode && self['on_scale_' + self.mode + '_clicked']) {
|
if (self.mode && self['on_scale_' + self.mode + '_clicked']) {
|
||||||
self['on_scale_' + self.mode + '_clicked']();
|
self['on_scale_' + self.mode + '_clicked']();
|
||||||
|
|
Loading…
Reference in New Issue