Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

Revert "Merge PR #1330 into 12.0" 

This reverts commit 0f95b0fb0a, reversing
changes made to d0ba3d3baf.
12.0
Pedro M. Baeza 2019-07-22 15:16:24 +02:00
parent aed62d6662
commit 79df8aadbe
6 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web_timeline/README.rst
View File

@ -183,7 +183,6 @@ Contributors
* Leonardo Donelli <donelli@webmonks.it>
* Adrien Didenot <adrien.didenot@horanet.com>
* Dennis Sluijk <d.sluijk@onestein.nl>
* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
Other credits
~~~~~~~~~~~~~

2
web_timeline/i18n/web_timeline.pot
View File

@ -86,7 +86,7 @@ msgstr ""
#. module: web_timeline
#. 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
msgid "Template \"timeline-item\" not present in timeline view definition."
msgstr ""

1
web_timeline/readme/CONTRIBUTORS.rst
View File

@ -4,4 +4,3 @@
* Leonardo Donelli <donelli@webmonks.it>
* Adrien Didenot <adrien.didenot@horanet.com>
* Dennis Sluijk <d.sluijk@onestein.nl>
* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>

1
web_timeline/static/description/index.html
View File

@ -560,7 +560,6 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<li>Leonardo Donelli &lt;<a class="reference external" href="mailto:donelli&#64;webmonks.it">donelli&#64;webmonks.it</a>&gt;</li>
<li>Adrien Didenot &lt;<a class="reference external" href="mailto:adrien.didenot&#64;horanet.com">adrien.didenot&#64;horanet.com</a>&gt;</li>
<li>Dennis Sluijk &lt;<a class="reference external" href="mailto:d.sluijk&#64;onestein.nl">d.sluijk&#64;onestein.nl</a>&gt;</li>
<li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="other-credits">

32
web_timeline/static/src/css/web_timeline.css
View File

@ -29,35 +29,3 @@
left: 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;
}

11
web_timeline/static/src/js/timeline_renderer.js
View File

@ -210,10 +210,7 @@ odoo.define('web_timeline.TimelineRenderer', function (require) {
onAdd: self.on_add,
onMove: self.on_move,
onUpdate: self.on_update,
onRemove: self.on_remove,
horizontalScroll: false,
verticalScroll:true,
zoomKey: 'ctrlKey',
onRemove: self.on_remove
});
this.qweb = new QWeb(session.debug, {_s: session.origin}, false);
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.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);
if (self.mode && self['on_scale_' + self.mode + '_clicked']) {
self['on_scale_' + self.mode + '_clicked']();