From 6b9bb2c14a05c98c6260de022af1ff003be6af22 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 20 Jun 2021 20:50:20 -0700
Subject: [PATCH] msgtplui - Tweak tabs

---
 ext/msgtplui/ang/msgtplui/Edit.html | 31 ++++++++++++++++++++---------
 ext/msgtplui/ang/msgtplui/Edit.js   |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ext/msgtplui/ang/msgtplui/Edit.html b/ext/msgtplui/ang/msgtplui/Edit.html
index 047031c3f4..c71d171233 100644
--- a/ext/msgtplui/ang/msgtplui/Edit.html
+++ b/ext/msgtplui/ang/msgtplui/Edit.html
@@ -22,18 +22,31 @@
 
     <a name="msgtplui-tabs"></a>
     <div class="panel panel-info">
-      <ul class="panel-heading nav nav-tabs">
-        <li role="presentation" ng-class="{active: $ctrl.tab == 'main'}" ng-if="!$ctrl.lang">
-          <a class="text-success" crm-icon="fa-file" ng-click="$ctrl.tab = 'main'">{{ts('Current')}}</a>
+<!--    <div class="panel" ng-class="{'panel-info': $ctrl.tab === 'original', 'panel-warning': $ctrl.tab === 'txDraft', 'panel-success': $ctrl.tab.match('main|txActive')}">-->
+      <ul class="panel-heading nav nav-pills">
+        <li role="presentation" class="navitem" ng-class="{active: $ctrl.tab == 'main'}" ng-if="!$ctrl.lang">
+          <a class="nav-link text-success" ng-click="$ctrl.tab = 'main'">
+            <span crm-icon="fa-file"></span>
+            {{::ts('Current')}}
+          </a>
         </li>
-        <li role="presentation" ng-class="{active: $ctrl.tab == 'txActive'}" ng-if="!!$ctrl.lang">
-          <a class="text-success" crm-icon="fa-file" ng-click="$ctrl.tab = 'txActive'">{{ts('Current')}}</a>
+        <li role="presentation" class="navitem" ng-class="{active: $ctrl.tab == 'txActive'}" ng-if="!!$ctrl.lang">
+          <a class="nav-link text-success" ng-click="$ctrl.tab = 'txActive'">
+            <span crm-icon="fa-file"></span>
+            {{::ts('Current')}}
+          </a>
         </li>
-        <li role="presentation" ng-class="{active: $ctrl.tab == 'txDraft'}" ng-if="$ctrl.hasDraft()">
-          <a class="text-warning" crm-icon="fa-file" ng-click="$ctrl.tab = 'txDraft'">{{ts('Draft')}}</a>
+        <li role="presentation" class="navitem" ng-class="{active: $ctrl.tab == 'txDraft'}" ng-if="$ctrl.hasDraft()">
+          <a class="nav-link text-warning" ng-click="$ctrl.tab = 'txDraft'">
+            <span crm-icon="fa-file"></span>
+            {{::ts('Draft')}}
+          </a>
         </li>
-        <li role="presentation" ng-class="{active: $ctrl.tab == 'original'}">
-          <a class="text-info" crm-icon="fa-file" ng-click="$ctrl.tab = 'original'">{{ts('Original')}}</a>
+        <li role="presentation" class="navitem" ng-class="{active: $ctrl.tab == 'original'}">
+          <a class="nav-link text-default" ng-click="$ctrl.tab = 'original'">
+            <span crm-icon="fa-file"></span>
+            {{::ts('Original')}}
+          </a>
         </li>
       </ul>
       <div class="panel-body">
diff --git a/ext/msgtplui/ang/msgtplui/Edit.js b/ext/msgtplui/ang/msgtplui/Edit.js
index e1dd0d431b..1a430b1cfe 100644
--- a/ext/msgtplui/ang/msgtplui/Edit.js
+++ b/ext/msgtplui/ang/msgtplui/Edit.js
@@ -159,7 +159,7 @@
     $ctrl.records = prefetch;
     if (args.lang) {
       $ctrl.lang = args.lang;
-      $ctrl.tab = args.status === 'draft' ? 'txDraft' : 'txActive';
+      $ctrl.tab = (args.status === 'draft' && $ctrl.records.txDraft && $ctrl.records.txDraft._exists) ? 'txDraft' : 'txActive';
     }
     else {
       $ctrl.lang = null;
-- 
2.25.1