From: Greg Burri <greg.burri@gmail.com>
Date: Fri, 10 Oct 2008 21:30:04 +0000 (+0000)
Subject: ADD #89 (/osef)
X-Git-Tag: 1.1.3~5
X-Git-Url: http://git.euphorik.ch/index.cgi?a=commitdiff_plain;h=c8e862a96eedcf1b996035b6b0e8a0c36e9a0cde;p=euphorik.git

ADD #89 (/osef)
FIX #87 (un bug trainait)
---

diff --git a/js/pageMinichat/commandes.js b/js/pageMinichat/commandes.js
index 014b9bb..3609e0d 100644
--- a/js/pageMinichat/commandes.js
+++ b/js/pageMinichat/commandes.js
@@ -71,6 +71,14 @@ euphorik.Commandes.liste = {
          pageMinichat.envoyerMessage("C'est pas faux");
          return [euphorik.Commandes.statut.ok, ''];
       }
+   },
+   "osef" : {
+      description : "Envoie le message \"On s'en fout !\"",
+      usage : "/osef",
+      exec : function(args, client, pageMinichat) {
+         pageMinichat.envoyerMessage("On s'en fout !");
+         return [euphorik.Commandes.statut.ok, ''];
+      }
    }
 };
 
diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 24768ea..3706f68 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -744,7 +744,7 @@ json_message(Mess, Repond_a, User) ->
    {struct, [
       {id, Mess#minichat.id},
       {user_id, User_mess#user.id},
-      {date, format_date(Mess#minichat.date)},
+      {date, case Mess#minichat.date of undefined -> "?"; _ -> format_date(Mess#minichat.date) end},
       {system, Mess#minichat.auteur_id =:= 0},
       {owner, Est_proprietaire},
       {answered, A_repondu_a_message},
diff --git a/styles/1/pageMinichat.css b/styles/1/pageMinichat.css
index de908dd..cf0be13 100755
--- a/styles/1/pageMinichat.css
+++ b/styles/1/pageMinichat.css
@@ -90,6 +90,12 @@
 	padding-left: 10px;
 }
 
+#page.minichat form#posterMessage > input,
+#page.minichat form#posterMessage > span,
+#page.minichat form#posterMessage > button{
+	vertical-align: middle;
+}
+
 #page.minichat.orderReverse form#posterMessage {
 	padding-bottom: 10px;
 }
@@ -116,7 +122,6 @@
 	background-image: url(img/return.png);
 	background-repeat: no-repeat;
 	background-position: 5px 2px;
-	vertical-align: top;
 	margin-right: 5px;
 }
 #page.minichat form#posterMessage .smiles {
@@ -125,7 +130,6 @@
 	background-image: url(../../img/bouton_smiles.png);
 	background-repeat: no-repeat;
 	background-position: 2px 2px;
-	vertical-align: top;
 	margin-right: 5px;
 }
 /* La boite montrant les messages auquels l'utilisateur répond */