FIX problème de mise à jour du profile

FIX bug de mise en évidence d'une conversation

diff --git a/css/1/pageMinichat.css b/css/1/pageMinichat.css
index a352ff9..539eb3f 100755 (executable)
--- a/css/1/pageMinichat.css
+++ b/css/1/pageMinichat.css
@@ -288,7 +288,6 @@
 #page.minichat div.message.ekMasterlight .pseudo {
        color: #f0df95
 }
-
 #page.minichat div.message.ekMasterheavy .pseudo {
    color: #fcd82f;
    padding-left: 14px;

diff --git a/css/2/euphorik.css b/css/2/euphorik.css
index df54431..22a533f 100755 (executable)
--- a/css/2/euphorik.css
+++ b/css/2/euphorik.css
@@ -1,28 +1,28 @@
 /* coding: utf-8 */
-\r
+
 @import url(pageMinichat.css);
-@import url(pageAdmin.css);\r
+@import url(pageAdmin.css);
 @import url(pageProfileRegister.css);
 @import url(pageAbout.css);
-\r
-* {\r
-       padding: 0px;\r
-       margin: 0px;\r
-}\r
-\r
-body {\r
-   font-family: sans-serif;\r
+
+* {
+       padding: 0px;
+       margin: 0px;
+}
+
+body {
+   font-family: monospace;
    font-size: 12px;
-   color: #EEEEEE;\r
-   background-color: #DFDFDF;\r
-   background-image: url(../../img/css2/fond.png)\r
-}\r
-\r
-#container {\r
-   height: auto;\r
-   margin-left: 10px;\r
-   margin-right: 10px;\r
-   margin-top: 40px;\r
+   color: #EEEEEE;
+   background-color: #DFDFDF;
+   background-image: url(../../img/css2/fond.png)
+}
+
+#container {
+   height: auto;
+   margin-left: 10px;
+   margin-right: 10px;
+   margin-top: 40px;
 }
 
 /***** Menu *****/
@@ -106,7 +106,7 @@ ul#menu {
    position: absolute;
    top: 20px;
    left: 4px;
-}\r
+}
 
 /***** Le pied de page *****/
 #footer {
@@ -120,18 +120,18 @@ ul#menu {
 }
 #footer span{
        margin-right: 10px;
-}\r
+}
 
-/***** La boite d'information (s'apparente à une MessageBox) *****/\r
+/***** La boite d'information (s'apparente à une MessageBox) *****/
 div#info {
-       text-align: center;\r
-       width:100%;\r
-       position: fixed;\r
-       left: 0px;\r
-       top: 0px;\r
+       text-align: center;
+       width:100%;
+       position: fixed;
+       left: 0px;
+       top: 0px;
        background-color: #000000;
-       border-bottom: 1px solid #aeaeae;\r
-       z-index: 20;\r
+       border-bottom: 1px solid #aeaeae;
+       z-index: 20;
 }
 div#info div.fermer {
        float:right;
@@ -189,9 +189,9 @@ div#info .boutons div:hover {
        padding: 3px 6px;
 }
 
-/***** Le faux captcha *****/\r
-.captcha {\r
-       display:none\r
+/***** Le faux captcha *****/
+.captcha {
+       display:none
 }
 
 /***** Les formulaires *****/
@@ -213,18 +213,18 @@ form input[readonly] {
        background-color: #484e46
 }
 
-/***** Les liens *****/\r
-.lien, a {\r
+/***** Les liens *****/
+.lien, a {
    text-decoration: none;
-       color: #7664ff;\r
+       color: #7664ff;
 }
 .lien {
        cursor: pointer;
-}\r
-a:link, a:visited {\r
-       color: #7664ff;\r
-}\r
-.lien:hover, .lien:active, a:hover, a:active {\r
-   color: #ffad0f;\r
-}\r
-\r
+}
+a:link, a:visited {
+       color: #7664ff;
+}
+.lien:hover, .lien:active, a:hover, a:active {
+   color: #ffad0f;
+}
+

diff --git a/css/2/pageMinichat.css b/css/2/pageMinichat.css
index f0e4785..bf27f96 100755 (executable)
--- a/css/2/pageMinichat.css
+++ b/css/2/pageMinichat.css
@@ -221,9 +221,14 @@
    font-weight: bold;
    color: #76ff33;
 }
-#page.minichat div.message.ekMaster .pseudo {
+#page.minichat div.message.ekMasterlight .pseudo {
        color: #ffffff;
 }
+#page.minichat div.message.ekMasterheavy .pseudo {
+       color: #ffffff;
+   text-decoration: underline
+}
+
 #page.minichat div.message .pseudo .login {
    margin-left: 2px;
    font-size: 8px;

diff --git a/doc/graphiques/maquette_1.svg b/doc/graphiques/maquette_1.svg
index f1ba88e..082335c 100644 (file)
--- a/doc/graphiques/maquette_1.svg
+++ b/doc/graphiques/maquette_1.svg
@@ -31,7 +31,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="2.0000001"
      inkscape:cx="261.23852"
-     inkscape:cy="932.02611"
+     inkscape:cy="972.02611"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -556,8 +556,8 @@
        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
        transform="matrix(0.2872886,0,0,0.2872886,-7.7117438,-40.627481)"
-       inkscape:export-ydpi="138.63565"
-       inkscape:export-xdpi="138.63565"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
        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"
        sodipodi:ry="131.82491"
@@ -579,8 +579,8 @@
        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
        inkscape:export-filename="/tmp/plop.png"
-       inkscape:export-ydpi="138.63565"
-       inkscape:export-xdpi="138.63565"
+       inkscape:export-ydpi="138.63892"
+       inkscape:export-xdpi="138.63892"
        sodipodi:nodetypes="ccccccccccccccccccccc"
        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"
@@ -678,7 +678,7 @@
        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"
+       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"
        sodipodi:ry="131.82491"
        sodipodi:rx="131.82491"
@@ -688,7 +688,7 @@
        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-filename="/tmp/plop.png"
        inkscape:export-ydpi="138.63892"
        inkscape:export-xdpi="138.63892"
        sodipodi:nodetypes="ccccccccccccccccccccc"
@@ -698,7 +698,7 @@
     <path
        inkscape:export-ydpi="138.63892"
        inkscape:export-xdpi="138.63892"
-       inkscape:export-filename="/home/gburri/projets/euphorik/trunk/img/css1/marque_ek.png"
+       inkscape:export-filename="/tmp/plop.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" />

diff --git a/js/euphorik.js b/js/euphorik.js
index 7e611db..8518495 100755 (executable)
--- a/js/euphorik.js
+++ b/js/euphorik.js
@@ -602,7 +602,8 @@ Client.prototype.resetDonneesPersonnelles = function()
    // les conversations, une conversation est un objet possédant les attributs suivants :
    // - root (entier)
    // - page (entier)
-   this.conversations = new Array()
+   // - reduit (bool)
+   this.conversations = []
 }
 
 Client.prototype.setCss = function(css)
@@ -665,7 +666,7 @@ Client.prototype.ajouterConversation = function(racine)
       if (this.conversations[i].root == racine)
          return false
    
-   this.conversations.push({root : racine, page : 1})
+   this.conversations.push({root : racine, page : 1, reduit : false})
    if (this.autoflush) this.flush(true)
    
    return true

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index 574dedd..8dc7b00 100755 (executable)
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -98,7 +98,7 @@ PageMinichat.prototype.charger = function()
       {
          var opacityBase = $(this).css("opacity")
          $(this).click(
-            function(event)
+            function()
             {
                thisPage.util.replaceSelection($("form#posterMessage input.message")[0], thisPage.formateur.smiles[$(this).attr("class")][0].source.replace(/\\/g, ""))
             }
@@ -355,21 +355,24 @@ Message.prototype.getConversation = function(messages)
       if (messages.messages[i].repondA.hasOwnProperty(this.id))
          messagesEnEvidence[messages.messages[i].id] = 2
    
-   var premierNiveau = true
-   var f = function(tabIds)
+   // parcours en 
+   var f = function(tabIds, premierNiveau)
    {
       for(var id in tabIds)
       {
+         // si le message (id) a déjà été traité
+         if (messagesEnEvidence[id] != undefined && !premierNiveau)
+            continue
+           
          var message = messages.messagesParId[id]
          if (message != undefined)
          {         
             messagesEnEvidence[id] = premierNiveau ? 3 : (message.auteurId == thisMessage.auteurId ? 1 : 0)
-            premierNiveau = false
-            f (message.repondA)
+            f (message.repondA, false)
          }
       }
    }
-   f(this.repondA)
+   f(this.repondA, true)
    
    return messagesEnEvidence
 }

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 3f9d7a1..dbad874 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -127,7 +127,7 @@ profile(
 ) ->\r
    % décomposition de la strucure JSON\r
    Conversations = lists:foldr(\r
-      fun({struc, [{root, Racine}, {minimized, Reduit}]}, A) ->\r
+      fun({struct, [{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

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index da5c656..1e0dcc1 100644 (file)
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1">
+        <file>
+            <url>modules/erl/euphorik_protocole.erl</url>
+            <line>677</line>
+        </file>
         <file>
             <url>js/pageMinichat.js</url>
             <line>237</line>
-            <line>906</line>
-            <line>1155</line>
+            <line>907</line>
+            <line>1156</line>
         </file>
     </editor-bookmarks>
 </project-private>