From 8c0004b53b7cf6475ad53b438aea896250f908e5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 29 Mar 2018 10:56:20 +0300
Subject: [PATCH] Improve email history link

---
 resources/views/clients/show.blade.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index 215b6d6f1d58..cf42a9d40f8b 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -171,18 +171,12 @@
 
 		<div class="col-md-3">
 			<h3>{{ trans('texts.contacts') }}</h3>
-		  	@foreach ($client->contacts as $contact)
+            @foreach ($client->contacts as $contact)
                 @if ($contact->first_name || $contact->last_name)
                     <b>{{ $contact->first_name.' '.$contact->last_name }}</b><br/>
                 @endif
                 @if ($contact->email)
-                    <i class="fa fa-envelope" style="width: 20px"></i>{!! HTML::mailto($contact->email, $contact->email) !!}
-                    @if (config('services.postmark'))
-                        | <a href="#" onclick="showEmailHistory('{{ $contact->email }}')">
-                            {{ trans('texts.history') }}
-                        </a>
-                    @endif
-                    <br/>
+                    <i class="fa fa-envelope" style="width: 20px"></i>{!! HTML::mailto($contact->email, $contact->email) !!}<br/>
                 @endif
                 @if ($contact->phone)
                     <i class="fa fa-phone" style="width: 20px"></i>{{ $contact->phone }}<br/>
@@ -197,11 +191,16 @@
 
                 @if (Auth::user()->confirmed && $client->account->enable_client_portal)
                     <i class="fa fa-dashboard" style="width: 20px"></i><a href="{{ $contact->link }}"
-                        onclick="window.open('{{ $contact->link }}?silent=true', '_blank');return false;">{{ trans('texts.view_in_portal') }}
-                    </a><br/>
+                        onclick="window.open('{{ $contact->link }}?silent=true', '_blank');return false;">{{ trans('texts.view_in_portal') }}</a>
+                    @if (config('services.postmark'))
+                        | <a href="#" onclick="showEmailHistory('{{ $contact->email }}')">
+                            {{ trans('texts.email_history') }}
+                        </a>
+                    @endif
+                    <br/>
                 @endif
                 <br/>
-		  	@endforeach
+            @endforeach
 		</div>
 
 		<div class="col-md-3">