X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2FpageMinichat.js;h=c46b82ddfa077b7f07341c8aa922a090832f8e4e;hp=45d7242da6685f2201b3511332efedc8249d48c9;hb=a193d10c45d8226937c91a17dc588e4f6f1586fd;hpb=84a86204f1f87a6b898975bc1d817130c7168a7c

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index 45d7242..c46b82d 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -9,7 +9,7 @@
 // (at your option) any later version.
 //
 // Euphorik is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FIAller à la première pageTNESS FOR A PARTICULAR PURPOSE.  See the
+// 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.
 //
@@ -60,24 +60,28 @@ PageMinichat.prototype.charger = function()
    // les outils de bannissement (uniquement pour les ekMaster)
    if (this.client.ekMaster)
    {    
-      $("body").append(
+      $(
          '<div id="outilsBan">' +
          '<form action=""><p><input id="raison" name="raison" type="text" size="10" maxlength="200"></input></p></form>' +
          '<img id="ban" src="img/ban.gif" alt="Ban de 3 jours" />' +
          '<img id="kick" src="img/kick.gif" alt="Ban de 15min" />' +
          '<img id="slap" src="img/slap.gif" alt="Avertissement" />' +
          '</div>'
-      )
-      $("#outilsBan").hover(
+      ).hover(
          function(){},
          function()
          {
             $("#outilsBan").hide()
          }
-      )
+      ).appendTo("body")
+      
+      this.util.infoBulle("Slap", $("#outilsBan #slap"))
+      this.util.infoBulle("Kick (" + conf.tempsKick + "min)", $("#outilsBan #kick"))
+      this.util.infoBulle("Ban (" + conf.tempsBan / 24 / 60 + " jours)", $("#outilsBan #ban"))
+      this.util.infoBulle("La raison", $("#outilsBan input"))
    }
    
-   this.util.infoBulle("Ouvrir la conversation liée au troll de la semaine", $("#trollCourant")) 
+   this.util.infoBulle("Ouvrir la conversation liée au troll de la semaine", $("#trollCourant .troll")) 
 
    // <smiles>
    $("body").append("<div id=\"smiles\"></div>")
@@ -223,7 +227,7 @@ PageMinichat.prototype.envoyerMessage = function(pseudo, message)
       
    this.client.pseudo = pseudo
    
-   ;;; dumpObj(this.getJSONMessage(pseudo, message, repondA))
+   ;; dumpObj(this.getJSONMessage(pseudo, message, repondA))
    jQuery.ajax(
       {
          url : "request", 
@@ -236,7 +240,7 @@ PageMinichat.prototype.envoyerMessage = function(pseudo, message)
          },
          success : function(data, textStatus)
          {
-            ;;; dumpObj(data)
+            ;; dumpObj(data)
          
             if(data["reply"] == "ok")
             {  
@@ -522,7 +526,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
          for (var id in message.repondA)
          {
             if (!debut) XHTMLrepondA += ", "
-            dumpObj(message.repondA.count)
+            ;; dumpObj(message.repondA.count)
             XHTMLrepondA += this.formateur.traitementComplet(message.repondA[id].pseudo)
             debut = false
          }
@@ -538,7 +542,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                (this.messages[i].ekMaster ? " ekMaster" : "") +
             "\">" +
                "<div class=\"extraire\"></div><span class=\"entete\">" +
-               "[<span class=\"date\">" + message.date + "</span>]" +
+               "<span class=\"dateComplete\">[<span class=\"date\">" + message.date + "</span>]</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>" +
@@ -567,6 +571,11 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
             }
          )
          
+         if (thisConversation.client.viewTimes)
+            $(".dateComplete", this).show()
+         else
+            $(".dateComplete", this).hide()
+         
          $("a[@rel*=lightbox]", this).lightBox()
          
          // les outils de bannissement (uniquement pour les ekMaster)
@@ -579,12 +588,13 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                   var h = element.height()
                   var offset = element.offset()
                   var outils = $("#outilsBan").css("top", offset.top - 2).css("left", offset.left - 2).height(h < 16 ? 16 : h).width(element.width() + 16 * 3 + 4 + 64).show()
-                  $("img", outils).unbind()
+                  $("img", outils).unbind("click")
                   $("#slap", outils).click(
                      function(e)
                      {
                         thisConversation.client.slap(userId, $("#outilsBan input").val())
                         $("#outilsBan input").val("")
+                        $("#outilsBan").hide()
                      }
                   )
                   $("#kick", outils).click(
@@ -592,6 +602,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                      {
                         thisConversation.client.kick(userId, $("#outilsBan input").val())
                         $("#outilsBan input").val("")
+                        $("#outilsBan").hide()
                      }
                   )
                   $("#ban", outils).click(
@@ -599,6 +610,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                      {
                         thisConversation.client.ban(userId, $("#outilsBan input").val())
                         $("#outilsBan input").val("")
+                        $("#outilsBan").hide()
                      }
                   )
                },
@@ -943,7 +955,7 @@ Messages.prototype.rafraichirMessages = function(vider)
          {
             case "new_troll" :
                thisMessages.trollIdCourant = data["troll_id"]
-               $("#trollCourant .troll").html(thisMessages.formateur.traitementComplet(data["content"])).unbind().click(
+               $("#trollCourant .troll").html(thisMessages.formateur.traitementComplet(data["content"])).unbind("click").click(
                   function()
                   {
                      thisMessages.ouvrirConversation(data["message_id"])