diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index ba9c9d28df2..e6ea920f462 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -33,20 +33,26 @@
{{location.phone}}
{{/if}}
{{else}}
-
+ {{loading-spinner size="small"}}
{{/if}}
- {{i18n ip_lookup.other_accounts}}
-
- {{#if other_accounts_loading}}
-
- {{else}}
- {{#each other_accounts}}
- {{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}}{{/link-to}}
+ {{i18n ip_lookup.other_accounts}} {{other_accounts.length}}
+
+ {{#loading-spinner size="small" condition=other_accounts_loading}}
+ {{#if other_accounts}}
+
+ {{#each other_accounts}}
+ -
+ {{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}} {{username}}{{/link-to}}
+ ({{trustLevel.name}}),
+ {{i18n ip_lookup.read_time}} {{time_read}},
+ {{i18n ip_lookup.topics_entered}} {{topics_entered}}
+
+ {{/each}}
{{else}}
{{i18n ip_lookup.no_other_accounts}}
- {{/each}}
- {{/if}}
+ {{/if}}
+ {{/loading-spinner}}
-
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 8d7f77cc1f0..fc25af6e6ae 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -85,6 +85,14 @@ td.flaggers td {
.close {
float: right;
}
+
+ .other-accounts {
+ margin: 0;
+ max-height: 200px;
+ overflow: auto;
+ ul { margin: 0; }
+ li { list-style: none; }
+ }
}
}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 01a7de8a803..5e5810ef192 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -278,8 +278,10 @@ en:
location_not_found: (unknown)
organisation: Organization
phone: Phone
- other_accounts: Other accounts with this IP address
+ other_accounts: "Other accounts with this IP address:"
no_other_accounts: (none)
+ read_time: "read time:"
+ topics_entered: "topics entered:"
user:
said: "{{username}}:"