From fae19aa56c36ea5a4febf5bd3ced4a5326365fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 17 Nov 2014 14:51:28 +0100
Subject: [PATCH] FEATURE: improve admin IP lookup dialog (add username/trust
 level/read time/topics entered)

---
 .../templates/components/ip-lookup.hbs        | 26 ++++++++++++-------
 .../stylesheets/common/admin/admin_base.scss  |  8 ++++++
 config/locales/client.en.yml                  |  4 ++-
 3 files changed, 27 insertions(+), 11 deletions(-)

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 @@
           <dd>{{location.phone}}</dd>
         {{/if}}
       {{else}}
-        <div class="spinner"></div>
+        {{loading-spinner size="small"}}
       {{/if}}
 
-      <dt>{{i18n ip_lookup.other_accounts}}</dt>
-      <dd>
-        {{#if other_accounts_loading}}
-          <div class="spinner"></div>
-        {{else}}
-          {{#each other_accounts}}
-            {{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}}{{/link-to}}
+      <dt>{{i18n ip_lookup.other_accounts}}&nbsp;<strong>{{other_accounts.length}}</strong></dt>
+      <dd class="other-accounts">
+        {{#loading-spinner size="small" condition=other_accounts_loading}}
+          {{#if other_accounts}}
+            <ul>
+            {{#each other_accounts}}
+              <li>
+                {{#link-to "adminUser" this}}{{avatar this usernamePath="user.username" imageSize="small"}}&nbsp;{{username}}{{/link-to}}
+                ({{trustLevel.name}}),
+                <strong>{{i18n ip_lookup.read_time}}</strong>&nbsp;{{time_read}},
+                <strong>{{i18n ip_lookup.topics_entered}}</strong>&nbsp;{{topics_entered}}
+              </li>
+            {{/each}}
           {{else}}
             {{i18n ip_lookup.no_other_accounts}}
-          {{/each}}
-        {{/if}}
+          {{/if}}
+        {{/loading-spinner}}
       <dd>
     </dl>
     <button class="btn close" {{action "hide"}}>{{i18n close}}</button>
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}}:"