X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=js%2FpageMinichat.js;h=19fadb06a11ac084e7faa2288f2265fd07c10fc3;hb=874434add86031d5f23991e78fb2072eac996458;hp=42314d18945d465609c6d4ca7a0614be7aa3cde0;hpb=3ea24df62da92d25d5479d26782c317439b0bc72;p=euphorik.git

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index 42314d1..19fadb0 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -9,8 +9,8 @@
 // (at your option) any later version.
 //
 // Euphorik is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
@@ -76,6 +76,8 @@ PageMinichat.prototype.charger = function()
          }
       )
    }
+   
+   this.util.infoBulle("Ouvrir la conversation liée au troll de la semaine", $("#trollCourant")) 
 
    // <smiles>
    $("body").append("<div id=\"smiles\"></div>")
@@ -240,9 +242,9 @@ PageMinichat.prototype.envoyerMessage = function(pseudo, message)
             {  
                $("form input.message").val("")
                         
-               // met à jour la classe des messages auquel repond celui ci (c'est un peu de la triche)
+               // met à jour la classe des messages auquel repond celui ci (c'est un peu de la triche) TODO : ya mieux ?
                for (var i = 0; i < repondA.length; i++)
-                  $("#conversations div#" + repondA[i]).addClass("repondu")
+                  $("#conversations div#mess" + repondA[i].toString(36)).addClass("repondu")
             }
             else if (data["reply"] == "error")
             {
@@ -375,12 +377,19 @@ function Conversation(num, util, formateur, client)
    $("#conversations").append(
       '<div id="' + this.getId() + '" class="conversation">\
       <div class="titre">' +
-         (num == 0 ? '' : '<div class="fermer">x</div><div class="lien">c</div>') +
+         (num == 0 ? '' : '<div class="fermer"></div><div class="lien"></div>') +
          '<span class="next">&lt;</span><span class="numPage">1</span><span class="prev">&gt;</span>\
          </div>\
       </div>'
    )
    
+   this.util.infoBulle("Aller à la première page", $("#conversations #" + this.getId() + " .numPage"))
+   if (num != 0)
+   {
+      this.util.infoBulle("Créer un lien vers la conversation", $("#conversations #" + this.getId() + " .lien"))
+      this.util.infoBulle("Fermer la conversation", $("#conversations #" + this.getId() + " .fermer"))   
+   }
+   
    // enlève la mise en évidence pour la conversation
    $("#conversations #" + this.getId()).hover(
       function(){},
@@ -509,9 +518,16 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
             this.formateur.traitementComplet(message.pseudo) + "<span class=\"login\">(" + this.formateur.traitementComplet(message.login) +")</span>" )
          
          var XHTMLrepondA = ""
+         var debut = true
          for (var id in message.repondA)
-            XHTMLrepondA += this.formateur.traitementComplet(message.repondA[id].pseudo) + "&gt; "
-         XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span>"
+         {
+            if (!debut) XHTMLrepondA += ", "
+            dumpObj(message.repondA.count)
+            XHTMLrepondA += this.formateur.traitementComplet(message.repondA[id].pseudo)
+            debut = false
+         }
+         if (XHTMLrepondA != "")
+            XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span><span class=\"delimitationRepondA\"></span>"
          
          XHTML += 
             "<div id=\"mess" + message.id.toString(36) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
@@ -521,9 +537,9 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                (this.messages[i].systeme ? " systeme" : "") +
                (this.messages[i].ekMaster ? " ekMaster" : "") +
             "\">" +
-               "<div class=\"extraire\">&gt;</div>" +
+               "<div class=\"extraire\"></div><span class=\"entete\">" +
                "[<span class=\"date\">" + message.date + "</span>]" +
-               "<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + message.auteurId + "</span class=\"ident\">" + identifiant + "</span>:" +
+               "<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + message.auteurId + "</span class=\"ident\">" + identifiant + "</span></span><span class=\"delimitationEntete\"></span>" +
                XHTMLrepondA +
                "<span class=\"contenu\">" + this.formateur.traitementComplet(message.contenu, message.pseudo) + "</span>" +
             "</div>"
@@ -537,9 +553,6 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
    if (nbMessagesAffiche > this.nbMessageMax)
       $("#conversations #" + this.getId() + " .message").slice(this.nbMessageMax, nbMessagesAffiche).empty()
    
-   
-   //.filter(function(){ return parseInt($(this).attr("id").substr(4), 36) > thisConversation.idDernierMessageAffiche })
-   
    var DOM = $(XHTML)
    DOM.each(
       function()
@@ -592,6 +605,8 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                function(){}
             )
          
+         thisConversation.util.infoBulle("Extraction de la conversation", $(".extraire", this))
+         
          $(this).click(
             function(event)
             {
@@ -852,8 +867,11 @@ Messages.prototype.supprimerConversation = function(num)
   */
 Messages.prototype.ajusterLargeurConversations = function()
 {
-   // le "- 0.01" evite que IE se chie dessus lamentablement et affiche les conversations les unes au dessus des autres
-   $("#conversations .conversation").css("width", (100 / this.conversations.length) - 0.01 + "%")
+   var largeurPourcent = (100 / this.conversations.length)   
+   // le "- 0.01" evite que IE se chie dessus lamentablement et affiche les conversations les unes au dessus des autres
+   if($.browser["msie"])
+      largeurPourcent -= 0.01
+   $("#conversations .conversation").css("width", largeurPourcent + "%")
 }
 
 /**