Luv added

hamen · Mar 6, 2010 · de7a6d2 · de7a6d2
1 parent 9ab8a9e
commit de7a6d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/app/chat-pp.xhtml b/app/chat-pp.xhtml
@@ -101,19 +101,21 @@
           <li><img src="emoticons/hmm.png"/></li>
           <li><img src="emoticons/kiss.png"/></li>
 	  <li><img src="emoticons/laugh.png"/></li>
+	  <li><img src="emoticons/luv.png"/></li>
           <li><img src="emoticons/monkey.png"/></li>
+	  <li><img src="emoticons/panic.png"/></li>
           <li><img src="emoticons/plain.png"/></li>
           <li><img src="emoticons/sad.png"/></li>
+	  <li><img src="emoticons/slobber.png"/></li>
+	  <li><img src="emoticons/smile.png"/></li>
           <li><img src="emoticons/smile-big.png"/></li>
           <li><img src="emoticons/surprise.png"/></li>
-          <li><img src="emoticons/wink.png"/></li>
 	  <li><img src="emoticons/V.png"/></li>
+          <li><img src="emoticons/wink.png"/></li>
 	  <li><img src="emoticons/drop.png"/></li>
 	  <li><img src="emoticons/gulp.png"/></li>
 	  <li><img src="emoticons/oll.png"/></li>
-	  <li><img src="emoticons/panic.png"/></li>
 	  <li><img src="emoticons/shit.png"/></li>
-	  <li><img src="emoticons/slobber.png"/></li>
 	  <li><img src="emoticons/vomit.png"/></li>
 	  <li><img src="emoticons/zzz.png"/></li>
 	  <li><img src="emoticons/tongue.png"/></li>

diff --git a/app/emoticons/luv.png b/app/emoticons/luv.png
diff --git a/app/lib/display_filters.js b/app/lib/display_filters.js
@@ -155,6 +155,7 @@ function processEmoticons(xmlMessageBody) {
         '(laugh)':	 'laugh',
         'lol':	 'laugh',
         'LOL':	 'laugh',
+        '(luv)':	 'luv',
 	'(v)':	 'V',
 	'(gulp)':	 'gulp',
 	'(panic)':	 'panic',

diff --git a/app/style/chat.css b/app/style/chat.css
@@ -432,6 +432,7 @@ body.icons-on .smiley-heart      { background: url(../emoticons/heart.png); }
 body.icons-on .smiley-hmm        { background: url(../emoticons/hmm.png); }
 body.icons-on .smiley-kiss       { background: url(../emoticons/kiss.png); }
 body.icons-on .smiley-laugh      { background: url(../emoticons/laugh.png); }
+body.icons-on .smiley-luv        { background: url(../emoticons/luv.png); }
 body.icons-on .smiley-monkey     { background: url(../emoticons/monkey.png); }
 body.icons-on .smiley-plain      { background: url(../emoticons/plain.png); }
 body.icons-on .smiley-sad        { background: url(../emoticons/sad.png); }
@@ -449,7 +450,6 @@ body.icons-on .smiley-panic      { background: url(../emoticons/panic.png); back
 body.icons-on .smiley-shit       { background: url(../emoticons/shit.png); background-repeat:no-repeat; background-position:bottom left; }
 body.icons-on .smiley-vomit      { background: url(../emoticons/vomit.png); background-repeat:no-repeat; background-position:bottom left; }
 body.icons-on .smiley-zzz        { background: url(../emoticons/zzz.png); background-repeat:no-repeat; background-position:bottom left; }
-body.icons-on .smiley-tongue     { background: url(../emoticons/tongue.png); background-repeat:no-repeat; background-position:bottom left;}
 
 /* SOCKET */