Samson Mutunga 3 年之前
父節點
當前提交
456f4c11f1
共有 2 個文件被更改,包括 18 次插入16 次删除
  1. 1 1
      resources/views/app/patient/send_email.blade.php
  2. 17 15
      resources/views/layouts/patient.blade.php

+ 1 - 1
resources/views/app/patient/send_email.blade.php

@@ -1,6 +1,6 @@
 <div class="d-inline" id="outgoingEmailTemplate">
     <div moe wide center class="ml-auto">
-        <a show href="" start>Send Email</a>
+        <a show href="" start><i class="fas fa-paper-plane"></i> Send Email</a>
         <form url="/api/imail/create">
             <div id="outgoingEmailTemplateComponent" v-cloak>
                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">

+ 17 - 15
resources/views/layouts/patient.blade.php

@@ -354,6 +354,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 						$patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
 
 						$confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
+						$hasConfirmedEmail = empty($patient->email_address) ? false:true;
 						$confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
 
 						$location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
@@ -922,15 +923,23 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 												{{$patient->phone_home}}
 											</li>
 										@endif
-										<li class="d-flex align-items-baseline">
-											<div class="{{empty($confirmedEmail) || $confirmedEmail === '-' ? 'screen-only' : ''}}">
-												<span class="aligned-icon">
-													<i class="fa fa-envelope" aria-hidden="true"></i>
-												</span>
-												{{$confirmedEmail}}
-											</div>
+										<li class="d-flex align-items-start">
+											<div class="d-flex align-items-center flex-wrap">												
+													<span class="ml-1 mr-2"><i class="fa fa-envelope"></i> 
+														@if($hasConfirmedEmail)
+															{{$confirmedEmail}}
+														@else
+															<i>(No email address)</i>
+														@endif
+													</span>
+													<div>
+														@include('app.patient.send_email')
+													</div>
+											</div>								
+										</li>
+
+										<li class="d-flex align-items-start">
 											<div class="d-inline-flex screen-only">
-												<span class="mx-2 text-secondary text-sm">|</span>
 												<span class="aligned-icon text-primary">
 													<i class="fa fa-link" aria-hidden="true"></i>
 												</span>
@@ -940,13 +949,6 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 												</a>
 											</div>
 										</li>
-
-										<li class="d-flex align-items-baseline">
-											
-											<div class="d-inline-flex screen-only">
-												@include('app.patient.send_email')
-											</div>
-										</li>
 									</ul>
 									
 								</div>