From 24c171db1ed57368e9dd44e91f70d70bd4c718ac Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 13 Sep 2018 13:59:42 -0400
Subject: [PATCH] Undo the changes for setting tabs.

Going back to the old way. We'll be updating this, and I don't want huge
conflicts by the time I try to merge these changes in.
---
 views/admin/settings/header.html | 46 ++++++++++++--------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/views/admin/settings/header.html b/views/admin/settings/header.html
index 5361c8fb..820efc6b 100644
--- a/views/admin/settings/header.html
+++ b/views/admin/settings/header.html
@@ -3,35 +3,23 @@
     <h2>{$glmPluginName} Settings</h2>
 
     <h2 class="nav-tab-wrapper">
-
-        <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">GLM Associate</a>
-
-        {foreach $addOnTabs as $a}
-            <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
-        {/foreach}
-
+{if apply_filters('glm-member-db-common-members-enabled', false)}
+
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">{$terms.term_member_cap} Types</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">{$terms.term_member_cap} Categories</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
+{/if}
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
+{if apply_filters('glm-member-db-common-members-enabled', false)}
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
+  {if apply_filters('glm-member-db-common-counties-enabled', false)}
+            <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
+  {/if}
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=emailsettings" class="nav-tab{if $thisAction==emailsettings} nav-tab-active{/if}">Email Settings</a>
+{/if}
+{foreach $addOnTabs as $a}
+        <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+{/foreach}
     </h2>
-
     <div id="glm-admin-content-container">
 
-        {if isset( $thisAction ) && in_array( $thisAction, array( 'index', 'categories', 'amenities', 'cities', 'regions', 'counties', 'emailsettings' ) )}
-            <h2 class="nav-tab-wrapper">
-                {if apply_filters('glm-member-db-common-members-enabled', false)}
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">{$terms.term_member_cap} Types</a>
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=categories" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">{$terms.term_member_cap} Categories</a>
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=amenities" class="nav-tab{if $thisAction==amenities} nav-tab-active{/if}">Amenities</a>
-                {/if}
-
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
-
-                {if apply_filters('glm-member-db-common-members-enabled', false)}
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
-                    {if apply_filters('glm-member-db-common-counties-enabled', false)}
-                        <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
-                    {/if}
-                {/if}
-
-                <a href="{$thisUrl}?page={$thisPage}&glm_action=emailsettings" class="nav-tab{if $thisAction==emailsettings} nav-tab-active{/if}">Email Settings</a>
-
-            </h2>
-        {/if}
-- 
2.17.1