--- a/cms/app-client/app/templates/components/notice-component.hbs	Thu Nov 24 19:08:36 2016 +0100
+++ b/cms/app-client/app/templates/components/notice-component.hbs	Sun Nov 27 15:12:30 2016 +0100
@@ -1,5 +1,5 @@
 <h2>{{ item.title }}</h2>
-<h5><a href={{abs-url-for "document" item.id}} class="notice-permalink" target="blank">permalien</a></h5>
+<h5><a href={{abs-url-for "document" item.id}} class="notice-permalink" target="_blank">permalien</a></h5>
 <table>
   <tr>
     <td class="title">Editeur{{#if (if-operator item.publishers.length '>' 1)}}s{{/if}}</td>
@@ -13,17 +13,15 @@
   </tr>
   <tr>
     <td class="title">Langue</td>
-    <td>{{#each item.languages as |lang index|}}{{if index ", "}}<span class="action" {{action 'addLanguageFilter' lang}}>{{ doc-language url=lang class="language"}}</span><a href="{{lang}}" target="_blank" class="fa fa-share-square">Share</a>{{/each}}</td>
+    <td>{{#each item.languages as |lang index|}}{{if index ", "}}{{ component (getLinkType lang) url=lang class="language" onClick=(action 'addLanguageFilter' lang)}}{{/each}}</td>
   </tr>
   <tr>
     <td class="title">Sujet{{#if (if-operator item.computedSubjects.length '>' 1)}}s{{/if}}</td>
     <td>
       <ul>
-        {{#each subjects as |subject|}}
+        {{#each item.subjects as |subject|}}
         <li>
-          {{#if subject.url}} {{#if subject.name}} {{subject.name}} {{else}}
-          <span class="action" {{action 'addThemeFilter' subject.url}}>{{component (getLinkType subject.url) url=subject.url}}</span>          {{/if}}
-          <a href="{{subject.url}}" target="_blank" class="fa fa-share-square">Share</a> {{else}} {{subject.name}} {{/if}}
+          {{component (getLinkType subject) url=subject onClick=(action "addThemeFilter" subject)}}
         </li>
         {{/each}}
       </ul>
@@ -38,14 +36,14 @@
     <td>
       <ul>
         {{#each participants as |participant|}}
-        <li>{{ participant.name }} ({{ participant.role }})</li>
+        <li>{{component (getLinkType participant.identifier) url=participant.identifier }} ({{#each participant.role as |r index| }}{{if index ", "}}{{r}}{{/each}})</li>
         {{/each}}
       </ul>
     </td>
   </tr>
   <tr>
     <td class="title">Lieu</td>
-    <td>{{ location }}</td>
+    <td>{{ notice-location-component geoInfo=item.geoInfo }}</td>
   </tr>
   <tr>
     <td class="title">Durée</td>