ADD avancement sur la possibilité de réduire une conversation (pas fini)

author Greg Burri <greg.burri@gmail.com>

Sat, 28 Jun 2008 23:09:58 +0000 (23:09 +0000)

committer Greg Burri <greg.burri@gmail.com>

Sat, 28 Jun 2008 23:09:58 +0000 (23:09 +0000)
author Greg Burri <greg.burri@gmail.com>
Sat, 28 Jun 2008 23:09:58 +0000 (23:09 +0000)
committer Greg Burri <greg.burri@gmail.com>
Sat, 28 Jun 2008 23:09:58 +0000 (23:09 +0000)
diff --git a/css/1/euphorik.css b/css/1/euphorik.css

index 5964a11..fa02cc0 100755 (executable)
--- a/css/1/euphorik.css
+++ b/css/1/euphorik.css
@@ -107,6 +107,9 @@ ul#menu {
         height: 129px;
         position: absolute;
  }
+#logo.ekMaster {
+       background-image: url(../../img/css1/logo_ek_master.png);
+}
  
  /***** Le pied de page *****/
  #footer {
diff --git a/css/1/pageMinichat.css b/css/1/pageMinichat.css

index faea35d..a352ff9 100755 (executable)
--- a/css/1/pageMinichat.css
+++ b/css/1/pageMinichat.css
@@ -285,9 +285,16 @@
     margin-right: 2px;
     font-weight: bold;
  }
-#page.minichat div.message.ekMaster .pseudo {
+#page.minichat div.message.ekMasterlight .pseudo {
         color: #f0df95
  }
+
+#page.minichat div.message.ekMasterheavy .pseudo {
+   color: #fcd82f;
+   padding-left: 14px;
+   background: transparent url(../../img/css1/marque_ek.png) no-repeat scroll left center
+}
+
  #page.minichat div.message .pseudo .login {
     margin-left: 2px;
     font-size: 8px; 
diff --git a/doc/TODO.txt b/doc/TODO.txt

index e54439d..c619c39 100755 (executable)
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -1,6 +1,9 @@
  == TODO ==
  
  === v1.1 ===
+* adapter au protocole pour envoyer les infos concernant les réductions des conversations
+* étudier la solution SVG et le calcul de pourcentage pour la largeur des fenêtres
+* un clic sur le nombre de message auquel le user répond enlève tous les mess
  * Gestion de l'historique au niveau du navigateur (pouvoir revenir aux pages précédentes). Utiliser un plugin jQuery si possible. Voir du coté des ancres (fragment d'url) : #ancre.
     * http://www.euphorik.ch/#page=chat
  * Revoir le système de conversation : 
@@ -13,10 +16,12 @@
        * un bouton "créer lien"
        * un bouton "fermer"
     * Possibilité de fermer temporairement une conversation (la réduire sous la forme d'un onglet)
+      * etre averti lorsqu'un nouveau message arrive dans une conversation réduite
     * lien vers une conversation : http://www.euphorik.ch/#conv=45
  * Mettre un icon (genre sablier ou truc qui tourne à la apple) lorsque le chat se charge (également lors d'un changement de page par exemple)
     * L'icon apparait tout en haut (absolute)
     * Simuler un réseau lent
+* supprimer le cookie si le client n'arrive pas à s'authentifier avec (réponse négative du serveur)
  * Avoir une option dans le profile pour montrer son rang (ekMaster) de manière ostantatoire, discret ou caché
  * Mise à jour automatique de la version dans le about en fonction du tag/branche courant (lors de la mise en production) ?
  * Tests de monter en charge coté serveur, analyse de la complexité (regarder du coté des TODO dans le code). Utiliser eventuellement Tsung
@@ -25,6 +30,8 @@
  * Pouvoir récupérer son mdp (ou en générer unhttp://www.euphorik.ch/ autre) via son email. Marquer dans le profile que l'email sert à cela et n'est pas visible pas les autres personnes
  * (Pouvoir inverser le chat) tester la faisabilité
  === v1.2 ===
+* option dans le profile pour ouvrir les liens dans un nouveau tab
+* Pouvoir auto répondre à une conversation
  * Possibilité d'ajouter des messages dans son profil
     * Les messages sont soient publics soient privées (Par défaut privées)
     * Un bouton "+" se trouve à coté de chaque message afin de pouvoir l'ajouter dans son profil
diff --git a/doc/graphiques/maquette_1.svg b/doc/graphiques/maquette_1.svg

index 3f930d9..f1ba88e 100644 (file)
--- a/doc/graphiques/maquette_1.svg
+++ b/doc/graphiques/maquette_1.svg
@@ -6,6 +6,7 @@
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:svg="http://www.w3.org/2000/svg"
     xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     width="744.09448819"
@@ -15,93 +16,147 @@
     inkscape:version="0.46"
     sodipodi:docname="maquette_1.svg"
     inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+   inkscape:export-filename="/tmp/plop.png"
     inkscape:export-xdpi="138.63565"
     inkscape:export-ydpi="138.63565">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.0000001"
+     inkscape:cx="261.23852"
+     inkscape:cy="932.02611"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="800"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
    <defs
       id="defs4">
+    <linearGradient
+       id="linearGradient3523"
+       inkscape:collect="always">
+      <stop
+         id="stop3525"
+         offset="0"
+         style="stop-color:#f5f352;stop-opacity:1" />
+      <stop
+         id="stop3527"
+         offset="1"
+         style="stop-color:#605108;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3631"
+       inkscape:collect="always">
+      <stop
+         id="stop3633"
+         offset="0"
+         style="stop-color:#f0ed10;stop-opacity:1" />
+      <stop
+         id="stop3635"
+         offset="1"
+         style="stop-color:#dc9c0e;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:path-effect
+       prop_scale="1"
+       bendpath="M 99.672,149.65 L 102.942,149.65 "
+       id="path-effect3449"
+       effect="bend_path" />
      <linearGradient
         id="linearGradient3254">
        <stop
-         style="stop-color:#e36a6a;stop-opacity:1;"
+         id="stop3256"
           offset="0"
-         id="stop3256" />
+         style="stop-color:#e36a6a;stop-opacity:1;" />
        <stop
-         style="stop-color:#7e1818;stop-opacity:1;"
+         id="stop3258"
           offset="1"
-         id="stop3258" />
+         style="stop-color:#7e1818;stop-opacity:1;" />
      </linearGradient>
      <linearGradient
         id="linearGradient3226">
        <stop
-         style="stop-color:#767676;stop-opacity:1;"
+         id="stop3228"
           offset="0"
-         id="stop3228" />
+         style="stop-color:#767676;stop-opacity:1;" />
        <stop
-         style="stop-color:#801f1f;stop-opacity:1;"
+         id="stop3230"
           offset="1"
-         id="stop3230" />
+         style="stop-color:#801f1f;stop-opacity:1;" />
      </linearGradient>
      <linearGradient
         id="linearGradient3478">
        <stop
-         style="stop-color:#e19671;stop-opacity:1;"
+         id="stop3480"
           offset="0"
-         id="stop3480" />
+         style="stop-color:#e19671;stop-opacity:1;" />
        <stop
-         style="stop-color:#e19671;stop-opacity:0;"
+         id="stop3482"
           offset="1"
-         id="stop3482" />
+         style="stop-color:#e19671;stop-opacity:0;" />
      </linearGradient>
      <linearGradient
         id="linearGradient3208">
        <stop
-         style="stop-color:#00009d;stop-opacity:1;"
+         id="stop3210"
           offset="0"
-         id="stop3210" />
+         style="stop-color:#00009d;stop-opacity:1;" />
        <stop
-         style="stop-color:#00009d;stop-opacity:0;"
+         id="stop3212"
           offset="1"
-         id="stop3212" />
+         style="stop-color:#00009d;stop-opacity:0;" />
      </linearGradient>
      <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="88.276247 : 1210.1869 : 1"
+       id="perspective10"
+       inkscape:persp3d-origin="-322.68963 : 976.74039 : 1"
+       inkscape:vp_z="-643.35895 : 565.56696 : 1"
         inkscape:vp_y="553.72929 : -450.20981 : 0"
-       inkscape:vp_z="-747.30364 : 545.76797 : 1"
-       inkscape:persp3d-origin="-426.63432 : 956.9414 : 1"
-       id="perspective10" />
+       inkscape:vp_x="192.22094 : 1229.9859 : 1"
+       sodipodi:type="inkscape:persp3d" />
      <filter
-       inkscape:collect="always"
-       id="filter5374">
+       id="filter5374"
+       inkscape:collect="always">
        <feGaussianBlur
-         inkscape:collect="always"
+         id="feGaussianBlur5376"
           stdDeviation="2.6490625"
-         id="feGaussianBlur5376" />
+         inkscape:collect="always" />
      </filter>
+    <linearGradient
+       y2="498.63116"
+       x2="355.4043"
+       y1="292.87076"
+       x1="320.21951"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3659"
+       xlink:href="#linearGradient3631"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3523"
+       id="linearGradient3521"
+       gradientUnits="userSpaceOnUse"
+       x1="317.01462"
+       y1="315.30496"
+       x2="367.15555"
+       y2="503.97266" />
+    <inkscape:perspective
+       id="perspective3653"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
    </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="563.89817"
-     inkscape:cy="896.60857"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="800"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     showguides="true"
-     inkscape:guide-bbox="true" />
    <metadata
       id="metadata7">
      <rdf:RDF>
@@ -114,520 +169,618 @@
      </rdf:RDF>
    </metadata>
    <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
+     style="display:inline"
       id="layer1"
-     style="display:inline">
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
      <rect
-       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3458"
-       width="453.62442"
-       height="492.34741"
-       x="46.644756"
-       y="32.944107"
-       ry="0"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       ry="0"
+       y="32.944107"
+       x="46.644756"
+       height="287.99356"
+       width="453.62442"
+       id="rect3458"
+       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
-       style="fill:#e19671;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
-       d="M 46.608811,76.256593 C 46.52482,55.815731 59.99113,32.741384 92.653703,32.992192 L 500.79271,33.368404 L 500.79271,526.20678 L 46.608811,526.20678 L 46.608811,76.256593 z"
-       id="rect3450"
+       style="fill:#e19671;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1;display:inline"
+       d="M 46.645147,76.210534 C 46.561157,55.769674 60.027467,32.695324 92.690037,32.946134 L 500.82905,33.322344 L 500.82905,526.16072 L 46.645147,526.16072 L 46.645147,76.210534 z"
+       id="path3659"
         sodipodi:nodetypes="cccccc"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
         inkscape:export-xdpi="138.63892"
         inkscape:export-ydpi="138.63892" />
      <rect
-       style="fill:#f0df95;fill-opacity:1;fill-rule:evenodd;stroke:#841919;stroke-width:0.93;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3474"
-       width="357.56439"
-       height="13.069962"
-       x="138.54781"
-       y="-132.54002"
-       transform="scale(1,-1)"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <rect
-       style="fill:#f0df95;fill-opacity:1;fill-rule:evenodd;stroke:#841919;stroke-width:0.86572993;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3510"
-       width="82.503021"
-       height="13.13427"
-       x="51.428371"
-       y="119.43791"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
-       inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       transform="scale(1,-1)"
+       y="-132.54002"
+       x="138.54781"
+       height="13.069962"
+       width="357.56439"
+       id="rect3474"
+       style="fill:#f0df95;fill-opacity:1;fill-rule:evenodd;stroke:#841919;stroke-width:0.93;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <rect
-       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
-       id="rect2411"
-       width="453.85715"
-       height="366.43207"
-       x="47.071426"
-       y="144.57297"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <path
-       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 46.294131,144.76665 L 138.52377,144.76665 L 143.38513,151.20817 L 138.52377,157.38453 L 46.294131,157.38453 L 46.294131,144.76665 z"
-       id="rect2413"
-       sodipodi:nodetypes="cccccc"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       y="119.43791"
+       x="51.428371"
+       height="13.13427"
+       width="82.503021"
+       id="rect3510"
+       style="fill:#f0df95;fill-opacity:1;fill-rule:evenodd;stroke:#841919;stroke-width:0.86572993;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f6dfc2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       x="47.904469"
-       y="153.76665"
-       id="text3185"
-       sodipodi:linespacing="125%"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       y="144.57297"
+       x="47.071426"
+       height="299.25693"
+       width="453.85715"
+       id="rect2411"
+       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" />
+    <path
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3189"
-         x="47.904469"
-         y="153.76665">[16:57:11] Pifou</tspan></text>
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:nodetypes="cccccc"
+       id="rect2413"
+       d="M 46.294131,144.76665 L 138.52377,144.76665 L 143.38513,151.20817 L 138.52377,157.38453 L 46.294131,157.38453 L 46.294131,144.76665 z"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
      <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       x="145.40186"
-       y="154.32814"
-       id="text3193"
-       sodipodi:linespacing="125%"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3185"
+       y="153.76665"
+       x="47.904469"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;fill:#f6dfc2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         id="tspan3253"
+         sodipodi:role="line">[16:57:11]</tspan></text>
+    <text
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3195"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3193"
+       y="154.32814"
+       x="145.40186"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="154.32814"
           x="145.40186"
-         y="154.32814">What is your favourite colour ?</tspan></text>
+         id="tspan3195"
+         sodipodi:role="line">What is your favourite colour ?</tspan></text>
      <rect
-       style="fill:#fbeede;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3219"
-       width="362.08197"
-       height="13.10165"
-       x="138.16286"
-       y="157.23653"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <path
-       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 46.556943,157.67408 L 138.78658,157.67408 L 143.64794,164.1156 L 138.78658,170.29196 L 46.556943,170.29196 L 46.556943,157.67408 z"
-       id="path5397"
-       sodipodi:nodetypes="cccccc"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       y="157.23653"
+       x="138.16286"
+       height="13.10165"
+       width="182.47685"
+       id="rect3219"
+       style="fill:#fbeede;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f6dfc2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       x="48.006577"
-       y="167.07393"
-       id="text3211"
-       sodipodi:linespacing="125%"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:nodetypes="cccccc"
+       id="path5397"
+       d="M 46.556943,157.67408 L 138.78658,157.67408 L 143.64794,164.1156 L 138.78658,170.29196 L 46.556943,170.29196 L 46.556943,157.67408 z"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
+    <text
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3213"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3211"
+       y="167.07393"
+       x="48.006577"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f6dfc2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="167.07393"
           x="48.006577"
-         y="167.07393">[16:57:11] Pifou</tspan></text>
+         id="tspan3213"
+         sodipodi:role="line">[16:57:11] Pifou</tspan></text>
      <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       x="145.50395"
-       y="167.63542"
-       id="text3215"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3217"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3215"
+       y="167.63542"
+       x="145.50395"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="167.63542"
           x="145.50395"
-         y="167.63542">What is your favourite colour ?</tspan></text>
+         id="tspan3217"
+         sodipodi:role="line">What is your favourite colour ?</tspan></text>
      <path
-       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 46.553376,170.63422 L 138.78303,170.63422 L 143.64439,177.07574 L 138.78303,183.2521 L 46.553376,183.2521 L 46.553376,170.63422 z"
-       id="path5399"
-       sodipodi:nodetypes="cccccc"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f6dfc2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       x="48.00658"
-       y="180.22029"
-       id="text3246"
-       sodipodi:linespacing="125%"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:nodetypes="cccccc"
+       id="path5399"
+       d="M 46.553376,170.63422 L 138.78303,170.63422 L 143.64439,177.07574 L 138.78303,183.2521 L 46.553376,183.2521 L 46.553376,170.63422 z"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" />
+    <text
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3248"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3246"
+       y="180.22029"
+       x="48.00658"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f6dfc2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="180.22029"
           x="48.00658"
-         y="180.22029">[16:57:11] Pifou</tspan></text>
+         id="tspan3248"
+         sodipodi:role="line">[16:57:11] Pifou</tspan></text>
      <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
-       x="145.50395"
-       y="180.78178"
-       id="text3250"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3252"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3250"
+       y="180.78178"
+       x="145.50395"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="180.78178"
           x="145.50395"
-         y="180.78178">What is your favourite colour ?</tspan></text>
+         id="tspan3252"
+         sodipodi:role="line">What is your favourite colour ?</tspan></text>
      <path
-       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 493.125,146.28125 C 490.82987,146.28125 488.96875,148.14237 488.96875,150.4375 C 488.96875,152.73263 490.82987,154.59375 493.125,154.59375 C 495.42013,154.59375 497.28125,152.73263 497.28125,150.4375 C 497.28125,148.14237 495.42013,146.28125 493.125,146.28125 z M 491.51535,147.7948 L 496.04661,150.37411 L 491.63548,153.08817 L 491.51535,147.7948 z"
-       id="path5401"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/extraction.png"
-       inkscape:export-xdpi="138.63892"
+       sodipodi:nodetypes="csssccccc"
         inkscape:export-ydpi="138.63892"
-       sodipodi:nodetypes="csssccccc" />
-    <path
-       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.20000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 493.125,159.46845 C 490.82987,159.46845 488.96875,161.32957 488.96875,163.6247 C 488.96875,165.91983 490.82987,167.78095 493.125,167.78095 C 495.42013,167.78095 497.28125,165.91983 497.28125,163.6247 C 497.28125,161.32957 495.42013,159.46845 493.125,159.46845 z M 491.51535,160.982 L 496.04661,163.56131 L 491.63548,166.27537 L 491.51535,160.982 z"
-       id="path3227"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/extraction_hover.png"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"
-       sodipodi:nodetypes="csssccccc" />
-    <path
-       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 493.125,172.43822 C 490.82987,172.43822 488.96875,174.29934 488.96875,176.59447 C 488.96875,178.8896 490.82987,180.75072 493.125,180.75072 C 495.42013,180.75072 497.28125,178.8896 497.28125,176.59447 C 497.28125,174.29934 495.42013,172.43822 493.125,172.43822 z M 491.51535,173.95177 L 496.04661,176.53108 L 491.63548,179.24514 L 491.51535,173.95177 z"
-       id="path3229"
         inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/extraction.png"
-       inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"
-       sodipodi:nodetypes="csssccccc" />
-    <path
-       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 531.65729,145.35293 C 529.36216,145.35293 527.50104,147.21405 527.50104,149.50918 C 527.50104,151.80431 529.36216,153.66543 531.65729,153.66543 C 533.95242,153.66543 535.81354,151.80431 535.81354,149.50918 C 535.81354,147.21405 533.95242,145.35293 531.65729,145.35293 z M 530.04764,146.86648 L 534.5789,149.44579 L 530.16777,152.15985 L 530.04764,146.86648 z"
         id="path3233"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/extraction.png"
-       inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"
-       sodipodi:nodetypes="csssccccc" />
+       d="M 531.65729,145.35293 C 529.36216,145.35293 527.50104,147.21405 527.50104,149.50918 C 527.50104,151.80431 529.36216,153.66543 531.65729,153.66543 C 533.95242,153.66543 535.81354,151.80431 535.81354,149.50918 C 535.81354,147.21405 533.95242,145.35293 531.65729,145.35293 z M 530.04764,146.86648 L 534.5789,149.44579 L 530.16777,152.15985 L 530.04764,146.86648 z"
+       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 531.65729,158.13031 C 529.36216,158.13031 527.50104,159.99143 527.50104,162.28656 C 527.50104,164.58169 529.36216,166.44281 531.65729,166.44281 C 533.95242,166.44281 535.81354,164.58169 535.81354,162.28656 C 535.81354,159.99143 533.95242,158.13031 531.65729,158.13031 z M 530.04764,159.64386 L 534.5789,162.22317 L 530.16777,164.93723 L 530.04764,159.64386 z"
-       id="path3235"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/extraction_hover.png"
-       inkscape:export-xdpi="138.63892"
+       sodipodi:nodetypes="csssccccc"
         inkscape:export-ydpi="138.63892"
-       sodipodi:nodetypes="csssccccc" />
+       inkscape:export-xdpi="138.63892"
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/extraction_hover.png"
+       id="path3235"
+       d="M 531.65729,158.13031 C 529.36216,158.13031 527.50104,159.99143 527.50104,162.28656 C 527.50104,164.58169 529.36216,166.44281 531.65729,166.44281 C 533.95242,166.44281 535.81354,164.58169 535.81354,162.28656 C 535.81354,159.99143 533.95242,158.13031 531.65729,158.13031 z M 530.04764,159.64386 L 534.5789,162.22317 L 530.16777,164.93723 L 530.04764,159.64386 z"
+       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 545.24466,145.35293 C 542.94951,145.35294 541.08841,147.21405 541.08841,149.50918 C 541.08839,151.80432 542.94953,153.66543 545.24466,153.66543 C 547.53977,153.66544 549.40091,151.80431 549.40091,149.50918 C 549.40089,147.21406 547.53979,145.35293 545.24466,145.35293 z M 543.83841,146.88418 L 545.24466,148.25918 L 546.65091,146.88418 L 547.90091,148.13418 L 546.49466,149.50918 L 547.90091,150.91543 L 546.65091,152.16543 L 545.24466,150.79043 L 543.83841,152.16543 L 542.58841,150.91543 L 543.99466,149.50918 L 542.58841,148.13418 L 543.83841,146.88418 z"
-       id="path3237"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fermer_conv.png"
+       inkscape:export-ydpi="140.75188"
         inkscape:export-xdpi="140.75188"
-       inkscape:export-ydpi="140.75188" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fermer_conv.png"
+       id="path3237"
+       d="M 545.24466,145.35293 C 542.94951,145.35294 541.08841,147.21405 541.08841,149.50918 C 541.08839,151.80432 542.94953,153.66543 545.24466,153.66543 C 547.53977,153.66544 549.40091,151.80431 549.40091,149.50918 C 549.40089,147.21406 547.53979,145.35293 545.24466,145.35293 z M 543.83841,146.88418 L 545.24466,148.25918 L 546.65091,146.88418 L 547.90091,148.13418 L 546.49466,149.50918 L 547.90091,150.91543 L 546.65091,152.16543 L 545.24466,150.79043 L 543.83841,152.16543 L 542.58841,150.91543 L 543.99466,149.50918 L 542.58841,148.13418 L 543.83841,146.88418 z"
+       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 545.24466,158.13031 C 542.94951,158.13032 541.08841,159.99143 541.08841,162.28656 C 541.08839,164.5817 542.94953,166.44281 545.24466,166.44281 C 547.53977,166.44282 549.40091,164.58169 549.40091,162.28656 C 549.40089,159.99144 547.53979,158.13031 545.24466,158.13031 z M 543.83841,159.66156 L 545.24466,161.03656 L 546.65091,159.66156 L 547.90091,160.91156 L 546.49466,162.28656 L 547.90091,163.69281 L 546.65091,164.94281 L 545.24466,163.56781 L 543.83841,164.94281 L 542.58841,163.69281 L 543.99466,162.28656 L 542.58841,160.91156 L 543.83841,159.66156 z"
-       id="path3251"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fermer_conv_hover.png"
+       inkscape:export-ydpi="140.75"
         inkscape:export-xdpi="140.75"
-       inkscape:export-ydpi="140.75" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fermer_conv_hover.png"
+       id="path3251"
+       d="M 545.24466,158.13031 C 542.94951,158.13032 541.08841,159.99143 541.08841,162.28656 C 541.08839,164.5817 542.94953,166.44281 545.24466,166.44281 C 547.53977,166.44282 549.40091,164.58169 549.40091,162.28656 C 549.40089,159.99144 547.53979,158.13031 545.24466,158.13031 z M 543.83841,159.66156 L 545.24466,161.03656 L 546.65091,159.66156 L 547.90091,160.91156 L 546.49466,162.28656 L 547.90091,163.69281 L 546.65091,164.94281 L 545.24466,163.56781 L 543.83841,164.94281 L 542.58841,163.69281 L 543.99466,162.28656 L 542.58841,160.91156 L 543.83841,159.66156 z"
+       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 586.9608,142.72403 L 591.82216,149.16555 L 586.9608,155.34191 L 586.9608,142.72403 z"
-       id="path3231"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche.png"
+       inkscape:export-ydpi="128.38945"
         inkscape:export-xdpi="128.38945"
-       inkscape:export-ydpi="128.38945" />
-    <path
-       style="fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 586.75494,158.78182 L 591.6163,165.22334 L 586.75494,171.3997 L 586.75494,158.78182 z"
-       id="path3254"
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche.png"
         sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_reponda.png"
+       id="path3231"
+       d="M 586.9608,142.72403 L 591.82216,149.16555 L 586.9608,155.34191 L 586.9608,142.72403 z"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
+    <path
+       inkscape:export-ydpi="128.38945"
         inkscape:export-xdpi="128.38945"
-       inkscape:export-ydpi="128.38945" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_reponda.png"
+       sodipodi:nodetypes="cccc"
+       id="path3254"
+       d="M 586.75494,158.78182 L 591.6163,165.22334 L 586.75494,171.3997 L 586.75494,158.78182 z"
+       style="fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
      <text
-       xml:space="preserve"
+       id="text3256"
+       y="48.037724"
+       x="511.36679"
         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="616.72571"
-       y="19.753452"
-       id="text3256"><tspan
-         sodipodi:role="line"
+       xml:space="preserve"><tspan
+         y="48.037724"
+         x="511.36679"
           id="tspan3258"
-         x="616.72571"
-         y="19.753452">dpi : 138.64</tspan></text>
+         sodipodi:role="line">dpi : 138.64</tspan></text>
      <path
-       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 557.34084,145.5037 C 555.04571,145.50371 553.18459,147.36482 553.18459,149.65995 C 553.18459,151.95509 555.04571,153.8162 557.34084,153.8162 C 559.63597,153.81621 561.49709,151.95508 561.49709,149.65995 C 561.49709,147.36483 559.63597,145.5037 557.34084,145.5037 z M 557.37209,145.84745 L 558.34084,148.3162 L 560.99709,148.5037 L 558.93459,150.1912 L 559.59084,152.7537 L 557.37209,151.34745 L 555.12209,152.7537 L 555.77834,150.1912 L 553.71584,148.5037 L 556.37209,148.3162 L 557.37209,145.84745 z"
-       id="path3260"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/copier_conv.png"
+       inkscape:export-ydpi="138.64"
         inkscape:export-xdpi="138.64"
-       inkscape:export-ydpi="138.64" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/copier_conv.png"
+       id="path3260"
+       d="M 557.34084,145.5037 C 555.04571,145.50371 553.18459,147.36482 553.18459,149.65995 C 553.18459,151.95509 555.04571,153.8162 557.34084,153.8162 C 559.63597,153.81621 561.49709,151.95508 561.49709,149.65995 C 561.49709,147.36483 559.63597,145.5037 557.34084,145.5037 z M 557.37209,145.84745 L 558.34084,148.3162 L 560.99709,148.5037 L 558.93459,150.1912 L 559.59084,152.7537 L 557.37209,151.34745 L 555.12209,152.7537 L 555.77834,150.1912 L 553.71584,148.5037 L 556.37209,148.3162 L 557.37209,145.84745 z"
+       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 556.97921,158.13031 C 554.68408,158.13032 552.82296,159.99143 552.82296,162.28656 C 552.82296,164.5817 554.68408,166.44281 556.97921,166.44281 C 559.27434,166.44282 561.13546,164.58169 561.13546,162.28656 C 561.13546,159.99144 559.27434,158.13031 556.97921,158.13031 z M 557.01046,158.47406 L 557.97921,160.94281 L 560.63546,161.13031 L 558.57296,162.81781 L 559.22921,165.38031 L 557.01046,163.97406 L 554.76046,165.38031 L 555.41671,162.81781 L 553.35421,161.13031 L 556.01046,160.94281 L 557.01046,158.47406 z"
-       id="path3274"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/copier_conv_hover.png"
+       inkscape:export-ydpi="138.64"
         inkscape:export-xdpi="138.64"
-       inkscape:export-ydpi="138.64" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/copier_conv_hover.png"
+       id="path3274"
+       d="M 556.97921,158.13031 C 554.68408,158.13032 552.82296,159.99143 552.82296,162.28656 C 552.82296,164.5817 554.68408,166.44281 556.97921,166.44281 C 559.27434,166.44282 561.13546,164.58169 561.13546,162.28656 C 561.13546,159.99144 559.27434,158.13031 556.97921,158.13031 z M 557.01046,158.47406 L 557.97921,160.94281 L 560.63546,161.13031 L 558.57296,162.81781 L 559.22921,165.38031 L 557.01046,163.97406 L 554.76046,165.38031 L 555.41671,162.81781 L 553.35421,161.13031 L 556.01046,160.94281 L 557.01046,158.47406 z"
+       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="fill:#31732f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 595.4055,142.72403 L 600.26686,149.16555 L 595.4055,155.34191 L 595.4055,142.72403 z"
-       id="path3464"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_reponse.png"
+       inkscape:export-ydpi="128.38945"
         inkscape:export-xdpi="128.38945"
-       inkscape:export-ydpi="128.38945" />
-    <path
-       style="fill:#bf2911;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 603.85013,142.72403 L 608.71149,149.16555 L 603.85013,155.34191 L 603.85013,142.72403 z"
-       id="path3466"
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_reponse.png"
         sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_proprietaire.png"
-       inkscape:export-xdpi="128.38945"
-       inkscape:export-ydpi="128.38945" />
+       id="path3464"
+       d="M 595.4055,142.72403 L 600.26686,149.16555 L 595.4055,155.34191 L 595.4055,142.72403 z"
+       style="fill:#31732f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
      <path
-       style="fill:#84196c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 612.29483,142.72403 L 617.15619,149.16555 L 612.29483,155.34191 L 612.29483,142.72403 z"
-       id="path3468"
+       inkscape:export-ydpi="128.38945"
+       inkscape:export-xdpi="128.38945"
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_proprietaire.png"
         sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_repondu.png"
+       id="path3466"
+       d="M 603.85013,142.72403 L 608.71149,149.16555 L 603.85013,155.34191 L 603.85013,142.72403 z"
+       style="fill:#bf2911;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
+    <path
+       inkscape:export-ydpi="128.38945"
         inkscape:export-xdpi="128.38945"
-       inkscape:export-ydpi="128.38945" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fleche_repondu.png"
+       sodipodi:nodetypes="cccc"
+       id="path3468"
+       d="M 612.29483,142.72403 L 617.15619,149.16555 L 612.29483,155.34191 L 612.29483,142.72403 z"
+       style="fill:#84196c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 519.27037,145.35293 C 516.97525,145.35292 515.11412,147.21405 515.11412,149.50918 C 515.11413,151.8043 516.97524,153.66543 519.27037,153.66543 C 521.56551,153.66542 523.42662,151.80431 523.42662,149.50918 C 523.42659,147.21404 521.5655,145.35293 519.27037,145.35293 z M 519.27037,146.57168 L 522.23912,149.50918 L 519.27037,152.47793 L 516.33287,149.50918 L 519.27037,146.57168 z"
-       id="path2721"
-       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/extraction_complete.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/extraction_complete.png"
+       id="path2721"
+       d="M 519.27037,145.35293 C 516.97525,145.35292 515.11412,147.21405 515.11412,149.50918 C 515.11413,151.8043 516.97524,153.66543 519.27037,153.66543 C 521.56551,153.66542 523.42662,151.80431 523.42662,149.50918 C 523.42659,147.21404 521.5655,145.35293 519.27037,145.35293 z M 519.27037,146.57168 L 522.23912,149.50918 L 519.27037,152.47793 L 516.33287,149.50918 L 519.27037,146.57168 z"
+       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 519.27037,158.13031 C 516.97525,158.1303 515.11412,159.99143 515.11412,162.28656 C 515.11413,164.58168 516.97524,166.44281 519.27037,166.44281 C 521.56551,166.4428 523.42662,164.58169 523.42662,162.28656 C 523.42659,159.99142 521.5655,158.13031 519.27037,158.13031 z M 519.27037,159.34906 L 522.23912,162.28656 L 519.27037,165.25531 L 516.33287,162.28656 L 519.27037,159.34906 z"
-       id="path3502"
-       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/extraction_complete_hover.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/extraction_complete_hover.png"
+       id="path3502"
+       d="M 519.27037,158.13031 C 516.97525,158.1303 515.11412,159.99143 515.11412,162.28656 C 515.11413,164.58168 516.97524,166.44281 519.27037,166.44281 C 521.56551,166.4428 523.42662,164.58169 523.42662,162.28656 C 523.42659,159.99142 521.5655,158.13031 519.27037,158.13031 z M 519.27037,159.34906 L 522.23912,162.28656 L 519.27037,165.25531 L 516.33287,162.28656 L 519.27037,159.34906 z"
+       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 569.31564,145.5037 C 567.02051,145.5037 565.15939,147.36482 565.15939,149.65995 C 565.15939,151.95508 567.02051,153.8162 569.31564,153.8162 C 571.61077,153.8162 573.47189,151.95508 573.47189,149.65995 C 573.47189,147.36482 571.61077,145.5037 569.31564,145.5037 z M 569.31564,146.0662 C 569.32581,146.06628 569.33669,146.066 569.34689,146.0662 C 570.25117,146.08396 571.28545,146.57492 571.81564,147.3162 C 571.11486,147.71347 570.50225,148.35045 570.40939,149.5662 C 570.41064,149.65901 570.40276,149.76061 570.40939,149.84745 C 570.50225,151.0632 571.11486,151.70018 571.81564,152.09745 C 571.28545,152.83873 570.25117,153.32969 569.34689,153.34745 C 569.33669,153.34765 569.32581,153.34737 569.31564,153.34745 C 568.41136,153.32969 567.37707,152.83873 566.84689,152.09745 C 567.54767,151.70018 568.16028,151.0632 568.25314,149.84745 C 568.25977,149.76061 568.25189,149.65901 568.25314,149.5662 C 568.16028,148.35045 567.54767,147.71347 566.84689,147.3162 C 567.37707,146.57492 568.41136,146.08396 569.31564,146.0662 z"
-       id="path2467"
-       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/reduire_conv.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/reduire_conv.png"
+       id="path2467"
+       d="M 569.31564,145.5037 C 567.02051,145.5037 565.15939,147.36482 565.15939,149.65995 C 565.15939,151.95508 567.02051,153.8162 569.31564,153.8162 C 571.61077,153.8162 573.47189,151.95508 573.47189,149.65995 C 573.47189,147.36482 571.61077,145.5037 569.31564,145.5037 z M 569.31564,146.0662 C 569.32581,146.06628 569.33669,146.066 569.34689,146.0662 C 570.25117,146.08396 571.28545,146.57492 571.81564,147.3162 C 571.11486,147.71347 570.50225,148.35045 570.40939,149.5662 C 570.41064,149.65901 570.40276,149.76061 570.40939,149.84745 C 570.50225,151.0632 571.11486,151.70018 571.81564,152.09745 C 571.28545,152.83873 570.25117,153.32969 569.34689,153.34745 C 569.33669,153.34765 569.32581,153.34737 569.31564,153.34745 C 568.41136,153.32969 567.37707,152.83873 566.84689,152.09745 C 567.54767,151.70018 568.16028,151.0632 568.25314,149.84745 C 568.25977,149.76061 568.25189,149.65901 568.25314,149.5662 C 568.16028,148.35045 567.54767,147.71347 566.84689,147.3162 C 567.37707,146.57492 568.41136,146.08396 569.31564,146.0662 z"
+       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.20000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 569.31564,158.13031 C 567.02051,158.13031 565.15939,159.99143 565.15939,162.28656 C 565.15939,164.58169 567.02051,166.44281 569.31564,166.44281 C 571.61077,166.44281 573.47189,164.58169 573.47189,162.28656 C 573.47189,159.99143 571.61077,158.13031 569.31564,158.13031 z M 569.31564,158.69281 C 569.32581,158.69289 569.33669,158.69261 569.34689,158.69281 C 570.25117,158.71057 571.28545,159.20153 571.81564,159.94281 C 571.11486,160.34008 570.50225,160.97706 570.40939,162.19281 C 570.41064,162.28562 570.40276,162.38722 570.40939,162.47406 C 570.50225,163.68981 571.11486,164.32679 571.81564,164.72406 C 571.28545,165.46534 570.25117,165.9563 569.34689,165.97406 C 569.33669,165.97426 569.32581,165.97398 569.31564,165.97406 C 568.41136,165.9563 567.37707,165.46534 566.84689,164.72406 C 567.54767,164.32679 568.16028,163.68981 568.25314,162.47406 C 568.25977,162.38722 568.25189,162.28562 568.25314,162.19281 C 568.16028,160.97706 567.54767,160.34008 566.84689,159.94281 C 567.37707,159.20153 568.41136,158.71057 569.31564,158.69281 z"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/reduire_conv_hover.png"
         id="path3267"
-       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/reduire_conv.png"
+       d="M 569.31564,158.13031 C 567.02051,158.13031 565.15939,159.99143 565.15939,162.28656 C 565.15939,164.58169 567.02051,166.44281 569.31564,166.44281 C 571.61077,166.44281 573.47189,164.58169 573.47189,162.28656 C 573.47189,159.99143 571.61077,158.13031 569.31564,158.13031 z M 569.31564,158.69281 C 569.32581,158.69289 569.33669,158.69261 569.34689,158.69281 C 570.25117,158.71057 571.28545,159.20153 571.81564,159.94281 C 571.11486,160.34008 570.50225,160.97706 570.40939,162.19281 C 570.41064,162.28562 570.40276,162.38722 570.40939,162.47406 C 570.50225,163.68981 571.11486,164.32679 571.81564,164.72406 C 571.28545,165.46534 570.25117,165.9563 569.34689,165.97406 C 569.33669,165.97426 569.32581,165.97398 569.31564,165.97406 C 568.41136,165.9563 567.37707,165.46534 566.84689,164.72406 C 567.54767,164.32679 568.16028,163.68981 568.25314,162.47406 C 568.25977,162.38722 568.25189,162.28562 568.25314,162.19281 C 568.16028,160.97706 567.54767,160.34008 566.84689,159.94281 C 567.37707,159.20153 568.41136,158.71057 569.31564,158.69281 z"
+       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.20000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <text
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3249"
+       y="154.29619"
+       x="104.03905"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#d0df27;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="154.29619"
+         x="104.03905"
+         id="tspan3255"
+         sodipodi:role="line">Pifou</tspan></text>
+    <path
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:nodetypes="cccccc"
+       id="path3677"
+       d="M 320.37439,443.48008 L 320.37439,351.25044 L 326.81591,346.38908 L 332.99227,351.25044 L 332.99227,443.48008 L 320.37439,443.48008 z"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
+    <text
+       transform="matrix(0,-1,1,0,0,0)"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3679"
+       y="329.77423"
+       x="-442.03046"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#f6dfc2;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="329.77423"
+         x="-442.03046"
+         id="tspan3687"
+         sodipodi:role="line">[12:47:29] Paul</tspan></text>
+    <text
+       transform="matrix(0,-1,1,0,0,0)"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3683"
+       y="330.33572"
+       x="-344.53308"
+       style="font-size:9px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="330.33572"
+         x="-344.53308"
+         id="tspan3689"
+         sodipodi:role="line">Blabla blablablabla bla blabla ..</tspan></text>
+    <path
+       id="path3693"
+       d="M 326.9805,173.26406 C 324.68537,173.26405 322.82425,175.12518 322.82425,177.42031 C 322.82425,179.71543 324.68537,181.57656 326.9805,181.57656 C 329.27563,181.57655 331.13675,179.71544 331.13675,177.42031 C 331.13671,175.12517 329.27563,173.26406 326.9805,173.26406 z M 325.8555,174.57656 L 328.1055,174.57656 L 328.1055,177.07656 L 327.8555,178.45156 L 326.07425,178.45156 L 325.8555,177.07656 L 325.8555,174.57656 z M 325.8555,179.29531 L 328.1055,179.29531 L 328.1055,180.26406 L 325.8555,180.26406 L 325.8555,179.29531 z"
+       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <path
+       inkscape:export-ydpi="140.75188"
+       inkscape:export-xdpi="140.75188"
+       inkscape:export-filename="/home/gburri/projets/euphorik/img/css1/fermer_conv.png"
+       id="path3701"
+       d="M 326.9805,148.7661 C 324.68535,148.76611 322.82425,150.62722 322.82425,152.92235 C 322.82423,155.21749 324.68537,157.0786 326.9805,157.0786 C 329.27561,157.07861 331.13675,155.21748 331.13675,152.92235 C 331.13673,150.62723 329.27563,148.7661 326.9805,148.7661 z M 325.57425,150.29735 L 326.9805,151.67235 L 328.38675,150.29735 L 329.63675,151.54735 L 328.2305,152.92235 L 329.63675,154.3286 L 328.38675,155.5786 L 326.9805,154.2036 L 325.57425,155.5786 L 324.32425,154.3286 L 325.7305,152.92235 L 324.32425,151.54735 L 325.57425,150.29735 z"
+       style="opacity:1;fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <path
+       inkscape:export-ydpi="138.64"
+       inkscape:export-xdpi="138.64"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/copier_conv_hover.png"
+       id="path3703"
+       d="M 326.9805,161.01509 C 324.68537,161.0151 322.82425,162.87621 322.82425,165.17134 C 322.82425,167.46648 324.68537,169.32759 326.9805,169.32759 C 329.27563,169.3276 331.13675,167.46647 331.13675,165.17134 C 331.13675,162.87622 329.27563,161.01509 326.9805,161.01509 z M 327.01175,161.35884 L 327.9805,163.82759 L 330.63675,164.01509 L 328.57425,165.70259 L 329.2305,168.26509 L 327.01175,166.85884 L 324.76175,168.26509 L 325.418,165.70259 L 323.3555,164.01509 L 326.01175,163.82759 L 327.01175,161.35884 z"
+       style="opacity:1;fill:#cb2626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
    </g>
    <g
-     inkscape:groupmode="layer"
-     id="layer2"
+     style="display:inline"
       inkscape:label="logo"
-     style="display:inline">
+     id="layer2"
+     inkscape:groupmode="layer">
      <rect
-       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect3224"
-       width="453.71909"
-       height="20.843534"
-       x="46.525745"
-       y="82.616722"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       y="82.616722"
+       x="46.525745"
+       height="20.843534"
+       width="453.71909"
+       id="rect3224"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter5374)"
-       d="M 87.929756,36.448593 C 70.696656,36.448593 56.136941,47.968757 51.554756,63.729843 L 46.617256,63.729843 L 46.617256,82.823589 L 51.023506,82.823589 C 54.891953,99.630647 69.953686,112.16733 87.929756,112.16733 C 105.90583,112.16733 120.93631,99.630647 124.80476,82.823589 L 500.71101,82.823589 L 500.71101,63.729843 L 124.27351,63.729843 C 119.69133,47.968757 105.16286,36.448592 87.929756,36.448593 z"
-       id="path5267"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png"
+       id="path5267"
+       d="M 87.929756,36.448593 C 70.696656,36.448593 56.136941,47.968757 51.554756,63.729843 L 46.617256,63.729843 L 46.617256,82.823589 L 51.023506,82.823589 C 54.891953,99.630647 69.953686,112.16733 87.929756,112.16733 C 105.90583,112.16733 120.93631,99.630647 124.80476,82.823589 L 500.71101,82.823589 L 500.71101,63.729843 L 124.27351,63.729843 C 119.69133,47.968757 105.16286,36.448592 87.929756,36.448593 z"
+       style="opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter5374)" />
      <path
-       sodipodi:type="arc"
-       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="path2407"
-       sodipodi:cx="332.84528"
-       sodipodi:cy="399.29855"
-       sodipodi:rx="131.82491"
-       sodipodi:ry="131.82491"
+       transform="matrix(0.2872886,0,0,0.2872886,-7.7117438,-40.627481)"
+       inkscape:export-ydpi="138.63565"
+       inkscape:export-xdpi="138.63565"
+       inkscape:export-filename="/tmp/plop.png"
         d="M 464.67018,399.29855 A 131.82491,131.82491 0 1 1 201.02037,399.29855 A 131.82491,131.82491 0 1 1 464.67018,399.29855 z"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png"
-       inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"
-       transform="matrix(0.2872886,0,0,0.2872886,-7.7117438,-40.627481)" />
+       sodipodi:ry="131.82491"
+       sodipodi:rx="131.82491"
+       sodipodi:cy="399.29855"
+       sodipodi:cx="332.84528"
+       id="path2407"
+       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       sodipodi:type="arc" />
      <rect
-       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect3462"
-       width="454.09647"
-       height="19.081215"
-       x="46.615898"
-       y="63.504051"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png"
+       y="63.504051"
+       x="46.615898"
+       height="19.081215"
+       width="454.09647"
+       id="rect3462"
+       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <path
-       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51327449;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 88.431816,40.254007 C 69.803625,40.166276 54.045002,54.16218 54.129835,75.22051 C 54.068954,91.274344 68.315564,108.10722 88.431816,107.91672 C 89.549813,107.91672 90.095216,107.88452 91.602061,107.7065 C 91.569653,103.93148 91.348366,91.115934 91.413181,87.162485 C 97.635009,91.828858 101.04085,94.097739 109.07738,100.44919 C 112.18829,97.868223 115.29373,94.591662 117.34476,90.7302 C 112.15991,87.360044 105.10581,81.72326 94.21761,73.68674 C 101.21717,66.557554 108.27196,59.995273 114.88264,53.643826 C 112.57171,50.906043 109.37619,47.542256 106.31623,45.699518 C 101.64986,50.106655 98.437833,52.770497 91.413181,59.441256 C 91.44732,54.651308 91.626799,44.013425 91.602061,40.511312 C 90.556557,40.322656 89.622719,40.270207 88.431816,40.254007 z M 79.801333,51.351275 C 79.779096,59.441488 79.924702,62.872417 79.801333,68.719324 C 74.553306,68.625903 71.396213,68.731631 64.915137,68.602009 C 65.721614,58.462795 72.73505,52.397459 79.801333,51.351275 z M 79.801333,80.324934 C 79.833045,85.530259 79.870744,89.328594 79.984647,96.135618 C 73.101686,95.143127 65.177362,88.021089 64.838379,80.002996 C 68.889043,79.921982 74.6941,80.096459 79.801333,80.324934 z"
-       id="path2383"
+       inkscape:export-filename="/tmp/plop.png"
+       inkscape:export-ydpi="138.63565"
+       inkscape:export-xdpi="138.63565"
         sodipodi:nodetypes="ccccccccccccccccccccc"
-       inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png" />
+       id="path2383"
+       d="M 88.431816,40.254007 C 69.803625,40.166276 54.045002,54.16218 54.129835,75.22051 C 54.068954,91.274344 68.315564,108.10722 88.431816,107.91672 C 89.549813,107.91672 90.095216,107.88452 91.602061,107.7065 C 91.569653,103.93148 91.348366,91.115934 91.413181,87.162485 C 97.635009,91.828858 101.04085,94.097739 109.07738,100.44919 C 112.18829,97.868223 115.29373,94.591662 117.34476,90.7302 C 112.15991,87.360044 105.10581,81.72326 94.21761,73.68674 C 101.21717,66.557554 108.27196,59.995273 114.88264,53.643826 C 112.57171,50.906043 109.37619,47.542256 106.31623,45.699518 C 101.64986,50.106655 98.437833,52.770497 91.413181,59.441256 C 91.44732,54.651308 91.626799,44.013425 91.602061,40.511312 C 90.556557,40.322656 89.622719,40.270207 88.431816,40.254007 z M 79.801333,51.351275 C 79.779096,59.441488 79.924702,62.872417 79.801333,68.719324 C 74.553306,68.625903 71.396213,68.731631 64.915137,68.602009 C 65.721614,58.462795 72.73505,52.397459 79.801333,51.351275 z M 79.801333,80.324934 C 79.833045,85.530259 79.870744,89.328594 79.984647,96.135618 C 73.101686,95.143127 65.177362,88.021089 64.838379,80.002996 C 68.889043,79.921982 74.6941,80.096459 79.801333,80.324934 z"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51327449;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
      <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#841919;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:cmmi10;-inkscape-font-specification:cmmi10"
-       x="131.22978"
-       y="79.663078"
-       id="text3438"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut.png"
+       sodipodi:linespacing="125%"
+       id="text3438"
+       y="79.663078"
+       x="131.22978"
+       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#841919;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:cmmi10;-inkscape-font-specification:cmmi10"
+       xml:space="preserve"><tspan
+         y="79.663078"
+         x="131.22978"
           id="tspan5392"
+         sodipodi:role="line">euphorik</tspan><tspan
+         y="114.66308"
           x="131.22978"
-         y="79.663078">euphorik</tspan><tspan
-         sodipodi:role="line"
           id="tspan5394"
-         x="131.22978"
-         y="114.66308" /></text>
+         sodipodi:role="line" /></text>
      <rect
-       style="opacity:1;fill:#e19671;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3280"
-       width="36.5"
-       height="36.5"
-       x="524.58624"
-       y="79.890785"
-       inkscape:export-filename="/tmp/euphorik.png"
+       inkscape:export-ydpi="493.1507"
         inkscape:export-xdpi="493.1507"
-       inkscape:export-ydpi="493.1507" />
+       inkscape:export-filename="/tmp/euphorik.png"
+       y="79.890785"
+       x="524.58624"
+       height="36.5"
+       width="36.5"
+       id="rect3280"
+       style="opacity:1;fill:#e19671;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
      <path
-       sodipodi:type="arc"
-       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="path3276"
-       sodipodi:cx="332.84528"
-       sodipodi:cy="399.29855"
-       sodipodi:rx="131.82491"
-       sodipodi:ry="131.82491"
+       transform="matrix(0.1293766,0,0,0.1293766,499.77383,46.480892)"
+       inkscape:export-ydpi="493.1507"
+       inkscape:export-xdpi="493.1507"
+       inkscape:export-filename="/tmp/euphorik.png"
         d="M 464.67018,399.29855 A 131.82491,131.82491 0 1 1 201.02037,399.29855 A 131.82491,131.82491 0 1 1 464.67018,399.29855 z"
+       sodipodi:ry="131.82491"
+       sodipodi:rx="131.82491"
+       sodipodi:cy="399.29855"
+       sodipodi:cx="332.84528"
+       id="path3276"
+       style="fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       sodipodi:type="arc" />
+    <path
         inkscape:export-filename="/tmp/euphorik.png"
-       inkscape:export-xdpi="493.1507"
         inkscape:export-ydpi="493.1507"
-       transform="matrix(0.1293766,0,0,0.1293766,499.77383,46.480892)" />
-    <path
-       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51327449;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 543.07082,82.904806 C 534.68186,82.865297 527.58517,89.168168 527.62338,98.651509 C 527.59596,105.88114 534.01173,113.46161 543.07082,113.37582 C 543.5743,113.37582 543.81991,113.36132 544.4985,113.28115 C 544.4839,111.58112 544.38425,105.80981 544.41344,104.02942 C 547.21536,106.13086 548.74914,107.15262 552.36828,110.01292 C 553.76924,108.85061 555.16773,107.37506 556.09139,105.6361 C 553.75646,104.11839 550.57974,101.57994 545.67638,97.960799 C 548.82854,94.750259 552.00557,91.795025 554.9826,88.934735 C 553.94191,87.70181 552.50285,86.186973 551.12483,85.35712 C 549.02339,87.341816 547.5769,88.541442 544.41344,91.545531 C 544.42881,89.388441 544.50964,84.59781 544.4985,83.02068 C 544.02767,82.935721 543.60713,82.912101 543.07082,82.904806 z M 539.1842,87.902314 C 539.17418,91.545635 539.23976,93.090709 539.1842,95.723789 C 536.82082,95.681719 535.39906,95.729329 532.48039,95.670959 C 532.84358,91.104894 536.00199,88.37345 539.1842,87.902314 z M 539.1842,100.95022 C 539.19848,103.29437 539.21546,105.0049 539.26675,108.07036 C 536.1671,107.6234 532.59848,104.41608 532.44583,100.80524 C 534.26999,100.76876 536.88422,100.84733 539.1842,100.95022 z"
+       inkscape:export-xdpi="493.1507"
+       sodipodi:nodetypes="ccccccccccccccccccccc"
         id="path3278"
+       d="M 543.07082,82.904806 C 534.68186,82.865297 527.58517,89.168168 527.62338,98.651509 C 527.59596,105.88114 534.01173,113.46161 543.07082,113.37582 C 543.5743,113.37582 543.81991,113.36132 544.4985,113.28115 C 544.4839,111.58112 544.38425,105.80981 544.41344,104.02942 C 547.21536,106.13086 548.74914,107.15262 552.36828,110.01292 C 553.76924,108.85061 555.16773,107.37506 556.09139,105.6361 C 553.75646,104.11839 550.57974,101.57994 545.67638,97.960799 C 548.82854,94.750259 552.00557,91.795025 554.9826,88.934735 C 553.94191,87.70181 552.50285,86.186973 551.12483,85.35712 C 549.02339,87.341816 547.5769,88.541442 544.41344,91.545531 C 544.42881,89.388441 544.50964,84.59781 544.4985,83.02068 C 544.02767,82.935721 543.60713,82.912101 543.07082,82.904806 z M 539.1842,87.902314 C 539.17418,91.545635 539.23976,93.090709 539.1842,95.723789 C 536.82082,95.681719 535.39906,95.729329 532.48039,95.670959 C 532.84358,91.104894 536.00199,88.37345 539.1842,87.902314 z M 539.1842,100.95022 C 539.19848,103.29437 539.21546,105.0049 539.26675,108.07036 C 536.1671,107.6234 532.59848,104.41608 532.44583,100.80524 C 534.26999,100.76876 536.88422,100.84733 539.1842,100.95022 z"
+       style="fill:#841919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51327449;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <g
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png"
+       inkscape:export-xdpi="138.63565"
+       inkscape:export-ydpi="138.63565"
+       id="g3532">
+      <path
+         sodipodi:type="arc"
+         style="fill:url(#linearGradient3521);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.43548787;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         id="path3245"
+         sodipodi:cx="332.84528"
+         sodipodi:cy="399.29855"
+         sodipodi:rx="131.82491"
+         sodipodi:ry="131.82491"
+         d="M 464.67018,399.29855 A 131.82491,131.82491 0 1 1 201.02037,399.29855 A 131.82491,131.82491 0 1 1 464.67018,399.29855 z"
+         inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png"
+         inkscape:export-xdpi="138.63892"
+         inkscape:export-ydpi="138.63892"
+         transform="matrix(2.9252204e-2,0,0,2.9252204e-2,90.185411,139.2606)" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51327449000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 99.97492,147.49609 C 98.078157,147.48715 96.473587,148.91225 96.482221,151.05644 C 96.476031,152.69107 97.926635,154.40502 99.97492,154.38563 C 100.08874,154.38563 100.14428,154.38235 100.29771,154.36422 C 100.2944,153.97984 100.27188,152.67494 100.27848,152.27239 C 100.91199,152.74752 101.25878,152.97855 102.07707,153.62526 C 102.39384,153.36246 102.71003,153.02884 102.91887,152.63566 C 102.39094,152.2925 101.67268,151.71856 100.56403,150.90027 C 101.27674,150.17437 101.99506,149.50618 102.66818,148.85946 C 102.43288,148.5807 102.10751,148.23818 101.79594,148.05056 C 101.32078,148.4993 100.99374,148.77054 100.27848,149.44977 C 100.28196,148.96203 100.30022,147.87888 100.29771,147.52228 C 100.19125,147.50308 100.09617,147.49774 99.97492,147.49609 z M 99.09614,148.62604 C 99.09387,149.44979 99.10869,149.79913 99.09614,150.39447 C 98.56177,150.38496 98.240318,150.39573 97.580409,150.38253 C 97.662512,149.35014 98.37663,148.73255 99.09614,148.62604 z M 99.09614,151.57618 C 99.09937,152.10619 99.10321,152.49295 99.11479,153.18605 C 98.41397,153.08499 97.607108,152.35981 97.572585,151.54341 C 97.985028,151.53515 98.57612,151.55292 99.09614,151.57618 z"
+         id="path3247"
+         sodipodi:nodetypes="ccccccccccccccccccccc"
+         inkscape:export-xdpi="138.63892"
+         inkscape:export-ydpi="138.63892"
+         inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png" />
+      <path
+         style="fill:#fdf9c4;fill-opacity:0.33333333;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 99.92613,147.0848 C 97.797523,147.0848 96.065696,148.81661 96.0657,150.94523 C 96.0657,151.41868 96.158426,151.85437 96.31476,152.27355 C 97.623354,150.22742 99.89244,148.86973 102.49975,148.86973 C 102.72713,148.86973 102.98327,148.89104 103.20542,148.91124 C 102.52544,147.81368 101.31129,147.0848 99.92613,147.0848 z"
+         id="path3263"
+         inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png"
+         inkscape:export-xdpi="138.63892"
+         inkscape:export-ydpi="138.63892" />
+    </g>
+  </g>
+  <g
+     style="display:inline"
+     inkscape:label="logo_ek_master"
+     id="layer4"
+     inkscape:groupmode="layer">
+    <path
+       transform="matrix(0.2882612,0,0,0.2882612,-8.0354588,-41.01581)"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png"
+       d="M 464.67018,399.29855 A 131.82491,131.82491 0 1 1 201.02037,399.29855 A 131.82491,131.82491 0 1 1 464.67018,399.29855 z"
+       sodipodi:ry="131.82491"
+       sodipodi:rx="131.82491"
+       sodipodi:cy="399.29855"
+       sodipodi:cx="332.84528"
+       id="path3646"
+       style="fill:url(#linearGradient3659);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       sodipodi:type="arc" />
+    <path
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
         sodipodi:nodetypes="ccccccccccccccccccccc"
-       inkscape:export-xdpi="493.1507"
-       inkscape:export-ydpi="493.1507"
-       inkscape:export-filename="/tmp/euphorik.png" />
+       id="path3648"
+       d="M 88.433689,40.139507 C 69.742342,40.051409 53.930364,54.094829 54.015447,75.224405 C 53.954448,91.332605 68.249193,108.22245 88.433689,108.03137 C 89.55531,108.03137 90.10262,107.99905 91.614572,107.82039 C 91.581954,104.03258 91.360034,91.173654 91.425073,87.20679 C 97.667896,91.888882 101.08528,94.16553 109.14899,100.53843 C 112.27055,97.94871 115.38639,94.661105 117.44437,90.786576 C 112.24197,87.404961 105.16399,81.749161 94.23898,73.685453 C 101.26227,66.532188 108.34084,59.947617 114.97399,53.574618 C 112.65526,50.827622 109.44896,47.452314 106.37864,45.603442 C 101.69625,50.025479 98.473488,52.69837 91.425073,59.391733 C 91.459366,54.585378 91.639306,43.911649 91.614572,40.397592 C 90.565479,40.208389 89.628528,40.155766 88.433689,40.139507 z M 79.773893,51.274418 C 79.751523,59.39193 79.897565,62.834445 79.773893,68.701128 C 74.508029,68.607413 71.340332,68.713545 64.837364,68.583467 C 65.646435,58.409945 72.683597,52.324004 79.773893,51.274418 z M 79.773893,80.3461 C 79.805722,85.568999 79.843563,89.380263 79.957676,96.210306 C 73.051558,95.214426 65.100465,88.068256 64.760264,80.023173 C 68.824617,79.941776 74.649439,80.116888 79.773893,80.3461 z"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.51327449;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <path
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
+       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png"
+       id="path3650"
+       d="M 87.952896,36.086515 C 66.976879,36.086515 49.910868,53.152359 49.910907,74.128504 C 49.910907,78.794041 50.824661,83.087479 52.365229,87.218221 C 65.260559,67.054961 87.620903,53.675822 113.31422,53.675822 C 115.5549,53.675822 118.07899,53.885818 120.26813,54.084876 C 113.56738,43.269146 101.60273,36.086515 87.952896,36.086515 z"
+       style="fill:#fdf9c4;fill-opacity:0.68306011;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
    </g>
    <g
-     inkscape:groupmode="layer"
-     id="layer3"
+     style="display:inline"
       inkscape:label="menu"
-     style="display:inline">
+     id="layer3"
+     inkscape:groupmode="layer">
      <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect5408"
-       width="33.23402"
-       height="19.003494"
-       x="278.95361"
-       y="63.561737"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
-       x="284.48007"
-       y="75.487816"
-       id="text3197"
-       sodipodi:linespacing="125%"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       y="63.561737"
+       x="278.95361"
+       height="19.003494"
+       width="33.23402"
+       id="rect5408"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <text
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3199"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3197"
+       y="75.487816"
+       x="284.48007"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
+       xml:space="preserve"><tspan
+         y="75.487816"
           x="284.48007"
-         y="75.487816">chat</tspan></text>
+         id="tspan3199"
+         sodipodi:role="line">chat</tspan></text>
      <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
-       x="324.82281"
-       y="75.487816"
-       id="text3201"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3203"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3201"
+       y="75.487816"
+       x="324.82281"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
+       xml:space="preserve"><tspan
+         y="75.487816"
           x="324.82281"
-         y="75.487816">profile</tspan></text>
+         id="tspan3203"
+         sodipodi:role="line">profile</tspan></text>
      <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
-       x="380.86096"
-       y="75.487816"
-       id="text3205"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3207"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3205"
+       y="75.487816"
+       x="380.86096"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
+       xml:space="preserve"><tspan
+         y="75.487816"
           x="380.86096"
-         y="75.487816">about</tspan></text>
+         id="tspan3207"
+         sodipodi:role="line">about</tspan></text>
      <path
-       style="fill:#510f0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 294.62095,77.596161 L 300.14691,82.88847 L 288.83185,82.88847 L 294.62095,77.596161 z"
-       id="rect3221"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892" />
-    <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L Italic"
-       x="132.93362"
-       y="96.410347"
-       id="text3466"
-       sodipodi:linespacing="125%"
         inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:nodetypes="cccc"
+       id="rect3221"
+       d="M 294.62095,77.596161 L 300.14691,82.88847 L 288.83185,82.88847 L 294.62095,77.596161 z"
+       style="fill:#510f0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
+    <text
+       inkscape:export-ydpi="138.63892"
         inkscape:export-xdpi="138.63892"
-       inkscape:export-ydpi="138.63892"><tspan
-         sodipodi:role="line"
-         id="tspan3468"
+       inkscape:export-filename="/home/gburri/projets/euphorik/doc/graphiques/logo_brut2.png"
+       sodipodi:linespacing="125%"
+       id="text3466"
+       y="96.410347"
+       x="132.93362"
+       style="font-size:9px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L Italic"
+       xml:space="preserve"><tspan
+         y="96.410347"
           x="132.93362"
-         y="96.410347">troll de la semaine :</tspan></text>
-    <rect
-       style="opacity:1;fill:#f6dfc2;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.8172037;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3222"
-       width="89.202576"
-       height="47.277973"
-       x="304.47925"
-       y="110.74908" />
-    <rect
-       style="opacity:1;fill:#df5050;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.93000001000000021;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3225"
-       width="129.26752"
-       height="124.60923"
-       x="184.00241"
-       y="111.9701" />
+         id="tspan3468"
+         sodipodi:role="line">troll de la semaine :</tspan></text>
    </g>
  </svg>
diff --git a/doc/protocole3.txt b/doc/protocole3.txt

index eb661a3..dc3ff4b 100644 (file)
--- a/doc/protocole3.txt
+++ b/doc/protocole3.txt
@@ -93,9 +93,9 @@ ou
        "nick_format" : "nick" | "login" | "nick_login",
        "view_times" : true | false,
        "view_tooltips" : true | false,
-      // "main_page" : 1,
-      "conversations" : [3, 8],
-      "ek_master" : true | false
+      "conversations" : [{"root" : 3, "minimized" : true},
+      "ek_master" : true | false,
+      "ostentatious_master" : "invisible" | "light" | "heavy"
     }
   
   
@@ -120,8 +120,8 @@ c -> s
        "nick_format" : "nick" | "login" | "nick_login",
        "view_times" : true | false,
        "view_tooltips" : true | false,
-      "main_page" : 1,
-      "conversations" : [3, 8]
+      "conversations" : [{"root" : 3, "minimized" : true},
+      "ostentatious_master" : "invisible" | "light" | "heavy"
     }
        
  s -> c
@@ -151,7 +151,8 @@ Si "main_page" est absent alors est vaut 1.
        "answer_to" : [
           { "id" : 123, "nick" : "Pierre", "login" : "pierre_45" }
        ]
-      "ek_master" : true | false
+      "ek_master" : true | false,
+      "ostentatious_master" : "invisible" | "light" | "heavy"
     }
  
  c -> s
diff --git a/img/css1/logo_ek_master.png b/img/css1/logo_ek_master.png

new file mode 100644 (file)

index 0000000..8e03c93

Binary files /dev/null and b/img/css1/logo_ek_master.png differ
diff --git a/img/css1/marque_ek.png b/img/css1/marque_ek.png

new file mode 100644 (file)

index 0000000..2755449

Binary files /dev/null and b/img/css1/marque_ek.png differ
diff --git a/index.yaws b/index.yaws

index d1469d9..d3ff0f8 100755 (executable)
--- a/index.yaws
+++ b/index.yaws
@@ -1,11 +1,12 @@
  <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" >
  <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>euphorik.ch</title>
     <erl>
+      % prédéfinit la feuille de style
        out(A) -> 
           CSS = case euphorik_bd:css_from_user_cookie(yaws_api:find_cookie_val("cookie", A)) of
              undefined -> "css/1/euphorik.css";
@@ -35,10 +36,16 @@
  </head>
     <body>
        <div id="container">
-         <div id="logo"></div>\r
+         <erl>
+            % permet de prédéfinir la "class" du logo pour un ekMaster..
+            out(A) -> 
+               Est_ek_master = euphorik_bd:is_ek_master_from_cookie(yaws_api:find_cookie_val("cookie", A)),
+               {ehtml, {'div', [{id, "logo"}] ++ if Est_ek_master -> [{class, "ekMaster"}]; true -> [] end}}.
+                   
+         </erl>
           <div id="info" style="display:none" ><div id="icone"></div><div class="fermer" ></div><div class="message" ></div><div class="boutons"></div></div>
           <ul id="menu">
-            <li class="minichat">chat</li><li class="admin" style="display:none">admin</li><li class="profile"></li><li class="register">register</li><li class="logout">logout</li><li class="about">about</li>\r
+            <li class="minichat">chat</li><li class="admin" style="display:none">admin</li><li class="profile"></li><li class="register">register</li><li class="logout">logout</li><li class="about">about</li>
           </ul>
           <form action=""  id="formMenuCss">
              <p>
diff --git a/js/euphorik.js b/js/euphorik.js

index 596ded4..7e611db 100755 (executable)
--- a/js/euphorik.js
+++ b/js/euphorik.js
@@ -597,6 +597,7 @@ Client.prototype.resetDonneesPersonnelles = function()
     
     this.pagePrincipale = 1
     this.ekMaster = false
+   this.ostentatiousMaster = "light"
     
     // les conversations, une conversation est un objet possédant les attributs suivants :
     // - root (entier)
@@ -720,7 +721,7 @@ Client.prototype.getJSONConversations = function()
  {
     var conversations = new Array()
     for (var i = 0; i < this.conversations.length; i++)
-      conversations.push(this.conversations[i].root)
+      conversations.push({root : this.conversations[i].root, minimized : this.conversations[i].reduit})
     return conversations
  }
  
@@ -737,7 +738,8 @@ Client.prototype.getJSONProfile = function()
        "nick_format" : this.nickFormat,
        "view_times" : this.viewTimes,
        "view_tooltips" : this.viewTooltips,
-      "conversations" : this.getJSONConversations()
+      "conversations" : this.getJSONConversations(),
+      "ostentatious_master" : this.ostentatiousMaster
     }
  }
  
@@ -788,6 +790,7 @@ Client.prototype.setStatut = function(statut)
     
     this.statut = statut   
     this.majMenu()
+   this.majLogo()
  }
  
  /**
@@ -879,6 +882,7 @@ Client.prototype.chargerDonnees = function(data)
        this.nickFormat = data["nick_format"]
        this.viewTimes = data["view_times"]
        this.viewTooltips = data["view_tooltips"]
+      this.ostentatiousMaster = data["ostentatious_master"]
        
        // la page de la conversation principale
        this.pagePrincipale = 1
@@ -886,10 +890,11 @@ Client.prototype.chargerDonnees = function(data)
        // les conversations
        this.conversations = data["conversations"]
        for (var i = 0; i < this.conversations.length; i++)
-         this.conversations[i] = {root : this.conversations[i], page : 1}
+         this.conversations[i] = {root : this.conversations[i].root, page : 1, reduit : this.conversations[i].minimized}
        
        this.majBulle()
        this.majCssSelectionee()
+      //this.majLogo()
     }
  }
  
@@ -984,6 +989,18 @@ Client.prototype.majCssSelectionee = function()
     }
  }
  
+/**
+  * Change la "class" du logo en fonction du statut de ekMaster.
+  */
+Client.prototype.majLogo = function()
+{
+   if (this.ekMaster)
+      $("#logo").addClass("ekMaster")
+   else
+      $("#logo").removeClass("ekMaster")   
+}
+
+
  Client.prototype.slap = function(userId, raison)
  {
     var thisClient = this
diff --git a/js/pageMinichat.js b/js/pageMinichat.js

index 4068f35..574dedd 100755 (executable)
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -302,6 +302,7 @@ function Message(client, formateur, element)
     this.systeme = element["system"] // est-ce un message 'système' ?
     this.setRepondA(element["answer_to"]) // un ensemble de reponse (voir Reponse) indexé par l'id du message de la reponses
     this.ekMaster = element["ek_master"]
+   this.degreeOstentatoire = element["ostentatious_master"]
  }
  
  /**
@@ -387,8 +388,8 @@ Message.prototype.XHTML = function(messagePair, pre)
     // construit l'identifiant de la personne
     var identifiant = 
        this.client.nickFormat == "nick" || this.login == "" ? this.formateur.traitementComplet(this.pseudo) : 
-      (this.client.nickFormat == "login" ? this.formateur.traitementComplet(message.login) : 
-      this.formateur.traitementComplet(this.pseudo) + "<span class=\"login\">(" + this.formateur.traitementComplet(message.login) +")</span>" )
+      (this.client.nickFormat == "login" ? this.formateur.traitementComplet(this.login) : 
+      this.formateur.traitementComplet(this.pseudo) + "<span class=\"login\">(" + this.formateur.traitementComplet(this.login) +")</span>" )
  
     var XHTMLrepondA = ""
     var debut = true
@@ -406,7 +407,7 @@ Message.prototype.XHTML = function(messagePair, pre)
           (this.clientARepondu ? " repondu" : "") +
           (this.estUneReponse ? " reponse" : "") +
           (this.systeme ? " systeme" : "") +
-         (this.ekMaster ? " ekMaster" : "") +
+         (this.ekMaster ? " ekMaster" + this.degreeOstentatoire : "") +
        "\">" +
           "<div class=\"outilsMess\"><div class=\"extraire\"></div><div class=\"extraireCompletement\"></div></div><span class=\"entete\">" +
           "<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +
@@ -662,8 +663,8 @@ Conversation.prototype.attacherEventsSurMessage = function(element)
     // l'id du message
     var idMess = this.idMessageFromString($(element).attr("id"))
  
-   this.util.infoBulle("Extraction de la conversation à partir de ce message", $(".extraire", this))
-   this.util.infoBulle("Extraction de la conversation complète", $(".extraireCompletement", this))
+   this.util.infoBulle("Extraction de la conversation à partir de ce message", $(".extraire", element))
+   this.util.infoBulle("Extraction de la conversation complète", $(".extraireCompletement", element))
     
     var thisConversation = this
     $(".lienConv", element).click(
diff --git a/js/pageProfile.js b/js/pageProfile.js

index 14ca09c..cb29198 100755 (executable)
--- a/js/pageProfile.js
+++ b/js/pageProfile.js
@@ -14,58 +14,61 @@
  // GNU General Public License for more details.\r
  //\r
  // You should have received a copy of the GNU General Public License\r
-// along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
-
-function PageProfile(client, formateur, util)
-{
-   this.nom = "profile"
-   
-   this.client = client
-   this.formateur = formateur
-   this.util = util
-}
-
-PageProfile.prototype.contenu = function()
-{
-   // pourquoi ?
-   return ""
-}
-
-PageProfile.prototype.charger = function()
-{
-   $("#page").html(this.getHTML())
-   
-   // en fonction du statut
-   if (this.client.authentifie())
-      this.chargerProfile()
-   else
-      this.chargerLogin()
-      
-   $("#page form#profile").submit(function(){return false})
-}
-
-PageProfile.prototype.chargerProfile = function()
+// along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.\r
+\r
+function PageProfile(client, formateur, util)\r
+{\r
+   this.nom = "profile"\r
+   \r
+   this.client = client\r
+   this.formateur = formateur\r
+   this.util = util\r
+}\r
+\r
+PageProfile.prototype.contenu = function()\r
+{\r
+   // pourquoi ?\r
+   return ""\r
+}\r
+\r
+PageProfile.prototype.charger = function()\r
+{\r
+   $("#page").html(this.getHTML())\r
+   \r
+   // en fonction du statut\r
+   if (this.client.authentifie())\r
+      this.chargerProfile()\r
+   else\r
+      this.chargerLogin()\r
+      \r
+   $("#page form#profile").submit(function(){return false})\r
+}\r
+\r
+PageProfile.prototype.chargerProfile = function()\r
  { \r
     var thisPage = this\r
     \r
     $("form#profile input.login").val(this.client.login)\r
     $("form#profile input.pseudo").val(this.client.pseudo)\r
-   $("form#profile input.email").val(this.client.email)
-   $("form#profile input#viewTooltips").attr("checked", this.client.viewTooltips)
-   $("form#profile input#viewTimes").attr("checked", this.client.viewTimes)
-   
-   $("form#profile select#affichagePseudo option").removeAttr("selected")
-   $("form#profile select#affichagePseudo option[value=" + this.client.nickFormat + "]").attr("selected", "selected")
+   $("form#profile input.email").val(this.client.email)\r
+   $("form#profile input#viewTooltips").attr("checked", this.client.viewTooltips)\r
+   $("form#profile input#viewTimes").attr("checked", this.client.viewTimes)\r
+   \r
+   $("form#profile select#degreeOstentatoire option").removeAttr("selected")\r
+   $("form#profile select#degreeOstentatoire option[value=" + this.client.ostentatiousMaster + "]").attr("selected", "selected")\r
     \r
+   $("form#profile select#affichagePseudo option").removeAttr("selected")\r
+   $("form#profile select#affichagePseudo option[value=" + this.client.nickFormat + "]").attr("selected", "selected")\r
  \r
     $("form#profile button").click(\r
        function()\r
        {\r
           thisPage.client.pseudo = thisPage.formateur.filtrerInputPseudo($("form#profile input.pseudo").val())\r
-         thisPage.client.email = $("form#profile input.email").val()
-         thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value") 
-         thisPage.client.viewTooltips = $("form#profile input#viewTooltips").attr("checked")
-         thisPage.client.viewTimes = $("form#profile input#viewTimes").attr("checked")
+         thisPage.client.email = $("form#profile input.email").val()\r
+         thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value") \r
+         thisPage.client.ostentatiousMaster = $("form#profile select#degreeOstentatoire option:selected").attr("value") \r
+         thisPage.client.viewTooltips = $("form#profile input#viewTooltips").attr("checked")\r
+         thisPage.client.viewTimes = $("form#profile input#viewTimes").attr("checked")\r
           \r
           var password = $("form#profile input.password").val()\r
           var passwordRe = $("form#profile input.passwordRe").val()  \r
@@ -81,80 +84,90 @@ PageProfile.prototype.chargerProfile = function()
           \r
           if(!thisPage.client.flush())\r
              thisPage.util.messageDialogue("Impossible de mettre à jour votre profile, causes inconnues", messageType.erreur)\r
-         else
-         {
-            thisPage.util.messageDialogue("Votre profile a été mis à jour")
-            thisPage.pages.afficherPage("minichat")
+         else\r
+         {\r
+            thisPage.util.messageDialogue("Votre profile a été mis à jour")\r
+            thisPage.pages.afficherPage("minichat")\r
           }\r
        }\r
-   )
-}
-
-PageProfile.prototype.chargerLogin = function()
-{   
-   var thisPage = this
-
-   $("#page form#profile button").click(
-      function()
-      {
-         if(thisPage.client.connexionLogin($("form#profile input.login").val(), thisPage.util.md5($("form#profile input.password").val())))
+   )\r
+}\r
+\r
+PageProfile.prototype.chargerLogin = function()\r
+{   \r
+   var thisPage = this\r
+\r
+   $("#page form#profile button").click(\r
+      function()\r
+      {\r
+         if(thisPage.client.connexionLogin($("form#profile input.login").val(), thisPage.util.md5($("form#profile input.password").val())))\r
           {\r
-            // TODO afficher un message "ok"
-            thisPage.pages.afficherPage("minichat")
-         }
-      }
-   )
-}
-
-PageProfile.prototype.getHTML = function()
-{
-return '\
-<form action="" id="profile" >\
- <table>\
-  <tr>\
-   <td>login</td>\
-   <td><input class="login" type="text" size="20" maxlength="20" ' + (this.client.authentifie() ? 'readonly="readonly"' : '') + ' /></td>\
-  </tr>\
-  <tr>\
-   <td>password</td>\
-   <td><input class="password" type="password" size="20" maxlength="20"/></td>\
-  </tr>' + 
-  (this.client.authentifie() ? '\
-  <tr>\
-   <td>password re</td>\
-   <td><input class="passwordRe" type="password" size="20" maxlength="20"/></td>\
-  </tr>\
-  <tr>\
-   <td>pseudo</td>\
-   <td><input class="pseudo" type="text" size="40" maxlength="20"/></td>\
-  </tr>\
-  <tr>\
-   <td>e-mail</td>\
-   <td><input class="email" type="text" size="40" maxlength="100"/></td>\
-  </tr>\
-  <tr>\
-   <td>Affichage des identifiants</td>\
-   <td>\
-    <select id="affichagePseudo">\
-     <option value="nick">Pseudo</option>\
-     <option value="login">Login</option>\
-     <option value="nick_login">Pseudo(Login)</option>\
-    </select>\
-   </td>\
-  </tr>\
-  <tr>\
-   <td>Afficher les infos bulles</td>\
-   <td><input type="checkbox" id="viewTooltips" /></td>\
-  </tr>\
-  <tr>\
-   <td>Afficher les dates</td>\
-   <td><input type="checkbox" id="viewTimes" /></td>\
-  </tr>' : '') + '\
-  <tr>\
-   <td></td>\
-   <td><button>Valider</button>\
-  </tr>\
- </table>\
-</form>' 
-}
-
+            // TODO afficher un message "ok"\r
+            thisPage.pages.afficherPage("minichat")\r
+         }\r
+      }\r
+   )\r
+}\r
+\r
+PageProfile.prototype.getHTML = function()\r
+{\r
+return '\\r
+<form action="" id="profile" >\\r
+ <table>\\r
+  <tr>\\r
+   <td>login</td>\\r
+   <td><input class="login" type="text" size="20" maxlength="20" ' + (this.client.authentifie() ? 'readonly="readonly"' : '') + ' /></td>\\r
+  </tr>\\r
+  <tr>\\r
+   <td>password</td>\\r
+   <td><input class="password" type="password" size="20" maxlength="20"/></td>\\r
+  </tr>' + \r
+  (this.client.authentifie() ? '\\r
+  <tr>\\r
+   <td>password re</td>\\r
+   <td><input class="passwordRe" type="password" size="20" maxlength="20"/></td>\\r
+  </tr>\\r
+  <tr>\\r
+   <td>pseudo</td>\\r
+   <td><input class="pseudo" type="text" size="40" maxlength="20"/></td>\\r
+  </tr>\\r
+  <tr>\\r
+   <td>e-mail</td>\\r
+   <td><input class="email" type="text" size="40" maxlength="100"/></td>\\r
+  </tr>\\r
+  <tr>' +\r
+   (this.client.ekMaster ? '<td>Degrée d\'ostentation</td>\\r
+   <td>\\r
+    <select id="degreeOstentatoire">\\r
+     <option value="invisible">Aucun</option>\\r
+     <option value="light">Léger</option>\\r
+     <option value="heavy">Lourd</option>\\r
+    </select>\\r
+   </td>' : '') +\r
+  '</tr>\\r
+  <tr>\\r
+   <td>Affichage des identifiants</td>\\r
+   <td>\\r
+    <select id="affichagePseudo">\\r
+     <option value="nick">Pseudo</option>\\r
+     <option value="login">Login</option>\\r
+     <option value="nick_login">Pseudo(Login)</option>\\r
+    </select>\\r
+   </td>\\r
+  </tr>\\r
+  <tr>\\r
+   <td>Afficher les infos bulles</td>\\r
+   <td><input type="checkbox" id="viewTooltips" /></td>\\r
+  </tr>\\r
+  <tr>\\r
+   <td>Afficher les dates</td>\\r
+   <td><input type="checkbox" id="viewTimes" /></td>\\r
+  </tr>' : '') + '\\r
+  <tr>\\r
+   <td></td>\\r
+   <td><button>Valider</button>\\r
+  </tr>\\r
+ </table>\\r
+</form>' \r
+}\r
+\r
diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl

index be46ab2..d84b0fb 100755 (executable)
--- a/modules/erl/euphorik_bd.erl
+++ b/modules/erl/euphorik_bd.erl
@@ -33,7 +33,7 @@
     % users :\r
     nouveau_user/2,\r
     nouveau_user/3,\r
-   set_profile/10,\r
+   set_profile/11,\r
     update_date_derniere_connexion/1,\r
     update_ip/2,\r
     update_pseudo_user/2,\r
@@ -47,6 +47,7 @@
     user_by_mess/1,\r
     toggle_ek_master/1,\r
     css_from_user_cookie/1,\r
+   is_ek_master_from_cookie/1,\r
     \r
     % messages :e\r
     nouveau_message/3,\r
@@ -192,8 +193,11 @@ nouveau_user(Login, Password, Cookie) ->
  \r
  \r
  % Mise à par Cookie les autres peuvent être undefined ce qui veut dire qu'ils ne seront pas modifié.\r
-set_profile(Cookie, Login, Password, Pseudo, Email, Css, Nick_format, View_times, View_tooltips, Conversations) ->\r
-   if Nick_format =:= nick; Nick_format =:= login; Nick_format =:= nick_login ->\r
+% Conversation est de type [{int(), bool()}] où l'entier est la racine, le booléen indique si la conversation est réduite ou non\r
+% Ostentatious_master peut valoir invisible, light ou heavy\r
+set_profile(Cookie, Login, Password, Pseudo, Email, Css, Nick_format, View_times, View_tooltips, Conversations, Ostentatious_master) ->\r
+   if Nick_format =:= nick; Nick_format =:= login; Nick_format =:= nick_login,\r
+      Ostentatious_master =:= invisible; Ostentatious_master =:= light; Ostentatious_master =:= heavy ->\r
           resultat_transaction(mnesia:transaction(\r
              fun() ->\r
                 case user_by_cookie(Cookie) of\r
@@ -213,7 +217,8 @@ set_profile(Cookie, Login, Password, Pseudo, Email, Css, Nick_format, View_times
                                nick_format = Nick_format,\r
                                view_times = View_times,\r
                                view_tooltips = View_tooltips,\r
-                              conversations = if is_list(Conversations) -> Conversations; true -> User#user.conversations end\r
+                              conversations = if is_list(Conversations) -> Conversations; true -> User#user.conversations end,\r
+                              ostentatious_master = Ostentatious_master\r
                             },\r
                             mnesia:write(User_modifie),\r
                             ok\r
@@ -396,6 +401,13 @@ css_from_user_cookie(Cookie) ->
           undefined\r
     end.\r
     \r
+   \r
+is_ek_master_from_cookie(Cookie) ->\r
+   case user_by_cookie(Cookie) of\r
+      {ok, #user{ek_master = true}} -> true;\r
+      _ -> false\r
+   end.\r
+   \r
  \r
  user_by_login_password(Login, Password) ->\r
     resultat_transaction(mnesia:transaction(\r
diff --git a/modules/erl/euphorik_bd_update.erl b/modules/erl/euphorik_bd_update.erl

index 14a85c9..1f04ab0 100644 (file)
--- a/modules/erl/euphorik_bd_update.erl
+++ b/modules/erl/euphorik_bd_update.erl
@@ -78,7 +78,7 @@ patch(1) ->
     mnesia:transform_table(
        user,
        fun({user, Id, Cookie, Pseudo, Login, Password, Email, Date_creation, Date_derniere_connexion, Css, Nick_format, View_times, View_tooltips, Indice_flood, _Page_principale, Conversations, Ek_master, Last_ip}) ->
-            {user, Id, Cookie, Pseudo, Login, Password, Email, Date_creation, Date_derniere_connexion, Css, Nick_format, View_times, View_tooltips, reverse, Indice_flood, lists:map(fun({C, _}) -> C end, Conversations), Ek_master, Last_ip}
+            {user, Id, Cookie, Pseudo, Login, Password, Email, Date_creation, Date_derniere_connexion, Css, Nick_format, View_times, View_tooltips, light, reverse, Indice_flood, lists:map(fun({R, _}) -> {R, false} end, Conversations), Ek_master, Last_ip}
        end,
        record_info(fields, user),
        user
diff --git a/modules/erl/euphorik_daemon.erl b/modules/erl/euphorik_daemon.erl

index 274a2c2..548eab1 100755 (executable)
--- a/modules/erl/euphorik_daemon.erl
+++ b/modules/erl/euphorik_daemon.erl
@@ -16,25 +16,25 @@
  % You should have received a copy of the GNU General Public License\r
  % along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.\r
  % \r
-% Module tournant en background s'occupant periodiquement de certaines tâches :
+% Module tournant en background s'occupant periodiquement de certaines tâches :\r
  %  - sélection du prochain troll chaque semaine\r
  %  - rechargement des modules lors d'une mise en production\r
-% Date : 05.11.2007
+% Date : 05.11.2007\r
  % @author G.Burri\r
  \r
  \r
--module(euphorik_daemon).
--export([start/1, reload_euphorik/0, loop/0]).
--include("../include/euphorik_defines.hrl").
+-module(euphorik_daemon).\r
+-export([start/1, reload_euphorik/0, loop/0]).\r
+-include("../include/euphorik_defines.hrl").\r
  \r
-
-% Démarre le démon
+\r
+% Démarre le démon\r
  start(_A) ->\r
     register(euphorik_daemon, self()),\r
-   loop().
+   loop().\r
+   \r
     \r
-   
-loop() ->
+loop() ->\r
     % on attend une minute de plus pour prevenir une dérive négative (ce qui pourrait engendrer une double élection)\r
     receive\r
        switch -> % permet de substituer le code du process par un nouveau code, voir reload_euphorik\r
@@ -42,38 +42,39 @@ loop() ->
        after 1000 * (trunc(temps_prochaine_election() + 60)) ->\r
           euphorik_bd:elire_troll(),\r
           euphorik_daemon:loop()\r
-   end.
-
-   
-% Renvoie le nombre de seconde qu'il reste jusque au prochain lundi à l'heure donnée (l'heure est sur 24heures)
-% 86400 est le nombre de seconde dans un jour
-temps_prochaine_election() ->
-   {Date, {H,M,S}} = calendar:local_time(),
-   Delta = (?JOUR_ELECTION_TROLL - 1) * 86400 + ?HEURE_ELECTION_TROLL * 60 * 60
-      -((calendar:day_of_the_week(Date) - 1) * 86400 + H * 60 * 60 + M * 60 + S),
-   % attention au cas où deux dates (maintenant et la date d'élection) ne se trouvent pas dans la même semaine.
-   if Delta =< 0 -> Delta + 7 * 86400; true -> Delta end.
-
-
-% Recharge tous les modules euphorik.
-% Appelé lors d'une mise en prod.
-% TODO : récupérer les noms à partir des .beam dans /modules/ebin
-reload_euphorik() ->
-   lists:foreach(
-      fun(M) ->
-         code:purge(M),
-         code:load_file(M)
-      end,
-      [
-         euphorik_common,
-         euphorik_minichat_conversation,
-         euphorik_protocole,
-         euphorik_requests,
-         euphorik_bd,
-         euphorik_bd_update,
-         euphorik_daemon
-      ]
+   end.\r
+\r
+   \r
+% Renvoie le nombre de seconde qu'il reste jusque au prochain lundi à l'heure donnée (l'heure est sur 24heures)\r
+% 86400 est le nombre de seconde dans un jour\r
+temps_prochaine_election() ->\r
+   {Date, {H,M,S}} = calendar:local_time(),\r
+   Delta = (?JOUR_ELECTION_TROLL - 1) * 86400 + ?HEURE_ELECTION_TROLL * 60 * 60\r
+      -((calendar:day_of_the_week(Date) - 1) * 86400 + H * 60 * 60 + M * 60 + S),\r
+   % attention au cas où deux dates (maintenant et la date d'élection) ne se trouvent pas dans la même semaine.\r
+   if Delta =< 0 -> Delta + 7 * 86400; true -> Delta end.\r
+\r
+\r
+% Recharge tous les modules euphorik.\r
+% Appelé lors d'une mise en prod.\r
+% TODO : récupérer les noms à partir des .beam dans /modules/ebin\r
+reload_euphorik() ->\r
+   lists:foreach(\r
+      fun(M) ->\r
+         code:purge(M),\r
+         code:load_file(M)\r
+      end,\r
+      [\r
+         euphorik_common,\r
+         euphorik_minichat_conversation,\r
+         euphorik_protocole,\r
+         euphorik_requests,\r
+         euphorik_bd,\r
+         euphorik_bd_update,\r
+         euphorik_daemon\r
+      ]\r
     ),\r
     % changement du code du daemon\r
-   euphorik_daemon ! switch.
+   euphorik_daemon ! switch,\r
+   ok.\r
     
 \ No newline at end of file
diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl

index dac7d03..3f9d7a1 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -74,19 +74,27 @@ erreur_register_flood() ->
  \r
  % Un utilisateur se logge (avec un couple {login, mot de passe})\r
  login([{login, Login}, {password, Password}], IP) ->\r
-   loginUser(euphorik_bd:user_by_login_password(Login, Password), IP);\r
+   case euphorik_bd:user_by_login_password(Login, Password) of\r
+      {ok, User} ->\r
+         loginUser(User, IP);\r
+      _ -> \r
+         timer:sleep(?TEMPS_ATTENTE_ERREUR_LOGIN),\r
+         erreur("Couple login/pass introuvable")\r
+   end;\r
  % Un utilisateur se logge (avec un cookie)\r
  login([{cookie, Cookie}], IP) ->\r
-   loginUser(euphorik_bd:user_by_cookie(Cookie), IP).\r
+   case euphorik_bd:user_by_cookie(Cookie) of\r
+      {ok, User} ->\r
+         loginUser(User, IP);\r
+      _ ->\r
+         timer:sleep(?TEMPS_ATTENTE_ERREUR_LOGIN),\r
+         erreur("Authentification impossible par cookie")\r
+   end.\r
     \r
-loginUser({ok, User}, IP) ->\r
+loginUser(User, IP) ->\r
     euphorik_bd:update_ip(User#user.id, IP),\r
     euphorik_bd:update_date_derniere_connexion(User#user.id),\r
-   json_reponse_login_ok(User);\r
-loginUser(_, _) ->\r
-   % ajoute un délais d'attente\r
-   timer:sleep(?TEMPS_ATTENTE_ERREUR_LOGIN),\r
-   erreur("Couple login/pass introuvable").\r
+   json_reponse_login_ok(User).\r
     \r
     \r
  % Renvoie un string() représentant un cookie en base 36. Il y a 10^32 possibillités.\r
@@ -113,14 +121,22 @@ profile(
        {nick_format, Nick_format_str},\r
        {view_times, View_times},\r
        {view_tooltips, View_tooltips},\r
-      {conversations, {array, Conversations_json}}\r
+      {conversations, {array, Conversations_json}},\r
+      {ostentatious_master, Ostentatious_master}\r
     ]\r
  ) ->\r
-   % virage des messages qui n'existent pas\r
-   Conversations = lists:dropwhile(\r
-      fun(Message_id) ->\r
-         not euphorik_bd:message_existe(Message_id)\r
+   % décomposition de la strucure JSON\r
+   Conversations = lists:foldr(\r
+      fun({struc, [{root, Racine}, {minimized, Reduit}]}, A) ->\r
+         % virage des messages qui n'existent pas\r
+         Message_exite = euphorik_bd:message_existe(Racine),\r
+         if Message_exite ->\r
+               [ {Racine, Reduit} | A];\r
+            true ->\r
+               A\r
+         end\r
        end,\r
+      [],\r
        Conversations_json\r
     ),\r
     %  TODO : pas très beau, mieux vaut construire un #user\r
@@ -134,7 +150,8 @@ profile(
           list_to_atom(Nick_format_str),\r
           View_times,\r
           View_tooltips,\r
-         Conversations) of\r
+         Conversations,\r
+         list_to_atom(Ostentatious_master)) of\r
        ok ->\r
           json_reponse_ok();\r
        login_deja_pris ->\r
@@ -658,8 +675,14 @@ json_reponse_login_ok(User) ->
           {nick_format, atom_to_list(User#user.nick_format)},\r
           {view_times, User#user.view_times},\r
           {view_tooltips, User#user.view_tooltips},\r
-         {conversations, {array, User#user.conversations } },\r
-         {ek_master, User#user.ek_master}\r
+         {conversations, {array, lists:map(\r
+            fun({Racine, Reduit}) ->\r
+               {struct, [{root, Racine}, {minimized, Reduit}]}\r
+            end,\r
+            User#user.conversations\r
+         )}},\r
+         {ek_master, User#user.ek_master},\r
+         {ostentatious_master, atom_to_list(User#user.ostentatious_master)}\r
        ]\r
     }.\r
     \r
@@ -692,5 +715,6 @@ json_message(Mess, Repond_a, User) ->
           end,\r
           Repond_a\r
        )}},\r
-      {ek_master, User_mess#user.ek_master}\r
+      {ek_master, User_mess#user.ek_master},\r
+      {ostentatious_master, atom_to_list(User_mess#user.ostentatious_master)}\r
     ]}.\r
diff --git a/modules/include/euphorik_bd.hrl b/modules/include/euphorik_bd.hrl

index b779583..1a12872 100755 (executable)
--- a/modules/include/euphorik_bd.hrl
+++ b/modules/include/euphorik_bd.hrl
@@ -74,9 +74,10 @@
        nick_format = nick, %atom(), peut valoir 'nick', 'login' ou 'nick_login'
        view_times = true,
        view_tooltips = true,
+      ostentatious_master = light, % peut valoir invisible, light ou heavy. seulement pour ek_master
        message_order = reverse, % can be normal or reverse
        indice_flood = 0, % integer() est incrémenté lorsque l'utilisateur envoie trop rapidement des messages.
-      conversations = [], % [integer()], la liste des messages correspondant au conversation
+      conversations = [], % [{integer(), bool}], la liste des messages correspondant au conversation {racine, reduite?}
        ek_master = false,
        last_ip = undefined % integer(), undefined si inconnu
     }).
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml

index 3212e36..da5c656 100644 (file)
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -4,8 +4,8 @@
          <file>
              <url>js/pageMinichat.js</url>
              <line>237</line>
-            <line>901</line>
-            <line>1150</line>
+            <line>906</line>
+            <line>1155</line>
          </file>
      </editor-bookmarks>
  </project-private>
author	Greg Burri <greg.burri@gmail.com>
	Sat, 28 Jun 2008 23:09:58 +0000 (23:09 +0000)
committer	Greg Burri <greg.burri@gmail.com>
	Sat, 28 Jun 2008 23:09:58 +0000 (23:09 +0000)
css/1/euphorik.css		patch \| blob \| history
css/1/pageMinichat.css		patch \| blob \| history
doc/TODO.txt		patch \| blob \| history
doc/graphiques/maquette_1.svg		patch \| blob \| history
doc/protocole3.txt		patch \| blob \| history
img/css1/logo_ek_master.png	[new file with mode: 0644]	patch \| blob
img/css1/marque_ek.png	[new file with mode: 0644]	patch \| blob
index.yaws		patch \| blob \| history
js/euphorik.js		patch \| blob \| history
js/pageMinichat.js		patch \| blob \| history
js/pageProfile.js		patch \| blob \| history
modules/erl/euphorik_bd.erl		patch \| blob \| history
modules/erl/euphorik_bd_update.erl		patch \| blob \| history
modules/erl/euphorik_daemon.erl		patch \| blob \| history
modules/erl/euphorik_protocole.erl		patch \| blob \| history
modules/include/euphorik_bd.hrl		patch \| blob \| history
nbproject/private/private.xml		patch \| blob \| history