Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
MAT-1694_email_icon_bug (#1503)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
danmee10 authored Aug 27, 2020
1 parent 3f24612 commit 514494d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
1 change: 1 addition & 0 deletions app/assets/javascripts/templates/users/edit_user.hbs
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/templates/users/table_header.hbs
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
3 changes: 2 additions & 1 deletion app/assets/javascripts/templates/users/user.hbs
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 2 additions & 6 deletions app/assets/stylesheets/users.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

0 comments on commit 514494d

Please sign in to comment.