diff --git a/client/css/style.css b/client/css/style.css index 4f6a8ec1..a4a4a397 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -1484,6 +1484,25 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */ display: inline-block; } +.whois { + display: -ms-grid; /* Edge 15- */ + display: grid; + -ms-grid-template-columns: max-content auto; + grid-template-columns: max-content auto; + margin: 0; +} + +.whois dt { + -ms-grid-column-start: 1; + grid-column-start: 1; + margin-right: 20px; +} + +.whois dd { + -ms-grid-column-start: 2; + grid-column-start: 2; +} + #form { background: #eee; border-top: 1px solid #ddd; diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl index 3f82243d..40c66977 100644 --- a/client/views/actions/whois.tpl +++ b/client/views/actions/whois.tpl @@ -1,93 +1,80 @@ -
- {{> ../user_name nick=whois.nick}} - ({{whois.user}}@{{whois.host}}) -
-{{#if whois.actualhost}} -
- {{> ../user_name nick=whois.nick}}'s actual host is: {{whois.actualhost}} ({{whois.actualip}}) -
-{{/if}} -{{#if whois.real_name}} -
- {{> ../user_name nick=whois.nick}}'s real name is: - {{{parse whois.real_name}}} -
-{{/if}} +

{{> ../user_name nick=whois.nick}}

+
{{#if whois.account}} -
- {{> ../user_name nick=whois.nick}} - is logged in as {{whois.account}} -
+
Logged in as:
+
{{whois.account}}
{{/if}} + +
Host mask:
+
{{whois.user}}@{{whois.host}}
+ +{{#if whois.actualhost}} +
Actual host:
+
{{whois.actualip}}{{#equal whois.actualhost whois.actualip}}{{else}} ({{whois.actualhost}}){{/equal}}
+{{/if}} + +{{#if whois.real_name}} +
Real name:
+
{{{parse whois.real_name}}}
+{{/if}} + {{#if whois.registered_nick}} -
- {{> ../user_name nick=whois.nick}} - {{whois.registered_nick}} -
-{{/if}} -{{#if whois.modes}} -
- {{> ../user_name nick=whois.nick}} - {{whois.modes}} -
-{{/if}} -{{#if whois.special}} -
- {{> ../user_name nick=whois.nick}} - {{whois.special}} -
-{{/if}} -{{#if whois.operator}} -
- {{> ../user_name nick=whois.nick}} - {{whois.operator}} -
-{{/if}} -{{#if whois.helpop}} -
- {{> ../user_name nick=whois.nick}} - is available for help -
-{{/if}} -{{#if whois.bot}} -
- {{> ../user_name nick=whois.nick}} - is a bot -
+
Registered nick:
+
{{whois.registered_nick}}
{{/if}} + {{#if whois.channels}} -
- {{> ../user_name nick=whois.nick}} - is on the following channels: {{{parse whois.channels}}} -
+
Channels:
+
{{{parse whois.channels}}}
{{/if}} -{{#if whois.server}} -
- {{> ../user_name nick=whois.nick}} - is connected to {{whois.server}} ({{whois.server_info}}) -
+ +{{#if whois.modes}} +
Modes:
+
{{whois.modes}}
{{/if}} -{{#if whois.secure}} -
- {{> ../user_name nick=whois.nick}} - is using a secure connection -
+ +{{#if whois.special}} +
Special:
+
{{whois.special}}
{{/if}} + +{{#if whois.operator}} +
Operator:
+
{{whois.operator}}
+{{/if}} + +{{#if whois.helpop}} +
Available for help:
+
Yes
+{{/if}} + +{{#if whois.bot}} +
Is a bot:
+
Yes
+{{/if}} + {{#if whois.away}} -
- {{> ../user_name nick=whois.nick}} - is away ({{whois.away}}) -
+
Away:
+
{{{parse whois.away}}}
{{/if}} + +{{#if whois.secure}} +
Secure connection:
+
Yes
+{{/if}} + +{{#if whois.server}} +
Connected to:
+
{{whois.server}} ({{whois.server_info}})
+{{/if}} + {{#if whois.logonTime}} -
- {{> ../user_name nick=whois.nick}} - connected at {{localetime whois.logonTime}} -
+
Connected at:
+
{{localetime whois.logonTime}}
{{/if}} + {{#if whois.idle}} -
- {{> ../user_name nick=whois.nick}} - has been idle since {{localetime whois.idleTime}} -
+
Idle since:
+
{{localetime whois.idleTime}}
{{/if}} +