1 files changed, 54 insertions, 37 deletions

diff --git a/docs/fr/source/media-src/graphique_structure_ishtar.dot b/docs/fr/source/media-src/graphique_structure_ishtar.dot
index 473706036..4322b6c4d 100644
--- a/docs/fr/source/media-src/graphique_structure_ishtar.dot
+++ b/docs/fr/source/media-src/graphique_structure_ishtar.dot
@@ -1,71 +1,88 @@
 digraph structure_Ishtar {
 
-    node [shape=box; style=filled];
-    AO [label="Opération archéologique"];
+    /* modules */
+    node [shape=ellipse; dir=none; shape="folder";width=3];
+    module_file [label="Module Dossier"];
+    module_AO [label="Module Opération"];
+    module_AS [label="Module Site/Entité archéologique"];
+    module_CR [label="Module Unité d'enregistrement"];
+    module_find [label="Module Mobilier"];
+    module_treatment [label="Module Traitement"];
+    module_warehouse [label="Module Lieu de conservation"];
+    no_module [label=" "];
+    module_file -> module_AO -> module_AS -> module_CR -> module_find -> module_treatment -> module_warehouse -> no_module [style=invis] ;
+
+    node [shape=box style=filled fontname="liberationsansnarrow"
+          style="rounded" penwidth=2 width=2];
+    File [label="Dossier"];
+    AO [label=< <b>Opération archéologique</b> >];
     Parcel [label="Parcelle cadastrale"];
     AS [label="Site/Entité archéologique"];
     CR [label="Unité d'enregistrement"];
     BaseFind [label="Mobilier d'origine"];
     Find [label="Mobilier"];
-    Container [label="Contenant"];
-    Warehouse [label="Dépôt"];
     Treatment [label="Traitement"];
     TreatmentFile [label="Demande de traitement"];
+    Container [label="Contenant"];
+    Warehouse [label="Lieu de conservation"];
     Document [label="Document"];
+    AdminAct [label="Acte administratif"];
 
-    {rank = same; Parcel; AS} /* alignement parcelle - AS */
-
-    root=AO;
-
-    /* liaisons vers doc */
-    AO -> Document;
-    AS -> Document;
-    CR -> Document;
-    Container -> Document;
-    Find -> Document;
-    Warehouse -> Document;
-    Treatment -> Document;
-    TreatmentFile -> Document;
+    root=File;
 
     /* liaisons entre concepts */
+    File -> File;
+    File -> AO;
     AO -> AO;
-    AO -> Parcel [arrowhead=none];
-    Parcel -> CR -> BaseFind -> Find -> Container -> Warehouse;
-    AO -> CR;
+    File -> Parcel;
+    AO -> Parcel;
     AO -> AS [dir=both];
+    Parcel -> CR -> BaseFind -> Find -> Container -> Warehouse;
+    AO -> CR [style=dashed];
     CR -> AS;
     CR -> CR;
     Find -> Treatment;
     TreatmentFile -> Treatment;
     Treatment -> Find;
-    Document -> Container;
     Container -> Container;
-
-
-    /* liaison entre modules */
-    node [shape=ellipse; style=filled; dir=none];
-    module_AO [label="Module Opération"];
-    module_AS [label="Module Site"];
-    module_CR [label="Module Unité d'enregistrement"];
-    module_find [label="Module Mobilier"];
-    module_treatment [label="Module Traitement"];
-    module_warehouse [label="Module Dépôt"];
-    module_AO -> module_AS -> module_CR -> module_find -> module_treatment -> module_warehouse [dir=none; style=invis] ;
+    Document -> Container;
 
     /* alignement concepts <-> modules */
     {rank = same; Warehouse; module_warehouse};
-    {rank = same; AO; module_AO};
+    {rank = same; File; module_file};
+    {rank = same; AS; module_AS};
+    {rank = same; Parcel; AO; module_AO};
     {rank = same; CR; module_CR};
     {rank = same; BaseFind; module_find};
     {rank = same; Treatment; TreatmentFile; module_treatment};
-    {rank = same; Container; Warehouse; module_warehouse};
+    {rank = same; Warehouse; Container; module_warehouse};
+    {rank = same; Document; AdminAct; no_module};
+
+    /* liaisons vers doc */
+    File -> Document;
+    AO -> Document;
+    AS -> Document;
+    CR -> Document;
+    Container -> Document;
+    Find -> Document;
+    Warehouse -> Document;
+    Treatment -> Document;
+    TreatmentFile -> Document;
+    AdminAct -> Document;
+
+    /* -> AdminAct */
+    File -> AdminAct;
+    AO -> AdminAct;
+    Treatment -> AdminAct;
+    TreatmentFile -> AdminAct;
 
     module_AO, AO, Parcel [color=red2];
-    Document [color=white];
+    Document, AdminAct, no_module [color=white];
     module_CR, CR [color=orange1];
     module_find, BaseFind, Find [color=mediumvioletred];
     module_warehouse, Container, Warehouse [color=yellowgreen];
-    module_treatment, Treatment, TreatmentFile [color=yellow];
-    module_AS, AS [color=slateblue2];
+    module_treatment, Treatment, TreatmentFile [color="#200fff"];
+    module_AS, AS [color="#8943d6"];
+    module_file, File [color="#114d00"];
 }