Skip to content

Commit

Permalink
Ajout du smiley " :B " (#4951)
Browse files Browse the repository at this point in the history
* Ajout de l'image du smiley " :B "

* Ajout du smiley " :B "

* Ajout de " :B " et " ^(;,;)^ " dans l'éditeur.

* Modification pour le coverage

* Update editor.js

* camelcase
  • Loading branch information
A-312 authored and pierre-24 committed Aug 3, 2018
1 parent 5676e1b commit e0f774c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion assets/js/editor.js
Expand Up @@ -115,7 +115,8 @@
smiley_ri: { title: ":lol:", start: ":lol:", end: "", image: "/static/smileys/rire.gif" },
smiley_un: { title: ":euh:", start: ":euh:", end: "", image: "/static/smileys/unsure.gif" },
smiley_tr: { title: ":(", start: ":(", end: "", image: "/static/smileys/triste.png" },
smiley_hu: { title: ":o", start: ":o", end: "", image: "/static/smileys/huh.png" }
smiley_hu: { title: ":o", start: ":o", end: "", image: "/static/smileys/huh.png" },
smiley_ib: { title: ":B", start: ":B", end: "", image: "/static/smileys/b.png" }
},
1: {
smiley_c1: { title: ":colere2:", start: ":colere2:", end: "", image: "/static/smileys/mechant.png" },
Expand Down
Binary file added assets/smileys/b.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions zds/utils/templatetags/smileys_def.py
Expand Up @@ -9,6 +9,7 @@
'smile.png': (':)', ':-)', ),
'heureux.png': (':D', ':-D', ),
'clin.png': (';)', ';-)', ),
'b.png': (':B', ),
'langue.png': (':p', ':P', ':-p', ':-P', ),
'rire.gif': (':lol:', ),
'unsure.gif': (':euh:', ),
Expand Down

0 comments on commit e0f774c

Please sign in to comment.