From 514494d421859c18190efb6d54397c20bab1cf50 Mon Sep 17 00:00:00 2001
From: Daniel Mee <danmee10@gmail.com>
Date: Thu, 27 Aug 2020 12:58:18 -0600
Subject: [PATCH] MAT-1694_email_icon_bug (#1503)

* MAT-1694_email_icon_bug (#1502)

* created new column for email trigger so that its position isn't affected by the email address

* cleanup

* fixed spec

* added cell to edit view to maintain spacing
---
 app/assets/javascripts/templates/users/edit_user.hbs    | 1 +
 app/assets/javascripts/templates/users/table_header.hbs | 1 +
 app/assets/javascripts/templates/users/user.hbs         | 3 ++-
 app/assets/stylesheets/users.less                       | 8 ++------
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/templates/users/edit_user.hbs b/app/assets/javascripts/templates/users/edit_user.hbs
index d8c56dd6b..bbf7d9f93 100644
--- a/app/assets/javascripts/templates/users/edit_user.hbs
+++ b/app/assets/javascripts/templates/users/edit_user.hbs
@@ -1,4 +1,5 @@
 <td><input type="text" class="form-control" name="email"></td>
+<td class="centered"></td>
 <td class="centered">{{measure_count}}</td>
 <td class="centered">{{patient_count}}</td>
 <td class="centered"><input type="checkbox" name="admin"></td>
diff --git a/app/assets/javascripts/templates/users/table_header.hbs b/app/assets/javascripts/templates/users/table_header.hbs
index 43ecddbb3..2fea5ae5f 100644
--- a/app/assets/javascripts/templates/users/table_header.hbs
+++ b/app/assets/javascripts/templates/users/table_header.hbs
@@ -1,5 +1,6 @@
 <tr>
   <th width="200px">Email Address</th>
+  <th width="75px" class="centered"></th>
   <th width="75px" class="centered">Measures ({{totalMeasures}})</th>
   <th width="75px" class="centered">Patients ({{totalPatients}})</th>
   <th width="75px" class="centered">Admin?</th>
diff --git a/app/assets/javascripts/templates/users/user.hbs b/app/assets/javascripts/templates/users/user.hbs
index e1e3e807d..e26357736 100644
--- a/app/assets/javascripts/templates/users/user.hbs
+++ b/app/assets/javascripts/templates/users/user.hbs
@@ -1,4 +1,5 @@
-<td class="user-email">{{email}}<i class="email-user fa fa-envelope fa-lg fa-fw"></i></td>
+<td class="user-email">{{email}}</td>
+<td><i class="email-user fa fa-envelope fa-lg fa-fw"></i></td>
 <td class="centered"><a href="admin/users/{{_id}}/measures">{{measure_count}}</a></td>
 <td class="centered"><a href="admin/users/{{_id}}/patients">{{patient_count}}</a></td>
 <td class="centered check">{{#if admin}}<i class="fa fa-check" aria-hidden="true"></i><span class="sr-only">checked</span>{{/if}}</td>
diff --git a/app/assets/stylesheets/users.less b/app/assets/stylesheets/users.less
index 2780b3f44..40d588ad2 100644
--- a/app/assets/stylesheets/users.less
+++ b/app/assets/stylesheets/users.less
@@ -6,11 +6,7 @@
     font-size: 1.25em;
     color: @brand-primary;
   }
-  td.user-email {
-    white-space: nowrap;
-    i {
-      cursor: pointer;
-      margin-left: 5px;
-    }
+  i.email-user {
+    cursor: pointer;
   }
 }