From 8d94658cf7c0a3af8805696e09660eb33fe51e05 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Thu, 5 Mar 2020 21:56:15 +0000
Subject: [PATCH] Cleanup 'View Cart' form markup

---
 templates/CRM/Event/Cart/Page/ViewCart.tpl | 57 ++++++++++++----------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/templates/CRM/Event/Cart/Page/ViewCart.tpl b/templates/CRM/Event/Cart/Page/ViewCart.tpl
index cae154bb76..2e84d4965e 100644
--- a/templates/CRM/Event/Cart/Page/ViewCart.tpl
+++ b/templates/CRM/Event/Cart/Page/ViewCart.tpl
@@ -1,29 +1,36 @@
-<table>
-  <thead>
-    <tr>
-      <th>
-      </th>
-    <th>
-      </th>
-    </tr>
-  </thead>
-  <tbody>
-    {foreach from=$events_in_carts item=event_in_cart}
-     {if !$event_in_cart.main_conference_event_id}
+{if $events_count == 0}
+  <div class="crm-section crm-eventcart crm-eventcart-noevents">
+    <div class="content">
+      {ts}You have no events in the cart.{/ts}
+    </div>
+  </div>
+{else}
+  <div class="crm-section crm-eventcart crm-eventcart-hasevents">
+    <table>
+      <thead>
       <tr>
-  <td>
-    <a href="{crmURL p='civicrm/event/info' q="reset=1&id=`$event_in_cart.event.id`"}" title="{ts}View event info page{/ts}" class="bold">{$event_in_cart.event.title}</a>
-  </td>
-  <td>
-    <a title="Remove From Cart" class="action-item" href="{crmURL p='civicrm/event/remove_from_cart' q="reset=1&id=`$event_in_cart.event.id`"}">{ts}Remove{/ts}</a>
-  </td>
+        <th>
+        </th>
+        <th>
+        </th>
       </tr>
-     {/if}
-    {/foreach}
-  </tbody>
-</table>
-{if $events_count > 0}
-        <a href="{crmURL p='civicrm/event/cart_checkout' }" title="Check Out" class="button crm-check-out-button"><span>{ts}Check Out{/ts}</span></a>
-<br /><br />
+      </thead>
+      <tbody>
+      {foreach from=$events_in_carts item=event_in_cart}
+        {if !$event_in_cart.main_conference_event_id}
+          <tr>
+            <td>
+              <a href="{crmURL p='civicrm/event/info' q="reset=1&id=`$event_in_cart.event.id`"}" title="{ts}View event info page{/ts}" class="bold">{$event_in_cart.event.title}</a>
+            </td>
+            <td>
+              <a title="Remove From Cart" class="action-item" href="{crmURL p='civicrm/event/remove_from_cart' q="reset=1&id=`$event_in_cart.event.id`"}">{ts}Remove{/ts}</a>
+            </td>
+          </tr>
+        {/if}
+      {/foreach}
+      </tbody>
+    </table>
+    <a href="{crmURL p='civicrm/event/cart_checkout'}" class="button crm-check-out-button"><i class="crm-i fa-credit-card"></i> {ts}Checkout{/ts}</a>
+  </div>
 {/if}
 <a href="{crmURL p="civicrm/event/ical" q="reset=1&page=1&html=1"}">&laquo; Back to Event List</a>
-- 
2.25.1