From aad757e50ae4a0144e58fd06c98d8ddb8562b15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Tue, 10 May 2016 19:17:52 -0400 Subject: [PATCH] Fix missing colors in action messages --- client/css/style.css | 1 + client/themes/crypto.css | 1 + client/themes/morning.css | 2 ++ client/themes/zenburn.css | 2 ++ client/views/actions/action.tpl | 2 +- client/views/actions/ctcp.tpl | 2 +- client/views/actions/invite.tpl | 4 ++-- client/views/actions/join.tpl | 2 +- client/views/actions/kick.tpl | 4 ++-- client/views/actions/mode.tpl | 2 +- client/views/actions/nick.tpl | 4 ++-- client/views/actions/part.tpl | 2 +- client/views/actions/quit.tpl | 2 +- client/views/actions/topic.tpl | 2 +- client/views/actions/topic_set_by.tpl | 4 +++- client/views/actions/whois.tpl | 12 ++++++------ 16 files changed, 28 insertions(+), 20 deletions(-) diff --git a/client/css/style.css b/client/css/style.css index 315eddb6..cd071a0c 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -747,6 +747,7 @@ button, } #chat.no-colors .from .user, +#chat.no-colors .text .user, #chat.no-colors .sidebar .user { color: #50a656 !important; } diff --git a/client/themes/crypto.css b/client/themes/crypto.css index a4106a4f..02716e1a 100644 --- a/client/themes/crypto.css +++ b/client/themes/crypto.css @@ -113,6 +113,7 @@ a:hover, } #chat.no-colors .from .user, +#chat.no-colors .text .user, #chat.no-colors .sidebar .user { color: #000 !important; font-weight: bold; diff --git a/client/themes/morning.css b/client/themes/morning.css index c4e7a2e8..900fc0e3 100644 --- a/client/themes/morning.css +++ b/client/themes/morning.css @@ -93,11 +93,13 @@ QUIT #d0907d /* Nicknames */ #chat.no-colors .from .user, +#chat.no-colors .text .user, #chat.no-colors .sidebar .user { color: #b0bacf !important; } #chat.no-colors .from .user:hover, +#chat.no-colors .text .user:hover, #chat.no-colors .sidebar .user:hover { color: #fefefe !important; } diff --git a/client/themes/zenburn.css b/client/themes/zenburn.css index e6e1b635..e92187f9 100644 --- a/client/themes/zenburn.css +++ b/client/themes/zenburn.css @@ -123,11 +123,13 @@ body { /* Nicknames */ #chat.no-colors .from .user, +#chat.no-colors .text .user, #chat.no-colors .sidebar .user { color: #bc8cbc !important; } #chat.no-colors .from .user:hover, +#chat.no-colors .text .user:hover, #chat.no-colors .sidebar .user:hover { color: #dcdccc !important; } diff --git a/client/views/actions/action.tpl b/client/views/actions/action.tpl index 1fcced98..f840a9ce 100644 --- a/client/views/actions/action.tpl +++ b/client/views/actions/action.tpl @@ -1,2 +1,2 @@ -{{mode}}{{from}} +{{mode}}{{from}} {{{parse text}}} diff --git a/client/views/actions/ctcp.tpl b/client/views/actions/ctcp.tpl index dd4e95d9..444ffdef 100644 --- a/client/views/actions/ctcp.tpl +++ b/client/views/actions/ctcp.tpl @@ -1,2 +1,2 @@ -{{from}} +{{from}} {{ctcpType}} {{{parse ctcpMessage}}} diff --git a/client/views/actions/invite.tpl b/client/views/actions/invite.tpl index 6b9cecac..74098399 100644 --- a/client/views/actions/invite.tpl +++ b/client/views/actions/invite.tpl @@ -1,9 +1,9 @@ -{{from}} +{{from}} invited {{#if invitedYou}} you {{else}} - {{invited}} + {{invited}} {{/if}} to {{{parse channel}}} diff --git a/client/views/actions/join.tpl b/client/views/actions/join.tpl index 2eaf2a93..5e3f48c3 100644 --- a/client/views/actions/join.tpl +++ b/client/views/actions/join.tpl @@ -1,3 +1,3 @@ -{{mode}}{{from}} +{{mode}}{{from}} ({{hostmask}}) has joined the channel diff --git a/client/views/actions/kick.tpl b/client/views/actions/kick.tpl index e41feb16..8dc44a29 100644 --- a/client/views/actions/kick.tpl +++ b/client/views/actions/kick.tpl @@ -1,6 +1,6 @@ -{{mode}}{{from}} +{{mode}}{{from}} has kicked -{{target}} +{{target}} {{#if text}} ({{{parse text}}}) {{/if}} diff --git a/client/views/actions/mode.tpl b/client/views/actions/mode.tpl index 56b5aa97..c162ac2a 100644 --- a/client/views/actions/mode.tpl +++ b/client/views/actions/mode.tpl @@ -1,3 +1,3 @@ -{{mode}}{{from}} +{{mode}}{{from}} sets mode {{{parse text}}} diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl index 2481e914..dc168ffa 100644 --- a/client/views/actions/nick.tpl +++ b/client/views/actions/nick.tpl @@ -1,3 +1,3 @@ -{{mode}}{{nick}} +{{mode}}{{nick}} is now known as -{{mode}}{{new_nick}} +{{mode}}{{new_nick}} diff --git a/client/views/actions/part.tpl b/client/views/actions/part.tpl index fd2eb23f..36415248 100644 --- a/client/views/actions/part.tpl +++ b/client/views/actions/part.tpl @@ -1,4 +1,4 @@ -{{mode}}{{from}} +{{mode}}{{from}} ({{hostmask}}) has left the channel {{#if text}} diff --git a/client/views/actions/quit.tpl b/client/views/actions/quit.tpl index 3f0933f8..a373f659 100644 --- a/client/views/actions/quit.tpl +++ b/client/views/actions/quit.tpl @@ -1,4 +1,4 @@ -{{mode}}{{from}} +{{mode}}{{from}} ({{hostmask}}) has quit {{#if text}} diff --git a/client/views/actions/topic.tpl b/client/views/actions/topic.tpl index 92fe29ae..d79e3eb8 100644 --- a/client/views/actions/topic.tpl +++ b/client/views/actions/topic.tpl @@ -1,5 +1,5 @@ {{#if from}} - {{mode}}{{from}} + {{mode}}{{from}} has changed the topic to: {{else}} The topic is: diff --git a/client/views/actions/topic_set_by.tpl b/client/views/actions/topic_set_by.tpl index 120c757d..9a31e293 100644 --- a/client/views/actions/topic_set_by.tpl +++ b/client/views/actions/topic_set_by.tpl @@ -1 +1,3 @@ -Topic set by {{mode}}{{nick}} on {{localeDate when}} +Topic set by +{{mode}}{{nick}} +on {{localeDate when}} diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl index ced3326b..7f8f5112 100644 --- a/client/views/actions/whois.tpl +++ b/client/views/actions/whois.tpl @@ -1,35 +1,35 @@
- {{whois.nick}} + {{whois.nick}} ({{whois.user}}@{{whois.host}}): {{whois.real_name}}
{{#if whois.account}}
- {{whois.nick}} + {{whois.nick}} is logged in as {{whois.account}}
{{/if}} {{#if whois.channels}}
- {{whois.nick}} + {{whois.nick}} is on the following channels: {{{parse whois.channels}}}
{{/if}} {{#if whois.server}}
- {{whois.nick}} + {{whois.nick}} is connected to {{whois.server}} ({{whois.server_info}})
{{/if}} {{#if whois.secure}}
- {{whois.nick}} + {{whois.nick}} is using a secure connection
{{/if}} {{#if whois.away}}
- {{whois.nick}} + {{whois.nick}} is away ({{whois.away}})
{{/if}}