Line 382: |
Line 382: |
| </tr> | | </tr> |
| <tr> | | <tr> |
− | <td class="markup half"><span style="color: #007700"><ul></span><br/><span style="color: #007700"> <li></span>Element 1<span style="color: #007700"></li></span><br/><span style="color: #007700"></ul></span><br/><span style="color: #007700"><ul</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"highlighted mw-collapsible-content"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <li></span>Element 2<span style="color: #007700"></li></span><br/><span style="color: #007700"></ul></span></td> | + | <td class="markup half"><span style="color: #007700"><ul></span><br/><span style="color: #007700"> <li></span>Element 1<span style="color: #007700"></li></span><br/><span style="color: #007700"></ul></span><br/><span style="color: #007700"><ul</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"highlighted mw-collapsible-content"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <li></span>Element 2<span style="color: #007700"></li></span><br/><span style="color: #007700"></ul></span></td> |
| <td class="half"> | | <td class="half"> |
| <div class="mw-collapsible" data-expandtext="Show Detailed View" data-collapsetext="Hide Detailed View"> | | <div class="mw-collapsible" data-expandtext="Show Detailed View" data-collapsetext="Hide Detailed View"> |
Line 398: |
Line 398: |
| </tr> | | </tr> |
| <tr> | | <tr> |
− | <td class="markup half"><span style="color: #007700"><ol></span><br/><span style="color: #007700"> <li></span>Element 1<span style="color: #007700"></li></span><br/><span style="color: #007700"></ol></span><br/><span style="color: #007700"><ol</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"highlighted mw-collapsible-content"</span><span style="color: #0000CC"> start=</span><span style="background-color: #fff0f0">"2"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <li></span>Element 2<span style="color: #007700"></li></span><br/><span style="color: #007700"></ol></span></td> | + | <td class="markup half"><span style="color: #007700"><ol></span><br/><span style="color: #007700"> <li></span>Element 1<span style="color: #007700"></li></span><br/><span style="color: #007700"></ol></span><br/><span style="color: #007700"><ol</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"highlighted mw-collapsible-content"</span><span style="color: #0000CC"> start=</span><span style="color: rgb(190, 70, 0)">"2"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <li></span>Element 2<span style="color: #007700"></li></span><br/><span style="color: #007700"></ol></span></td> |
| <td class="half"> | | <td class="half"> |
| <div class="mw-collapsible" data-expandtext="Show Detailed View" data-collapsetext="Hide Detailed View"> | | <div class="mw-collapsible" data-expandtext="Show Detailed View" data-collapsetext="Hide Detailed View"> |
Line 456: |
Line 456: |
| </tr> | | </tr> |
| <tr> | | <tr> |
− | <td class="markup half"><span style="color: #007700"><table</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"wikitable sortable"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <th></span>Header 1<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Header 2<span style="color: #007700"></th></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Detail 1<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Detail 2<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Detail 3<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Detail 4<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"></table></span> | + | <td class="markup half"><span style="color: #007700"><table</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"wikitable sortable"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <th></span>Header 1<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Header 2<span style="color: #007700"></th></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Detail 1<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Detail 2<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Detail 3<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Detail 4<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"></table></span> |
| </td> | | </td> |
| <td class="half"> | | <td class="half"> |
Line 535: |
Line 535: |
| </tr> | | </tr> |
| <tr> | | <tr> |
− | <td class="markup"><span style="color: #007700"><table></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span><nowiki>[[File:Traffic_cone.png|40px]]</nowiki><span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"disclaimerText"</span><span style="color: #007700">></span>Recent additions include <nowiki>[[Technology_Trends/Blockchain|Blockchain]], [[Technology_Trends/Drones|Drones]]</nowiki>.<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"></table></span></td> | + | <td class="markup"><span style="color: #007700"><table></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span><nowiki>[[File:Traffic_cone.png|40px]]</nowiki><span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"disclaimerText"</span><span style="color: #007700">></span>Recent additions include <nowiki>[[Technology_Trends/Blockchain|Blockchain]], [[Technology_Trends/Drones|Drones]]</nowiki>.<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"></table></span></td> |
| <td> | | <td> |
| <table class="disclaimer" style="margin: auto;"><tr> | | <table class="disclaimer" style="margin: auto;"><tr> |
Line 544: |
Line 544: |
| </tr> | | </tr> |
| <tr> | | <tr> |
− | <td class="markup"><span style="color: #007700"><table</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"wikitable sortable technology-table"</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"border: 0px solid;"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <th</span> <span style="color: #0000CC">colspan=</span><span style="background-color: #fff0f0">"3"</span><span style="color: #007700">></span>Name<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Status<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"white-space: nowrap;"</span><span style="color: #007700">></span>Release Date<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Official Publications<span style="color: #007700"></th></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"border-right: 0px solid; text-align:right;"</span><span style="color: #007700">></span>[[Technology_Trends/Blockchain|Blockchain]]<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"border-left: 0px solid; border-right: 0px solid;"</span><span style="color: #007700">></span>-<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"border-left: 0px solid; text-align:left"</span><span style="color: #007700">></span>[[Tendances_Technologiques/Chaîne_de_Blocs|Chaîne de Blocs]]<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Published<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>2019-05-23<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>[[Media:EN_-_Technology_Trends_-_Blockchain.pdf|EN]] - [[Media:FR_-_Tendances_Technologiques_-_Blockchain.pdf|FR]]<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"border-right: 0px solid; text-align:right;"</span><span style="color: #007700">></span>3D XPoint (Optane)<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"border-left: 0px solid; border-right: 0px solid;"</span><span style="color: #007700">></span>-<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="background-color: #fff0f0">"border-left: 0px solid; text-align:left"</span><span style="color: #007700">></span>3D XPoint (Optane)<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Development<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>FY 19-20 Q2<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"></table></span> | + | <td class="markup"><span style="color: #007700"><table</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"wikitable sortable technology-table"</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"border: 0px solid;"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <th</span> <span style="color: #0000CC">colspan=</span><span style="color: rgb(190, 70, 0)">"3"</span><span style="color: #007700">></span>Name<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Status<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"white-space: nowrap;"</span><span style="color: #007700">></span>Release Date<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Official Publications<span style="color: #007700"></th></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"border-right: 0px solid; text-align:right;"</span><span style="color: #007700">></span>[[Technology_Trends/Blockchain|Blockchain]]<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"border-left: 0px solid; border-right: 0px solid;"</span><span style="color: #007700">></span>-<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"border-left: 0px solid; text-align:left"</span><span style="color: #007700">></span>[[Tendances_Technologiques/Chaîne_de_Blocs|Chaîne de Blocs]]<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Published<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>2019-05-23<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>[[Media:EN_-_Technology_Trends_-_Blockchain.pdf|EN]] - [[Media:FR_-_Tendances_Technologiques_-_Blockchain.pdf|FR]]<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"border-right: 0px solid; text-align:right;"</span><span style="color: #007700">></span>3D XPoint (Optane)<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"border-left: 0px solid; border-right: 0px solid;"</span><span style="color: #007700">></span>-<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td</span> <span style="color: #0000CC">style=</span><span style="color: rgb(190, 70, 0)">"border-left: 0px solid; text-align:left"</span><span style="color: #007700">></span>3D XPoint (Optane)<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Development<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>FY 19-20 Q2<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"></table></span> |
| </td> | | </td> |
| <td> | | <td> |
Line 585: |
Line 585: |
| </tr> | | </tr> |
| <tr> | | <tr> |
− | <td class="markup"><span style="color: #007700"><div</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"container"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <div</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"row"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <div</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"col-sm-8"</span><span style="color: #007700">></span><nowiki>[[File:EN_Technology_Trends_-_Blockchain_Hype_Cycle_2018.png|center]]</nowiki><span style="color: #007700"></div></span><br/><span style="color: #007700"> <div</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"col-sm-4"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <table</span> <span style="color: #0000CC">class=</span><span style="background-color: #fff0f0">"wikitable hypecycleTable"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <th></span>English<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Français<span style="color: #007700"></th></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Figure 1. Hype Cycle for Blockchain Technologies, 2018<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Figure 1. Rapport Hype Cycle sur les technologies de la chaîne de blocs, 2018<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Expectations<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Attentes<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Time<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Temps<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> </table></span><br/><span style="color: #007700"> </div></span><br/><span style="color: #007700"> </div></span><br/><span style="color: #007700"></div></span> | + | <td class="markup"><span style="color: #007700"><div</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"container"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <div</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"row"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <div</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"col-sm-8"</span><span style="color: #007700">></span><nowiki>[[File:EN_Technology_Trends_-_Blockchain_Hype_Cycle_2018.png|center]]</nowiki><span style="color: #007700"></div></span><br/><span style="color: #007700"> <div</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"col-sm-4"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <table</span> <span style="color: #0000CC">class=</span><span style="color: rgb(190, 70, 0)">"wikitable hypecycleTable"</span><span style="color: #007700">></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <th></span>English<span style="color: #007700"></th></span><br/><span style="color: #007700"> <th></span>Français<span style="color: #007700"></th></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Figure 1. Hype Cycle for Blockchain Technologies, 2018<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Figure 1. Rapport Hype Cycle sur les technologies de la chaîne de blocs, 2018<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Expectations<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Attentes<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> <tr></span><br/><span style="color: #007700"> <td></span>Time<span style="color: #007700"></td></span><br/><span style="color: #007700"> <td></span>Temps<span style="color: #007700"></td></span><br/><span style="color: #007700"> </tr></span><br/><span style="color: #007700"> </table></span><br/><span style="color: #007700"> </div></span><br/><span style="color: #007700"> </div></span><br/><span style="color: #007700"></div></span> |
| </td> | | </td> |
| <td> | | <td> |