diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-02-20 18:16:01 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-02-20 18:16:01 +0100 |
| commit | aec02cb4935103aa7d158b56397c191932b35fa7 (patch) | |
| tree | 82915059f96448510e6b1c5183611175c483e579 /doc | |
| parent | e13923c0db1fd4ba9c98eacdcd987c6be7575a5f (diff) | |
| parent | d350f5b59e8905a76e965b6f34a0db14dbb53af0 (diff) | |
[MERGE] forward port of branch 8.0 up to d350f5b
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/_themes/odoodoc/static/app.js | 19 | ||||
| -rw-r--r-- | doc/cla/corporate/eugeconsulting.md | 15 | ||||
| -rw-r--r-- | doc/cla/corporate/jamotion.md | 17 | ||||
| -rw-r--r-- | doc/cla/individual/vice.md | 11 |
4 files changed, 54 insertions, 8 deletions
diff --git a/doc/_themes/odoodoc/static/app.js b/doc/_themes/odoodoc/static/app.js index 208a29dcf42..64a77c15c40 100644 --- a/doc/_themes/odoodoc/static/app.js +++ b/doc/_themes/odoodoc/static/app.js @@ -66,22 +66,25 @@ $(function () { .prependTo('.switchable:not(.setup) .highlight'); $(document).on('click', '.btn-show-setup', function (e) { var $target = $(e.target); - var target = $target.closest('.switchable:not(.setup)').get(0); + var switchable = $target.closest('.switchable:not(.setup)').get(0); // not in a switchable (???) - if (!target) { return; } - var lang = getHighlightLanguage(target); + if (!switchable) { return; } + + var lang = getHighlightLanguage(switchable); if (!lang) { // switchable without highlight (e.g. language-specific notes), // don't munge return; } - var $setup_code = $target.prev(); - if ($setup_code.length) { - // remove existing setup code - $setup_code.remove(); + var $following_siblings = $target.nextAll(); + if ($following_siblings.length > 1) { + // remove all but the very last following sibling (which + // should be the non-setup <pre>) + $following_siblings.slice(0, -1).remove(); } else { - $('.setupcode.highlight-' + lang + ' pre').clone().insertBefore($target); + // otherwise insert setupcode + $('.setupcode.highlight-' + lang + ' pre').clone().insertAfter($target); } }); })(); } diff --git a/doc/cla/corporate/eugeconsulting.md b/doc/cla/corporate/eugeconsulting.md new file mode 100644 index 00000000000..ae172b2f546 --- /dev/null +++ b/doc/cla/corporate/eugeconsulting.md @@ -0,0 +1,15 @@ +USA, 2015-02-17 + +EUGE Consulting agrees to the terms of the Odoo Corporate Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +E.R. Spada II er@eugeconsulting.com https://github.com/spadae22 + +List of contributors: + +E.R. Spada II er@eugeconsulting.com https://github.com/spadae22 diff --git a/doc/cla/corporate/jamotion.md b/doc/cla/corporate/jamotion.md new file mode 100644 index 00000000000..d7fd5029c63 --- /dev/null +++ b/doc/cla/corporate/jamotion.md @@ -0,0 +1,17 @@ +Switzerland, 19.02.2015 + +Jamotion GmbH agrees to the terms of the Odoo Corporate Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Renzo Meister, rm@jamotion.ch https://github.com/jamotion + +List of contributors: + +Renzo Meister, rm@jamotion.ch https://github.com/rm-jamotion +Patrick Reiser, pr@jamotion.ch https://github.com/prjamo +Gregor Lazzarato, gl@jamotion.ch https://github.com/gregorlazzarato diff --git a/doc/cla/individual/vice.md b/doc/cla/individual/vice.md new file mode 100644 index 00000000000..acd4d1515b8 --- /dev/null +++ b/doc/cla/individual/vice.md @@ -0,0 +1,11 @@ +Spain, 2015-02-20 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Vicente Jimenez Aguilar googuy@gmail.com https://github.com/vice |
