Merge pull request #324 from retropc/master

[irc/quakenet/qwebirc.git] / js / ui / theme.js

diff --git a/js/ui/theme.js b/js/ui/theme.js
index 78c43d630fe071f760513e2b1c4ddb1e15af4fc3..beffc0b84eab3de9cfd15e1c8350b3b777d9fa84 100644 (file)
--- a/js/ui/theme.js
+++ b/js/ui/theme.js
@@ -32,18 +32,18 @@ qwebirc.ui.themes.Default = {
   "INVITE": ["$N invites you to join $c", true],
   "HILIGHT": ["$C4"],
   "HILIGHTEND": ["$O"],
-  "CHANMSG": ["<${$@$($N$)$}> $m"],
+  "CHANMSG": ["<$C15$@$O${$($N$)$}> $m"],
   "PRIVMSG": ["<$($N$)> $m"],
   "CHANNOTICE": ["-${$($N$)$}:$c- $m"],
   "PRIVNOTICE": ["-$($N$)- $m"],
-  "OURCHANMSG": ["<$@$N> $m"],
-  "OURPRIVMSG": ["<$N> $m"],
+  "OURCHANMSG": ["<$C15$@$O$U$N$O> $m"],
+  "OURPRIVMSG": ["<$U$N$O> $m"],
   "OURTARGETEDMSG": ["*$[$t$]* $m"],
   "OURTARGETEDNOTICE": ["[notice($[$t$])] $m"],
   "OURCHANNOTICE": ["-$N:$t- $m"],
   "OURPRIVNOTICE": ["-$N- $m"],
-  "OURCHANACTION": [" * $N $m"],
-  "OURPRIVACTION": [" * $N $m"],
+  "OURCHANACTION": [" * $U$N$O $m"],
+  "OURPRIVACTION": [" * $U$N$O $m"],
   "CHANACTION": [" * ${$($N$)$} $m"],
   "PRIVACTION": [" * $($N$) $m"],
   "CHANCTCP": ["$N [$h] requested CTCP $x from $c: $m"],
@@ -75,7 +75,20 @@ qwebirc.ui.themes.Default = {
   "IGNOREHEADER": ["Ignore list:", false],
   "IGNOREENTRY": ["- $h", false],
   "IGNOREEMPTY": ["Ignore list is empty.", false],
-  "SILENCE": ["Silenced: $h", false]
+  "SILENCE": ["Silenced: $h", false],
+
+  "NOTIFYCHANMSGTITLE": ["Mentioned on $c:", false],
+  "NOTIFYCHANMSGBODY": ["<$@$n> $m", false],
+  "NOTIFYCHANACTIONTITLE": ["Mentioned on $c:", false],
+  "NOTIFYCHANACTIONBODY": [" * $n $m", false],
+  "NOTIFYPRIVMSGTITLE": ["Private message from $n:", false],
+  "NOTIFYPRIVMSGBODY": ["$m", false],
+  "NOTIFYPRIVACTIONTITLE": ["Private message from $n:", false],
+  "NOTIFYPRIVACTIONBODY": [" * $n $m", false],
+  "NOTIFYCHANNOTICETITLE": ["Mentioned on $c:", false],
+  "NOTIFYCHANNOTICEBODY": ["-$n- $m", false],
+  "NOTIFYPRIVNOTICETITLE": ["Private notice from $n:", false],
+  "NOTIFYPRIVNOTICEBODY": ["$m", false]
 };
 
 qwebirc.ui.Theme = new Class({